updates to pip install works

.gitignore

@@ -1,5 +1,6 @@
 *.py[cod]
 test/testconfig/cache
+MANIFEST
 
 # C extensions
 *.so

MANIFEST.in

@@ -0,0 +1,4 @@
+include README.md  COPYING
+include packaging/distutils/setup.py
+recursive-include share *
+include Makefile

Makefile

@@ -0,0 +1,42 @@
+#!/usr/bin/make
+# WARN: gmake syntax
+########################################################
+# Makefile for Battleschool
+#
+# useful targets:
+#   make sdist ---------------- produce a tarball
+
+########################################################
+# variable section
+
+NAME = "battleschool"
+OS = $(shell uname -s)
+
+PYTHON=python
+SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
+# VERSION file provides one place to update the software version
+VERSION := $(shell cat VERSION)
+
+########################################################
+
+all: clean python
+
+clean:
+	@echo "Cleaning up distutils stuff"
+	rm -rf build
+	rm -rf dist
+	@echo "Cleaning up byte compiled python stuff"
+	find . -type f -regex ".*\.py[co]$$" -delete
+	@echo "Cleaning up editor backup files"
+	find . -type f \( -name "*~" -or -name "#*" \) -delete
+	find . -type f \( -name "*.swp" \) -delete
+
+python:
+	$(PYTHON) setup.py build
+
+install:
+	$(PYTHON) setup.py install
+
+sdist: clean
+	$(PYTHON) setup.py sdist -t MANIFEST.in

README.md

@@ -3,6 +3,11 @@
 
 Development environment provisioning using ansible, ala boxen -> puppet, kitchenplan -> chef
 
+### install
+
+    sudo pip install https://github.com/32degrees/battleschool/archive/v0.0.1.tar.gz
+
+
 ### remote source playbooks
 
 Directory Layout
@@ -14,10 +19,12 @@ The top level of the directory would contain files and directories like so:
     ux.yml                    # playbook for ux
 
     roles/                    # standard ansible role hierarchy
-    modules/                  # remote module definitions
+    library/                  # remote module definitions
 
-TODO: Consolidated simple cli output
+TODO: Polish cli output
 
 TODO: Docs
 
+TODO: Submit pip
+
 TODO: Submit mac port

VERSION

@@ -0,0 +1 @@
+0.0.1

lib/battleschool/constants.py

@@ -15,13 +15,11 @@ def get_config(env_var, default):
 # correct location. See #1277 for discussion
 if getattr(sys, "real_prefix", None):
     DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/battleschool/')
-    DIST_CONFIG_PATH = os.path.join(sys.prefix, 'etc/battleschool/')
 else:
     DIST_MODULE_PATH = '/usr/share/battleschool/'
-    DIST_CONFIG_PATH = '/etc/battleschool/'
 
-DEFAULT_MODULE_PATH = get_config('BATTLESCHOOL_LIBRARY', DIST_MODULE_PATH)
-DEFAULT_HOST_LIST = os.path.expanduser(get_config('BATTLESCHOOL_HOSTS', os.path.join(DIST_CONFIG_PATH, 'hosts')))
-DEFAULT_PLAYBOOK = os.path.expanduser(get_config('BATTLESCHOOL_PLAYBOOK', os.path.join(DIST_MODULE_PATH, 'battleschool.yml')))
+DEFAULT_MODULE_PATH = get_config('BATTLESCHOOL_LIBRARY', os.path.join(DIST_MODULE_PATH, 'library'))
+DEFAULT_HOST_LIST = os.path.expanduser(get_config('BATTLESCHOOL_HOSTS', os.path.join(DIST_MODULE_PATH, 'defaults', 'hosts')))
+DEFAULT_PLAYBOOK = os.path.expanduser(get_config('BATTLESCHOOL_PLAYBOOK', os.path.join(DIST_MODULE_PATH, 'defaults', 'battleschool.yml')))
 DEFAULT_CALLBACK_PLUGIN_PATH = os.path.expanduser(get_config('BATTLESCHOOL_CALLBACK_PLUGINS', os.path.join(DIST_MODULE_PATH, 'callback_plugins')))
 

setup.py

@@ -23,7 +23,7 @@
 
 setup(name='battleschool',
       version=__version__,
-      description='Radically simple IT automation',
+      description='simple dev box provisioning',
       author=__author__,
       author_email='spencer@32degre.es',
       url='http://32degre.es',

share/defaults/battleschool.yml

@@ -0,0 +1,11 @@
+---
+- hosts: workstation
+  vars_files:
+    - ~/.battleschool/config.yml
+
+  tasks:
+    - name: print from playbook
+      debug: msg="in battleschool.yml"
+
+    #- include: {{item}}
+    #  with_items: playbooks

share/defaults/hosts

@@ -0,0 +1,2 @@
+[workstation]
+localhost		ansible_connection=local