opskeleton 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706f4bed888cfc1b329c1ef8c0511e93149b3520
-  data.tar.gz: 0eec567ed879cdd11c1985bd1e9e480b75acf1b3
+  metadata.gz: db0cc5b42bae8a325f0dc39601081e56e4ffe78d
+  data.tar.gz: acd80a01463506ae34c11de387f612701d42b68b
 SHA512:
-  metadata.gz: d6411095566b1a54b99b0553ea104134e3f86beb69fde48d6c210e3eca2e74ad080ebbb33e9c26f1f290306a47d5e54e9bff41a67d4deeddaf573092995d77f7
-  data.tar.gz: dea45fface16bd4c48c8c73bd901e3f8a9c5ebcd7e5c09d9814ff0200f9f21fb766f2d9b97847a1046d9dc6c24b5902738e81727d4a35add4e74b3abe663e35c
+  metadata.gz: b6e1fcb1c227fc69cc80522195605ec8e1f8f8a44ee51aba55bb29a81c974b6be69fa6357d67cd935564819fff58b05c28ec7365d4600b6d42fae90f9ad7105c
+  data.tar.gz: 0061f5575d2a0862f287d61a0072068ba2eb0b54a41f9cfec838f97e82fc5853f4ef6e7980253b264cd9f043f2e0fdfeb24285b38f219ff4864b97f57aec179e

data/.gitignore

@@ -1,2 +1,3 @@
 pkg
 foo-sandbox
+dist

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.8.12)
+    opskeleton (0.9.3)
       aws-sdk (~> 2)
       bintray_deploy
       git
@@ -21,6 +21,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    asciidoctor (1.5.2)
     aws-sdk (2.1.3)
       aws-sdk-resources (= 2.1.3)
     aws-sdk-core (2.1.3)
@@ -77,7 +78,24 @@ GEM
     ffi (1.9.10)
     ffi-yajl (2.2.0)
       libyajl2 (~> 1.2)
+    formatador (0.2.5)
     git (1.2.9.1)
+    guard (2.12.8)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-minitest (2.4.4)
+      guard-compat (~> 1.2)
+      minitest (>= 3.0)
+    guard-shell (0.7.1)
+      guard (>= 2.0.0)
+      guard-compat (~> 1.0)
     hashie (2.1.2)
     her (0.7.6)
       activemodel (>= 3.0.0, <= 4.3.0)
@@ -102,6 +120,10 @@ GEM
     librarianp (0.6.3)
       thor (~> 0.15)
     libyajl2 (1.2.0)
+    listen (3.0.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (2.6.1)
@@ -116,6 +138,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
     multipart-post (2.0.0)
+    nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
@@ -126,6 +149,9 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     netrc (0.10.3)
+    notiffany (0.0.6)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     ohai (8.5.0)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -139,6 +165,7 @@ GEM
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     plist (3.1.0)
+    posix-spawn (0.3.11)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -158,8 +185,14 @@ GEM
       puppet-syntax
       rake
       rspec-puppet
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
     rack (1.6.4)
     rake (10.4.2)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -192,10 +225,11 @@ GEM
       rspec-its
       specinfra (~> 2.35)
     sfl (2.2)
+    shellany (0.0.1)
     slop (3.6.0)
-    specinfra (2.37.0)
+    specinfra (2.37.1)
       net-scp
-      net-ssh
+      net-ssh (~> 2.7)
       net-telnet
       sfl
     syslog-logger (1.6.8)
@@ -209,18 +243,21 @@ GEM
     unf_ext (0.0.7.1)
     uuidtools (2.1.5)
     wmi-lite (1.0.0)
+    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  asciidoctor
   chef
+  guard
+  guard-minitest
+  guard-shell
   librarian-puppet (= 2.1.0)
   opskeleton!
   pry
   puppet (= 3.7.5)
   puppetlabs_spec_helper (>= 0.1.0)
+  pygments.rb
   rspec-puppet
-
-BUNDLED WITH
-   1.10.5

data/Guardfile

@@ -0,0 +1,12 @@
+
+guard :shell do
+  watch %r{^docs/.*adoc} do |m|
+    `rake asciidoc:create`
+  end
+end
+
+guard :minitest do
+  watch(%r{^test/(.*)\/?test_(.*)\.rb$}){'test'}
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$}){'test'}
+  watch(%r{^test/test_helper\.rb$}){'test'}
+end

