opskeleton 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cfcb486138d0f5efe9d222886ec2f9132adcbde
-  data.tar.gz: e0b64670311839c7f528965f00537caccde479ed
+  metadata.gz: ab1eee67ae87cd2cb4c1c0f7cee0c78fb62a89de
+  data.tar.gz: 5a01ca76ebd36a04f962ab72f07cd281a1a62240
 SHA512:
-  metadata.gz: 30a40eeb9f493ea38070fe2a97de41ffaa1657c8755f11c11b6c0db35cabf14a4ffa513c13ae2e17ca72025d0e44517b3a72df2b30c4b05ae96f30ada9f4644c
-  data.tar.gz: 92d9fab6dd1bc801df31a14c08c3fdbe2a8a96b9f6acd0d3b0b5a454c2986d1ad9a9b67cb32defd8cbbb440bf1e626760211682f33b554eeda686139bde71a48
+  metadata.gz: bff1fb18e8e28eb8e47fb117de5226a665d8de7a298e5a685e1901db7fdfffd22328c3249f29fdd4c93c9ed32483a30b5c135b9294eaa6d7522d94fa1dfc0c0e
+  data.tar.gz: ddd589e8df1c1dccbf233eb3edbf2029c18e3fbcc4ddfa4ecc9f055d37d228441a952fa01f5d64def5a5eb06a45b66bb7734841acfa222a3a1a427a01f0e0508

data/CHANGES.md

@@ -1,3 +1,8 @@
+# Changes to opskeleton in version 0.8.0
+
+* Adding plot/benchmark support.
+* Officialy supporting docker using fig.
+
 # Changes to opskeleton in version 0.2.0
 
 * Moving to Vagrant 1.1, vagrant to be installed from package and not from gem

data/Gemfile.lock

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

data/lib/opskeleton/generate_chef.rb

@@ -6,6 +6,7 @@ module Opsk
     argument :box, :type => :string, :desc => 'Vagrant box type'
     class_option :box_url, :type=> :string, :desc => 'vagrant box url'
     class_option :os_type, :type=> :string, :desc => 'Operating system type (bsd/linux)'
+    class_option :bench_enable, :type=> :boolean, :desc => 'Control if to enable benchmarking support'
 
     desc 'Generate a Vagrant, Chef librarian and fpm project'
 
@@ -19,11 +20,11 @@ module Opsk
     end
 
     def create_gemfile
-	copy_file('templates/chef/gemfile', "#{path}/Gemfile")
+	template('templates/chef/Gemfile.erb', "#{path}/Gemfile")
     end
 
     def create_rakefile
-	copy_file('templates/chef/Rakefile', "#{path}/Rakefile")
+	template('templates/chef/Rakefile.erb', "#{path}/Rakefile")
     end
 
     def create_version
@@ -44,7 +45,7 @@ module Opsk
     def create_chef_base
 	empty_directory("#{path}/static-cookbooks/")
 	copy_file('templates/chef/Cheffile', "#{path}/Cheffile")
-      empty_directory("#{path}/roles/")
+	empty_directory("#{path}/roles/")
 	template('templates/chef/roles.erb', "#{path}/roles/#{name}.rb")
 	template('templates/chef/dna.json.erb', "#{path}/dna.json")
 	copy_file('templates/chef/run.sh', "#{path}/run.sh")
@@ -64,7 +65,9 @@ module Opsk
     end
 
     def server_spec
-	directory('templates/parent/spec', "#{path}/spec")
+	empty_directory("#{path}/spec")
+	template('templates/parent/spec/spec_helper.erb', "#{path}/spec/spec_helper.rb")
+	directory('templates/parent/spec/default', "#{path}/spec/default")
     end
 
     def git

data/lib/opskeleton/generate_puppet.rb

@@ -6,6 +6,7 @@ module Opsk
     argument :box, :type => :string, :desc => 'Vagrant box type'
     class_option :box_url, :type=> :string, :desc => 'vagrant box url'
     class_option :os_type, :type=> :string, :desc => 'Operating system type (bsd/linux)'
+    class_option :bench_enable, :type=> :boolean, :desc => 'Control if to enable benchmarking support'
 
     desc 'Generate a Vagrant, Puppet librarian and fpm project'
 
