opskeleton 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26d32885b62a88bd0bd3fd0efe5488a7354f5c80
-  data.tar.gz: 55c592d0a60a47ee379c312f7def6321254efed0
+  metadata.gz: a4527e12e7195227b3a1e6196be5bcc73fd1bd14
+  data.tar.gz: 0b80916fb0d4088c32ec46985781d8caadb29dcf
 SHA512:
-  metadata.gz: 01e7c53f0f89763dd0ff559fd62488a3ca6eab03c7b5872d0c86636b89c20ad2fc3cbc093662279481c0ead19432cbd205a5436e9d4eddc24fcf79bf50822f48
-  data.tar.gz: 19f77f77c16957c07db7d24c033fcce43ca0bb6dafd7594ca5cdef4527200613009d31f876e361e479531b0747e76ff218ae9d8283a10df69a92a3205b8dd666
+  metadata.gz: 384af8c4b51c63cca1d3437c1a3004838727ee211b66bbecd58a3d7c4570f6d35422de8b1988a842aa0fdbe732aacd5ef6bc6a8438200a6565b777d22cab5416
+  data.tar.gz: f296b30e181976539c91e59f4c86de5c11eaf6347faa97d6199a2dfda8bf18070ba7636c2491da5e9b2e3e9e456b57940cd88f64e1e10abe6c055a75c9f527bc

data/.gitignore

@@ -1,3 +1,4 @@
 pkg
 foo-sandbox
 dist
+puppet.log

data/Gemfile.lock

@@ -1,18 +1,17 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.9.8)
+    opskeleton (0.9.9)
       aws-sdk (~> 2)
       bintray_deploy
       git
-      git_clone_url
+      git_clone_url (~> 1.0)
       net-scp
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
     activemodel (4.2.3)
       activesupport (= 4.2.3)
       builder (~> 3.1)
@@ -22,68 +21,34 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    asciidoctor (1.5.2)
-    aws-sdk (2.1.8)
-      aws-sdk-resources (= 2.1.8)
-    aws-sdk-core (2.1.8)
+    asciidoctor (1.5.5)
+    aws-sdk (2.7.3)
+      aws-sdk-resources (= 2.7.3)
+    aws-sdk-core (2.7.3)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.1.8)
-      aws-sdk-core (= 2.1.8)
+    aws-sdk-resources (2.7.3)
+      aws-sdk-core (= 2.7.3)
+    aws-sigv4 (1.0.0)
     bintray_deploy (0.0.4)
       configuration
       rest-client
       thor
-    builder (3.2.2)
-    chef (12.4.1)
-      chef-config (= 12.4.1)
-      chef-zero (~> 4.2, >= 4.2.2)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
-      mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.4)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1)
-      ohai (~> 8.0)
-      plist (~> 3.1.0)
-      pry (~> 0.9)
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
-      syslog-logger (~> 1.6)
-    chef-config (12.4.1)
-      mixlib-config (~> 2.0)
-      mixlib-shellout (~> 2.0)
-    chef-zero (4.2.3)
-      ffi-yajl (>= 1.1, < 3.0)
-      hashie (~> 2.0)
-      mixlib-log (~> 1.3)
-      rack
-      uuidtools (~> 2.1)
-    coderay (1.1.0)
+    builder (3.2.3)
+    coderay (1.1.1)
     configuration (1.3.4)
-    diff-lcs (1.2.5)
-    domain_name (0.5.24)
+    diff-lcs (1.3)
+    domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
-    erubis (2.7.0)
-    facter (2.4.4)
-      CFPropertyList (~> 2.2.6)
-    faraday (0.9.1)
+    facter (2.4.6)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
-    ffi-yajl (2.2.2)
-      libyajl2 (~> 1.2)
+    ffi (1.9.17)
     formatador (0.2.5)
-    git (1.2.9.1)
-    git_clone_url (0.1.0)
-      uri-ssh_git
-    guard (2.12.9)
+    git (1.3.0)
+    git_clone_url (1.0.1)
+      uri-ssh_git (>= 1.0, < 2.0)
+    guard (2.13.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
@@ -99,7 +64,6 @@ GEM
     guard-shell (0.7.1)
       guard (>= 2.0.0)
       guard-compat (~> 1.0)
-    hashie (2.1.2)
     her (0.6.8)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -107,78 +71,51 @@ GEM
       multi_json (~> 1.7)
     hiera (1.3.4)
       json_pure
-    highline (1.7.2)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (0.7.0)
-    ipaddress (0.8.0)
-    jmespath (1.0.2)
-      multi_json (~> 1.0)
+    jmespath (1.3.1)
     json (1.8.3)
-    json_pure (1.8.2)
+    json_pure (2.0.3)
     librarian-puppet (2.1.0)
       librarianp (>= 0.5.1)
       puppet_forge
       rsync
     librarianp (0.6.3)
       thor (~> 0.15)
-    libyajl2 (1.2.0)
-    listen (3.0.3)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    lumberjack (1.0.11)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    minitest (5.7.0)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.5.0)
-    mixlib-config (2.2.1)
-    mixlib-log (1.6.0)
-    mixlib-shellout (2.1.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.10.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
-    nenv (0.2.0)
+    nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.1)
-      net-ssh (>= 2.6.5)
-      net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
-    netrc (0.10.3)
-    notiffany (0.0.6)
+    net-ssh (4.0.1)
+    netrc (0.11.0)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    ohai (8.5.0)
-      ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
-      ipaddress
-      mime-types (~> 2.0)
-      mixlib-cli
-      mixlib-config (~> 2.0)
-      mixlib-log
-      mixlib-shellout (~> 2.0)
-      rake (~> 10.1)
-      systemu (~> 2.6.4)
-      wmi-lite (~> 1.0)
-    plist (3.1.0)
     posix-spawn (0.3.11)
-    pry (0.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puppet (3.7.5)
+    puppet (3.8.7)
       facter (> 1.6, < 3)
       hiera (~> 1.0)
       json_pure
-    puppet-lint (1.1.0)
-    puppet-syntax (2.0.0)
+    puppet-lint (2.1.0)
+    puppet-syntax (2.2.0)
       rake
     puppet_forge (1.0.5)
       her (~> 0.6.8)
@@ -191,62 +128,40 @@ GEM
     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)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rest-client (1.8.0)
+    rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-puppet (2.2.0)
+      rspec-support (~> 3.5.0)
+    rspec-puppet (2.5.0)
       rspec
-    rspec-support (3.3.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
+    rspec-support (3.5.0)
     rsync (1.0.9)
-    serverspec (2.20.0)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.38)
-    sfl (2.2)
     shellany (0.0.1)
     slop (3.6.0)
-    specinfra (2.38.1)
-      net-scp
-      net-ssh (~> 2.7)
-      net-telnet
-      sfl
-    syslog-logger (1.6.8)
-    systemu (2.6.5)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
-    uri-ssh_git (0.1.1)
-    uuidtools (2.1.5)
-    wmi-lite (1.0.0)
+    unf_ext (0.0.7.2)
+    uri-ssh_git (1.0.0)
     yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -254,14 +169,15 @@ PLATFORMS
 
 DEPENDENCIES
   asciidoctor
-  chef
-  guard
+  guard (= 2.13.0)
   guard-minitest
   guard-shell
   librarian-puppet (= 2.1.0)
   opskeleton!
-  pry
-  puppet (= 3.7.5)
+  puppet (= 3.8.7)
   puppetlabs_spec_helper (>= 0.1.0)
   pygments.rb
   rspec-puppet
+
+BUNDLED WITH
+   1.14.3

data/README.md

@@ -4,9 +4,9 @@
 
 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.
+* Developing Puppet modules on master machines which results with 'It works on my master' approach.
+* Large monolithic Puppet code bases, code isn't modular or reusable.
+* Implicit/Missing dependencies including: Ruby version, OS, gems, modules.
 * 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).

data/autocomplete/_opsk

