knife-solo 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185d7ad8aab05bbb1f49d75b658736269c881988
-  data.tar.gz: d168feaaf06c9c58d6828aafa0aa87016cd35e5e
+  metadata.gz: aaa57c26fd7e654b43bb5286b1652f92d8400ae4
+  data.tar.gz: 64fd07ee767055a7291073b6b3ea9bb6b77ebfe1
 SHA512:
-  metadata.gz: e2e27539c89353f585dcc643722e5b8fc0751b8e2e4dfdbc9134f9002355c82bb6511e862ec8ed73a09764d666e6ae095848f1422f1582b932561c8cfb2ec3e3
-  data.tar.gz: 24e8fe991daa1990bbed002508e5cb933af0e0f7406905fb945e863f63535708cbff6bfde3ba8f24a60dd0fdb0f098ea5a4c2dd0818256e2881993b600674b0d
+  metadata.gz: 69b3f89c75297c8998a8680eef37a3d05eb1273a050010b5f12f1da2727d2d5ccd8d84e33aabd6ccd8dc38b954f8434c8d68fbc848592515cd898c0c4e3243fb
+  data.tar.gz: 9f7ddb4384f9a0d3d5ec54b73f80774efb23a11f0fa35b0e9051089511fd05130d88368b2dafdf4a94ec218f9b18aef04a1595b7f18fb8fe5ab6fb930a999c80

data/CHANGELOG.md

@@ -1,12 +1,65 @@
-# 0.4.3 / 2015-09-10
+# 0.5.0 / 2015-08-28
+
+## Changes and new features
+
+* Configurable cygwin prefixes ([378][])
+* Configurable sudo command ([394][])
+* SSH keepalive support, required bump to Chef >=10.20 ([288][], [404][])
+* Configurable secret file location ([412][])
+* Allow passing options to Berkshelf (>=3 only) ([369][])
+* Arch Linux support ([389][], [393][], [396][])
+* Manjaro Linux support ([414][])
+* Debian 8 support ([436][])
+* Use control sockets to speed up rsync transfers ([440][])
+* Support for ohai hints ([339][])
 
 ## Fixes
 
-* Pass node name down to solo.rb ([452][])
+* Updates for Berkshelf 3 ([376][], [405][])
+* Better warnings for berkshelf/librarian ([383][])
+* Show chef command during run output ([401][])
+* Make `ssl_verify_mode` `:verify_peer` by default ([413][])
+* Avoid copying local http proxy info to node's knife.rb ([421][])
 
 ## Thanks to our contributors!
 
-* [aaadschutz][aaadschutz]
+* [Ivan Tanev][VanTanev]
+* [Masato Ikeda][a2ikm]
+* [Graham Lyus][grahamlyus]
+* [Oleg Selin][OlegPS]
+* [Todd Willey][xtoddx]
+* [DQNEO][DQNEO]
+* [Kevin McAllister][mclazarus]
+* [Yoz (Jeremy) Grahame][yozlet]
+* [Nori Yoshioka][noric]
+* [Josh Yotty][jyotty]
+* [Markus Kern][makern]
+* [esio][es1o]
+* [Evgeny Vereshchagin][evverx]
+* [Tomo Masakura][masakura]
+* [Iavael][iavael]
+* [Patrick Connolly][patcon]
+* [Markus Kern][makern]
+
+[378]: https://github.com/matschaffer/knife-solo/issues/378
+[376]: https://github.com/matschaffer/knife-solo/issues/376
+[383]: https://github.com/matschaffer/knife-solo/issues/383
+[389]: https://github.com/matschaffer/knife-solo/issues/389
+[393]: https://github.com/matschaffer/knife-solo/issues/393
+[396]: https://github.com/matschaffer/knife-solo/issues/396
+[394]: https://github.com/matschaffer/knife-solo/issues/394
+[401]: https://github.com/matschaffer/knife-solo/issues/401
+[405]: https://github.com/matschaffer/knife-solo/issues/405
+[288]: https://github.com/matschaffer/knife-solo/issues/288
+[404]: https://github.com/matschaffer/knife-solo/issues/404
+[413]: https://github.com/matschaffer/knife-solo/issues/413
+[412]: https://github.com/matschaffer/knife-solo/issues/412
+[414]: https://github.com/matschaffer/knife-solo/issues/414
+[421]: https://github.com/matschaffer/knife-solo/issues/421
+[369]: https://github.com/matschaffer/knife-solo/issues/369
+[436]: https://github.com/matschaffer/knife-solo/issues/436
+[440]: https://github.com/matschaffer/knife-solo/issues/440
+[339]: https://github.com/matschaffer/knife-solo/issues/339
 
 # 0.4.2 / 2014-06-05
 
@@ -452,18 +505,28 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * Cook via rsync
 
 [ChrisLundquist]:  https://github.com/ChrisLundquist
+[DQNEO]:           https://github.com/DQNEO
+[Domon]:           https://github.com/Domon
 [DrGonzo65]:       https://github.com/DrGonzo65
 [Frozenproduce]:   https://github.com/Frozenproduce
 [Motiejus]:        https://github.com/Motiejus
 [Nix-wie-weg]:     https://github.com/Nix-wie-weg
+[OlegPS]:          https://github.com/OlegPS
 [TheAlphaTester]:  https://github.com/TheAlphaTester
 [TylerRick]:       https://github.com/TylerRick
+[VanTanev]:        https://github.com/VanTanev
+[a2ikm]:           https://github.com/a2ikm
 [aaronjensen]:     https://github.com/aaronjensen
+[alexsiri7]:       https://github.com/alexsiri7
+[allaire]:         https://github.com/allaire
 [amoslanka]:       https://github.com/amoslanka
+[angelabad]:       https://github.com/angelabad
+[anl]:             https://github.com/anl
 [ares]:            https://github.com/ares
 [aromarom64]:      https://github.com/aromarom64
 [avit]:            https://github.com/avit
 [bambuchaAdm]:     https://github.com/bambuchaAdm
+[brainopia]:       https://github.com/brainopia
 [brynary]:         https://github.com/brynary
 [btm]:             https://github.com/btm
 [dapatil]:         https://github.com/dapatil
@@ -471,19 +534,27 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [deepak]:          https://github.com/deepak
 [dkinzer]:         https://github.com/dkinzer
 [dwradcliffe]:     https://github.com/dwradcliffe
