opskeleton 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010f9793ae61094386bd62cbcb6057adc43fe3cf
-  data.tar.gz: ef76043ada71b082876516f259ff04c33421920d
+  metadata.gz: f6eca6be1a2c2a6584aa8a085aa9f80e78f98fc0
+  data.tar.gz: 0aaf45e8e17c7ddc71d02f577ac3478ff7a127d6
 SHA512:
-  metadata.gz: 0bf99b01016136f1bbc83e619f0732d970e4705c3f4a6189e201cfbfb26469f8f376a2a6331a977cd91f234529408822f2fdf211dbf6af662afac2eef4f89068
-  data.tar.gz: 32d147a5964d0718b00c618fc6873845f973f5c55d628c55db27151ef11befa4ff22581d1916b7c5ba6ea48448bff1829d35be7c44760e5d2bcf2c3b2e089a13
+  metadata.gz: e8a8953067ee4e0c6f4a839ea9cd6330a61a00c2ff12745564d5e9fbd9a32f867cd8aa1577f0ecdc20f9b4db751114e49facbefe0a1d89840af0a10bf6f1bfef
+  data.tar.gz: b643610aa6c5c733d7ee125ed553b1d686795b8a32b6c2a7006e39f3b94eb70053d428601eed9821234b42c650e2bd5aa3d0c42f42f0b04677be2e0cb7085aae

data/Gemfile.lock

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

data/README.md

@@ -5,15 +5,15 @@
 Opskelaton is an opinionated bootstrap tool for local Sandbox projects.
 
 Opskeleton aims to solve the following common issues:
- * Devops develop Puppet modules on master machines which results with 'It works on my (machine) master' approach.
- * Implicit/Missing dependencies, like ruby version used, operating system, gems, third party puppet module
- * Manual steps in setting up puppet modules and local sandboxes (like installing third party code).
+ * 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 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.
  
-Opskeleton comes to solve these issues by introducing a decentralized development workflow with pre-defined layout, packaging and dependency management.
-
-See it in action [here](https://www.youtube.com/watch?v=LNlHC54Ej8c).
+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)
 

data/chef.md

@@ -1,8 +1,6 @@
 # Intro
 
-Opskelaton fully supports chef based sandboxes with the same lifecycle semantics 
-
-it offers similar features to the Puppet based sandboxes with additional support for roles, environments and cookbooks.
+Opskelaton fully supports Chef based sandboxes it offers similar features to the Puppet based sandboxes with additional support for roles, environments and cookbooks.
 
 # Usage
 
@@ -19,7 +17,7 @@ Opskelaton creates the complete folder structure fine tuned to match best practi
 
 Folder layout:
 
-<!-- <img src="https://raw.github.com/narkisr/vagrant&#45;sketching&#45;board/master/images/opsk&#45;folders.png" width='30%' hight='50%'  alt="" /> -->
+<img src="https://github.com/opskeleton/opskeleton/blob/master/img/chef-layout.png" width='30%' hight='50%'  alt="" />
 
 
 ## Cookbook lifecycle
@@ -28,13 +26,13 @@ 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) cookbook which resides under modules folder.
+ 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:
 
-<img src="https://raw.github.com/narkisr/vagrant-sketching-board/master/images/module-lifecycle-black.png" width='30%' hight='50%'  alt="" />
+<img src="https://github.com/opskeleton/opskeleton/blob/master/img/chef-cycle.png" width='30%' hight='50%'  alt="" />
 
-Creating new (cookbooks) modules is easy as:
+Creating new cookbooks is easy as:
 
 ```bash
 $ opsk cookbook foo

data/lib/opskeleton/dockerize.rb

@@ -2,18 +2,19 @@ module Opsk
   class Dockerize < Thor::Group
     include Thorable, Thor::Actions
 
-    argument :from, :type => :string, :desc => 'which source image to use'
-    argument :os_type, :type=> :string, :desc => 'Ubuntu/Centos'
+    argument :from, :type => :string, :desc => 'Which source image to use'
+    argument :os_type, :type=> :string, :desc => 'Flavor of container Ubuntu/Centos'
 
 
     desc 'Creates a docker image using the current opsk sandbox'
 
     def create_dockerfile
-	template("templates/#{type_of}/#{os_type}_docker.erb", 'Dockerfile')
+	template("templates/#{type_of}/docker/#{os_type}_docker.erb", 'Dockerfile')
     end
 
-    def create_image
-	run("docker build . -t #{name}/#{meta.version}")
+    def docker_build
+	template("templates/docker_build.erb", 'docker_build.sh')
+	chmod('docker_build.sh', 0755)
     end
 
   end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end

data/puppet.md

@@ -17,7 +17,7 @@ Opskelaton creates the complete folder structure fine tuned to match best practi
 
 Folder layout:
 
-<img src="https://raw.github.com/narkisr/vagrant-sketching-board/master/images/opsk-folders.png" width='30%' hight='50%'  alt="" />
+<img src="https://github.com/opskeleton/opskeleton/blob/master/img/puppet-layout.png" width='30%' hight='50%'  alt="" />
 
 
 ## Module lifecycle
@@ -30,7 +30,7 @@ Opskelaton defines a simple module life cycle:
 
 Life cycle scheme:
 
-<img src="https://raw.github.com/narkisr/vagrant-sketching-board/master/images/module-lifecycle-black.png" width='30%' hight='50%'  alt="" />
+<img src="https://github.com/opskeleton/opskeleton/blob/master/img/puppet-cycle.png" width='30%' hight='50%'  alt="" />
 
 Creating new (static) modules is easy as:
 
@@ -123,3 +123,13 @@ 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
+$ opsk package
+# creates the Dockerfile
+$ opsk dockerize
+# builds <sandbox>/<version> image
+$ sudo ./build_docker.sh
+```

data/templates/docker_build.erb

@@ -0,0 +1 @@
+docker build -t <%= name.gsub('-','_') %>/<%= meta.version %> .

data/templates/puppet/docker/ubuntu_docker.erb

@@ -0,0 +1,11 @@
+FROM <%=from%>
+
+RUN apt-get update
+RUN apt-get install wget -y
+RUN /usr/bin/wget 'https://gist.githubusercontent.com/narkisr/6097786/raw' --no-check-certificate && /bin/bash raw
+ADD pkg/<%=artifact%>.tar.gz /
+RUN cd <%=artifact%> && /bin/bash run.sh
+RUN rm -rf <%=artifact%> 
+
+# CMD ["YOUR PROCESSES"]
+# EXPOSE 80 514 12201 9200

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -131,6 +131,10 @@ files:
 - autocomplete/opsk_bash_completion
 - bin/opsk
 - chef.md
+- img/chef-cycle.png
+- img/chef-layout.png
+- img/puppet-cycle.png
+- img/puppet-layout.png
 - lib/opskeleton.rb
 - lib/opskeleton/bump.rb
 - lib/opskeleton/clean.rb
@@ -160,6 +164,7 @@ files:
 - templates/chef/ubuntu_docker.erb
 - templates/chef/vagrant.erb
 - templates/clean.yaml
+- templates/docker_build.erb
 - templates/gitignore
 - templates/hiera.yaml
 - templates/hiera_vagrant.yaml
@@ -171,6 +176,7 @@ files:
 - templates/puppet/Rakefile
 - templates/puppet/boot.sh
 - templates/puppet/default.erb
+- templates/puppet/docker/ubuntu_docker.erb
 - templates/puppet/gemfile
 - templates/puppet/opsk.yaml
 - templates/puppet/run.sh