vagabond 0.2.4 → 0.2.6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.2.6
+* Better use of `store_path` for working in standalone cookbooks
+* Always vendor cookbooks when resolving, use knife to upload
+* Clean up cluster test-kitchen support. Only resolve cookbooks once when in cluster mode
+* Use `update` if `install` has already been preformed with librarian
+* Add node name validation smarts to short circuit if action does not require it
+
 ## v0.2.4
 * Use correct sudo within provision action
 * Fix options helper in `destroy` (implicitly fixes `cluster` options)

data/lib/vagabond/actions/cluster.rb

@@ -25,6 +25,10 @@ module Vagabond
         end
       end
 
+      def cluster_validate?
+        false
+      end
+
       def _cluster
         clr = vagabondfile[:clusters][name] if vagabondfile[:clusters]
         if(clr)

data/lib/vagabond/actions/create.rb

@@ -30,7 +30,7 @@ module Vagabond
         end
         config[:daemon] = true
         config[:original] = tmpl
-        config[:bind] = File.expand_path(File.dirname(vagabondfile.store_path))
+        config[:bind] = File.expand_path(vagabondfile.store_directory)
         ephemeral = Lxc::Ephemeral.new(config)
         ephemeral.start!(:fork)
         e_name = ephemeral.name

data/lib/vagabond/actions/destroy.rb

@@ -18,6 +18,10 @@ module Vagabond
           end
         end
       end
+
+      def destroy_validate?
+        !options[:cluster]
+      end
       
       def _destroy
         name_required!

data/lib/vagabond/bootstraps/server-zero.erb

@@ -4,8 +4,8 @@ apt-get install -y -q wget
 
 mkdir -p /var/chef/cookbooks/vagabond
 mkdir -p /var/chef/cookbooks/lxc