data/README.md

@@ -2,59 +2,19 @@
 
 # Intro
 
-Opskelaton is an opinionated bootstrap tool for local Sandbox projects.
-
-Opskeleton aims to solve the following common issues:
- * Developing Puppet/Chef modules/cookbooks on master machines which results with 'It works on my master/server' approach.
- * Large monolithic Puppet/Chef code bases, code isn't modular or reusable.
- * Implicit/Missing dependencies, like ruby version used, operating system, gems, third party modules/cookbooks.
- * Manual steps in setting up modules/cookbooks and local sandboxes (like installing third party code).
- * Non standard layout, projects missing README and LICENSE files, no clear separation between developed and dependant code.
- * No clear development guidelines, for example extracting general modules and exporting them, no deployment packaging or general testing guide.
- * No continues build, linting and testing, provisioning code is second class citizen.
+Opskelaton is an opinionated bootstrap tool for local Sandbox projects, it aims to solve the following common issues:
+
+* Developing Puppet/Chef modules/cookbooks on master machines which results with 'It works on my master/server' approach.
+* Large monolithic Puppet/Chef code bases, code isn't modular or reusable.
+* Implicit/Missing dependencies including: Ruby version, OS, gems, modules/cookbooks.
+* Manual steps in setting up and maintaining such projects.
+* Non standard layout, projects missing README and LICENSE files, no clear separation between developed and dependant code.
+* Lacking development guidelines (for example extracting general modules and exporting them).
+* No continues build, linting and testing, provisioning code is second class citizen.
  
 Opskeleton comes to solve these issues by introducing a decentralized development work flow with pre-defined layout, packaging and dependency management.
 
-[![Build Status](https://travis-ci.org/opskeleton/opskeleton.png)](https://travis-ci.org/opskeleton/opskeleton)
-
-
-# Usage
-
-## Installation
-
-Perquisites (on Ubuntu):
-
-* Vagrant 1.7.x
-* RVM
-* Ruby 2.1.x
-
-```bash 
- $ rvm use system
- $ sudo gem install opskeleton
-``` 
-
-Now Follow either [Chef](docs/chef.md) or [Puppet](docs/puppet.md).
-
-# Boxes
-Opskeleton recommends the use of [box-cutter](https://github.com/box-cutter) in order to create Vagrant boxes in a consistent manner (as no free hosting solution currently exist):
-```bash
-# make sure to have latest packer
-$ packer version
-Packer v0.6.0
-$ git clone git@github.com:box-cutter/ubuntu-vm.git
-$ cd ubuntu-vm
-# Edit Makefile.local
-$ cat Makefile.local
-# Makefile.local
-CM := puppet
-CM_VERSION := 3.6.1
-$ make virtualbox/ubuntu1404
-```
-A useful convention for Box names:
-
-```bash
-ubuntu-14.04_puppet-3.6.1 ([os]-[version]_[provisioner]-[version])
-```
+For [Usage](http://opskeleton.github.io/opskeleton/latest/) and more info please follow the [docs](http://opskeleton.github.io/opskeleton/latest/).
 
 # Copyright and license
 

data/Rakefile

@@ -6,3 +6,23 @@ Rake::TestTask.new do |t|
     t.pattern = "test/*_test.rb"
     t.verbose = true
 end
+
+namespace :asciidoc do
+
+  desc 'create asciidoc'
+  task :create do
+    sh 'asciidoctor -a docinfo -a stylesheet! -o dist/latest/index.html docs/doc.adoc'
+  end
+
+  desc 'publish ascciidoc to gh-pages'
+  task :publish => [:create] do
+    sh 'ghp-import -m "Generate documentation" -b gh-pages dist/'
+    sh 'git push origin gh-pages'
+  end
+
+  desc 'clear asciidoc'
+  task :clear do
+    rm_rf 'dist'
+  end
+end
+

data/bin/opsk

@@ -21,6 +21,7 @@ module Opsk
     register Opsk::Package, 'package', 'package', 'packages current module for celestial'
     register Opsk::Dockerize, 'dockerize', 'dockerize [from] [os_type]', 'Creates a docker image from the current sandbox'
     register Opsk::Commit, 'commit', 'commit [message]', 'commit each changed puppet module under modules folder'
+    register Opsk::Uncommited, 'uncommited', 'uncommited', 'list uncommited modules changes'
     register Opsk::Push, 'push', 'push', 'push each changed puppet module under modules folder'
     register Opsk::Clean, 'clean', 'clean', 'cleans up packaging products'
     register Opsk::Bump, 'bump', 'bump', 'bumps up version (clearing old version also)'

data/docs/doc-docinfo.html

@@ -0,0 +1,2 @@
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Liberation+Mono:400|Roboto+Slab:400,700"/>
+<link rel="stylesheet" href="https://www.niwi.nz/_assets/asciidoctor-styles/simple-red-titles/stylesheet.css"/>

data/docs/doc.adoc

@@ -0,0 +1,434 @@
+= Opskeleton 
+Ronen Narkis, <narkisr@gmail.com>
+v0.9.2
+:toc: left
+:!numbered:
+:idseparator: -
+:idprefix:
+:source-highlighter: pygments
+:pygments-style: friendly
+:sectlinks:
+
+== Introduction
+
+Opskelaton is an opinionated bootstrap tool for local Sandbox projects, it aims to solve the following common issues:
+
+* Developing Puppet/Chef modules/cookbooks on master machines which results with 'It works on my master/server' approach.
+* Large monolithic Puppet/Chef code bases, code isn't modular or reusable.
+* Implicit/Missing dependencies including: Ruby version, OS, gems, modules/cookbooks.
+* Manual steps in setting up and maintaining such projects.
+* Non standard layout, projects missing README and LICENSE files, no clear separation between developed and dependant code.
+* Lacking development guidelines (for example extracting general modules and exporting them).
+* No continues build, linting and testing, provisioning code is second class citizen.
+ 
+Opskeleton comes to solve these issues by introducing a decentralized development work flow with pre-defined layout, packaging and dependency management.
+
+Currently Opskeleton supports Puppet and Chef, this guide is segmented to common functionality the respective separate sections for Puppet and Chef.
+
+== Usage
+
+=== Installation
+
+Perquisites (on Ubuntu):
+
+* Vagrant 1.7.x
+* RVM
+* Ruby 2.1.x
+
+```bash 
+ $ rvm use system
+ $ sudo gem install opskeleton
+``` 
+
+=== Boxes
+
+Opskeleton recommends the use of https://github.com/box-cutter[box-cutter] in order to create Vagrant boxes in a consistent manner (as no free hosting solution currently exist):
+```bash
+# make sure to have latest packer
+$ packer version
+Packer v0.6.0
+$ git clone git@github.com:box-cutter/ubuntu-vm.git
+$ cd ubuntu-vm
+# Edit Makefile.local
+$ cat Makefile.local
+# Makefile.local
+CM := puppet
+CM_VERSION := 3.6.1
+$ make virtualbox/ubuntu1404
+```
+A useful convention for Box names:
+
+```bash
+ubuntu-14.04_puppet-3.6.1 ([os]-[version]_[provisioner]-[version])
+```
+
+== Puppet
+
+=== Introduction
+
+Opskeleton supports the creation of Puppet based projects supporting dependency management (using librarian-puppet), linting and testing.
+
+
+=== Structure
+
+==== Layout
+
+Opskeleton generates the complete folder structure for projects:
+
+image:https://raw.githubusercontent.com/opskeleton/opskeleton/master/img/puppet-layout.png[width=30%,hight=50%]
+
+==== Lifecycle
+
+Opskelaton defines a module life cycle:
+
+1. Internal non reusable modules (usually specific to a client site) go under static-modules
+2. If we create a general reusable module which is ready for prime time we pull out to a new git repository.
+3. The extracted module is added back as a third party (using link:https://github.com/rodjek/librarian-puppet[librarian-puppet] module which resides under modules folder.
+
+Life cycle scheme:
+
+image:https://raw.githubusercontent.com/opskeleton/opskeleton/master/img/puppet-cycle.png[width='40%',hight='50%']
+
+Creating new (static) modules is easy as:
+
+```bash
+$ opsk module foo
+```
+
+Each generated module will contain puppet-rspec with matching Rakefile. 
+
+==== Pushing changes
+
+Making changes to third party modules is quite easy once librarian-puppet installed them locally (you can push only git based modules):
+
+```ruby
+forge "https://forgeapi.puppetlabs.com"
+
+mod 'puppetlabs/stdlib'
+mod 'puppetlabs/apt'
+
+mod 'strings/artifactory', 
+   :git => 'git://github.com/pulling-strings/puppet-artifactory.git'
+
+mod 'rip/module-data',
+  :git => 'git://github.com/ripienaar/puppet-module-data.git'
+```
+
+Its best practice to use git protocol (read only) which makes pushing changes from multiple modules a bit tedious, Opskeleton fixes that:
+
+
+We can list the changes:
+
+```bash 
+$ opsk uncommited
+Listing changes for modules/artifactory:
+
+changed files:
+
+- metadata.json
+
+added files:
+
+untracked files:
+```
+
+We can commit them (providing a commit message per module or --message for all):
+```bash
+# We hacked a number of submodules, now we commit
+$ opsk commit
+Listing changes for modules/artifactory:
+
+changed files:
+
+- metadata.json
+
+added files:
+
+untracked files:
+
+Commit the changes under modules/artifactory? (y/n) y
+Commit message:
+This is a nice change
+```
+
+
+Once commits are made we can push the changes:
+
+```bash
+$ opsk push
+Push modules/artifactory? (y/n) y
+pushing modules/artifactory ..
+```
+
+
+=== Testing
+
+Opskelaton supports two levels of testing:
+
+* Static module testing that includes rspec and linting.
+* Integration testing using http://serverspec.org/[serverspec]and Vagrant.
+
+```bash
+# linting all static modules
+$ rake lint
+# rspecing 
+$ rake modspec
+# running serverspec
+$ rake spec
+```
+
+=== Packaging 
+Opskelaton fully supports deployment and portable execution of sandboxes on non Vagrant environments:
+
+```bash
+$ opsk generate_puppet foo ubuntu-13.10
+$ cd foo-sandbox
+# The package version file
+$ cat opsk.yaml
+--- 
+  version: '0.0.1'
+  name: foo
+
+# post bundle and gem install ..
+$ opsk package
+      create  pkg/foo-sandbox-0.0.1
+      create  pkg/foo-sandbox-0.0.1/scripts
+      create  pkg/foo-sandbox-0.0.1/scripts/lookup.rb
+       chmod  pkg/foo-sandbox-0.0.1/scripts/lookup.rb
+      create  pkg/foo-sandbox-0.0.1/scripts/run.sh
+       chmod  pkg/foo-sandbox-0.0.1/scripts/run.sh
+      create  pkg/foo-sandbox-0.0.1/manifests/site.pp
+       exist  pkg
+$ ls pkg
+foo-sandbox-0.0.1  foo-sandbox-0.0.1.tar.gz
+```
+The packaging process creates a portable tar file that can be run on any machine with puppet installed via the bundled run.sh:
+
+```bash 
+$ tar -xvzf foo-sandbox-0.0.1.tar.gz
+$ cd foo-sandbox-0.0.1 
+$ sudo ./run.sh
+```
+
+An external node classifier based runner is also available under scripts/run.sh, this runner expects to get a <hostname>.yaml input file with the required node classes.
+
+=== Updating
+Keeping you box up to date with latest opsk version is easy, just re-generate it again and resolve conflicts by answering y/n:
+```bash
+# Moving to latest opsk
+$ gem update opskeleton
+# foo box already exists
+$ opsk generate foo <vagrant-box>
+ exist  foo-sandbox
+    conflict  foo-sandbox/Vagrantfile
+Overwrite /home/ronen/code/foo-sandbox/Vagrantfile? (enter "h" for help) [Ynaqdh]
+```
+
+=== Vagrant
+Opskeleton generates a Vagrant file with couple of enhancements:
+ 
+* VAGRANT_BRIDGE (default eth0) for setting up public bridge on the go.
+* PUPPET_ENV (default dev) for setting puppet environment.
+* Puppet options preset to match modules and hiera folders.
+
+=== Docker
+The only assumption that Opskelaton makes is that the target host will have Pupppet installed, this enables us to create docker images from our sandboxes quite easily:
+
+```bash
+# creates dockerfiles/<host> and fig.yml
+$ opsk dockerize
+$ opsk package
+# grabs the opsk tar file
+$ sudo fig build
+```
+
+=== Benchmarking
+Tracking the speed of our provisioning code is important for keeping a consistent level of service with the produced sandboxes, enabling benchmarking:
+
+```bash 
+$ opsk generate_puppet redis ubuntu-14.04 --bench-enable
+# install imagemagic before bundle install
+$ sudo apt-get install imagemagick libmagickwand-dev
+$ rake serverspec:redis
+# with each run more result lines will be recorded
+$ cat benchmark.json
+{"total":656,"host":"redis","revision":"5d03a41ade9fc3dd5296d4119ccb0b0ad8290b9e","time":"2014-12-17 02:57:45 +0200"}
+# add it to git for tracking
+$ git add benchmark.json
+```
+
+Now after a number of runs we could plot and view the results of a single host or of all the hosts side by side:
+
+```bash 
+$ rake plot:hosts plot:per_hosts
+# resulting png files 
+$ google-chrome plots
+```
+
+== Chef
+
+=== Introduction
+Opskelaton fully supports Chef based projects it offers similar features to the Puppet based sandboxes with additional support for roles, environments and cookbooks.
+
+Creating out first sandbox
+
+```bash
+$ opsk generate_chef redis ubuntu-14.04
+$ cd redis-sandbox
+```
+
+=== Structure
+
+==== layout
+Opskelaton creates the complete folder structure fine tuned to match best practices:
+
+Folder layout:
+
+image:https://raw.githubusercontent.com/opskeleton/opskeleton/master/img/chef-layout.png[width='30%',hight='50%']
+
+==== lifecycle
+
+Opskelaton defines a simple cookbook life cycle:
+
+ 1. Internal non reusable cookbooks (usually specific to a client site) go under static-cookbooks
+ 2. If we create a general reusable cookbook which is ready for prime time we pull out to a new git repository.
+ 3. The extracted cookbook is added back as a third party (using [librarian-chef](https://github.com/applicationsonline/librarian-chef) thatd will place them under cookbooks folder).
+
+Life cycle scheme:
+
+image:https://raw.githubusercontent.com/opskeleton/opskeleton/master/img/chef-cycle.png[width='40%',hight='50%']
+
+Creating new cookbooks is easy as:
+
+```bash
+$ opsk cookbook foo
+```
+
+=== Testing
+
+Opskelaton supports testing/linting:
+
+* Static cookbook testing that includes rspec and food-critic. (TBD)
+* Integration testing using [serverspec](http://serverspec.org/) and Vagrant.
+
+```bash
+# running serverspec
+$ rake spec
+```
+
+=== Packaging 
+Opskelaton fully supports deployment and portable execution of sandboxes on non Vagrant environments:
+
+```bash
+$ opsk generate_chef foo ubuntu-14.04.
+$ cd foo-sandbox
+# The package version file
+$ cat opsk.yaml
+
+--- 
+  version: '0.0.1'
+  name: redis
+  includes: 
+    - Cheffile
+    - cookbooks
+    - static-cookbooks
+    - dna.json
+    - environments
+    - Gemfile
+    - Gemfile.lock
+    - opsk.yaml
+    - roles
+    - LICENSE-2.0.txt
+    - run.sh
+    - boot.sh
+    - solo.rb
+
+# post bundle and gem install ..
+$ opsk package
+	create  pkg/foo-sandbox-0.0.1
+	create  pkg/foo-sandbox-0.0.1/scripts
+	create  pkg/foo-sandbox-0.0.1/scripts/lookup.rb
+	 chmod  pkg/foo-sandbox-0.0.1/scripts/lookup.rb
+	create  pkg/foo-sandbox-0.0.1/scripts/run.sh
+	 chmod  pkg/foo-sandbox-0.0.1/scripts/run.sh
+	 exist  pkg
+$ ls pkg
+foo-sandbox-0.0.1  foo-sandbox-0.0.1.tar.gz
+```
+The packaging process creates a portable tar file that can be run on any machine with chef-solo installed via the bundled run.sh:
+
+```bash 
+$ tar -xvzf foo-sandbox-0.0.1.tar.gz
+$ cd foo-sandbox-0.0.1 
+# expects to get the chef environment
+$ sudo ./run.sh dev
+```
+
+=== Updating
+
+Keeping you box up to date with latest opsk version is easy, just re-generate it again and resolve conflicts by answering y/n:
+```bash
+# Moving to latest opsk
+$ gem update opskeleton
+# foo box already exists
+$ opsk generate_chef foo <vagrant-box>
+ exist  foo-sandbox
+    conflict  foo-sandbox/Vagrantfile
+Overwrite /home/ronen/code/foo-sandbox/Vagrantfile? (enter "h" for help) [Ynaqdh]
+```
+
+=== Vagrant
+Opskeleton generates a Vagrant file with couple of enhancements:
+ 
+* CHEF_ENV (default dev) for setting chef environment.
+* Default role (sandbox name) created under roles/{type}.rb
+* static-cookbooks/cookbooks roles/environments folders are set.
+
+== Deployment
+
+The packaged tar files can be consumed using any tool and protocol (http, s3 etc),  opsk has built in support for deploying public sandboxes into:
+
+* Bintray (make sure to  https://github.com/narkisr/bintray-deploy#usage[configure] the bintray API key):
+
+```bash 
+$ opsk package
+$ opsk deploy_bintray <bintray-repo>
+   deployed foo-sandbox-0.0.1.tar.gz to http://dl.bintray.com/narkisr/<bintray-repo>/foo-sandbox-0.0.1.tar.gz
+```
+
+* S3 (Make sure to configure s3 section under ~/.configuration.rb):
+
+```bash 
+$ opsk package
+$ opsk deploy_s3 <bucket> <path>
+   deployed foo-sandbox-0.0.1.tar.gz to opsk-boxes/foo/foo-sandbox-0.0.1.tar.gz
+```
+
+```ruby
+Configuration.for('s3') {
+  access_key ''
+  secret_key ''
+  region ''
+}
+```
+
+* Scp (Make sure to configure scp section under ~/.configuration.rb):
+
+```bash 
+$ opsk package
+$ opsk deploy_scp bar
+   deployed foo-sandbox-0.0.1.tar.gz to foo@opsk-boxes:/var/boxes
+```
+
+```ruby
+Configuration.for('scp') {
+  bar {
+   host 'opsk-boxes'
+   user 'foo'
+   dest '/var/boxes'
+   # optional
+   port 2222
+ }
+}
+```
+

data/lib/opskeleton/commit.rb

@@ -1,14 +1,42 @@
 
-def report(g)
-  %i(changed added untracked).each do |state|
-    say "#{state} files:\n\n"
-    g.status.send(state).each do |k,v|
-	say "- #{k}"
+
+module  Opsk
+  class CommitGit
+    def initialize(d,options,thor)
+	@g = Git.init(d)
+	@options = options
+	@thor = thor
+    end
+
+    def changed?
+	@g.status.changed.keys.length > 0
+    end
+
+    def report
+	%i(changed added untracked).each do |state|
+	  @thor.say "#{state} files:\n\n"
+	  @g.status.send(state).each do |k,v|
+	    @thor.say "- #{k}"
+	  end
+	  @thor.say "\n"
+	end
+    end
+
+    def master_commit(d)
+	resp = @thor.yes? "Commit the changes under #{d}? (y/n)" unless @options['all']
+	if(@options['all'] or resp)
+	  @g.checkout('master')
+	  if @options['message']
+	    @g.commit_all(@options['message']) 
+	  else 
+	    @thor.say 'Commit message:'
+	    @g.commit_all(STDIN.gets.chomp) 
+	  end
+	end
+
     end
   end
-end
 
-module  Opsk
   class Commit < Thor::Group
     include Thorable, Thor::Actions
 
@@ -23,25 +51,19 @@ module  Opsk
     def commit
 	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
 	  if File.exists?("#{d}/.git")
-	    g = Git.init(d)
-	    if g.status.changed.keys.length > 0
-		say "Listing changes for #{d}:\n\n"
-		report(g)
-		resp = yes? "Commit the changes under #{d}? (y/n)" unless options['all']
-		if(options['all'] or resp)
-		  g.checkout('master')
-		  if options['message']
-		    g.commit_all(options['message']) 
-		  else 
-		    say 'Commit message:'
-		    g.commit_all(STDIN.gets.chomp) 
-		  end
+	    begin
+		cg = Opsk::CommitGit.new(d,options,self)
+		if cg.changed?
+		  say "Listing changes for #{d}:\n\n"
+		  cg.report
+		  cg.master_commit(d)
 		end
+	    rescue => e 
+		say "Failed to commit #{d} due to #{e}"
 	    end
 	  end
 	end
     end
 
-
   end
 end

data/lib/opskeleton/push.rb

@@ -32,17 +32,21 @@ module  Opsk
 
     def push
 	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
-	  if File.exists?("#{d}/.git")
-	    g = Git.init(d)
-	    add_writable(g,options['protocol'].to_sym)
-	    if !options['dry'] and g.diff('origin').stats[:files].keys.length > 0
-		resp = yes?("Push #{d}? (y/n)") unless options['all']
-		if(options['all'] or resp)
-		  say "pushing #{d} .."
-		  g.push('writable') 
-		  g.pull
+	  begin
+	    if File.exists?("#{d}/.git")
+		g = Git.init(d)
+		add_writable(g,options['protocol'].to_sym)
+		if !options['dry'] and g.diff('origin').stats[:files].keys.length > 0
+		  resp = yes?("Push #{d}? (y/n)") unless options['all']
+		  if(options['all'] or resp)
+		    say "pushing #{d} .."
+		    g.push('writable') 
+		    g.pull
+		  end
 		end
 	    end
+	  rescue => e
+	    say "Failed to push #{d} due to #{e}"
 	  end
 	end
     end

data/lib/opskeleton/uncommited.rb

@@ -0,0 +1,64 @@
+
+
+module  Opsk
+  class CommitGit
+    def initialize(d,options,thor)
+	@g = Git.init(d)
+	@options = options
+	@thor = thor
+    end
+
+    def changed?
+	@g.status.changed.keys.length > 0
+    end
+
+    def report
+	%i(changed added untracked).each do |state|
+	  @thor.say "#{state} files:\n\n"
+	  @g.status.send(state).each do |k,v|
+	    @thor.say "- #{k}"
+	  end
+	  @thor.say "\n"
+	end
+    end
+
+    def master_commit(d)
+	resp = @thor.yes? "Commit the changes under #{d}? (y/n)" unless @options['all']
+	if(@options['all'] or resp)
+	  @g.checkout('master')
+	  if @options['message']
+	    @g.commit_all(@options['message']) 
+	  else 
+	    @thor.say 'Commit message:'
+	    @g.commit_all(STDIN.gets.chomp) 
+	  end
+	end
+
+    end
+  end
+
+  class Uncommited < Thor::Group
+    include Thorable, Thor::Actions
+
+    def validate
+	check_root
+    end
+
+
+    def uncommited
+	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
+	  if File.exists?("#{d}/.git")
+	    begin
+		cg = Opsk::CommitGit.new(d,options,self)
+		if cg.changed?
+		  say "Listing changes for #{d}:\n\n"
+		  cg.report
+		end
+	    rescue => e 
+		say "Failed to check uncommited under #{d} due to #{e}"
+	    end
+	  end
+	end
+    end
+  end
+end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/lib/opskeleton.rb

@@ -16,5 +16,6 @@ require 'opskeleton/deploy_s3'
 require 'opskeleton/deploy_scp'
 require 'opskeleton/module'
 require 'opskeleton/commit'
+require 'opskeleton/uncommited'
 require 'opskeleton/push'
 

data/opskeleton.gemspec

@@ -22,6 +22,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('librarian-puppet', '= 2.1.0')
   gem.add_development_dependency('puppetlabs_spec_helper', '>= 0.1.0')
   gem.add_development_dependency('pry')
+  gem.add_development_dependency('asciidoctor')
+  gem.add_development_dependency('pygments.rb')
+  gem.add_development_dependency('guard')
+  gem.add_development_dependency('guard-shell')
+  gem.add_development_dependency('guard-minitest')
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -164,6 +164,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: asciidoctor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A generator for ops projects that include vagrant puppet and fpm
 email:
 - narkisr@gmail.com
@@ -179,6 +249,7 @@ files:
 - CHANGES.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE-2.0.txt
 - README.md
 - Rakefile
@@ -187,6 +258,8 @@ files:
 - bin/opsk
 - docs/chef.md
 - docs/deploy.md
+- docs/doc-docinfo.html
+- docs/doc.adoc
 - docs/puppet.md
 - img/chef-cycle.png
 - img/chef-layout.png
@@ -206,6 +279,7 @@ files:
 - lib/opskeleton/package.rb
 - lib/opskeleton/push.rb
 - lib/opskeleton/thorable.rb
+- lib/opskeleton/uncommited.rb
 - lib/opskeleton/version.rb
 - opskeleton.gemspec
 - templates/LICENSE-2.0.txt