opskeleton 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fc7f3c7be28794db4f4439d770863d598989ba5
-  data.tar.gz: a39ccc598356b656e7429dbcad46f9c11f0fc604
+  metadata.gz: 6a3103abb2babcf700c3c58e85a2834424e256c2
+  data.tar.gz: 0db0b9f223358e7a658d14a333ea6ece8a557b74
 SHA512:
-  metadata.gz: a036c652786fc5bf457b6fd01e1076ea0d25923d4fe0cf2d3660685349fe3a60e1c55e0da74e4cf396e6fa6689c02ebc97ec592a2d4d26e5bde94f1383cb6793
-  data.tar.gz: f06e8eb48afc25c213fd49ef7f753b569568ce729627e5bb654f909be84af4fc7e56e5872d5695b19af0a4f482c59a114b75fe743ce0b0e0eec8b6976866aba0
+  metadata.gz: ab2241dbf15147a3c7a64d7ed98c14e8ea63be23ecfc74b2caaddda89541cdb7c199185390c0bbf41cc15e16636bf5bc539ea1d3be1dd73490993e9da2362eec
+  data.tar.gz: bfabda81c608ba5c1bca8c634a182f51dc01aafbf9afdccd143467031794aa6834f3ff89c81afb2bd980d56ba512a8bbe3adc9e4e264054b4e8ad3552d7d6c3a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.4.4)
+    opskeleton (0.4.6)
       bintray_deploy
       thor
 

data/README.md

@@ -14,7 +14,7 @@ Opsk aims to solve the following common issues:
 
 See it in action [here](https://www.youtube.com/watch?v=LNlHC54Ej8c).
 
-[![Build Status](https://travis-ci.org/narkisr/opskeleton.png)](https://travis-ci.org/narkisr/opskeleton)
+[![Build Status](https://travis-ci.org/opskeleton/opskeleton.png)](https://travis-ci.org/opskeleton/opskeleton)
 
 Usage
 =========
@@ -57,14 +57,37 @@ Opskelaton defines a simple 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 [librarian-puppet](https://github.com/rodjek/librarian-puppet) module which reside under module folder.
+ 3. The extracted module is added back as a third party (using [librarian-puppet](https://github.com/rodjek/librarian-puppet) module which resides under modules folder.
 
 Life cycle scheme:
 
 <img src="https://raw.github.com/narkisr/vagrant-sketching-board/master/images/module-lifecycle-black.png" width='30%' hight='50%'  alt="" />
 
-## Packaging 
+Creating new (static) modules is easy as:
+
+```bash
+$ opsk module foo
+```
+
+Each generated module will contain puppet-rspec with matching Rakefile (see [testing](https://github.com/opskeleton/opskeleton#testing)).
 
+## Testing
+
+Opskelaton supports two levels of testing:
+
+* Static module testing that includes rspec and linting.
+* Integration testing using [serverspec](http://serverspec.org/) 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
@@ -75,6 +98,7 @@ $ cat opsk.yaml
 --- 
   version: '0.0.1'
   name: foo
+
 # post bundle and gem install ..
 $ opsk package
       create  pkg/foo-sandbox-0.0.1
@@ -110,6 +134,26 @@ deployed foo-sandbox-0.0.1.tar.gz to http://dl.bintray.com/narkisr/<bintray-repo
 ```
 
 Make sure to  [configure](https://github.com/narkisr/bintray-deploy#usage) configure the bintray API key.
+
+## 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.
+
 # Copyright and license
 
 Copyright [2013] [Ronen Narkis]

data/lib/opskeleton/generate.rb

@@ -41,7 +41,9 @@ module Opsk
 	template('templates/puppetfile.erb', "#{path}/Puppetfile")
 	template('templates/puppet/default.erb', "#{path}/manifests/default.pp")
 	copy_file('templates/run.sh', "#{path}/run.sh")
+	copy_file('templates/boot.sh', "#{path}/boot.sh")
 	chmod("#{path}/run.sh", 0755)
+	chmod("#{path}/boot.sh", 0755)
     end
 
     def create_heira
@@ -64,6 +66,10 @@ module Opsk
 	template('templates/parent/travis.erb', "#{path}/.travis.yml")
     end
 
+    def server_spec
+	directory('templates/parent/spec', "#{path}/spec")
+    end
+
     def git
 	if(!File.exists?("#{path}/.git"))
 	   copy_file('templates/gitignore', "#{path}/.gitignore")
@@ -75,8 +81,5 @@ module Opsk
 	end
     end
 
-    def server_spec
-	directory('templates/parent/spec', "#{path}/spec")
-    end
   end
 end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

data/templates/README.erb

@@ -3,9 +3,8 @@ This project manages a sandbox for [<%=name%>](url)
 
 # Usage
 ```bash
-  $ bundle install 
-  $ librarian-puppet install 
-  $ vagrant up
+  # install require gems, puppet modules and fire up vagrant
+  $ ./boot.sh
 ```
 
 # Copyright and license

data/templates/Rakefile

@@ -20,5 +20,5 @@ task :modspec do
 end
 
 require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.ignore_paths =['modules/**/*']
+PuppetLint.configuration.ignore_paths =['modules/**/*', 'vendor/**/*']
 PuppetLint.configuration.send("disable_80chars")

data/templates/boot.sh

@@ -0,0 +1,4 @@
+gem install bundle
+bundle install
+librarian-puppet install
+vagrant up

data/templates/parent/travis.erb

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
 script:
-  - "librarian-puppet install"
-  - "rake lint"
-  - "rake modspec"
+  - "bundle exec librarian-puppet install"
+  - "bundle exec rake lint"
+  - "bundle exec rake modspec"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,6 +128,7 @@ files:
 - templates/LICENSE-2.0.txt
 - templates/README.erb
 - templates/Rakefile
+- templates/boot.sh
 - templates/clean.yaml
 - templates/gemfile
 - templates/gitignore