+[es1o]:            https://github.com/es1o
+[evverx]:          https://github.com/evverx
 [fnichol]:         https://github.com/fnichol
 [funglaub]:        https://github.com/funglaub
+[grahamlyus]:      https://github.com/grahamlyus
 [gregf]:           https://github.com/gregf
 [gsterndale]:      https://github.com/gsterndale
 [hectcastro]:      https://github.com/hectcastro
 [hrp]:             https://github.com/hrp
+[iavael]:          https://github.com/iavael
 [jgarber]:         https://github.com/jgarber
 [jgrevich]:        https://github.com/jgrevich
+[jyotty]:          https://github.com/jyotty
 [kmdsbng]:         https://github.com/kmdsbng
 [makern]:          https://github.com/makern
+[masakura]:        https://github.com/masakura
+[mclazarus]:       https://github.com/mclazarus
 [michaelglass]:    https://github.com/michaelglass
 [naoya]:           https://github.com/naoya
 [natlownes]:       https://github.com/natlownes
+[noric]:           https://github.com/noric
 [patatepartie]:    https://github.com/patatepartie
 [patcon]:          https://github.com/patcon
 [pferdefleisch]:   https://github.com/pferdefleisch
@@ -491,6 +562,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [portertech]:      https://github.com/portertech
 [retr0h]:          https://github.com/retr0h
 [rmoriz]:          https://github.com/rmoriz
+[robacarp]:        https://github.com/robacarp
 [rosstimson]:      https://github.com/rosstimson
 [rubiojr]:         https://github.com/rubiojr
 [russellcardullo]: https://github.com/russellcardullo
@@ -503,14 +575,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [tmatilai]:        https://github.com/tmatilai
 [tocky]:           https://github.com/tocky
 [vjpr]:            https://github.com/vjpr
-[zeph]:            https://github.com/zeph
-[allaire]:         https://github.com/allaire
-[yugui]:           https://github.com/yugui
 [xtoddx]:          https://github.com/xtoddx
-[anl]:             https://github.com/anl
-[robacarp]:        https://github.com/robacarp
-[alexsiri7]:       https://github.com/alexsiri7
-[brainopia]:       https://github.com/brainopia
-[Domon]:           https://github.com/Domon
-[angelabad]:       https://github.com/angelabad
-[aaadschutz]:      https://github.com/aaadschutz
+[yozlet]:          https://github.com/yozlet
+[yugui]:           https://github.com/yugui
+[zeph]:            https://github.com/zeph

data/README.rdoc

@@ -22,6 +22,9 @@ Installation is a normal gem installation.
 
     gem install knife-solo
 
+    # or if using ChefDK
+    chef gem install knife-solo
+
 If you need to install from git run:
 
     bundle && bundle exec rake install
@@ -106,7 +109,7 @@ Under the hood it first calls +knife solo prepare+ and then +knife solo cook+ wi
 
 ==== Integration with knife bootstrap
 