@@ -24,11 +25,11 @@ module Opsk
     end
 
     def create_gemfile
-	copy_file('templates/puppet/gemfile', "#{path}/Gemfile")
+	template('templates/puppet/Gemfile.erb', "#{path}/Gemfile")
     end
 
     def create_rakefile
-	copy_file('templates/puppet/Rakefile', "#{path}/Rakefile")
+	template('templates/puppet/Rakefile.erb', "#{path}/Rakefile")
     end
 
     def create_version
@@ -73,9 +74,12 @@ module Opsk
     end
 
     def server_spec
-	directory('templates/parent/spec', "#{path}/spec")
+	empty_directory("#{path}/spec")
+	template('templates/parent/spec/spec_helper.erb', "#{path}/spec/spec_helper.rb")
+	directory('templates/parent/spec/default', "#{path}/spec/default")
     end
 
+
     def git
 	if(!File.exists?("#{path}/.git"))
 	  copy_file('templates/gitignore', "#{path}/.gitignore")

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.7.3'
+  VERSION = '0.8.0'
 end

data/puppet.md

@@ -127,9 +127,33 @@ Opskeleton generates a Vagrant file with couple of enhancements:
 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
+# creates dockerfiles/<host> and fig.yml
 $ opsk dockerize
-# builds <sandbox>/<version> image
-$ sudo ./build_docker.sh
+$ 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
+```
+

data/templates/chef/Gemfile.erb

@@ -0,0 +1,21 @@
+source "https://rubygems.org"
+
+# base
+gem 'chef'
+
+group :testing do
+  gem 'serverspec', '~> 1.14.0'
+  gem 'test-kitchen'
+end
+
+group :build do
+  gem 'rake'
+  gem 'foodcritic'
+  gem 'librarian-chef'
+  gem 'opskeleton'
+end
+
+<% if(@options[:bench_enable]) %>
+gem 'gruff', :group => :benchmark
+<% end %>
+

data/templates/chef/Rakefile.erb

@@ -0,0 +1,76 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end
+
+task :default => :spec
+
+desc "Run serverspec to all hosts"
+task :spec => 'serverspec:all'
+
+class ServerspecTask < RSpec::Core::RakeTask
+
+  attr_accessor :target
+
+  def spec_command
+    cmd = super
+    "env TARGET_HOST=#{target} #{cmd}"
+  end
+
+end
+
+namespace :serverspec do
+
+  %w(<%=@name%>).each do |profile|
+    ServerspecTask.new(profile.to_sym) do |t|
+	t.target = profile
+	t.pattern = "spec/#{profile}/*_spec.rb"
+    end
+  end
+end
+
+<% if(@options[:bench_enable]) %>
+require 'gruff'
+require 'json'
+
+PLOTS = 'plots'
+
+namespace :plot do
+
+  directory PLOTS
+
+  task :hosts => [PLOTS] do
+    hosts = IO.readlines('benchmark.json').map {|b| 
+	JSON.parse(b,{:symbolize_names => true })
+    }.group_by {|m|
+	m[:host]
+    }
+
+    g = Gruff::Line.new
+    g.title = 'All Hosts side by side'
+    g.labels = Hash[hosts.keys.each_with_index.map {|i,h| [h , i]}]
+    g.labels.each_pair {|i, l|
+	g.data(l, hosts[l].map {|h| h[:total] })
+    }
+    g.write("#{PLOTS}/all_hosts.png") 	
+  end
+
+  task :per_host => [PLOTS] do
+    hosts = IO.readlines('benchmark.json').map {|b| 
+	JSON.parse(b,{:symbolize_names => true })
+    }.group_by {|m|
+	m[:host]
+    }
+
+    hosts.each_pair {|h,data|
+	g = Gruff::Line.new
+	g.title = h
+	g.labels = {0 => h}
+	g.data(h, data.map {|d| d[:total] })
+	g.write("#{PLOTS}/#{h}.png") 	
+    }
+  end
+end
+<% end %>

data/templates/parent/spec/{spec_helper.rb → spec_helper.erb}

@@ -12,6 +12,21 @@ def run(cmd)
   end
 end
 
+<% if(options[:bench_enable]) -%>
+class StopWatch
+  attr_accessor :total
+  def stop
+    @total = Time.now - @start
+  end
+
+  def reset
+    @start = Time.now	
+  end
+end
+
+WATCH = StopWatch.new
+<% end -%>
+
 RSpec.configure do |c|
   c.before :suite do
     c.host  = ENV['TARGET_HOST']
@@ -19,6 +34,9 @@ RSpec.configure do |c|
     options = Net::SSH::Config.for(c.host)
     if(!ENV['LOCAL'])
 	run("vagrant destroy #{c.host} -f")
+      <% if(options[:bench_enable]) %>
+      WATCH.reset
+      <% end %>
 	run("vagrant up #{c.host}")
       config = `vagrant ssh-config #{c.host}`
       sshhost =  sshuser = ''
