knife-solo 0.6.0 → 0.7.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55351e6ed65fb674523ab4ba6047e769bd303644
-  data.tar.gz: ce43f7330c68a474c52ebf41a9cd147a871d2fd3
+  metadata.gz: 54b796b366bee333a0859d7f76c02c00aace3dfa
+  data.tar.gz: a7544fec3cd45386282288640a98b928da7265a4
 SHA512:
-  metadata.gz: 9515a71ab78348df464c4d7e08034057af8d3ae50f2f1e6a480f7f29b3227d35156a2e06a4bb79e733d4025b6c66637776b559b1e2e7803d8c934a21baacacb1
-  data.tar.gz: 850e01f65af5d744e5cd4e69846ffe40c39cd2da1932d5d19079cb52ede78c264f381308b221478c794b30677c4cf01824f8f41c73dbcdbb18139a94b1f9a585
+  metadata.gz: a2f863db00f02c4f16402e7964178bca9f2c7d5dee8ef4c7699938227c1e3010a7c98be098ac4a4db07f5fdf4665d56d7f0accb29fae762a1db3ce3a7d17508b
+  data.tar.gz: 1d6ba62ef6d0e1d27c1e1d0ca11beece9f95623fad826e0bcd61548f8b3c0425b8ebe9bb947dc7f35f60e90391d0af3201818badd966231f92a613ca4465ff8f

data/README.rdoc

@@ -99,6 +99,8 @@ This also supports encrypted data bags. To use them, set the path to your key wi
 
 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.
 
+If you want to run chef-solo in legacy mode, you may use +--legacy-mode+ option or put +solo_legacy_mode true+ into .chef/knife.rb.
+
 === Bootstrap command
 
 The bootstrap command takes the same arguments and most of the options as prepare and cook:

data/lib/chef/knife/solo_cook.rb

@@ -75,6 +75,10 @@ class Chef
         :long        => '--clean-up',
         :description => 'Run the clean command after cooking'
 
+      option :legacy_mode,
+        :long        => '--legacy-mode',
+        :description => 'Run chef-solo in legacy mode'
+
       def run
         time('Run') do
 
@@ -135,6 +139,10 @@ class Chef
         Chef::Config[:ssl_verify_mode] || :verify_peer
       end
 
+      def solo_legacy_mode
+        Chef::Config[:solo_legacy_mode] || false
+      end
+
       def expand_path(path)
         Pathname.new(path).expand_path
       end
@@ -308,6 +316,9 @@ class Chef
         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]
+        if Gem::Version.new(::Chef::VERSION) >= Gem::Version.new("12.10.54")
+          cmd << " --legacy-mode" if config[:legacy_mode]
+        end
 
         ui.msg "Running Chef: #{cmd}"
 

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

@@ -100,7 +100,7 @@ module KnifeSolo::Bootstraps
         {:type => "yum_omnibus"}
       when %r{SUSE Linux Enterprise Server 1[12]}
         {:type => "omnibus"}
-      when %r{openSUSE 1[23]}
+      when %r{openSUSE 1[23]}, %r{openSUSE Leap 42}
         {:type => "zypper_omnibus"}
       when %r{This is \\n\.\\O \(\\s \\m \\r\) \\t}
         {:type => "emerge_gem"}

data/lib/knife-solo/info.rb

@@ -1,6 +1,6 @@
 module KnifeSolo
   def self.version
-    '0.6.0'
+    '0.7.0.pre'
   end
 
   def self.post_install_message

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

@@ -9,6 +9,7 @@ encrypted_data_bag_secret File.join(base, 'data_bag_key')
 environment_path          File.join(base, 'environments')
 environment               <%= node_environment.inspect %>
 ssl_verify_mode           <%= ssl_verify_mode.inspect %>
+solo_legacy_mode          <%= solo_legacy_mode.inspect %>
 
 cookbook_path []
 <% cookbook_paths.each_with_index do |path, i| -%>

data/test/gemfiles/Gemfile.chef-10

@@ -2,12 +2,20 @@ source 'https://rubygems.org'
 
 gemspec :path => '../..'
 
-gem 'chef', '~> 10'
+gem 'chef', '~> 10.34'
 
 platform :ruby_19 do
   gem 'berkshelf-api-client', '~> 1.3.1'
+  gem 'tins', '~> 1.6.0'
   gem 'varia_model', '~> 0.4.0'
   gem 'json', '~> 1.8.1'
   gem 'mixlib-config', '~> 1.1.2'
   gem 'ohai', '~> 6.24.2'
+  gem 'nio4r', '~> 1.2.1'
+  gem 'buff-ignore', '~> 1.1.1'
+  gem 'rack', '~> 1.6.5'
+  gem 'net-http-persistent', '~> 2.9.4'
+  gem 'dep_selector', '<= 1.0.3'
+  gem 'term-ansicolor', '~> 1.3.2'
+  gem 'nokogiri', '~> 1.6.8'
 end

data/test/gemfiles/Gemfile.chef-11

@@ -9,4 +9,11 @@ platform :ruby_19 do
   gem 'tins', '~> 1.6.0'
   gem 'varia_model', '~> 0.4.0'
   gem 'ohai', '~> 7.4.1'
+  gem 'nio4r', '~> 1.2.1'
+  gem 'buff-ignore', '~> 1.1.1'
+  gem 'rack', '~> 1.6.5'
+  gem 'net-http-persistent', '~> 2.9.4'
+  gem 'dep_selector', '<= 1.0.3'
+  gem 'term-ansicolor', '~> 1.3.2'
+  gem 'nokogiri', '~> 1.6.8'
 end

data/test/gemfiles/Gemfile.chef-master

@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 gemspec :path => '../..'
 
 gem 'chef', github: 'opscode/chef'
+
+gem "ohai", github: 'chef/ohai'

data/test/solo_cook_test.rb

@@ -44,6 +44,11 @@ class SoloCookTest < TestCase
     assert_equal :verify_none, command.ssl_verify_mode
   end
 
+  def test_sets_solo_legacy_mode
+    Chef::Config[:solo_legacy_mode] = true
+    assert_equal true, command.solo_legacy_mode
+  end
+
   def test_rsync_without_gateway_connection_options
     in_kitchen do
 
@@ -347,6 +352,23 @@ class SoloCookTest < TestCase
     assert_chef_solo_option "--override-runlist=sandbox::default", "-o sandbox::default"
   end
 
+  def test_passes_legacy_mode_to_chef_solo
+    if Gem::Version.new(::Chef::VERSION) >= Gem::Version.new("12.10.54")
+      assert_chef_solo_option "--legacy-mode", "--legacy-mode"
+    else
+      matcher = regexp_matches(/\s#{Regexp.quote("--legacy-mode")}(\s|$)/)
+      in_kitchen do
+        cmd = command("somehost", "--legacy-mode")
+        cmd.expects(:stream_command).with(Not(matcher)).returns(SuccessfulResult.new)
+        cmd.run
+
+        cmd = command("somehost")
+        cmd.expects(:stream_command).with(Not(matcher)).returns(SuccessfulResult.new)
+        cmd.run
+      end
+    end
+  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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0.pre
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -185,9 +185,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -195,9 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -357,12 +351,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A collection of knife plugins for dealing with chef solo