-knife-solo also integrates with <tt>knife bootstrap</tt> by adding +--solo+ command line option and +knife[:solo]+ configuration parameter to it. When requested, "knife solo bootrap" is used instead of the normal template based chef-client bootstrap. This is especially useful with other knife plugins like {knife-ec2}[https://github.com/opscode/knife-ec2] that invoke "knife bootstrap" after creating an server instance. Even if these plugins do not have the "--solo" option, you can put <tt>knife[:solo] = true</tt> in knife.rb.
+knife-solo also integrates with <tt>knife bootstrap</tt> by adding +--solo+ command line option and +knife[:solo]+ configuration parameter to it. When requested, "knife solo bootstrap" is used instead of the normal template based chef-client bootstrap. This is especially useful with other knife plugins like {knife-ec2}[https://github.com/opscode/knife-ec2] that invoke "knife bootstrap" after creating an server instance. Even if these plugins do not have the "--solo" option, you can put <tt>knife[:solo] = true</tt> in knife.rb.
 
 === Clean command
 
@@ -134,7 +137,10 @@ The cook command will work on Windows node if you meet the following howto:
 
 ==== Cook
 
-- cook should work as expected automatically, if you use cygwin rsync
+- cook should work as expected automatically, if you use cygwin rsync. If you're using MinGW / Git Bash, or you have a non-standard <tt>cygdrive</tt> setting, you can set that in <tt>.chef/knife.rb</tt>:
+
+    knife[:cygdrive_prefix_local] = '/cygdrive'  # prefix for your local machine, set to empty string for MinGW
+    knife[:cygdrive_prefix_remote] = '/cygdrive' # prefix on the remote windows node
 
 == DEVELOPMENT
 

data/lib/chef/knife/solo_cook.rb

@@ -26,7 +26,7 @@ class Chef
         KnifeSolo::NodeConfigCommand.load_deps
       end
 
-      banner "knife solo cook [USER@]HOSTNAME [JSON] (options)"
+      banner "knife solo cook [USER@]HOSTNAME [JSONFILE] (options)"
 
       option :chef_check,
         :long        => '--no-chef-check',
@@ -53,6 +53,10 @@ class Chef
         :long        => '--no-librarian',
         :description => 'Skip librarian-chef install'
 
+      option :secret_file,
+        :long        => '--secret-file SECRET_FILE',
+        :description => 'A file containing the secret key used to encrypt data bag item values'
+
       option :why_run,
         :short       => '-W',
         :long        => '--why-run',
@@ -123,7 +127,7 @@ class Chef
         upload_to_provision_path(nodes_path, 'nodes')
         upload_to_provision_path(:role_path, 'roles')
         upload_to_provision_path(:data_bag_path, 'data_bags')
-        upload_to_provision_path(:encrypted_data_bag_secret, 'data_bag_key')
+        upload_to_provision_path(config[:secret_file] || :encrypted_data_bag_secret, 'data_bag_key')
         upload_to_provision_path(:environment_path, 'environments')
       end
 
@@ -144,7 +148,7 @@ class Chef
       end
 
       def proxy_setting_keys
-        [:http_proxy, :https_proxy, :http_proxy_user, :http_proxy_pass, :no_proxy]
+        [:http_proxy, :https_proxy, :http_proxy_user, :http_proxy_pass, :https_proxy_user, :https_proxy_pass, :no_proxy]
       end
 
       def proxy_settings
@@ -167,20 +171,20 @@ class Chef
         @chefignore ||= ::Chef::Cookbook::Chefignore.new("./")
       end
 
-      # cygwin rsync path must be adjusted to work
-      def adjust_rsync_path(path)
+      # path must be adjusted to work on windows
+      def adjust_rsync_path(path, path_prefix)
         path_s = path.to_s
-        path_s.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+        path_s.gsub(/^(\w):/) { path_prefix + "/#{$1}" }
       end
 
       def adjust_rsync_path_on_node(path)
         return path unless windows_node?
-        adjust_rsync_path(path)
+        adjust_rsync_path(path, config_value(:cygdrive_prefix_remote, '/cygdrive'))
       end
 
       def adjust_rsync_path_on_client(path)
         return path unless windows_client?
-        adjust_rsync_path(path)
+        adjust_rsync_path(path, config_value(:cygdrive_prefix_local, '/cygdrive'))
       end
 
       def rsync_debug
@@ -193,7 +197,7 @@ class Chef
       end
 
       def rsync_excludes
-        (%w{revision-deploys tmp .git .hg .svn .bzr} + chefignore.ignores).uniq
+        (%w{revision-deploys .git .hg .svn .bzr} + chefignore.ignores).uniq
       end
 
       def debug?
@@ -256,18 +260,21 @@ class Chef
         file.unlink
       end
 
-      def rsync(source_path, target_path, extra_opts = '--delete-after')
+      def rsync(source_path, target_path, extra_opts = ['--delete-after', '-zt'])
         if config[:ssh_gateway]
           ssh_command = "ssh -TA #{config[:ssh_gateway]} ssh -T -o StrictHostKeyChecking=no #{ssh_args}"
         else
           ssh_command = "ssh #{ssh_args}"
         end
 
-        cmd = ['rsync', '-rL', rsync_debug, rsync_permissions, %Q{--rsh=#{ssh_command}}, extra_opts]
+        cmd = ['rsync', '-rL', rsync_debug, rsync_permissions, %Q{--rsh=#{ssh_command}}]
+        cmd += extra_opts
         cmd += rsync_excludes.map { |ignore| "--exclude=#{ignore}" }
-        cmd << adjust_rsync_path_on_client(source_path)
-        cmd << %Q{:#{adjust_rsync_path_on_node(target_path)}}
-        cmd = cmd.flatten.compact
+        cmd += [ adjust_rsync_path_on_client(source_path),
+                 ':' + adjust_rsync_path_on_node(target_path) ]
+
+        cmd = cmd.compact
+
         Chef::Log.debug cmd.inspect
         system!(*cmd)
       end
@@ -296,13 +303,14 @@ class Chef
       end
 
       def cook
-        ui.msg "Running Chef..."
         cmd = "sudo chef-solo -c #{provisioning_path}/solo.rb -j #{provisioning_path}/dna.json"
         cmd << " -l debug" if debug?
         cmd << " -N #{config[:chef_node_name]}" if config[:chef_node_name]
         cmd << " -W" if config[:why_run]
         cmd << " -o #{config[:override_runlist]}" if config[:override_runlist]
 
+        ui.msg "Running Chef: #{cmd}"
+
         result = stream_command cmd
         raise "chef-solo failed. See output above." unless result.success?
       end

data/lib/chef/knife/solo_prepare.rb

@@ -39,6 +39,14 @@ class Chef
         :long        => '--omnibus-version VERSION',
         :description => 'Deprecated. Replaced with --bootstrap-version.'
 
+      option :hint,
+        :long        => '--hint HINT_NAME[=HINT_FILE]',
+        :description => 'Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.',
+        :proc        => Proc.new { |h|
+          Chef::Config[:knife][:hints] ||= Hash.new
+          name, path = h.split("=")
+          Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new  }
+
       def run
         if config[:omnibus_version]
           ui.warn '`--omnibus-version` is deprecated, please use `--bootstrap-version`.'

data/lib/knife-solo/berkshelf.rb

@@ -19,7 +19,12 @@ module KnifeSolo
       path = berkshelf_path
       ui.msg "Installing Berkshelf cookbooks to '#{path}'..."
 
-      berksfile = ::Berkshelf::Berksfile.from_file('Berksfile')
+      if Gem::Version.new(::Berkshelf::VERSION) >= Gem::Version.new("3.0.0")
+        berkshelf_options = KnifeSolo::Tools.config_value(config, :berkshelf_options) || {}
+        berksfile = ::Berkshelf::Berksfile.from_file('Berksfile',berkshelf_options)
+      else
+        berksfile = ::Berkshelf::Berksfile.from_file('Berksfile')
+      end
       if berksfile.respond_to?(:vendor)
         FileUtils.rm_rf(path)
         berksfile.vendor(path)
@@ -40,7 +45,11 @@ module KnifeSolo
     end
 
     def initial_config
-      'site :opscode'
+      if defined?(::Berkshelf) && Gem::Version.new(::Berkshelf::VERSION) >= Gem::Version.new("3.0.0")
+        'source "https://api.berkshelf.com"'
+      else
+        'site :opscode'
+      end
     end
   end
 end

data/lib/knife-solo/bootstraps.rb

@@ -49,6 +49,7 @@ module KnifeSolo
       def bootstrap!
         run_pre_bootstrap_checks
         send("#{distro[:type]}_install")
+        install_ohai_hints
       end
 
       def distro
@@ -111,6 +112,18 @@ module KnifeSolo
           "--version #{chef_version}"
         end
       end
+
+      def install_ohai_hints
+        hints = Chef::Config[:knife][:hints]
+        unless hints.nil? || hints.empty?
+          ui.msg "Setting Ohai hints..."
+          run_command("sudo mkdir -p /etc/chef/ohai/hints")
+          run_command("sudo rm -f /etc/chef/ohai/hints/*")
+          hints.each do |name, hash|
+            run_command("sudo tee -a /etc/chef/ohai/hints/#{name}.json > /dev/null <<EOF\n#{hash.to_json}\nEOF\n")
+          end
+        end
+      end
     end #InstallCommands
 
     class Base

data/lib/knife-solo/bootstraps/linux.rb

@@ -4,6 +4,7 @@ module KnifeSolo::Bootstraps
       commands = [
         'lsb_release -d -s',
         'cat /etc/redhat-release',
+        'cat /etc/os-release',
         'cat /etc/issue'
       ]
       result = prepare.run_with_fallbacks(commands)
@@ -29,20 +30,10 @@ module KnifeSolo::Bootstraps
       gem_install
     end
 
-    def yaourt_install
+    def pacman_install
       ui.msg("Installing required packages...")
-      stream_command <<-BASH
-        if ! sudo grep -Fxq "[archlinuxfrx]" /etc/pacman.conf ; then
-          sudo bash -c 'echo "[archlinuxfr]" >> /etc/pacman.conf'
-          sudo bash -c 'echo "SigLevel = Never" >> /etc/pacman.conf'
-          sudo bash -c 'echo "Server = http://repo.archlinux.fr/\\\$arch" >> /etc/pacman.conf'
-        fi
-        if ! command -v yaourt >/dev/null 2>&1 ; then
-          sudo pacman -Sy --noconfirm yaourt
-        fi
-        yaourt -S --noconfirm ruby-chef rsync
-      BASH
-      run_command("sudo gem install --no-rdoc --no-ri pry") # patch for ruby-chef
+      run_command("sudo pacman -Sy ruby rsync make gcc --noconfirm")
+      run_command("sudo gem install chef --no-user-install --no-rdoc --no-ri")
     end
 
     def debianoid_gem_install
@@ -79,7 +70,7 @@ module KnifeSolo::Bootstraps
     def distro
       return @distro if @distro
       @distro = case issue
-      when %r{Debian GNU/Linux [67]}
+      when %r{Debian GNU/Linux [678]}
         {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
       when %r{Debian}
         {:type => "debianoid_gem"}
@@ -113,8 +104,8 @@ module KnifeSolo::Bootstraps
         {:type => "zypper_omnibus"}
       when %r{This is \\n\.\\O \(\\s \\m \\r\) \\t}
         {:type => "emerge_gem"}
-      when %r{Arch Linux \\r \(\\l\)}
-        {:type => "yaourt"}
+      when %r{Arch Linux}, %r{Manjaro Linux}
+        {:type => "pacman"}
       else
         raise "Distribution not recognized. Please run again with `-VV` option and file an issue: https://github.com/matschaffer/knife-solo/issues"
       end

data/lib/knife-solo/cookbook_manager.rb

@@ -22,12 +22,7 @@ module KnifeSolo
       end
 
       def load_gem
-        begin
-          gem_libraries.each { |lib| require lib }
-          true
-        rescue LoadError
-          false
-        end
+        gem_libraries.each { |lib| require lib }
       end
 
       # Key in Chef::Config and CLI options
@@ -63,6 +58,9 @@ module KnifeSolo
 
       def gem_installed?
         self.class.load_gem
+        true
+      rescue LoadError
+        false
       end
 
       def conf_file(base = nil)
@@ -87,11 +85,15 @@ module KnifeSolo
       def install
         if !conf_file_exists?
           Chef::Log.debug "#{conf_file} not found"
-        elsif !self.class.load_gem
-          ui.warn "#{name} could not be loaded"
-          ui.warn "Please add the #{gem_name} gem to your Gemfile or install it manually with `gem install #{gem_name}`"
         else
-          return install!
+          begin
+            self.class.load_gem
+            return install!
+          rescue LoadError => e
+            ui.warn e.inspect
+            ui.warn "#{name} could not be loaded"
+            ui.warn "Please add the #{gem_name} gem to your Gemfile or install it manually with `gem install #{gem_name}`"
+          end
         end
         nil
       end

data/lib/knife-solo/info.rb

@@ -1,6 +1,6 @@
 module KnifeSolo
   def self.version
-    '0.4.3'
+    '0.5.0'
   end
 
   def self.post_install_message

data/lib/knife-solo/librarian.rb

@@ -28,7 +28,7 @@ module KnifeSolo
     end
 
     def initial_config
-      "site 'http://community.opscode.com/api/v1'"
+      "site 'http://supermarket.getchef.com/api/v1'"
     end
 
     # Returns an array of strings to gitignore when bootstrapping

data/lib/knife-solo/resources/knife.rb

@@ -6,3 +6,4 @@ data_bag_path    "data_bags"
 #encrypted_data_bag_secret "data_bag_key"
 
 knife[:berkshelf_path] = "cookbooks"
+Chef::Config[:ssl_verify_mode] = :verify_peer if defined? ::Chef

data/lib/knife-solo/resources/solo.rb.erb

@@ -1,4 +1,4 @@
-node_name <%= node_name.inspect %>
+node_name <%= host.inspect %>
 
 base = File.expand_path('..', __FILE__)
 

data/lib/knife-solo/ssh_command.rb

@@ -47,6 +47,11 @@ module KnifeSolo
           :long        => '--ssh-identity FILE',
           :description => 'Deprecated. Replaced with --identity-file.'
 
+        option :ssh_control_master,
+          :long => '--ssh-control-master SETTING',
+          :description => 'Control master setting to use when running rsync (use "no" to disable)',
+          :default => 'auto'
+
         option :identity_file,
           :short       => '-i IDENTITY_FILE',
           :long        => '--identity-file FILE',
@@ -54,7 +59,7 @@ module KnifeSolo
 
         option :forward_agent,
           :long        => '--forward-agent',
-          :description => 'Forward SSH authentication',
+          :description => 'Forward SSH authentication. Adds -E to sudo, override with --sudo-command.',
           :boolean     => true,
           :default     => false
 
@@ -63,6 +68,17 @@ module KnifeSolo
           :long        => '--ssh-port PORT',
           :description => 'The ssh port'
 
+        option :ssh_keepalive,
+          :long        => '--[no-]ssh-keepalive',
+          :description => 'Use ssh keepalive',
+          :default     => true
+
+        option :ssh_keepalive_interval,
+          :long        => '--ssh-keepalive-interval SECONDS',
+          :description => 'The ssh keepalive interval',
+          :default     => 300,
+          :proc        => Proc.new { |v| v.to_i }
+
         option :startup_script,
           :short       => '-s FILE',
           :long        => '--startup-script FILE',
@@ -98,6 +114,12 @@ module KnifeSolo
       if config[:ssh_user]
         host_descriptor[:user] ||= config[:ssh_user]
       end
+
+      # NOTE: can't rely on default since it won't get called when invoked via knife bootstrap --solo
+      if config[:ssh_keepalive_interval] && config[:ssh_keepalive_interval] <= 0
+        ui.fatal '`--ssh-keepalive-interval` must be a positive number'
+        exit 1
+      end
     end
 
     def host_descriptor
@@ -149,6 +171,10 @@ module KnifeSolo
         options[:paranoid] = false
         options[:user_known_hosts_file] = "/dev/null"
       end
+      if config[:ssh_keepalive]
+        options[:keepalive] = config[:ssh_keepalive]
+        options[:keepalive_interval] = config[:ssh_keepalive_interval]
+      end
       # Respect users' specification of config[:ssh_config]
       # Prevents Net::SSH itself from applying the default ssh_config files.
       options[:config] = false
@@ -173,20 +199,45 @@ module KnifeSolo
     end
 
     def ssh_args
-      host_arg = [user, host].compact.join('@')
-      config_arg = "-F #{config[:ssh_config]}" if config[:ssh_config]
-      ident_arg = "-i #{config[:identity_file]}" if config[:identity_file]
-      forward_arg = "-o ForwardAgent=yes" if config[:forward_agent]
-      port_arg = "-p #{config[:ssh_port]}" if config[:ssh_port]
-      knownhosts_arg  =  "-o UserKnownHostsFile=#{connection_options[:user_known_hosts_file]}" if config[:host_key_verify] == false
-      stricthosts_arg = "-o StrictHostKeyChecking=no" if config[:host_key_verify] == false
+      args = []
+
+      args << [user, host].compact.join('@')
+
+      args << "-F #{config[:ssh_config]}" if config[:ssh_config]
+      args << "-i #{config[:identity_file]}" if config[:identity_file]
+      args << "-o ForwardAgent=yes" if config[:forward_agent]
+      args << "-p #{config[:ssh_port]}" if config[:ssh_port]
+      args << "-o UserKnownHostsFile=#{connection_options[:user_known_hosts_file]}" if config[:host_key_verify] == false
+      args << "-o StrictHostKeyChecking=no" if config[:host_key_verify] == false
+      args << "-o ControlMaster=auto -o ControlPath=#{ssh_control_path} -o ControlPersist=3600" unless config[:ssh_control_master] == "no"
 
+      args.join(' ')
+    end
 
-      [host_arg, config_arg, ident_arg, forward_arg, port_arg, knownhosts_arg, stricthosts_arg].compact.join(' ')
+    def ssh_control_path
+      dir = File.join(ENV['HOME'], '.chef', 'knife-solo-sockets')
+      FileUtils.mkdir_p(dir)
+      File.join(dir, '%h')
+    end
+
+    def custom_sudo_command
+      if sudo_command=config[:sudo_command]
+        Chef::Log.debug("Using replacement sudo command: #{sudo_command}")
+        return sudo_command
+      end
+    end
+
+    def standard_sudo_command
+      return unless sudo_available?
+      if config[:forward_agent]
+        return 'sudo -E -p \'knife sudo password: \''
+      else
+        return 'sudo -p \'knife sudo password: \''
+      end
     end
 
     def sudo_command
-      config[:sudo_command]
+      custom_sudo_command || standard_sudo_command || ''
     end
 
     def startup_script
@@ -196,7 +247,11 @@ module KnifeSolo
     def windows_node?
       return @windows_node unless @windows_node.nil?
       @windows_node = run_command('ver', :process_sudo => false).stdout =~ /Windows/i
-      Chef::Log.debug("Windows node detected") if @windows_node
+      if @windows_node
+        Chef::Log.debug("Windows node detected")
+      else
+        @windows_node = false
+      end
       @windows_node
     end
 
@@ -208,15 +263,7 @@ module KnifeSolo
     end
 
     def process_sudo(command)
-      if sudo_command
-        Chef::Log.debug("Using replacement sudo command: #{sudo_command}")
-        replacement = sudo_command
-      elsif sudo_available?
-        replacement = 'sudo -E -p \'knife sudo password: \''
-      else
-        replacement = ''
-      end
-      command.gsub(/sudo/, replacement)
+      command.gsub(/sudo/, sudo_command)
     end
 
     def process_startup_file(command)

data/test/deprecated_command_test.rb

@@ -32,13 +32,13 @@ class DeprecatedCommandTest < TestCase
 
   def test_warns_about_deprecation
     cmd = command
-    cmd.ui.expects(:err).with(regexp_matches(/deprecated!/))
+    cmd.ui.expects(:warn).with(regexp_matches(/deprecated!/))
     cmd.run
   end
 
   def test_runs_new_command
     cmd = command
-    cmd.ui.stubs(:err)
+    cmd.ui.stubs(:warn)
     cmd.expects(:new_run)
     cmd.run
   end

data/test/gemfiles/Gemfile.chef-12

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'chef', '~> 12'

data/test/integration/cases/apache2_bootstrap.rb

@@ -8,7 +8,7 @@ module Apache2Bootstrap
 
   def write_berksfile
     File.open('Berksfile', 'w') do |f|
-      f.puts "site :opscode"
+      f.puts 'source "https://supermarket.chef.io"'
       f.puts "cookbook 'apache2'"
     end
   end

data/test/integration/cases/ohai_hints.rb

@@ -0,0 +1,33 @@
+# Tries to bootstrap with --hint option and
+# verifies ohai hints get written properly.
+
+module OhaiHints
+  def prepare_hints(hints)
+    hints.map { |name, data|
+      if data.nil?
+        "--hint #{name}"
+      else
+        File.open("#{name}.json", "wb") { |f| f.write(data) }
+        "--hint #{name}=#{name}.json"
+      end
+    }.join(' ')
+  end
+
+  def check_hints(hints)
+    hints.each do |name, data|
+      actual = `ssh #{connection_string} cat /etc/chef/ohai/hints/#{name}.json`
+      assert_match actual.strip, data.nil? ? '{}' : data
+    end
+  end
+
+  def test_ohai_hints
+    hints = {
+      'test_hint_1' => '{"foo":"bar"}',
+      'test_hint_2' => nil
+    }
+
+    hint_opts = prepare_hints(hints)
+    assert_subcommand "bootstrap #{hint_opts}" 
+    check_hints(hints)
+  end
+end

data/test/integration/centos6_3_test.rb

@@ -1,6 +1,8 @@
 require 'integration_helper'
 
 class Centos6_3Test < IntegrationTest
+  disable_firewall
+
   def user
     "root"
   end
@@ -9,15 +11,6 @@ class Centos6_3Test < IntegrationTest
     "ami-86e15bef"
   end
 
-  def prepare_server
-    disable_firewall
-    super
-  end
-
-  def disable_firewall
-    system "ssh #{connection_string} service iptables stop >> #{log_file}"
-  end
-
   include EmptyCook
   include Apache2Cook
   include EncryptedDataBag

data/test/integration/debian6_bootstrap_test.rb

@@ -9,7 +9,7 @@ class Debian6BootstrapTest < IntegrationTest
   def image_id
     # PVM 64-bit
     # From https://wiki.debian.org/Cloud/AmazonEC2Image/Squeeze
-    "ami-0740476e"
+    "ami-5e12dc36"
   end
 
   def prepare_server

data/test/integration/debian7_knife_bootstrap_test.rb

@@ -8,7 +8,7 @@ class Debian7KnifeBootstrapTest < IntegrationTest
   def image_id
     # PVM instance store
     # From https://wiki.debian.org/Cloud/AmazonEC2Image/Wheezy
-    "ami-848a6eec"
+    "ami-74efab1c"
   end
 
   def prepare_server

data/test/integration/scientific_linux_63_test.rb

@@ -1,6 +1,8 @@
 require 'integration_helper'
 
 class ScientificLinux63Test < IntegrationTest
+  disable_firewall
+
   def user
     "root"
   end
@@ -10,6 +12,6 @@ class ScientificLinux63Test < IntegrationTest
   end
 
   include EmptyCook
-  #include Apache2Cook
+  include Apache2Cook
   include EncryptedDataBag
 end

data/test/integration/ubuntu12_04_ohai_hints_test.rb

@@ -0,0 +1,17 @@
+require 'integration_helper'
+
+class Ubuntu12_04OhaiHintsTest < IntegrationTest
+  def user
+    "ubuntu"
+  end
+
+  def image_id
+    "ami-9a873ff3"
+  end
+
+  def prepare_server
+    # Do nothing as `solo bootstrap` will do everything
+  end
+
+  include OhaiHints
+end

data/test/integration_helper.rb

@@ -11,5 +11,5 @@ require 'support/loggable'
 require 'support/ec2_runner'
 require 'support/integration_test'
 
-MiniTest::Parallel.processor_count = 5
+MiniTest::Parallel.processor_count = Dir[$base_dir.join('integration', '*.rb')].size
 MiniTest::Unit.runner = EC2Runner.new

data/test/knife_bootstrap_test.rb

@@ -49,7 +49,7 @@ class KnifeBootstrapTest < TestCase
 
   def test_barks_without_atleast_a_hostname
     cmd = command("--solo")
-    cmd.ui.expects(:err)
+    cmd.ui.expects(:error)
     in_kitchen do
       assert_exits cmd
     end

data/test/solo_cook_test.rb

@@ -51,9 +51,7 @@ class SoloCookTest < TestCase
       cmd.expects(:system!).with('rsync',
                                   '-rL',
                                   '--rsh=ssh ssh_arguments',
-                                  '--delete-after',
                                   '--exclude=revision-deploys',
-                                  '--exclude=tmp',
                                   '--exclude=.git',
                                   '--exclude=.hg',
                                   '--exclude=.svn',
@@ -64,7 +62,7 @@ class SoloCookTest < TestCase
       cmd.stubs(:ssh_args => 'ssh_arguments')
       cmd.stubs(:windows_node? => false)
 
-      cmd.rsync 'source', 'dest'
+      cmd.rsync 'source', 'dest', []
     end
   end
 
@@ -76,9 +74,7 @@ class SoloCookTest < TestCase
       cmd.expects(:system!).with('rsync',
                                   '-rL',
                                   '--rsh=ssh -TA user@gateway ssh -T -o StrictHostKeyChecking=no ssh_arguments',
-                                  '--delete-after',
                                   '--exclude=revision-deploys',
-                                  '--exclude=tmp',
                                   '--exclude=.git',
                                   '--exclude=.hg',
                                   '--exclude=.svn',
@@ -89,7 +85,7 @@ class SoloCookTest < TestCase
       cmd.stubs(:ssh_args => 'ssh_arguments')
       cmd.stubs(:windows_node? => false)
 
-      cmd.rsync 'source', 'dest'
+      cmd.rsync 'source', 'dest', []
     end
   end
 
@@ -175,8 +171,9 @@ class SoloCookTest < TestCase
     in_kitchen do
       FileUtils.touch "Berksfile"
       cmd = command("somehost")
-      cmd.ui.expects(:err).with(regexp_matches(/berkshelf gem/))
-      KnifeSolo::Berkshelf.expects(:load_gem).returns(false)
+      cmd.ui.expects(:warn).with(regexp_matches(/LoadError/))
+      cmd.ui.expects(:warn).with(regexp_matches(/berkshelf gem/))
+      KnifeSolo::Berkshelf.expects(:load_gem).raises(LoadError)
       Berkshelf::Berksfile.any_instance.expects(:vendor).never
       cmd.run
     end
@@ -185,7 +182,7 @@ class SoloCookTest < TestCase
   def test_wont_complain_if_berkshelf_gem_missing_but_no_berkfile
     in_kitchen do
       cmd = command("somehost")
-      cmd.ui.expects(:err).never
+      cmd.ui.expects(:fatal).never
       KnifeSolo::Berkshelf.expects(:load_gem).never
       Berkshelf::Berksfile.any_instance.expects(:vendor).never
       cmd.run
@@ -230,8 +227,9 @@ class SoloCookTest < TestCase
     in_kitchen do
       FileUtils.touch "Cheffile"
       cmd = command("somehost")
-      cmd.ui.expects(:err).with(regexp_matches(/librarian-chef gem/))
-      KnifeSolo::Librarian.expects(:load_gem).returns(false)
+      cmd.ui.expects(:warn).with(regexp_matches(/LoadError/))
+      cmd.ui.expects(:warn).with(regexp_matches(/librarian-chef gem/))
+      KnifeSolo::Librarian.expects(:load_gem).raises(LoadError)
       Librarian::Action::Install.any_instance.expects(:run).never
       cmd.run
     end

data/test/solo_init_test.rb

@@ -23,7 +23,7 @@ class SoloInitTest < TestCase
 
   def test_barks_without_directory_arg
     cmd = command
-    cmd.ui.expects(:err).with(regexp_matches(/You must specify a directory/))
+    cmd.ui.expects(:fatal).with(regexp_matches(/You must specify a directory/))
     $stdout.stubs(:puts)
     outside_kitchen do
       assert_exits cmd
@@ -110,7 +110,7 @@ class SoloInitTest < TestCase
   def test_wont_create_berksfile_if_gem_missing
     outside_kitchen do
       cmd = command(".")
-      KnifeSolo::Berkshelf.expects(:load_gem).returns(false)
+      KnifeSolo::Berkshelf.expects(:load_gem).raises(LoadError)
       cmd.run
       refute File.exist?("Berksfile")
     end
@@ -189,7 +189,7 @@ class SoloInitTest < TestCase
   def test_wont_create_cheffile_if_gem_missing
     outside_kitchen do
       cmd = command(".")
-      KnifeSolo::Librarian.expects(:load_gem).returns(false)
+      KnifeSolo::Librarian.expects(:load_gem).raises(LoadError)
       cmd.run
       refute File.exist?("Cheffile")
     end
@@ -210,8 +210,8 @@ class SoloInitTest < TestCase
   end
 
   def command(*args)
-    KnifeSolo::Berkshelf.stubs(:load_gem).returns(false)
-    KnifeSolo::Librarian.stubs(:load_gem).returns(false)
+    KnifeSolo::Berkshelf.stubs(:load_gem).raises(LoadError)
+    KnifeSolo::Librarian.stubs(:load_gem).raises(LoadError)
     knife_command(Chef::Knife::SoloInit, *args)
   end
 end

data/test/ssh_command_test.rb

@@ -158,11 +158,15 @@ class SshCommandTest < TestCase
     cmd = command("usertest@10.0.0.1", "--ssh-gateway=test@host.com")
     cmd.validate_ssh_options!
     assert_equal "usertest@10.0.0.1", cmd.ssh_args
+
+    cmd = command_internal("usertest@10.0.0.1", "--ssh-gateway=test@host.com")
+    cmd.validate_ssh_options!
+    assert_equal "usertest@10.0.0.1 -o ControlMaster=auto -o ControlPath=#{cmd.ssh_control_path} -o ControlPersist=3600", cmd.ssh_args
   end
 
   def test_barks_without_atleast_a_hostname
     cmd = command
-    cmd.ui.expects(:err).with(regexp_matches(/hostname.*argument/))
+    cmd.ui.expects(:fatal).with(regexp_matches(/hostname.*argument/))
     $stdout.stubs(:puts)
     assert_exits { cmd.validate_ssh_options! }
   end
@@ -188,6 +192,32 @@ class SshCommandTest < TestCase
     assert_equal 1, res.exit_code
   end
 
+  def test_handle_ssh_keepalive
+    cmd = command("usertest@10.0.0.1", "--ssh-keepalive", '--ssh-keepalive-interval=100')
+    cmd.validate_ssh_options!
+    assert_equal true, cmd.connection_options[:keepalive]
+    assert_equal 100, cmd.connection_options[:keepalive_interval]
+  end
+
+  def test_handle_no_ssh_keepalive
+    cmd = command("usertest@10.0.0.1", "--no-ssh-keepalive")
+    assert_equal nil, cmd.connection_options[:keepalive]
+  end
+
+  def test_handle_default_ssh_keepalive_is_true
+    cmd = command("usertest@10.0.0.1")
+    cmd.validate_ssh_options!
+    assert_equal true, cmd.connection_options[:keepalive]
+    assert_equal 300, cmd.connection_options[:keepalive_interval]
+  end
+
+  def test_barks_if_ssh_keepalive_is_zero
+    cmd = command("usertest@10.0.0.1", "--ssh-keepalive-interval=0")
+    cmd.ui.expects(:fatal).with(regexp_matches(/--ssh-keepalive-interval.*positive number/))
+    $stdout.stubs(:puts)
+    assert_exits { cmd.validate_ssh_options! }
+  end
+
   def result(code, stdout = "")
     res = KnifeSolo::SshConnection::ExecResult.new(code)
     res.stdout = stdout
@@ -195,6 +225,11 @@ class SshCommandTest < TestCase
   end
 
   def command(*args)
+    args << '--ssh-control-master=no'
+    command_internal(*args)
+  end
+
+  def command_internal(*args)
     Net::SSH::Config.stubs(:default_files)
     knife_command(DummySshCommand, *args)
   end

data/test/support/ec2_runner.rb

@@ -42,19 +42,24 @@ class EC2Runner < MiniTest::Unit
       `nc #{dns_name} 22 -w 1 -q 0 </dev/null`
       $?.success?
     end
-    logger.info "Sleeping 10s to avoid Net::SSH locking up by connecting too early..."
-    logger.info "  (if you know a better way, please send me a note at https://github.com/matschaffer/knife-solo)"
-    # These may have better ways:
-    # http://rubydoc.info/gems/fog/Fog/Compute/AWS/Server:setup
-    # http://rubydoc.info/gems/knife-ec2/Chef/Knife/Ec2ServerCreate:tcp_test_ssh
-    sleep 10
+
+    unless server.tags["knife_solo_ssh_sleep_passed"]
+      logger.info "Sleeping 10s to avoid Net::SSH locking up by connecting too early..."
+      logger.info "  (if you know a better way, please send me a note at https://github.com/matschaffer/knife-solo)"
+      # These may have better ways:
+      # http://rubydoc.info/gems/fog/Fog/Compute/AWS/Server:setup
+      # http://rubydoc.info/gems/knife-ec2/Chef/Knife/Ec2ServerCreate:tcp_test_ssh
+      sleep 10
+      tag_as(:ssh_sleep_passed, server)
+    end
+
     server
   end
 
   # Adds a knife_solo_prepared tag to the server so we can know not to re-prepare it
-  def tag_as_prepared(server)
+  def tag_as(state, server)
     compute.tags.create(resource_id: server.identity,
-                        key:         :knife_solo_prepared,
+                        key:         "knife_solo_#{state}",
                         value:       true)
   end
 

data/test/support/environment_cookbook/metadata.rb

@@ -1,4 +1,4 @@
-name             "environment"
+name             "environment_cookbook"
 maintainer       "Mat Schaffer"
 maintainer_email "mat@schaffer.me"
 license          "MIT"

data/test/support/integration_test.rb

@@ -66,8 +66,11 @@ class IntegrationTest < TestCase
   # Prepares the server unless it has already been marked as such
   def prepare_server
     return if server.tags["knife_solo_prepared"]
+    if self.class.firewall_disabled
+      system "ssh #{connection_string} service iptables stop >> #{log_file}"
+    end
     assert_subcommand prepare_command
-    runner.tag_as_prepared(server)
+    runner.tag_as(:prepared, server)
   end
 
   # The prepare command to use on this server
@@ -87,7 +90,11 @@ class IntegrationTest < TestCase
 
   # Asserts that a knife command is successful
   def assert_knife_command(subcommand)
-    system "knife #{subcommand} #{connection_string} -VV >> #{log_file}"
+    pid = Process.spawn("knife #{subcommand} #{connection_string} -VV",
+                        :out => log_file.to_s,
+                        :err => log_file.to_s)
+    Process.wait(pid)
+
     assert $?.success?
   end
 
@@ -95,5 +102,13 @@ class IntegrationTest < TestCase
   def assert_subcommand(subcommand)
     assert_knife_command "solo #{subcommand}"
   end
+
+  class << self
+    attr_reader :firewall_disabled
+
+    def disable_firewall
+      @firewall_disabled = true
+    end
+  end
 end
 

data/test/support/test_case.rb

@@ -12,8 +12,9 @@ class TestCase < MiniTest::Unit::TestCase
     cmd_class.load_deps
     command = cmd_class.new(args)
     command.ui.stubs(:msg)
-    command.ui.stubs(:err)
+    command.ui.stubs(:warn)
     Chef::Config[:verbosity] = 0
+    command.config[:config_file] = "#{__dir__}/knife.rb"
     command.configure_chef
     command
   end

data/test/support/validation_helper.rb

@@ -7,7 +7,7 @@ module ValidationHelper
 
     def test_barks_without_atleast_a_hostname
       cmd = command
-      cmd.ui.expects(:err).with(regexp_matches(/hostname.*argument/))
+      cmd.ui.expects(:fatal).with(regexp_matches(/hostname.*argument/))
       $stdout.stubs(:puts)
       in_kitchen do
         assert_exits cmd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -170,21 +170,21 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.12'
+        version: '10.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.12'
+        version: '10.20'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.7'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -192,9 +192,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.7'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -218,7 +218,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
 - CHANGELOG.md
 - LICENSE
 - README.rdoc
@@ -279,6 +278,7 @@ files:
 - test/deprecated_command_test.rb
 - test/gemfiles/Gemfile.chef-10
 - test/gemfiles/Gemfile.chef-11
+- test/gemfiles/Gemfile.chef-12
 - test/gemfiles/Gemfile.chef-master
 - test/gitignore_test.rb
 - test/integration/amazon_linux_2012_09_bootstrap_test.rb
@@ -290,6 +290,7 @@ files:
 - test/integration/cases/encrypted_data_bag.rb
 - test/integration/cases/environment.rb
 - test/integration/cases/knife_bootstrap.rb
+- test/integration/cases/ohai_hints.rb
 - test/integration/centos5_8_test.rb
 - test/integration/centos6_3_test.rb
 - test/integration/debian6_bootstrap_test.rb
@@ -298,8 +299,8 @@ files:
 - test/integration/omnios_r151004_test.rb
 - test/integration/scientific_linux_63_test.rb
 - test/integration/sles_11_test.rb
-- test/integration/ubuntu10_04_test.rb
 - test/integration/ubuntu12_04_bootstrap_test.rb
+- test/integration/ubuntu12_04_ohai_hints_test.rb
 - test/integration/ubuntu12_04_test.rb
 - test/integration_helper.rb
 - test/knife_bootstrap_test.rb
@@ -325,6 +326,7 @@ files:
 - test/support/issue_files/sles11-sp1
 - test/support/issue_files/ubuntu
 - test/support/kitchen_helper.rb
+- test/support/knife.rb
 - test/support/loggable.rb
 - test/support/secret_cookbook/metadata.rb
 - test/support/secret_cookbook/recipes/default.rb
@@ -372,6 +374,7 @@ test_files:
 - test/deprecated_command_test.rb
 - test/gemfiles/Gemfile.chef-10
 - test/gemfiles/Gemfile.chef-11
+- test/gemfiles/Gemfile.chef-12
 - test/gemfiles/Gemfile.chef-master
 - test/gitignore_test.rb
 - test/integration/amazon_linux_2012_09_bootstrap_test.rb
@@ -383,6 +386,7 @@ test_files:
 - test/integration/cases/encrypted_data_bag.rb
 - test/integration/cases/environment.rb
 - test/integration/cases/knife_bootstrap.rb
+- test/integration/cases/ohai_hints.rb
 - test/integration/centos5_8_test.rb
 - test/integration/centos6_3_test.rb
 - test/integration/debian6_bootstrap_test.rb
@@ -391,8 +395,8 @@ test_files:
 - test/integration/omnios_r151004_test.rb
 - test/integration/scientific_linux_63_test.rb
 - test/integration/sles_11_test.rb
-- test/integration/ubuntu10_04_test.rb
 - test/integration/ubuntu12_04_bootstrap_test.rb
+- test/integration/ubuntu12_04_ohai_hints_test.rb
 - test/integration/ubuntu12_04_test.rb
 - test/integration_helper.rb
 - test/knife_bootstrap_test.rb
@@ -418,6 +422,7 @@ test_files:
 - test/support/issue_files/sles11-sp1
 - test/support/issue_files/ubuntu
 - test/support/kitchen_helper.rb
+- test/support/knife.rb
 - test/support/loggable.rb
 - test/support/secret_cookbook/metadata.rb
 - test/support/secret_cookbook/recipes/default.rb

data/.coveralls.yml

@@ -1,2 +0,0 @@
-service_name: travis-pro
-repo_token: Z5jr8jFYz6ILfHjkgsFw6fd6CEMR8Mmdn

data/test/integration/ubuntu10_04_test.rb

@@ -1,15 +0,0 @@
-require 'integration_helper'
-
-class Ubuntu10_04Test < IntegrationTest
-  def user
-    "ubuntu"
-  end
-
-  def image_id
-    "ami-6936fb00"
-  end
-
-  include EmptyCook
-  include Apache2Cook
-  include EncryptedDataBag
-end