-wget -qO- https://github.com/chrisroberts/chef-vagabond/tarball/master | tar xvzC /var/chef/cookbooks/vagabond --strip-components=1
-wget -qO- https://github.com/hw-cookbooks/lxc/tarball/master | tar xvzC /var/chef/cookbooks/lxc --strip-components=1
+wget --no-check-certificate -qO- https://github.com/chrisroberts/chef-vagabond/tarball/master | tar xvzC /var/chef/cookbooks/vagabond --strip-components=1
+wget --no-check-certificate -qO- https://github.com/hw-cookbooks/lxc/tarball/master | tar xvzC /var/chef/cookbooks/lxc --strip-components=1
 
 (
 echo "

data/lib/vagabond/bootstraps/server.erb

@@ -1,8 +1,8 @@
 bash -c '
 apt-get install -y -q wget
 mkdir -p /var/chef/cache /var/chef/cookbooks/chef-server /var/chef/cookbooks/chef-server-populator
-wget -qO- https://github.com/opscode-cookbooks/chef-server/archive/master.tar.gz | tar xvzC /var/chef/cookbooks/chef-server --strip-components=1
-wget -qO- https://github.com/hw-cookbooks/chef-server-populator/tarball/master | tar xvzC /var/chef/cookbooks/chef-server-populator --strip-components=1
+wget --no-check-certificate -qO- https://github.com/opscode-cookbooks/chef-server/archive/master.tar.gz | tar xvzC /var/chef/cookbooks/chef-server --strip-components=1
+wget --no-check-certificate -qO- https://github.com/hw-cookbooks/chef-server-populator/tarball/master | tar xvzC /var/chef/cookbooks/chef-server-populator --strip-components=1
 
 mkdir -p /tmp/chef-server-setup
 (

data/lib/vagabond/kitchen.rb

@@ -84,9 +84,9 @@ module Vagabond
       setup(cookbook, :test)
 
       ui.info "#{ui.color('Vagabond:', :bold)} - Kitchen testing for cookbook #{ui.color(name, :cyan)}"
-      results = Mash.new
       platforms = [options[:platform] || platform_map.keys].flatten
-      if(cluster_name = options[:cluster])
+      @results = Mash[*platforms.zip([[]] * platforms.size).flatten(1)]
+      if(cluster_name = options.delete(:cluster))
         ui.info ui.color("  -> Cluster Testing #{cluster_name}!", :yellow)
         if(kitchen.clusters.empty? || kitchen.clusters[cluster_name].nil?)
           ui.fatal "Requested cluster is not defined: #{options[:cluster]}"
@@ -96,47 +96,76 @@ module Vagabond
         if(@solo && serv.vagabondfile[:local_chef_server].empty?)
           serv.vagabondfile[:local_chef_server].update(:enabled => true, :zero => true)
         end
-        serv.options = options
+        internal_config.make_knife_config_if_required(:force)
+        serv.options = options.update(:auto_upload => false)
         serv.send(:do_create)
-        serv.auto_upload # upload everything : make optional?
-        suites = kitchen.clusters[options[:cluster]]
+        load_cookbooks(:upload)
+        suites = kitchen.clusters[cluster_name]
         platforms.each do |platform|
-          %w(local_server_provision test destroy).each do |action|
+          begin
             suites.each do |suite_name|
-              res = self.send("#{action}_node", platform, suite_name)
-              if(action == 'test')
-                results[platform] ||=[]
-                results[platform] << {
+              unless(local_server_provision_node(platform, suite_name))
+                ui.error "Failed to provision #{suite_name} in platform #{platform}"
+                @results[platform] << {
                   :suite_name => suite_name,
-                  :result => res
-                }
+                  :result => false
+                } 
+                raise VagabondError::HostProvisionFailed.new("#{platform}[#{suite_name}]")
               end
             end
+            suites.each do |suite_name|
+              @results[platform] << {
+                :suite_name => suite_name,
+                :result => test_node(platform, suite_name)
+              }
+            end
+          rescue VagabondError::HostProvisionFailed => e
+            debug("Caught failed provision error. Scrubbing nodes. - #{e}")
+          ensure
+            suites.each do |suite_name|
+              destroy_node(platform, suite_name)
+            end
           end
         end
         serv.destroy
       else
-        suites = options[:suites] ? options[:suites].split(',') : ['default']
+        load_cookbooks
+        suites = options[:suites] ? options[:suites].split(',') : kitchen.suites.map(&:name)
+        runners = []
         platforms.each do |platform|
           suites.each do |suite_name|
-            provision_node(platform, suite_name)
-            results[platform] ||= []
-            results[platform] << {
-              :suite_name => suite_name,
-              :result => test_node(platform, suite_name)
-            }
-            destroy_node(platform, suite_name)
+            runner = lambda do
+              provision_node(platform, suite_name)
+              @results[platform] << {
+                :suite_name => suite_name,
+                :result => test_node(platform, suite_name)
+              }
+              destroy_node(platform, suite_name)
+            end
+            if(options[:parallel])
+              runners << Thread.new{ runner.call }
+            else
+              runner.call
+            end
+          end
+        end
+        if(options[:parallel])
+          until(runners.empty?)
+            runners.each do |runner|
+              runner.join
+              runners.delete(runner)
+            end
           end
         end
       end
       ui.info ui.color('Kitchen Test Results:', :bold)
-      results.each do |platform, infos|
+      @results.each do |platform, infos|
         ui.info "  Platform: #{ui.color(platform, :blue, :bold)}"
         infos.each do |res|
           ui.info "    Suite: #{res[:suite_name]} -> #{res[:result] ? ui.color('SUCCESS!', :green) : ui.color('FAILED!', :red)}"
         end
       end
-      raise KitchenTestFailed.new(infos.map{|res| res[:suite_name] unless res[:result]}.compact)
+      raise VagabondError::KitchenTestFailed.new(@results.values.flatten.map{|res| res[:suite_name] unless res[:result]}.compact)
     end
 
     desc 'status [NAME]', 'Show test node status'
@@ -154,6 +183,7 @@ module Vagabond
     def local_server_provision_node(platform, suite_name)
       run_list = generate_runlist(platform, suite_name)
       v_inst = vagabond_instance(:up, platform, :suite_name => suite_name, :run_list => run_list)
+      v_inst.options[:auto_provision] = true
       raise "ERROR! No local chef!" unless v_inst.options[:knife_opts]
       v_inst.send(:execute)
     end
@@ -164,8 +194,8 @@ module Vagabond
       ui.info ui.color("  -> Provisioning suite #{suite_name} on platform: #{platform}", :cyan)
       v_inst = vagabond_instance(:create, platform, :suite_name => suite_name)
       v_inst.send(:execute)
-      solo_path = configure_for(v_inst.name, platform, suite_name, run_list, :dna, :cookbooks)
-      v_inst.send(:provision_solo, solo_path)
+      directory = configure_for(v_inst.name, platform, suite_name, run_list, :dna, :cookbooks)
+      v_inst.send(:provision_solo, directory)
     end
 
     def test_node(platform, suite_name)
@@ -189,6 +219,7 @@ module Vagabond
       @solo = name.to_s.strip.empty?
       @options = options.dup
       @vagabondfile = Vagabondfile.new(options[:vagabond_file], :allow_missing)
+      base_setup
       setup_ui
       @internal_config = InternalConfiguration.new(@vagabondfile, ui, options)
       @name = name || action == :status ? name : discover_name
@@ -215,16 +246,20 @@ module Vagabond
       dir = File.join(File.dirname(vagabondfile.store_path), ".vagabond/node_configs/#{l_name}")
       FileUtils.mkdir_p(dir)
       _args = [args.include?(:integration) ? :integration : nil].compact
-      write_dna(l_name, suite_name, dir, platform, runlist, *_args) if args.include?(:dna)
-      load_cookbooks(l_name, suite_name, dir, platform, runlist, *_args) if args.include?(:cookbooks)
-      write_solo_config(dir) if args.include?(:cookbooks) && !args.include?(:integration)
+      if(args.include?(:dna))
+        write_dna(l_name, suite_name, dir, platform, runlist, *_args)
+      end
+      if(args.include?(:cookbooks) && !args.include?(:integration))
+        write_solo_config(dir)
+      end
       dir
     end
 
     def write_solo_config(dir)
       File.open(File.join(dir, 'solo.rb'), 'w') do |file|
-        file.write("cookbook_path '#{File.join(dir, 'cookbooks')}'\n")
+        file.write("cookbook_path '#{File.join(vagabondfile.store_directory, 'cookbooks')}'\n")
       end
+      dir
     end
 
     def write_dna(l_name, suite_name, dir, platform, runlist, *args)
@@ -236,9 +271,10 @@ module Vagabond
         dna.merge!(suite.attributes)
       end
       dna[:run_list] = runlist
-      File.open(File.join(dir, 'dna.json'), 'w') do |file|
+      File.open(path = File.join(dir, 'dna.json'), 'w') do |file|
         file.write(JSON.dump(dna))
       end
+      path
     end
 
     def cookbook_path
@@ -265,15 +301,16 @@ module Vagabond
       contents.join("\n")
     end
 
-    def load_cookbooks(l_name, suite_name, dir, platform, runlist, *_args)
+    def load_cookbooks(*args)
       if(File.exists?(File.join(vagabondfile.directory, 'Berksfile')))
-        berks_vendor
+        uploader = berks_vendor(args.include?(:upload))
       else
-        librarian_vendor
+        uploader = librarian_vendor(args.include?(:upload))
       end
+      uploader
     end
-          
-    def berks_vendor
+
+    def berks_vendor(upload=false)
       ui.info 'Cookbooks being vendored via berks'
       berk_uploader = Uploader::Berkshelf.new(
         vagabondfile.generate_store_path, options.merge(
@@ -282,23 +319,26 @@ module Vagabond
           :chef_server_url => options[:knife_opts].to_s.split(' ').last
         )
       )
-      berk_uploader.upload
+      upload ? berk_uploader.upload : berk_uploader.prepare
+      berk_uploader
     end
 
-    def librarian_vendor
+    def librarian_vendor(upload=false)
       ui.info 'Cookbooks being vendored with librarian'
       unless(File.exists?(cheffile = File.join(vagabondfile.directory, 'Cheffile')))
-        File.open(cheffile = vagabond.generate_store_path, 'w') do |file|
+        File.open(cheffile = File.join(vagabondfile.generate_store_path, 'Cheffile'), 'w') do |file|
           file.write custom_cheffile
         end
       end
       librarian_uploader = Uploader::Librarian.new(
-        vagabondfile.generate_store_path, options.merge(
+        vagabondfile.generate_store_path,
+        options.merge(
           :ui => ui,
           :cheffile => cheffile
         )
       )
-      librarian_uploader.prepare
+      upload ? librarian_uploader.upload : librarian_uploader.prepare
+      librarian_uploader
     end
 
     def bus_node(v_inst, suite_name)
@@ -327,6 +367,8 @@ module Vagabond
         :disable_name_validate => true,
         :ui => ui
       )
+      v.vagabondfile = vagabondfile
+      v.vagabondfile.generate_store_path
       v.internal_config.force_bases = platform_map[platform][:template]
       v.internal_config.ensure_state
       v.mappings_key = :test_mappings

data/lib/vagabond/uploader/berkshelf.rb

@@ -1,12 +1,12 @@
-require 'vagabond/uploader/berkshelf'
+require 'vagabond/uploader/knife'
 
 module Vagabond
   class Uploader
-    class Berkshelf < Uploader
+    class Berkshelf < Knife
 
       def initialize(*args)
         super
-        %w(berksfile chef_server_url).each do |k|
+        %w(berksfile).each do |k|
           unless(options[k])
             raise ArgumentError.new "Option '#{k}' must be provided!"
           end
@@ -20,7 +20,7 @@ module Vagabond
         else
           cur = Mash.new
         end
-        url = options[:chef_server_url]
+        url = options[:chef_server_url] || 'http://127.0.0.1'
         if(cur[:chef].nil? || cur[:chef][:chef_server_url] != url)
           cur[:chef] = Mash.new(:chef_server_url => url)
           cur[:ssl] = Mash.new(:verify => false)
@@ -28,19 +28,11 @@ module Vagabond
             file.write(JSON.dump(cur))
           end
         end
-      end
-
-      def upload(*args)
-        prepare unless args.include?(:no_prepare)
-        com = "berks upload -b #{options[:berksfile]} -c #{File.join(store, 'berks.json')}#{" #{Array(options[:berks_opts]).join(' ')}"}"
-        debug(com)
-        cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug], :env => {'HOME' => ENV['HOME']})
-        cmd.run_command
-        cmd.error!
+        vendor
+        options[:cookbook_paths] = [File.join(store, 'cookbooks')]
       end
 
       def vendor(*args)
-        prepare unless args.include?(:no_prepare)
         FileUtils.mkdir_p(ckbk_store = File.join(store, 'cookbooks'))
         com = "berks install -b #{options[:berksfile]} -p #{ckbk_store}"
         debug(com)

data/lib/vagabond/uploader/knife.rb

@@ -10,6 +10,9 @@ module Vagabond
         if(options[:cookbook_paths])
           com << " --cookbook-path #{Array(options[:cookbook_paths]).join(':')}"
         end
+        if(File.exists?(knife_config = File.join(store, '.chef/knife.rb')))
+          com << " --config #{knife_config}"
+        end
         debug(com)
         cmd = Mixlib::ShellOut.new(com,
           :live_stream => options[:debug],

data/lib/vagabond/uploader/librarian.rb

@@ -15,7 +15,11 @@ module Vagabond
       end
 
       def prepare
-        com = "librarian-chef install --path=#{store}"
+        if(File.directory?(File.join(store, 'cookbooks')))
+          com = 'librarian-chef update' # TODO: Check path in .librarian config
+        else
+          com = "librarian-chef install --path=#{File.join(store, 'cookbooks')}"
+        end
         debug(com)
         cmd = Mixlib::ShellOut.new(com,
           :live_stream => options[:debug],
@@ -23,7 +27,7 @@ module Vagabond
         )
         cmd.run_command
         cmd.error!
-        options[:cookbook_paths] = [store]
+        options[:cookbook_paths] = [File.join(store, 'cookbooks')]
       end
       
     end

data/lib/vagabond/vagabond.rb

@@ -133,8 +133,11 @@ module Vagabond
       @leftover_args = args
       setup_ui(_ui)
       load_configurations
-      validate! unless action == 'cluster' # TODO -> allow action
-      # method to check for validation run
+      if(respond_to?(check = "#{action}_validate?".to_sym))
+        validate! if send(check)
+      else
+        validate!
+      end
     end
 
     def name_required!
@@ -144,11 +147,11 @@ module Vagabond
       end
     end
 
-    def provision_solo(path)
+    def provision_solo(dir)
       ui.info "#{ui.color('Vagabond:', :bold)} Provisioning node: #{ui.color(name, :magenta)}"
       lxc.container_ip(20) # force wait for container to appear and do so quietly
       direct_container_command(
-        "chef-solo -c #{File.join(path, 'solo.rb')} -j #{File.join(path, 'dna.json')}",
+        "chef-solo -c #{File.join(dir, 'solo.rb')} -j #{File.join(dir, 'dna.json')}",
         :live_stream => STDOUT
       )
     end

data/lib/vagabond/version.rb

@@ -6,5 +6,5 @@ module Vagabond
       super(v)
     end
   end
-  VERSION = Version.new('0.2.4', 'train hopper')
+  VERSION = Version.new('0.2.6', 'gutterpup')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagabond
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef