knife-solo 0.3.0.pre1 → 0.3.0.pre2

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # 0.3.0: _In progress_
 
+## Changes and new features
+
+* Moved root path configuration into `knife[:solo_path]` and use $HOME/chef-solo by default (#197)
+* `--prerelease` option to allow pre-release versions of chef omnibus or rubygem to be installed (#205)
+* Prepare/bootstrap now installs the same version of Chef that the workstation is running (#186)
+* Switch `--omnibus-version` flag to `--bootstrap-version` (#185)
+* Support --override-runlist option (#204)
+
+## Fixes
+
+* FreeBSD 9.1 support
+* Clear yum cache before installing rsync (#200)
+
+## Thanks to our contributors!
+
+* [David Kinzer][dkinzer]
+* [Naoya Ito][naoya]
+
 # 0.2.0: February 12, 2013
 
 ## Changes and new features
@@ -276,3 +294,5 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [tmatilai]:      https://github.com/tmatilai
 [vjpr]:          https://github.com/vjpr
 [zeph]:          https://github.com/zeph
+[dkinzer]:       https://github.com/dkinzer
+[naoya]:         https://github.com/naoya

data/lib/chef/knife/solo_cook.rb

@@ -51,6 +51,11 @@ class Chef
         :long        => '--why-run',
         :description => 'Enable whyrun mode'
 
+      option :override_runlist,
+        :short       => '-o RunlistItem,RunlistItem...,',
+        :long        => '--override-runlist',
+        :description => 'Replace current run list with specified items'
+
       def run
         @solo_config = KnifeSolo::Config.new
 
@@ -85,6 +90,22 @@ class Chef
         @chefignore ||= ::Chef::Cookbook::Chefignore.new("./")
       end
 
+      # cygwin rsync path must be adjusted to work
+      def adjust_rsync_path(path)
+        path_s = path.to_s
+        path_s.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+      end
+
+      def adjust_rsync_path_on_node(path)
+        return path unless windows_node?
+        adjust_rsync_path(path)
+      end
+
+      def adjust_rsync_path_on_client(path)
+        return path unless windows_client?
+        adjust_rsync_path(path)
+      end
+
       # see http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
       def rsync_permissions
         '--chmod=ugo=rwX' if windows_client?
@@ -138,7 +159,7 @@ class Chef
       end
 
       def rsync(source_path, target_path, extra_opts = '')
-        cmd = %Q|rsync -rl #{rsync_permissions} --rsh="ssh #{ssh_args}" #{extra_opts} #{rsync_excludes.collect{ |ignore| "--exclude #{ignore} " }.join} #{source_path} :#{target_path}|
+        cmd = %Q{rsync -rl #{rsync_permissions} --rsh="ssh #{ssh_args}" #{extra_opts} #{rsync_excludes.collect{ |ignore| "--exclude #{ignore} " }.join} #{adjust_rsync_path_on_client(source_path)} :#{adjust_rsync_path_on_node(target_path)}}
         ui.msg cmd if debug?
         system! cmd
       end
@@ -161,6 +182,7 @@ class Chef
         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]
 
         result = stream_command cmd
         raise "chef-solo failed. See output above." unless result.success?

data/lib/chef/knife/solo_prepare.rb

@@ -18,6 +18,15 @@ class Chef
 
       banner "knife solo prepare [USER@]HOSTNAME [JSON] (options)"
 
+      option :bootstrap_version,
+        :long        => '--bootstrap-version VERSION',
+        :description => 'The version of Chef to install',
+        :proc        => lambda {|v| Chef::Config[:knife][:bootstrap_version] = v}
+
+      option :prerelease,
+        :long        => '--prerelease',
+        :description => 'Install the pre-release Chef version'
+
       option :omnibus_url,
         :long        => '--omnibus-url URL',
         :description => 'URL to download install.sh from'
@@ -28,11 +37,12 @@ class Chef
 
       option :omnibus_version,
         :long        => '--omnibus-version VERSION',
-        :description => 'The version of Omnibus to install'
+        :description => 'Deprecated. Replaced with --bootstrap-check.'
 
       def run
         if config[:omnibus_version]
-          config[:omnibus_options] = "#{config[:omnibus_options]} -v #{config[:omnibus_version]}".strip
+          ui.warn '`--omnibus-version` is deprecated, please use `--bootstrap-version`.'
+          Chef::Config[:knife][:bootstrap_version] = config[:omnibus_version]
         end
 
         validate!
@@ -52,6 +62,14 @@ class Chef
       def operating_system
         run_command('uname -s').stdout.strip
       end
+
+      def chef_version
+        if (v = Chef::Config[:knife][:bootstrap_version])
+          v.empty? ? nil : v
+        else
+          Chef::VERSION
+        end
+      end
     end
   end
 end

data/lib/knife-solo/bootstraps.rb

@@ -35,6 +35,10 @@ module KnifeSolo
         prepare.ui
       end
 
+      def chef_version
+        prepare.chef_version
+      end
+
       def prepare
         @prepare
       end
@@ -43,7 +47,7 @@ module KnifeSolo
     module InstallCommands
 
       def bootstrap!
-        run_pre_bootstrap_checks()
+        run_pre_bootstrap_checks
         send("#{distro[:type]}_install")
       end
 
@@ -51,8 +55,9 @@ module KnifeSolo
         raise "implement distro detection for #{self.class.name}"
       end
 
+      # gems to install before chef
       def gem_packages
-        raise "implement gem packages for #{self.class.name}"
+        []
       end
 
       def http_client_get_url(url, file)
@@ -70,12 +75,24 @@ module KnifeSolo
         file = File.basename(url)
         http_client_get_url(url, file)
 
-        install_command = "sudo bash #{file} #{prepare.config[:omnibus_options]}"
+        install_command = "sudo bash #{file} #{omnibus_options}"
         stream_command(install_command)
       end
 
+      def omnibus_options
+        options = prepare.config[:omnibus_options] || ""
+        if prepare.config[:prerelease]
+          options << " -p"
+        elsif chef_version
+          options << " -v #{chef_version}"
+        end
+        options
+      end
+
       def yum_omnibus_install
         omnibus_install
+        # Avoid rsync not being found in package cache.
+        run_command("sudo yum clean all")
         # Make sure we have rsync on builds that don't include it by default
         # (for example Scientific Linux minimal, CentOS minimal)
         run_command("sudo yum -y install rsync")
@@ -99,7 +116,16 @@ module KnifeSolo
         run_command("tar zxf #{file}")
         run_command("cd #{release} && sudo ruby setup.rb --no-format-executable")
         run_command("sudo rm -rf #{release} #{file}")
-        run_command("sudo gem install --no-rdoc --no-ri #{gem_packages().join(' ')}")
+        run_command("sudo gem install --no-rdoc --no-ri #{gem_packages.join(' ')}") unless gem_packages.empty?
+        run_command("sudo gem install --no-rdoc --no-ri chef #{gem_options}")
+      end
+
+      def gem_options
+        if prepare.config[:prerelease]
+          "--prerelease"
+        elsif chef_version
+          "--version #{chef_version}"
+        end
       end
     end #InstallCommands
 

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

@@ -5,10 +5,6 @@ module KnifeSolo::Bootstraps
       run_command("sw_vers -productVersion").stdout.strip
     end
 
-    def gem_packages
-      ['chef']
-    end
-
     def distro
       case issue
       when %r{10.5}

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

@@ -4,10 +4,6 @@ module KnifeSolo::Bootstraps
       run_command("uname -sr").stdout.strip
     end
 
-    def gem_packages
-      ['chef']
-    end
-
     def prepare_make_conf
       ui.msg "Preparing make.conf"
       run_command <<-EOF
@@ -47,7 +43,7 @@ module KnifeSolo::Bootstraps
     def distro
       return @distro if @distro
       case issue
-      when %r{FreeBSD 9.0-RELEASE}
+      when %r{FreeBSD 9\.[01]}
         {:type => 'freebsd_port'}
       else
         raise "#{issue} not supported"

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

@@ -19,7 +19,7 @@ module KnifeSolo::Bootstraps
     end
 
     def gem_packages
-      ['ruby-shadow','chef']
+      ['ruby-shadow']
     end
 
     def emerge_gem_install

data/lib/knife-solo/info.rb

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

data/test/bootstraps_test.rb

@@ -6,7 +6,6 @@ class KnifeSolo::Bootstraps::StubOS < KnifeSolo::Bootstraps::Base
 end
 
 class KnifeSolo::Bootstraps::StubOS2 < KnifeSolo::Bootstraps::Base
-  def gem_packages ; ['chef'] ; end
   def distro ; {:type => 'gem', :version => 'Fanny Faker'} ; end
   def gem_install
     # dont' actually install anything
@@ -15,19 +14,13 @@ end
 
 class BootstrapsTest < TestCase
   def test_bootstrap_class_exists_for
-    assert_equal true, KnifeSolo::Bootstraps.class_exists_for?('Stub OS')
-    assert_equal false, KnifeSolo::Bootstraps.class_exists_for?('Mythical OS')
+    assert KnifeSolo::Bootstraps.class_exists_for?('Stub OS')
+    refute KnifeSolo::Bootstraps.class_exists_for?('Mythical OS')
   end
 
   def test_distro_raises_if_not_implemented
     assert_raises RuntimeError do
-      bootstrap_instance.distro()
-    end
-  end
-
-  def test_gem_packages_raises_if_not_implemented
-    assert_raises RuntimeError do
-      bootstrap_instance.gem_packages()
+      bootstrap_instance.distro
     end
   end
 
@@ -47,8 +40,7 @@ class BootstrapsTest < TestCase
   def test_bootstrap_delegates_to_knife_prepare
     prepare = mock('chef::knife::prepare')
     bootstrap = KnifeSolo::Bootstraps::StubOS2.new(prepare)
-
-    assert prepare == bootstrap.prepare
+    assert_equal prepare, bootstrap.prepare
   end
 
   def test_darwin_checks_for_xcode_install_and_barfs_if_missing
@@ -72,6 +64,7 @@ class BootstrapsTest < TestCase
     bootstrap = bootstrap_instance
     bootstrap.stubs(:distro).returns({:type => "omnibus"})
     bootstrap.stubs(:http_client_get_url)
+    bootstrap.stubs(:chef_version)
 
     options = "-v 10.16.4"
     matcher = regexp_matches(/\s#{Regexp.quote(options)}(\s|$)/)
@@ -81,10 +74,44 @@ class BootstrapsTest < TestCase
     bootstrap.bootstrap!
   end
 
+  def test_combines_omnibus_options
+    bootstrap = bootstrap_instance
+    bootstrap.prepare.stubs(:chef_version).returns("0.10.8-3")
+    bootstrap.prepare.stubs(:config).returns({:omnibus_options => "-s"})
+    assert_equal "-s -v 0.10.8-3", bootstrap.omnibus_options
+  end
+
+  def test_passes_prerelease_omnibus_version
+    bootstrap = bootstrap_instance
+    bootstrap.prepare.stubs(:chef_version).returns("10.18.3")
+    bootstrap.prepare.stubs(:config).returns({:prerelease => true})
+    assert_equal "-p", bootstrap.omnibus_options.strip
+  end
+
+  def test_passes_gem_version
+    bootstrap = bootstrap_instance
+    bootstrap.prepare.stubs(:chef_version).returns("10.16.4")
+    assert_equal "--version 10.16.4", bootstrap.gem_options
+  end
+
+  def test_passes_prereleaes_gem_version
+    bootstrap = bootstrap_instance
+    bootstrap.prepare.stubs(:chef_version).returns("10.18.1")
+    bootstrap.prepare.stubs(:config).returns({:prerelease => true})
+    assert_equal "--prerelease", bootstrap.gem_options
+  end
+
+  def test_wont_pass_unset_gem_version
+    bootstrap = bootstrap_instance
+    bootstrap.prepare.stubs(:chef_version).returns(nil)
+    assert_equal "", bootstrap.gem_options.to_s
+  end
+
   # ***
 
   def bootstrap_instance
     prepare = mock('Knife::Chef::SoloPrepare')
+    prepare.stubs(:config).returns({})
     KnifeSolo::Bootstraps::StubOS.new(prepare)
   end
 end

data/test/integration/cases/apache2_bootstrap.rb

@@ -8,7 +8,7 @@ module Apache2Bootstrap
 
   def test_apache2
     write_cheffile
-    assert_subcommand "bootstrap --run-list=recipe[apache2] #{omnibus_options}"
+    assert_subcommand "bootstrap --run-list=recipe[apache2]"
     assert_match default_apache_message, http_response
   end
 end

data/test/solo_cook_test.rb

@@ -122,6 +122,10 @@ class SoloCookTest < TestCase
     assert_chef_solo_option "--why-run", "-W"
   end
 
+  def test_passes_override_runlist_to_chef_solo
+    assert_chef_solo_option "--override-runlist=sandbox::default", "-o sandbox::default"
+  end
+
   # Asserts that the chef_solo_option is passed to chef-solo iff cook_option
   # is specified for the cook command
   def assert_chef_solo_option(cook_option, chef_solo_option)

data/test/solo_prepare_test.rb

@@ -12,17 +12,24 @@ class SoloPrepareTest < TestCase
     @host = 'someuser@somehost.domain.com'
   end
 
-  def test_combines_omnibus_options
-    in_kitchen do
-      bootstrap_instance = mock('mock OS bootstrap instance')
-      bootstrap_instance.stubs(:bootstrap!)
+  def test_uses_local_chef_version_by_default
+    Chef::Config[:knife][:bootstrap_version] = nil
+    assert_equal Chef::VERSION, command.chef_version
+  end
 
-      run_command = command(@host, "--omnibus-version", "0.10.8-3", "--omnibus-options", "-s")
-      run_command.stubs(:bootstrap).returns(bootstrap_instance)
-      run_command.run
+  def test_uses_chef_version_from_knife_config
+    Chef::Config[:knife][:bootstrap_version] = "10.12.2"
+    assert_equal "10.12.2", command.chef_version
+  end
 
-      assert_match "-s -v 0.10.8-3", run_command.config[:omnibus_options]
-    end
+  def test_uses_chef_version_from_command_line_option
+    Chef::Config[:knife][:bootstrap_version] = "10.16.2"
+    assert_equal "0.4.2", command("--bootstrap-version", "0.4.2").chef_version
+  end
+
+  def test_chef_version_returns_nil_if_empty
+    Chef::Config[:knife][:bootstrap_version] = "10.12.2"
+    assert_nil command("--bootstrap-version", "").chef_version
   end
 
   def test_run_raises_if_operating_system_is_not_supported

data/test/support/integration_test.rb

@@ -72,14 +72,7 @@ class IntegrationTest < TestCase
 
   # The prepare command to use on this server
   def prepare_command
-    "prepare #{omnibus_options}"
-  end
-
-  def omnibus_options
-    return "" if ENV['CHEF_VERSION'].to_s.empty?
-
-    v = `knife --version`.split(':')
-    v[0].strip == 'Chef' ? "--omnibus-version=#{v[1].strip}" : ''
+    "prepare"
   end
 
   # Provides the path to the runner's key file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre1
+  version: 0.3.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,6 +274,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3096439346196899405
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: