chef-provisioning 1.3.0 → 1.4.0

data/lib/chef/provisioning/convergence_strategy/install_sh.rb

@@ -42,7 +42,7 @@ module Provisioning
         install_command = Mixlib::Install.new(chef_version, false, opts).install_command
         machine.write_file(action_handler, install_sh_path, install_command, :ensure_dir => true)
         machine.set_attributes(action_handler, install_sh_path, :mode => '0755')
-        machine.execute(action_handler, "sh -c #{install_sh_path}")
+        machine.execute(action_handler, "sh -c '#{install_sh_path} #{install_sh_arguments}'")
       end
 
       def converge(action_handler, machine)

data/lib/chef/provisioning/convergence_strategy/precreate_chef_objects.rb

@@ -2,11 +2,20 @@ require 'chef/provisioning/convergence_strategy'
 require 'pathname'
 require 'cheffish'
 require 'chef_zero/socketless_server_map'
+require_relative 'ignore_convergence_failure'
 
 class Chef
 module Provisioning
   class ConvergenceStrategy
     class PrecreateChefObjects < ConvergenceStrategy
+
+      def initialize(convergence_options, config)
+        super
+        if convergence_options[:ignore_failure]
+          extend IgnoreConvergenceFailure
+        end
+      end
+
       def chef_server
         @chef_server ||= convergence_options[:chef_server] || Cheffish.default_chef_server(config)
       end

data/lib/chef/provisioning/driver.rb

@@ -308,3 +308,16 @@ module Provisioning
   end
 end
 end
+
+# In chef-provisioning we don't perform resource cloning
+# This fixes resource cloning when the ResourceBuilder is present
+
+class Chef
+  class ResourceBuilder
+    if defined?(:prior_resource)
+      def prior_resource
+        # NOOP
+      end
+    end
+  end
+end

data/lib/chef/provisioning/machine/unix_machine.rb

@@ -226,6 +226,13 @@ elif test "x$os" = "xAIX"; then
 platform="aix"
 platform_version=`uname -v`
 machine="ppc"
+elif test -f "/etc/os-release"; then
+. /etc/os-release
+if test "x$ID_LIKE" = "xwrlinux" || test "x$ID_LIKE" = "xcisco-wrlinux"; then
+platform="wrlinux"
+# 3.4.43-WR5.0.1.13_standard  -->  5
+platform_version=`uname -r | sed 's/.*-WR\([0-9]\+\).*/\1/'`
+fi
 fi
 
 if test "x$platform" = "x"; then

data/lib/chef/provisioning/machine/windows_machine.rb

@@ -75,6 +75,10 @@ EOM
         end
       end
 
+      def system_drive
+        transport.execute('$env:SystemDrive').stdout.strip
+      end
+
       # Set file attributes { :owner, :group, :rights }
 #      def set_attributes(action_handler, path, attributes)
 #      end

data/lib/chef/provisioning/rspec.rb

@@ -0,0 +1,27 @@
+RSpec.shared_context "run with driver" do |driver_args|
+  require 'cheffish/rspec/chef_run_support'
+  extend Cheffish::RSpec::ChefRunSupport
+
+  include_context "with a chef repo"
+
+  driver_object = Chef::Provisioning.driver_for_url(driver_args[:driver_string])
+
+  # globally set this as the driver. overridden by a resource's :driver attribute.
+  before { Chef::Config.driver(driver_object) }
+
+  let(:provisioning_driver) { driver_object }
+
+  # only class methods are available outside of examples.
+  def self.with_chef_server(description = "is running", *options, &block)
+
+    # no need to repeat these every time.
+    args = { organization: "spec_tests", server_scope: :context, port: 8900..9000 }
+    args = args.merge(options.last) if options.last.is_a?(Hash)
+
+    # this ends up in ChefZero::RSpec::RSpecClassMethods#when_the_chef_server, which defines all its code
+    # inside an RSpec context and then runs `instance_eval` on &block--which means it's only available as a
+    # block operator. it's not obviously impossible to factor out the code into a shared_context that we could
+    # include as above with "with a chef repo", but that's a chef-zero patch.
+    when_the_chef_12_server description, args, &block
+  end
+end

data/lib/chef/provisioning/transport/winrm.rb

@@ -36,8 +36,11 @@ module Provisioning
       def execute(command, execute_options = {})
         output = with_execute_timeout(execute_options) do
           session.set_timeout(execute_timeout(execute_options))
-          session.run_powershell_script(command) do |stdout, stderr|
-            stream_chunk(execute_options, stdout, stderr)
+          block = Proc.new { |stdout, stderr| stream_chunk(execute_options, stdout, stderr) }
+          if execute_options[:raw]
+            session.run_cmd(command, &block)
+          else
+            session.run_powershell_script(command, &block)
           end
         end
         WinRMResult.new(command, execute_options, config, output)

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end
 end

data/spec/chef/provisioning/convergence_strategy/ignore_convergence_failure_spec.rb

@@ -0,0 +1,86 @@
+require 'chef/provisioning/convergence_strategy/ignore_convergence_failure'
+
+class TestConvergenceStrategyError < RuntimeError; end
+
+class TestConvergeClass
+  attr_reader :convergence_options, :test_error
+  def initialize(convergence_options, test_error)
+    @convergence_options = convergence_options
+    @test_error = test_error
+  end
+  def converge(action_handler, machine)
+    test_error.call
+  end
+end
+
+describe Chef::Provisioning::ConvergenceStrategy::IgnoreConvergenceFailure do
+
+  let(:test_class) do
+    t = TestConvergeClass.new(convergence_options, test_error)
+    t.extend(Chef::Provisioning::ConvergenceStrategy::IgnoreConvergenceFailure)
+    t
+  end
+  let(:action_handler) { double("ActionHandler") }
+
+  shared_examples "does not raise an error" do
+    it "does not raise an error" do
+      expect(action_handler).to receive(:performed_action)
+      expect { test_class.converge(action_handler, nil) }.to_not raise_error
+    end
+  end
+
+  context "when ignore_failures is a single Fixnum" do
+    let(:convergence_options) { {ignore_failure: 1} }
+    let(:test_error) { proc { exit(1) } }
+    include_examples "does not raise an error"
+  end
+
+  context "when ignore_failures is an array of Fixnum" do
+    let(:convergence_options) { {ignore_failure: [1, 2]} }
+    let(:test_error) { proc { exit(1) } }
+    include_examples "does not raise an error"
+  end
+
+  context "when ignore_failures is a Range" do
+    let(:convergence_options) { {ignore_failure: [1, 5..10]} }
+    let(:test_error) { proc { exit(6) } }
+    include_examples "does not raise an error"
+  end
+
+  context "when ignore_failures is a single error class" do
+    let(:convergence_options) { {ignore_failure: TestConvergenceStrategyError} }
+    let(:test_error) { proc { raise TestConvergenceStrategyError } }
+    include_examples "does not raise an error"
+  end
+
+  context "when ignore_failures is an array of errors" do
+    let(:convergence_options) { {ignore_failure: [TestConvergenceStrategyError, NoMethodError]} }
+    let(:test_error) { proc { raise TestConvergenceStrategyError } }
+    include_examples "does not raise an error"
+  end
+
+  context "when ignore_failures is a different error" do
+    let(:convergence_options) { {ignore_failure: [NoMethodError]} }
+    let(:test_error) { proc { raise TestConvergenceStrategyError } }
+    it "does not catch the TestConvergenceStrategyError" do
+      expect { test_class.converge(action_handler, nil) }.to raise_error(TestConvergenceStrategyError)
+    end
+  end
+
+  context "when ignore_failures is true" do
+    let(:convergence_options) { {ignore_failure: true} }
+
+    context "and test_error is a RuntimeError" do
+      let(:test_error) { proc { raise TestConvergenceStrategyError } }
+      include_examples "does not raise an error"
+    end
+
+    context "and test_error is a SystemExit error" do
+      let(:test_error) { proc { exit(1) } }
+      it "does not catch SystemExit errors" do
+        expect { test_class.converge(action_handler, nil) }.to raise_error(SystemExit)
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+require 'simplecov'
+SimpleCov.start do
+  # add_filter do |source_file|
+  #   # source_file.lines.count < 5
+  #   source.filename =~ /^#{SimpleCov.root}\/chef-provisioning-fake/)
+  # end
+end
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.expect_with(:rspec) { |c| c.syntax = :expect }
+
+  #Chef::Log.level = :debug
+  # Chef::Config[:log_level] = :warn
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.16.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.16.4
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +106,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.1'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.1'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 12.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +176,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
 description: A library for creating machines and infrastructures idempotently in Chef.
 email: jkeiser@chef.io
 executables: []
@@ -190,6 +216,7 @@ files:
 - lib/chef/provisioning/chef_provider_action_handler.rb
 - lib/chef/provisioning/chef_run_data.rb
 - lib/chef/provisioning/convergence_strategy.rb
+- lib/chef/provisioning/convergence_strategy/ignore_convergence_failure.rb
 - lib/chef/provisioning/convergence_strategy/install_cached.rb
 - lib/chef/provisioning/convergence_strategy/install_msi.rb
 - lib/chef/provisioning/convergence_strategy/install_sh.rb
@@ -206,6 +233,7 @@ files:
 - lib/chef/provisioning/managed_entry.rb
 - lib/chef/provisioning/managed_entry_store.rb
 - lib/chef/provisioning/recipe_dsl.rb
+- lib/chef/provisioning/rspec.rb
 - lib/chef/provisioning/transport.rb
 - lib/chef/provisioning/transport/ssh.rb
 - lib/chef/provisioning/transport/winrm.rb
@@ -218,6 +246,8 @@ files:
 - lib/chef/resource/machine_file.rb
 - lib/chef/resource/machine_image.rb
 - lib/chef_metal.rb
+- spec/chef/provisioning/convergence_strategy/ignore_convergence_failure_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/chef/chef-provisioning/README.md
 licenses: []
 metadata: {}
@@ -237,8 +267,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A library for creating machines and infrastructures idempotently in Chef.
 test_files: []
+has_rdoc: