knife-solo 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd9171b48ca9a42d6e3c65c7a60d40680089574
-  data.tar.gz: e96f7e04397a1ef4301bfd5f51f1b108d0f9b605
+  metadata.gz: e6a9075b35d746ef773b48fab2a4058b9b10b007
+  data.tar.gz: 2a4a78e808b7052a9775fb8da0018abfdb07bd33
 SHA512:
-  metadata.gz: 04e3c21476fb20b17175d6225e4a64c75e3e7fcab24a295ba1fac27e8dedae394f0306fb333a3cea8e9c183cfda41e13a34ed11ca83ddf3b190300c6b7743ab5
-  data.tar.gz: 0e0879f24ade781b7b96ebbcd25255f99d1bd9777bfac3b249a30fa0bedee700df02b1aa287816eaeec501eebbe9a299b28110044218a9d7c03e8d12f22a640c
+  metadata.gz: a2020e3b7d7971c882e29a4fe1391f96231d10de8643e5a045d612b45181df2f2e95e78728af0ee10be4c5513f2a2df127e5c928620a6988077d8e1e7bb6cacd
+  data.tar.gz: b6c1d721762e00bcfbc5cc25626094184c91d5feae3c882947cbf2772a62bd952c47eb5675af38ab07c4f7952cbd8f1012035ddca2b11b9e546e62435ceda8ce

data/.coveralls.yml

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

data/CHANGELOG.md

@@ -1,3 +1,49 @@
+# 0.4.0 / 2013-10-30
+
+## Changes and new features
+
+* Add SSH option --[no-]host-key-verify ([274])
+* Add --no-sync option to skip syncing and only run Chef ([284])
+* Use Omnibus installer for Debian 7 ([287])
+* Support Raspbian ([295])
+* Support environments (from Chef 11.6.0 on) ([285])
+
+## Fixes
+
+* Cache SSH connections ([265])
+* Support Berkshelf 3.0 ([268])
+* Follow symlinks when uploading kitchen ([279], [289])
+* Quote rsync paths to avoid problems with spaces in directory names ([281], [286])
+* Fix precedence of automatic cookbook_path components ([296], [298])
+* Print an error message if a `*_path` configuration value is not a String ([278], [300])
+* Mention knife-solo_data_bag gem in the docs ([83])
+* Pin to ffi 1.9.1 due to issues with newer versions
+* Docs around berkshelf and librarian-chef integrations
+
+## Thanks to our contributors!
+
+* [Andreas Josephson][teyrow]
+* [Markus Kern][makern]
+* [Michael Glass][michaelglass]
+* [Mathieu Allaire][allaire]
+
+[83]:  https://github.com/matschaffer/knife-solo/issues/83
+[265]: https://github.com/matschaffer/knife-solo/issues/265
+[268]: https://github.com/matschaffer/knife-solo/issues/268
+[274]: https://github.com/matschaffer/knife-solo/issues/274
+[278]: https://github.com/matschaffer/knife-solo/issues/278
+[279]: https://github.com/matschaffer/knife-solo/issues/279
+[281]: https://github.com/matschaffer/knife-solo/issues/281
+[284]: https://github.com/matschaffer/knife-solo/issues/284
+[285]: https://github.com/matschaffer/knife-solo/issues/285
+[286]: https://github.com/matschaffer/knife-solo/issues/286
+[287]: https://github.com/matschaffer/knife-solo/issues/287
+[289]: https://github.com/matschaffer/knife-solo/issues/289
+[295]: https://github.com/matschaffer/knife-solo/issues/295
+[296]: https://github.com/matschaffer/knife-solo/issues/296
+[298]: https://github.com/matschaffer/knife-solo/issues/298
+[300]: https://github.com/matschaffer/knife-solo/issues/300
+
 # 0.3.0 / 2013-08-01
 
 **NOTE**: This release includes breaking changes. See [upgrade instructions](https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0) for more information.
@@ -358,6 +404,8 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [jgarber]:       https://github.com/jgarber
 [jgrevich]:      https://github.com/jgrevich
 [kmdsbng]:       https://github.com/kmdsbng
+[makern]:        https://github.com/makern
+[michaelglass]:  https://github.com/michaelglass
 [naoya]:         https://github.com/naoya
 [natlownes]:     https://github.com/natlownes
 [patatepartie]:  https://github.com/patatepartie
@@ -373,8 +421,10 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [searlm]:        https://github.com/searlm
 [skyeagle]:      https://github.com/skyeagle
 [smdern]:        https://github.com/smdern
+[teyrow]:        https://github.com/teyrow
 [tknerr]:        https://github.com/tknerr
 [tmatilai]:      https://github.com/tmatilai
-[tocky]:          https://github.com/tocky
+[tocky]:         https://github.com/tocky
 [vjpr]:          https://github.com/vjpr
 [zeph]:          https://github.com/zeph
+[allaire]:       https://github.com/allaire

data/README.rdoc

@@ -26,6 +26,26 @@ If you need to install from git run:
 
     bundle && bundle exec rake install
 
+== Integration with Berkshelf & Librarian
+
+knife-solo also integrates with {Berkshelf}[http://berkshelf.com/] and {Librarian-Chef}[https://github.com/applicationsonline/librarian-chef] for managing your cookbooks out of the box.
+
+We try to do this somewhat automatically by first checking if you have either of the two gems installed. If you have both, we will default to Berkshelf.
+
+During <tt>knife solo init</tt> we'll generate the appropriate configuration file for either gem. Then during <tt>knife solo cook</tt> we'll run the installation step for whichever configuration file is in your kitchen.
+
+Both commands accept option flags to disable this feature if needed (<tt>--no-berkshelf</tt> or <tt>--no-librarian</tt>). The init command also offers enable flags to generate configuration files regardless of whether or not you have the supporting gem installed.
+
+More detailed logic for this integration is available in the {Berkshelf & Librarian-Chef integration}[https://github.com/matschaffer/knife-solo/wiki/Berkshelf-&-Librarian-Chef-integration] wiki page.
+
+=== A note about the "cookbooks" directory
+
+One common "gotcha" is that you may have Berkshelf or Librarian-Chef installed without knowing it. This will generate a kitchen that is configured to use them which might not have been your intention. Once the configuration file is available, the <tt>cookbooks</tt> directory will be reserved for cookbooks that are resolved via one of those tools. Any cookbooks that you create there will be removed when you run <tt>knife solo cook</tt>.
+
+Please use <tt>site-cookbooks</tt> for custom cookbooks or (better yet) give them their own git repositories which are then included using Berkshelf or Librarian-Chef.
+
+== knife-solo commands
+
 === Init command
 
 The init command simply takes a name of the directory to store the kitchen structure. Use "." to initialize the current directory.
@@ -74,7 +94,7 @@ This uploads all of your cookbooks in addition to a patch that allows you to use
 
 This also supports encrypted data bags. To use them, set the path to your key with +encrypted_data_bag_secret+ in .chef/knife.rb.
 
-The knife command for creating encrypted data bags doesn't work well without a Chef server, so use {this gist}[https://gist.github.com/2896172] as an example on how to create encrypted data bag items on your local file system.
+The built-in knife commands for working with data bags don't work well without a Chef server so we recommend using the {knife-solo_data_bag}[https://github.com/thbishop/knife-solo_data_bag] gem. This will provide "solo" versions of all the typical data bag commands. The default kitchen structure generated by <tt>knife solo init</tt> should be compatible with all the operations listed in the documentation for that gem.
 
 === Bootstrap command
 

data/Rakefile

@@ -15,7 +15,6 @@ MANIFEST_IGNORES = %w[
     script/test
   ]
 
-
 namespace :manifest do
   desc 'Checks for outstanding changes to the manifest'
   task :verify => :update do
@@ -72,6 +71,11 @@ task 'gh-pages' do
 end
 
 namespace :test do
+  Rake::TestTask.new(:performance) do |t|
+    t.libs << "test"
+    t.test_files = FileList['test/performance/*_test.rb']
+  end
+
   Rake::TestTask.new(:integration) do |t|
     t.libs << "test"
     t.test_files = FileList['test/integration/*_test.rb']

data/lib/chef/knife/solo_cook.rb

@@ -41,6 +41,10 @@ class Chef
         :long        => '--sync-only',
         :description => 'Only sync the cookbook - do not run Chef'
 
+      option :sync,
+        :long        => '--no-sync',
+        :description => 'Do not sync kitchen - only run Chef'
+
       option :berkshelf,
         :long        => '--no-berkshelf',
         :description => 'Skip berks install'
@@ -76,11 +80,14 @@ class Chef
           ui.msg "Running Chef on #{host}..."
 
           check_chef_version if config[:chef_check]
-          generate_node_config
-          berkshelf_install if config_value(:berkshelf, true)
-          librarian_install if config_value(:librarian, true)
-          sync_kitchen
-          generate_solorb
+          if config_value(:sync, true)
+            generate_node_config
+            berkshelf_install if config_value(:berkshelf, true)
+            librarian_install if config_value(:librarian, true)
+            patch_cookbooks_install
+            sync_kitchen
+            generate_solorb
+          end
           cook unless config[:sync_only]
         end
       end
@@ -104,13 +111,14 @@ class Chef
         run_portable_mkdir_p(provisioning_path, '0700')
 
         cookbook_paths.each_with_index do |path, i|
-          upload_to_provision_path(path, "/cookbooks-#{i + 1}", 'cookbook_path')
+          upload_to_provision_path(path.to_s, "/cookbooks-#{i + 1}", 'cookbook_path')
         end
-        upload_to_provision_path(node_config, 'dna.json')
+        upload_to_provision_path(node_config.to_s, 'dna.json')
         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(:environment_path, 'environments')
       end
 
       def expand_path(path)
@@ -122,7 +130,7 @@ class Chef
       end
 
       def cookbook_paths
-        @cookbook_paths ||= expanded_config_paths(:cookbook_path) + [patch_cookbooks_path]
+        @cookbook_paths ||= expanded_config_paths(:cookbook_path)
       end
 
       def proxy_setting_keys
@@ -219,6 +227,8 @@ class Chef
 
         if src.nil?
           Chef::Log.debug "'#{key_name}' not set"
+        elsif !src.is_a?(String)
+          ui.error "#{key_name} is not a String: #{src.inspect}"
         elsif !File.exist?(src)
           ui.warn "Local #{key_name} '#{src}' does not exist"
         else
@@ -237,24 +247,36 @@ class Chef
       end
 
       def rsync(source_path, target_path, extra_opts = '--delete')
-        cmd = %Q{rsync -rl #{rsync_debug} #{rsync_permissions} --rsh="ssh #{ssh_args}" #{extra_opts}}
-        cmd << rsync_excludes.map { |ignore| " --exclude '#{ignore}'" }.join
-        cmd << %Q{ #{adjust_rsync_path_on_client(source_path)} :#{adjust_rsync_path_on_node(target_path)}}
-        Chef::Log.debug cmd
-        system! cmd
+        cmd = ['rsync', '-rL', rsync_debug, rsync_permissions, %Q{--rsh=ssh #{ssh_args}}, 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
+        Chef::Log.debug cmd.inspect
+        system!(*cmd)
       end
 
       def check_chef_version
         ui.msg "Checking Chef version..."
-        unless Gem::Requirement.new(CHEF_VERSION_CONSTRAINT).satisfied_by? Gem::Version.new(chef_version)
+        unless chef_version_satisfies? CHEF_VERSION_CONSTRAINT
           raise "Couldn't find Chef #{CHEF_VERSION_CONSTRAINT} on #{host}. Please run `knife solo prepare #{ssh_args}` to ensure Chef is installed and up to date."
         end
+        if node_environment != '_default' && chef_version_satisfies?('<11.6.0')
+          ui.warn "Chef version #{chef_version} does not support environments. Environment '#{node_environment}' will be ignored."
+        end
+      end
+
+      def chef_version_satisfies?(requirement)
+        Gem::Requirement.new(requirement).satisfied_by? Gem::Version.new(chef_version)
       end
 
       # Parses "Chef: x.y.z" from the chef-solo version output
       def chef_version
-        cmd = %q{sudo chef-solo --version 2>/dev/null | awk '$1 == "Chef:" {print $2}'}
-        run_command(cmd).stdout.strip
+        # Memoize the version to avoid multiple SSH calls
+        @chef_version ||= lambda do
+          cmd = %q{sudo chef-solo --version 2>/dev/null | awk '$1 == "Chef:" {print $2}'}
+          run_command(cmd).stdout.strip
+        end.call
       end
 
       def cook
@@ -268,6 +290,12 @@ class Chef
         result = stream_command cmd
         raise "chef-solo failed. See output above." unless result.success?
       end
+
+      protected
+
+      def patch_cookbooks_install
+        add_cookbook_path(patch_cookbooks_path) 
+      end
     end
   end
 end

data/lib/chef/knife/solo_init.rb

@@ -32,7 +32,7 @@ class Chef
         validate!
         create_kitchen
         create_config
-        create_cupboards %w[nodes roles data_bags site-cookbooks cookbooks]
+        create_cupboards %w[nodes roles data_bags environments site-cookbooks cookbooks]
         gitignore %w[/cookbooks/]
         if (cm = cookbook_manager)
           cm.bootstrap(@base)

data/lib/knife-solo/berkshelf.rb

@@ -1,4 +1,5 @@
 require 'digest/sha1'
+require 'fileutils'
 require 'knife-solo/cookbook_manager'
 require 'knife-solo/tools'
 
@@ -17,7 +18,15 @@ module KnifeSolo
     def install!
       path = berkshelf_path
       ui.msg "Installing Berkshelf cookbooks to '#{path}'..."
-      ::Berkshelf::Berksfile.from_file('Berksfile').install(:path => path)
+
+      berksfile = ::Berkshelf::Berksfile.from_file('Berksfile')
+      if berksfile.respond_to?(:vendor)
+        FileUtils.rm_rf(path)
+        berksfile.vendor(path)
+      else
+        berksfile.install(:path => path)
+      end
+
       path
     end
 

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

@@ -63,10 +63,12 @@ module KnifeSolo::Bootstraps
     def distro
       return @distro if @distro
       @distro = case issue
-      when %r{Debian GNU/Linux 6}
+      when %r{Debian GNU/Linux [67]}
         {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
       when %r{Debian}
         {:type => "debianoid_gem"}
+      when %r{Raspbian}
+        {:type => "debianoid_gem"}
       when %r{Ubuntu}i
         {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
       when %r{Linaro}

data/lib/knife-solo/info.rb

@@ -1,6 +1,6 @@
 module KnifeSolo
   def self.version
-    '0.3.0'
+    '0.4.0'
   end
 
   def self.post_install_message

data/lib/knife-solo/node_config_command.rb

@@ -30,6 +30,12 @@ module KnifeSolo
           :description => 'A JSON string to be added to node config (if it does not exist)',
           :proc        => lambda { |o| JSON.parse(o) },
           :default     => nil
+
+        option :environment,
+          :short       => '-E ENVIRONMENT',
+          :long        => '--environment ENVIRONMENT',
+          :description => 'The Chef environment for your node'
+
       end
     end
 
@@ -47,6 +53,11 @@ module KnifeSolo
       config[:chef_node_name] || host
     end
 
+    def node_environment
+      node = node_config.exist? ? JSON.parse(IO.read(node_config)) : {}
+      config[:environment] || node['environment'] || '_default'
+    end
+
     def generate_node_config
       if node_config.exist?
         Chef::Log.debug "Node config '#{node_config}' already exists"
@@ -56,7 +67,8 @@ module KnifeSolo
         File.open(node_config, 'w') do |f|
           attributes = config[:json_attributes] || config[:first_boot_attributes] || {}
           run_list = { :run_list => config[:run_list] || [] }
-          f.print attributes.merge(run_list).to_json
+          environment = config[:environment] ? { :environment => config[:environment] } : {}
+          f.print attributes.merge(run_list).merge(environment).to_json
         end
       end
     end

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

@@ -1,7 +1,8 @@
-cookbook_path ["cookbooks", "site-cookbooks"]
-node_path     "nodes"
-role_path     "roles"
-data_bag_path "data_bags"
+cookbook_path    ["cookbooks", "site-cookbooks"]
+node_path        "nodes"
+role_path        "roles"
+environment_path "environments"
+data_bag_path    "data_bags"
 #encrypted_data_bag_secret "data_bag_key"
 
 knife[:berkshelf_path] = "cookbooks"

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

@@ -4,6 +4,8 @@ nodes_path                File.join(base, 'nodes')
 role_path                 File.join(base, 'roles')
 data_bag_path             File.join(base, 'data_bags')
 encrypted_data_bag_secret File.join(base, 'data_bag_key')
+environment_path          File.join(base, 'environments')
+environment               <%= node_environment.inspect %>
 
 cookbook_path []
 <% cookbook_paths.each_with_index do |path, i| -%>

data/lib/knife-solo/ssh_command.rb

@@ -1,7 +1,9 @@
+
 module KnifeSolo
   module SshCommand
 
     def self.load_deps
+      require 'knife-solo/ssh_connection'
       require 'net/ssh'
     end
 
@@ -59,6 +61,12 @@ module KnifeSolo
           :long        => '--sudo-command SUDO_COMMAND',
           :description => 'The command to use instead of sudo for admin privileges'
 
+        option :host_key_verify,
+          :long => "--[no-]host-key-verify",
+          :description => "Verify host key, enabled by default.",
+          :boolean => true,
+          :default => true
+
       end
     end
 
@@ -124,6 +132,10 @@ module KnifeSolo
       options[:port] = config[:ssh_port] if config[:ssh_port]
       options[:password] = config[:ssh_password] if config[:ssh_password]
       options[:keys] = [config[:identity_file]] if config[:identity_file]
+      if !config[:host_key_verify]
+        options[:paranoid] = false
+        options[:user_known_hosts_file] = "/dev/null"
+      end
       options
     end
 
@@ -148,9 +160,12 @@ module KnifeSolo
       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]
-      port_arg = "-p #{config[:ssh_port]}" if config[:ssh_port]
+      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
+
 
-      [host_arg, config_arg, ident_arg, port_arg].compact.join(' ')
+      [host_arg, config_arg, ident_arg, port_arg, knownhosts_arg, stricthosts_arg].compact.join(' ')
     end
 
     def sudo_command
@@ -161,27 +176,6 @@ module KnifeSolo
       config[:startup_script]
     end
 
-    class ExecResult
-      attr_accessor :stdout, :stderr, :exit_code
-
-      def initialize(exit_code = nil)
-        @exit_code = exit_code
-        @stdout = ""
-        @stderr = ""
-      end
-
-      def success?
-        exit_code == 0
-      end
-
-      # Helper to use when raising exceptions since some operations
-      # (e.g., command not found) error on stdout
-      def stderr_or_stdout
-        return stderr unless stderr.empty?
-        stdout
-      end
-    end
-
     def windows_node?
       return @windows_node unless @windows_node.nil?
       @windows_node = run_command('ver', :process_sudo => false).stdout =~ /Windows/i
@@ -229,43 +223,14 @@ module KnifeSolo
       detect_authentication_method
 
       Chef::Log.debug("Initial command #{command}")
-      result = ExecResult.new
 
       command = processed_command(command, options)
       Chef::Log.debug("Running processed command #{command}")
 
-      Net::SSH.start(host, user, connection_options) do |ssh|
-        ssh.open_channel do |channel|
-          channel.request_pty
-          channel.exec(command) do |ch, success|
-            raise "ssh.channel.exec failure" unless success
-
-            channel.on_data do |ch, data|  # stdout
-              if data =~ /^knife sudo password: /
-                ch.send_data("#{password}\n")
-              else
-                Chef::Log.debug("#{command} stdout: #{data}")
-                ui.stdout << data if options[:streaming]
-                result.stdout << data
-              end
-            end
-
-            channel.on_extended_data do |ch, type, data|
-              next unless type == 1
-              Chef::Log.debug("#{command} stderr: #{data}")
-              ui.stderr << data if options[:streaming]
-              result.stderr << data
-            end
-
-            channel.on_request("exit-status") do |ch, data|
-              result.exit_code = data.read_long
-            end
-
-          end
-          ssh.loop
-        end
-      end
-      result
+      output = ui.stdout if options[:streaming]
+
+      @connection ||= SshConnection.new(host, user, connection_options, method(:password))
+      @connection.run_command(command, output)
     end
 
     # Runs commands from the specified array until successful.
@@ -276,7 +241,7 @@ module KnifeSolo
         result = run_command(command, options)
         return result if result.success?
       end
-      ExecResult.new(1)
+      SshConnection::ExecResult.new(1)
     end
 
     # TODO:

data/lib/knife-solo/ssh_connection.rb

@@ -0,0 +1,78 @@
+require 'net/ssh'
+
+module KnifeSolo
+  class SshConnection
+    class ExecResult
+      attr_accessor :stdout, :stderr, :exit_code
+
+      def initialize(exit_code = nil)
+        @exit_code = exit_code
+        @stdout = ""
+        @stderr = ""
+      end
+
+      def success?
+        exit_code == 0
+      end
+
+      # Helper to use when raising exceptions since some operations
+      # (e.g., command not found) error on stdout
+      def stderr_or_stdout
+        return stderr unless stderr.empty?
+        stdout
+      end
+    end
+
+    def initialize(host, user, connection_options, sudo_password_hook)
+      @host = host
+      @user = user
+      @connection_options = connection_options
+      @password_hook = sudo_password_hook
+    end
+
+    attr_reader :host, :user, :connection_options
+
+    def session
+      @session ||= Net::SSH.start(host, user, connection_options)
+    end
+
+    def password
+      @password ||= @password_hook.call
+    end
+
+    def run_command(command, output = nil)
+      result = ExecResult.new
+
+      session.open_channel do |channel|
+        channel.request_pty
+        channel.exec(command) do |ch, success|
+          raise "ssh.channel.exec failure" unless success
+
+          channel.on_data do |ch, data|  # stdout
+            if data =~ /^knife sudo password: /
+              ch.send_data("#{password}\n")
+            else
+              Chef::Log.debug("#{command} stdout: #{data}")
+              output << data if output
+              result.stdout << data
+            end
+          end
+
+          channel.on_extended_data do |ch, type, data|
+            next unless type == 1
+            Chef::Log.debug("#{command} stderr: #{data}")
+            output << data if output
+            result.stderr << data
+          end
+
+          channel.on_request("exit-status") do |ch, data|
+            result.exit_code = data.read_long
+          end
+
+        end
+      end.wait
+
+      result
+    end
+  end
+end

data/lib/knife-solo/tools.rb

@@ -1,7 +1,7 @@
 module KnifeSolo
   module Tools
-    def system!(command)
-      raise "Failed to launch command #{command}" unless system(command)
+    def system!(*command)
+      raise "Failed to launch command #{command}" unless system(*command)
     end
 
     def windows_client?

data/test/integration/cases/environment.rb

@@ -0,0 +1,25 @@
+module Environment
+  def setup
+    super
+    FileUtils.cp_r $base_dir.join('support', 'environment_cookbook'), 'site-cookbooks/environment_cookbook'
+    FileUtils.cp $base_dir.join('support', 'test_environment.json'), 'environments/test_environment.json'
+  end
+
+  def cook_environment(node)
+    write_nodefile(node)
+    assert_subcommand "cook"
+    `ssh #{connection_string} cat /etc/chef_environment`
+  end
+
+  # Test that chef picks up environments properly
+  # NOTE: This shells out to ssh, so may not be windows-compatible
+  def test_chef_environment
+    # If no environment is specified chef needs to use "_default" and attribute from cookbook
+    actual = cook_environment(run_list: ["recipe[environment_cookbook]"])
+    assert_equal "_default/untouched", actual
+
+    # If one is specified chef needs to pick it up and get override attibute
+    actual = cook_environment(run_list: ["recipe[environment_cookbook]"], environment: 'test_environment')
+    assert_equal "test_environment/test_env_was_here", actual
+  end
+end

data/test/integration/debian7_knife_bootstrap_test.rb

@@ -6,7 +6,7 @@ class Debian7KnifeBootstrapTest < IntegrationTest
   end
 
   def image_id
-    "ami-1d620e74"
+    "ami-9e95e8f7"
   end
 
   def prepare_server

data/test/integration/ubuntu12_04_test.rb

@@ -13,4 +13,5 @@ class Ubuntu12_04Test < IntegrationTest
   include Apache2Cook
   include EncryptedDataBag
   include CachePathUsage
+  include Environment
 end

data/test/performance/ssh_performance_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+require 'support/kitchen_helper'
+require 'chef/knife/solo_prepare'
+
+require 'knife-solo/bootstraps'
+require 'knife-solo/bootstraps/linux'
+
+require 'knife-solo/ssh_connection'
+
+require 'benchmark'
+
+class KnifeSolo::Bootstraps::Linux
+  def debianoid_omnibus_install
+    run_command("echo apt-get update")
+    run_command("echo apt-get install")
+    run_command("echo curl omnibus")
+    run_command("echo run omnibus")
+  end
+end
+
+class SshPerformanceTest < TestCase
+  include KitchenHelper
+
+  def do_it
+    # NOTE: Assumes user & host on @matschaffer's machine. Modify or paramaterize if needed.
+    10.times { knife_command(Chef::Knife::SoloPrepare, "ubuntu@172.16.20.133").run }
+  end
+
+  def test_ssh_performance_of_prepare
+    in_kitchen do
+      Benchmark.bmbm do |b|
+        b.report("cached attributes: ") do
+          do_it
+        end
+      end
+    end
+  end
+end

data/test/solo_cook_test.rb

@@ -56,11 +56,6 @@ class SoloCookTest < TestCase
     assert Dir.exist?(path), "patch_cookbooks_path is not a directory"
   end
 
-  def test_cookbook_paths_includes_patch_cookbooks
-    cmd = command
-    assert_equal cmd.patch_cookbooks_path, cmd.cookbook_paths.last, "patch_cookbooks is not included"
-  end
-
   def test_cookbook_paths_expands_paths
     cmd = command
     Chef::Config.cookbook_path = ["mycookbooks", "/some/other/path"]
@@ -84,9 +79,18 @@ class SoloCookTest < TestCase
     assert_equal({ :http_proxy => "http://proxy:3128" }, conf)
   end
 
+  def test_adds_patch_cookboks_with_lowest_precedence
+   in_kitchen do
+      cmd = command("somehost")
+      cmd.run
+      #note: cookbook_paths are in order of precedence (low->high)
+      assert_equal cmd.patch_cookbooks_path, cmd.cookbook_paths[0]
+    end 
+  end
+
   def test_does_not_run_berkshelf_if_no_berkfile
     in_kitchen do
-      Berkshelf::Berksfile.any_instance.expects(:install).never
+      Berkshelf::Berksfile.any_instance.expects(:vendor).never
       command("somehost").run
     end
   end
@@ -94,7 +98,7 @@ class SoloCookTest < TestCase
   def test_runs_berkshelf_if_berkfile_found
     in_kitchen do
       FileUtils.touch "Berksfile"
-      Berkshelf::Berksfile.any_instance.expects(:install)
+      Berkshelf::Berksfile.any_instance.expects(:vendor)
       command("somehost").run
     end
   end
@@ -102,7 +106,7 @@ class SoloCookTest < TestCase
   def test_does_not_run_berkshelf_if_denied_by_option
     in_kitchen do
       FileUtils.touch "Berksfile"
-      Berkshelf::Berksfile.any_instance.expects(:install).never
+      Berkshelf::Berksfile.any_instance.expects(:vendor).never
       command("somehost", "--no-berkshelf").run
     end
   end
@@ -113,7 +117,7 @@ class SoloCookTest < TestCase
       cmd = command("somehost")
       cmd.ui.expects(:err).with(regexp_matches(/berkshelf gem/))
       KnifeSolo::Berkshelf.expects(:load_gem).returns(false)
-      Berkshelf::Berksfile.any_instance.expects(:install).never
+      Berkshelf::Berksfile.any_instance.expects(:vendor).never
       cmd.run
     end
   end
@@ -123,7 +127,7 @@ class SoloCookTest < TestCase
       cmd = command("somehost")
       cmd.ui.expects(:err).never
       KnifeSolo::Berkshelf.expects(:load_gem).never
-      Berkshelf::Berksfile.any_instance.expects(:install).never
+      Berkshelf::Berksfile.any_instance.expects(:vendor).never
       cmd.run
     end
   end
@@ -132,9 +136,10 @@ class SoloCookTest < TestCase
     in_kitchen do
       FileUtils.touch "Berksfile"
       KnifeSolo::Berkshelf.any_instance.stubs(:berkshelf_path).returns("berkshelf/path")
+      Berkshelf::Berksfile.any_instance.stubs(:vendor)
       cmd = command("somehost")
       cmd.run
-      assert_equal File.join(Dir.pwd, "berkshelf/path"), cmd.cookbook_paths[0].to_s
+      assert_equal File.join(Dir.pwd, "berkshelf/path"), cmd.cookbook_paths[1].to_s
     end
   end
 
@@ -186,9 +191,10 @@ class SoloCookTest < TestCase
     ENV['LIBRARIAN_CHEF_PATH'] = "librarian/path"
     in_kitchen do
       FileUtils.touch "Cheffile"
+      Librarian::Action::Install.any_instance.stubs(:run)
       cmd = command("somehost")
       cmd.run
-      assert_equal File.join(Dir.pwd, "librarian/path"), cmd.cookbook_paths[0].to_s
+      assert_equal File.join(Dir.pwd, "librarian/path"), cmd.cookbook_paths[1].to_s
     end
   end
 
@@ -247,6 +253,14 @@ class SoloCookTest < TestCase
     end
   end
 
+  def test_does_not_sync_if_no_sync_specified
+    in_kitchen do
+      cmd = command("somehost", "--no-sync")
+      cmd.expects(:sync_kitchen).never
+      cmd.run
+    end
+  end
+
   def test_passes_node_name_to_chef_solo
     assert_chef_solo_option "--node-name=mynode", "-N mynode"
   end

data/test/ssh_command_test.rb

@@ -82,6 +82,18 @@ class SshCommandTest < TestCase
     assert_equal "source ~/.bashrc && echo $TEST_PROP",  cmd.processed_command("echo $TEST_PROP")
   end
 
+  def test_handle_no_host_key_verify
+    cmd = command("10.0.0.1", "--no-host-key-verify")
+    assert_equal false,  cmd.connection_options[:paranoid]
+    assert_equal "/dev/null",  cmd.connection_options[:user_known_hosts_file]
+  end
+
+  def test_handle_default_host_key_verify_is_paranoid
+    cmd = command("10.0.0.1")
+    assert_nil(cmd.connection_options[:paranoid]) # Net:SSH default is :paranoid => true
+    assert_nil(cmd.connection_options[:user_known_hosts_file])
+  end
+
   def test_builds_cli_ssh_args
     DummySshCommand.any_instance.stubs(:try_connection)
 
@@ -103,6 +115,10 @@ class SshCommandTest < TestCase
     cmd = command("usertest@10.0.0.1", "--ssh-port=222")
     cmd.validate_ssh_options!
     assert_equal "usertest@10.0.0.1 -p 222", cmd.ssh_args
+
+    cmd = command("usertest@10.0.0.1", "--no-host-key-verify")
+    cmd.validate_ssh_options!
+    assert_equal "usertest@10.0.0.1 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no", cmd.ssh_args
   end
 
   def test_barks_without_atleast_a_hostname
@@ -127,14 +143,14 @@ class SshCommandTest < TestCase
   def test_run_with_fallbacks_returns_error_if_all_fail
     cmd = command
     cmd.expects(:run_command).twice.returns(result(64, "fail"))
-    
+
     res = cmd.run_with_fallbacks(["foo", "bar"])
     assert_equal "", res.stdout
     assert_equal 1, res.exit_code
   end
 
   def result(code, stdout = "")
-    res = KnifeSolo::SshCommand::ExecResult.new(code)
+    res = KnifeSolo::SshConnection::ExecResult.new(code)
     res.stdout = stdout
     res
   end

data/test/support/environment_cookbook/attributes/default.rb

@@ -0,0 +1 @@
+default['environment']['test_attribute'] = "untouched"

data/test/support/environment_cookbook/metadata.rb

@@ -0,0 +1,6 @@
+name             "environment"
+maintainer       "Mat Schaffer"
+maintainer_email "mat@schaffer.me"
+license          "MIT"
+description      "Spits out a file containing the current chef environment and a test attribute"
+version          "0.0.1"

data/test/support/environment_cookbook/recipes/default.rb

@@ -0,0 +1,4 @@
+file "/etc/chef_environment" do
+  mode 0644
+  content "#{node.chef_environment}/#{node['environment']['test_attribute']}"
+end

data/test/support/test_environment.json

@@ -0,0 +1,11 @@
+{
+  "name": "test_environment",
+  "description": "An environment for integration tests",
+  "override_attributes": {
+    "environment": {
+      "test_attribute": "test_env_was_here"
+    }
+  },
+  "json_class": "Chef::Environment",
+  "chef_type": "environment"
+}

data/test/test_helper.rb

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'coveralls'
+Coveralls.wear!
+
 require 'minitest/autorun'
 require 'mocha/setup'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +218,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - CHANGELOG.md
 - LICENSE
 - README.rdoc
@@ -221,6 +250,7 @@ files:
 - lib/knife-solo/resources/knife.rb
 - lib/knife-solo/resources/solo.rb.erb
 - lib/knife-solo/ssh_command.rb
+- lib/knife-solo/ssh_connection.rb
 - lib/knife-solo/tools.rb
 - test/bootstraps_test.rb
 - test/deprecated_command_test.rb
@@ -233,6 +263,7 @@ files:
 - test/integration/cases/cache_path_usage.rb
 - test/integration/cases/empty_cook.rb
 - test/integration/cases/encrypted_data_bag.rb
+- test/integration/cases/environment.rb
 - test/integration/cases/knife_bootstrap.rb
 - test/integration/centos5_8_test.rb
 - test/integration/centos6_3_test.rb
@@ -249,6 +280,7 @@ files:
 - test/knife_bootstrap_test.rb
 - test/minitest/parallel.rb
 - test/node_config_command_test.rb
+- test/performance/ssh_performance_test.rb
 - test/solo_bootstrap_test.rb
 - test/solo_clean_test.rb
 - test/solo_cook_test.rb
@@ -260,6 +292,9 @@ files:
 - test/support/config.yml.example
 - test/support/data_bag_key
 - test/support/ec2_runner.rb
+- test/support/environment_cookbook/attributes/default.rb
+- test/support/environment_cookbook/metadata.rb
+- test/support/environment_cookbook/recipes/default.rb
 - test/support/integration_test.rb
 - test/support/issue_files/gentoo2011
 - test/support/issue_files/sles11-sp1
@@ -270,6 +305,7 @@ files:
 - test/support/secret_cookbook/recipes/default.rb
 - test/support/ssh_config
 - test/support/test_case.rb
+- test/support/test_environment.json
 - test/support/validation_helper.rb
 - test/test_helper.rb
 - test/tools_test.rb
@@ -341,6 +377,7 @@ test_files:
 - test/integration/cases/cache_path_usage.rb
 - test/integration/cases/empty_cook.rb
 - test/integration/cases/encrypted_data_bag.rb
+- test/integration/cases/environment.rb
 - test/integration/cases/knife_bootstrap.rb
 - test/integration/centos5_8_test.rb
 - test/integration/centos6_3_test.rb
@@ -357,6 +394,7 @@ test_files:
 - test/knife_bootstrap_test.rb
 - test/minitest/parallel.rb
 - test/node_config_command_test.rb
+- test/performance/ssh_performance_test.rb
 - test/solo_bootstrap_test.rb
 - test/solo_clean_test.rb
 - test/solo_cook_test.rb
@@ -368,6 +406,9 @@ test_files:
 - test/support/config.yml.example
 - test/support/data_bag_key
 - test/support/ec2_runner.rb
+- test/support/environment_cookbook/attributes/default.rb
+- test/support/environment_cookbook/metadata.rb
+- test/support/environment_cookbook/recipes/default.rb
 - test/support/integration_test.rb
 - test/support/issue_files/gentoo2011
 - test/support/issue_files/sles11-sp1
@@ -378,6 +419,7 @@ test_files:
 - test/support/secret_cookbook/recipes/default.rb
 - test/support/ssh_config
 - test/support/test_case.rb
+- test/support/test_environment.json
 - test/support/validation_helper.rb
 - test/test_helper.rb
 - test/tools_test.rb