@@ -44,6 +62,14 @@ RSpec.configure do |c|
 
   c.after :suite do
     c.host  = ENV['TARGET_HOST']
+    <% if(options[:bench_enable]) %>
+    WATCH.stop
+    rev = %x{git rev-parse HEAD}.chomp
+    File.open('benchmark.json', 'a') { |f| 
+	json = {:total => WATCH.total.to_i, :host => c.host, :revision => rev, :time => Time.now}.to_json
+	f.write("#{json}\n") 
+    }
+    <% end %>
     run("vagrant destroy #{c.host} -f")
   end
 end

data/templates/puppet/Gemfile.erb

@@ -0,0 +1,22 @@
+source "https://rubygems.org"
+
+# base
+gem 'puppet'
+
+group :testing do 
+  gem 'rspec-puppet'
+  gem 'puppetlabs_spec_helper', '>= 0.1.0'
+  gem 'serverspec', '~> 1.14.0'
+end
+
+group :build do 
+  gem 'puppet-lint', :group => :build
+  gem 'rake', :group => :build
+  gem 'librarian-puppet', :group => :build
+  gem 'opskeleton', :group => :build
+end
+
+<% if(@options[:bench_enable]) %>
+gem 'gruff', :group => :benchmark
+<% end %>
+

data/templates/puppet/Rakefile.erb

@@ -0,0 +1,101 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end
+
+task :default => :spec
+
+task :modspec do
+    FileList["static-modules/**/Rakefile"].each do |project|
+        Rake::Task.clear
+        load project
+        dir = project.pathmap("%d")
+        Dir.chdir(dir) do
+          spec_task = Rake::Task[:spec]
+          spec_task.invoke()
+        end
+    end
+end
+
+require 'puppet-lint/tasks/puppet-lint'
+
+# see https://github.com/rodjek/puppet-lint/issues/331
+Rake::Task[:lint].clear
+
+PuppetLint::RakeTask.new :lint do |config|
+  config.pattern = 'static-modules/**/*.pp'
+  config.ignore_paths = ['modules']
+  config.disable_checks = ['80chars']
+  config.with_context = true
+end
+
+
+desc "Run serverspec to all hosts"
+task :spec => 'serverspec:all'
+
+class ServerspecTask < RSpec::Core::RakeTask
+
+  attr_accessor :target
+
+  def spec_command
+    cmd = super
+    "env TARGET_HOST=#{target} #{cmd}"
+  end
+
+end
+
+namespace :serverspec do
+
+  %w(<%=@name%>).each do |profile|
+    ServerspecTask.new(profile.to_sym) do |t|
+      t.target = profile
+      t.pattern = "spec/#{profile}/*_spec.rb"
+    end
+  end
+end
+
+<% if(@options[:bench_enable]) %>
+require 'gruff'
+require 'json'
+
+PLOTS = 'plots'
+
+namespace :plot do
+
+  directory PLOTS
+
+  task :hosts => [PLOTS] do
+    hosts = IO.readlines('benchmark.json').map {|b| 
+	JSON.parse(b,{:symbolize_names => true })
+    }.group_by {|m|
+	m[:host]
+    }
+
+    g = Gruff::Line.new
+    g.title = 'All Hosts side by side'
+    g.labels = Hash[hosts.keys.each_with_index.map {|i,h| [h , i]}]
+    g.labels.each_pair {|i, l|
+	g.data(l, hosts[l].map {|h| h[:total] })
+    }
+    g.write("#{PLOTS}/all_hosts.png") 	
+  end
+
+  task :per_host => [PLOTS] do
+    hosts = IO.readlines('benchmark.json').map {|b| 
+	JSON.parse(b,{:symbolize_names => true })
+    }.group_by {|m|
+	m[:host]
+    }
+
+    hosts.each_pair {|h,data|
+	g = Gruff::Line.new
+	g.title = h
+	g.labels = {0 => h}
+	g.data(h, data.map {|d| d[:total] })
+	g.write("#{PLOTS}/#{h}.png") 	
+    }
+  end
+end
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -151,11 +151,11 @@ files:
 - templates/LICENSE-2.0.txt
 - templates/README.erb
 - templates/chef/Cheffile
-- templates/chef/Rakefile
+- templates/chef/Gemfile.erb
+- templates/chef/Rakefile.erb
 - templates/chef/boot.sh
 - templates/chef/dna.json.erb
 - templates/chef/environments/dev.rb
-- templates/chef/gemfile
 - templates/chef/gitignore
 - templates/chef/opsk.yaml
 - templates/chef/roles.erb
@@ -171,13 +171,13 @@ files:
 - templates/module/Rakefile.erb
 - templates/module/spec_helper.rb
 - templates/parent/spec/default/stub_spec.rb
-- templates/parent/spec/spec_helper.rb
+- templates/parent/spec/spec_helper.erb
 - templates/parent/travis.erb
-- templates/puppet/Rakefile
+- templates/puppet/Gemfile.erb
+- templates/puppet/Rakefile.erb
 - 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
 - templates/puppet/scripts/lookup.rb

data/templates/chef/Rakefile

@@ -1,34 +0,0 @@
-require 'rake'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/*/*_spec.rb'
-end
-
-task :default => :spec
-
-desc "Run serverspec to all hosts"
-task :spec => 'serverspec:all'
-
-class ServerspecTask < RSpec::Core::RakeTask
-
-  attr_accessor :target
-
-  def spec_command
-    cmd = super
-    "env TARGET_HOST=#{target} #{cmd}"
-  end
-
-end
-
-namespace :serverspec do
-
-  %w(<%=@name%>).each do |profile|
-    ServerspecTask.new(profile.to_sym) do |t|
-	t.target = profile
-	t.pattern = "spec/#{profile}/*_spec.rb"
-    end
-  end
-end
-
-task :default => 'serverspec:minimal'

data/templates/chef/gemfile

@@ -1,14 +0,0 @@
-source "https://rubygems.org"
-
-# base
-gem 'chef'
-
-# testing
-gem 'serverspec', '~> 1.14.0'
-gem 'test-kitchen'
-
-# build 
-gem 'rake'
-gem 'foodcritic'
-gem 'librarian-chef'
-gem 'opskeleton'

data/templates/puppet/Rakefile

@@ -1,50 +0,0 @@
-require 'rake'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/*/*_spec.rb'
-end
-
-task :default => :spec
-
-task :modspec do
-    FileList["static-modules/**/Rakefile"].each do |project|
-        Rake::Task.clear
-        load project
-        dir = project.pathmap("%d")
-        Dir.chdir(dir) do
-          spec_task = Rake::Task[:spec]
-          spec_task.invoke()
-        end
-    end
-end
-
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.ignore_paths =['modules/**/*', 'vendor/**/*']
-PuppetLint.configuration.send("disable_80chars")
-
-desc "Run serverspec to all hosts"
-task :spec => 'serverspec:all'
-
-class ServerspecTask < RSpec::Core::RakeTask
-
-  attr_accessor :target
-
-  def spec_command
-    cmd = super
-    "env TARGET_HOST=#{target} #{cmd}"
-  end
-
-end
-
-namespace :serverspec do
-
-  %w(<%=@name%>).each do |profile|
-    ServerspecTask.new(profile.to_sym) do |t|
-      t.target = profile
-      t.pattern = "spec/#{profile}/*_spec.rb"
-    end
-  end
-end
-
-task :default => 'serverspec:minimal'

data/templates/puppet/gemfile

@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-# base
-gem 'puppet'
-
-# testing
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'serverspec', '~> 1.14.0'
-
-# build 
-gem 'puppet-lint'
-gem 'rake'
-gem 'librarian-puppet'
-gem 'opskeleton'