@@ -0,0 +1,11 @@
+#compdef opsk
+#autoload
+
+local lines words
+
+words=(${(f)"$(opsk | grep opsk | cut -d " " -f 4)"} )
+lines=(${(f)"$(opsk  | grep opsk | cut -d '#'  -f 2)"})
+
+compadd -l -d lines -a -- words
+
+# compadd `opsk | grep opsk | cut -d " " -f 4`

data/bin/opsk

@@ -16,11 +16,11 @@ module Opsk
   class Root < Thor
 
     register Opsk::GeneratePuppet, 'generate_puppet', "generate_puppet [name] [box]", 'generates a Puppet based project '
-    register Opsk::GenerateChef, 'generate_chef', "generate_chef [name] [box]", 'generates a Chef based project '
+    register Opsk::Analyze, 'analyze', "profile [file]", 'analyze the output of a puppet run'
     register Opsk::Module, 'module', 'module [name]', 'generate an rspec ready Puppet module'
     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::Update, 'update', 'update [module]', 'update a common module across projects'
     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'
@@ -38,8 +38,8 @@ end
 
 # not sure that this is the cleanest way
 Opsk::Root.tasks['generate_puppet'].options = Opsk::GeneratePuppet.class_options 
-Opsk::Root.tasks['generate_chef'].options = Opsk::GenerateChef.class_options 
 Opsk::Root.tasks['push'].options = Opsk::Push.class_options 
 Opsk::Root.tasks['commit'].options = Opsk::Commit.class_options 
+Opsk::Root.tasks['analyze'].options = Opsk::Analyze.class_options 
 
 Opsk::Root.start ARGV

data/docs/doc.adoc

@@ -7,8 +7,10 @@ v0.9.2
 :idprefix:
 :source-highlighter: pygments
 :pygments-style: friendly
+:ubuntuversion: 16.04
 :sectlinks:
 
+
 == Introduction
 
 Opskelaton is an opinionated bootstrap tool for local Sandbox projects, it aims to solve the following common issues:
@@ -31,7 +33,7 @@ Currently Opskeleton supports Puppet and Chef, this guide is segmented to common
 
 Perquisites (on Ubuntu):
 
-* Vagrant 1.7.x
+* Vagrant 1.8.x
 * RVM
 * Ruby >= 2.1.2
 
@@ -40,6 +42,26 @@ Perquisites (on Ubuntu):
  $ sudo gem install opskeleton
 ``` 
 
+=== Autocompletion
+
+Both zsh and bash are supported just copy the macthing file from the project https://github.com/opskeleton/opskeleton/tree/master/autocomplete[autocomplete] folder.
+
+```bash
+$ opsk help
+ Describe available commands or one spe...
+ bumps up version (clearing old version...
+ cleans up packaging products
+ deploy packge into bintray.com
+ deploy packge into s3 bucket under pat...
+ deploy packge using scp to host
+ generate an rspec ready Puppet module
+ generates a Chef based project 
+ generates a Puppet based project 
+ packages current module for celestial
+ print opsk version
+
+```
+
 === 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):
@@ -47,19 +69,19 @@ Opskeleton recommends the use of https://github.com/box-cutter[box-cutter] in or
 # make sure to have latest packer
 $ packer version
 Packer v0.6.0
-$ git clone git@github.com:box-cutter/ubuntu-vm.git
+$ 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
+$ make virtualbox/ubuntu1604
 ```
 A useful convention for Box names:
 
 ```bash
-ubuntu-14.04_puppet-3.6.1 ([os]-[version]_[provisioner]-[version])
+ubuntu-{ubuntuversion}_puppet-3.6.1 ([os]-[version]_[provisioner]-[version])
 ```
 
 == Puppet
@@ -262,22 +284,11 @@ Opskeleton generates a Vagrant file with couple of enhancements:
 * 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
+$ opsk generate_puppet redis ubuntu-16.04 --bench-enable
 # install imagemagic before bundle install
 $ sudo apt-get install imagemagick libmagickwand-dev
 $ rake serverspec:redis
@@ -296,125 +307,6 @@ $ rake plot:hosts plot:per_hosts
 $ 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 link:https://github.com/applicationsonline/librarian-chef[librarian-chef]) cookbook 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: