chef-provisioning 2.0.0 → 2.0.1

data/lib/chef/resource/machine_execute.rb

@@ -1,29 +1,30 @@
-require 'chef/resource/lwrp_base'
-require 'chef/provisioning'
-require 'chef/provisioning/machine'
-require 'chef/provisioning/driver'
-
-class Chef
-class Resource
-class MachineExecute < Chef::Resource::LWRPBase
-
-  self.resource_name = 'machine_execute'
-
-  def initialize(*args)
-    super
-    @chef_server = run_context.cheffish.current_chef_server
-  end
-
-  actions :run
-  default_action :run
-
-  attribute :command, :kind_of => String, :name_attribute => true
-  attribute :machine, :kind_of => String
-  attribute :live_stream, :kind_of => [TrueClass,FalseClass], :default => false
-
-  attribute :chef_server, :kind_of => Hash
-  attribute :driver, :kind_of => Chef::Provisioning::Driver
-
-end
-end
-end
+require 'chef/resource/lwrp_base'
+require 'chef/provisioning'
+require 'chef/provisioning/machine'
+require 'chef/provisioning/driver'
+
+class Chef
+class Resource
+class MachineExecute < Chef::Resource::LWRPBase
+
+  self.resource_name = 'machine_execute'
+
+  def initialize(*args)
+    super
+    @chef_server = run_context.cheffish.current_chef_server
+  end
+
+  actions :run
+  default_action :run
+
+  attribute :command, :kind_of => String, :name_attribute => true
+  attribute :timeout, :kind_of => Integer, :default => 15*60
+  attribute :machine, :kind_of => String, :required => true
+  attribute :live_stream, :kind_of => [TrueClass,FalseClass], :default => false
+
+  attribute :chef_server, :kind_of => Hash
+  attribute :driver, :kind_of => Chef::Provisioning::Driver
+
+end
+end
+end

data/lib/chef/resource/machine_file.rb

@@ -1,34 +1,34 @@
-require 'chef/resource/lwrp_base'
-require 'chef/provisioning'
-require 'chef/provisioning/machine'
-require 'chef/provisioning/driver'
-
-class Chef
-class Resource
-class MachineFile < Chef::Resource::LWRPBase
-
-  self.resource_name = 'machine_file'
-
-  def initialize(*args)
-    super
-    @chef_server = run_context.cheffish.current_chef_server
-  end
-
-  actions :upload, :download, :delete, :nothing
-  default_action :upload
-
-  attribute :path, :kind_of => String, :name_attribute => true
-  attribute :machine, :kind_of => String
-  attribute :local_path, :kind_of => String
-  attribute :content
-
-  attribute :owner, :kind_of => String
-  attribute :group, :kind_of => String
-  attribute :mode, :kind_of => String
-
-  attribute :chef_server, :kind_of => Hash
-  attribute :driver, :kind_of => Chef::Provisioning::Driver
-
-end
-end
-end
+require 'chef/resource/lwrp_base'
+require 'chef/provisioning'
+require 'chef/provisioning/machine'
+require 'chef/provisioning/driver'
+
+class Chef
+class Resource
+class MachineFile < Chef::Resource::LWRPBase
+
+  self.resource_name = 'machine_file'
+
+  def initialize(*args)
+    super
+    @chef_server = run_context.cheffish.current_chef_server
+  end
+
+  actions :upload, :download, :delete, :nothing
+  default_action :upload
+
+  attribute :path, :kind_of => String, :name_attribute => true
+  attribute :machine, :kind_of => String, :required => true
+  attribute :local_path, :kind_of => String
+  attribute :content
+
+  attribute :owner, :kind_of => String
+  attribute :group, :kind_of => String
+  attribute :mode, :kind_of => String
+
+  attribute :chef_server, :kind_of => Hash
+  attribute :driver, :kind_of => Chef::Provisioning::Driver
+
+end
+end
+end

data/lib/chef/resource/machine_image.rb

@@ -1,35 +1,35 @@
-require 'chef/resource/lwrp_base'
-require 'cheffish'
-require 'chef/provisioning'
-require 'cheffish/merged_config'
-
-class Chef
-class Resource
-class MachineImage < Chef::Resource::Machine
-
-  self.resource_name = 'machine_image'
-
-  def initialize(*args)
-    super
-    @image_options = run_context.chef_provisioning.current_image_options
-    @machine_options = run_context.chef_provisioning.current_machine_options
-  end
-
-  # TODO check if we still have all the actions from machine
-  actions :create, :destroy, :archive
-  default_action :create
-
-  attribute :image_options, :kind_of => Hash
-
-  # TODO
-  # - policy for old version cleanup
-  # - when attributes or recipes of the machine_image changes, or when the actual
-  #   recipes therein change, we will regenerate the image
-  # - attribute to force or turn off image updates
-  # - ability to rebuild new image based on the previous image
-  # - ability to specify whether and how to keep the image-building machine around
-  # - ability to specify whether to leave the chef config around or not
-
-end
-end
-end
+require 'chef/resource/lwrp_base'
+require 'cheffish'
+require 'chef/provisioning'
+require 'cheffish/merged_config'
+
+class Chef
+class Resource
+class MachineImage < Chef::Resource::Machine
+
+  self.resource_name = 'machine_image'
+
+  def initialize(*args)
+    super
+    @image_options = run_context.chef_provisioning.current_image_options
+    @machine_options = run_context.chef_provisioning.current_machine_options
+  end
+
+  # TODO check if we still have all the actions from machine
+  actions :create, :destroy, :archive
+  default_action :create
+
+  attribute :image_options, :kind_of => Hash
+
+  # TODO
+  # - policy for old version cleanup
+  # - when attributes or recipes of the machine_image changes, or when the actual
+  #   recipes therein change, we will regenerate the image
+  # - attribute to force or turn off image updates
+  # - ability to rebuild new image based on the previous image
+  # - ability to specify whether and how to keep the image-building machine around
+  # - ability to specify whether to leave the chef config around or not
+
+end
+end
+end

data/lib/chef_metal.rb

@@ -1 +1 @@
-require 'chef/provisioning'
+require 'chef/provisioning'

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

@@ -1,86 +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
+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

@@ -1,27 +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
+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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -87,19 +87,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: winrm
+  name: winrm-fs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-install
   requirement: !ruby/object:Gem::Requirement