chef-provisioning 2.0.1 → 2.0.2

data/lib/chef/provisioning/chef_provider_action_handler.rb

@@ -1,74 +1,74 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Douglas Triggs (<doug@chef.io>)
-#
-# Copyright (C) 2014, Chef, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'chef/provisioning/action_handler'
-
-# This is included in provisioning drivers to proxy from generic requests needed
-# to specific driver actions
-class Chef
-module Provisioning
-  class ChefProviderActionHandler < ActionHandler
-    def initialize(provider)
-      @provider = provider
-    end
-
-    attr_reader :provider
-
-    def updated!
-      provider.new_resource.updated_by_last_action(true)
-    end
-
-    def should_perform_actions
-      !provider.run_context.config.why_run
-    end
-
-    def report_progress(description)
-      # TODO this seems wrong but Chef doesn't have another thing
-      provider.converge_by description do
-        # We already did the action, but we trust whoever told us that they did it.
-      end
-    end
-
-    def performed_action(description)
-      provider.converge_by description do
-        # We already did the action, but we trust whoever told us that they did it.
-      end
-    end
-
-    def perform_action(description, &block)
-      provider.converge_by(description, &block)
-    end
-
-    def open_stream(name, &block)
-      if provider.run_context.respond_to?(:open_stream)
-        provider.run_context.open_stream({ :name => name }, &block)
-      else
-        if block_given?
-          yield STDOUT
-        else
-          STDOUT
-        end
-      end
-    end
-
-    def host_node
-      "#{provider.run_context.config[:chef_server_url]}/nodes/#{provider.run_context.node['name']}"
-    end
-  end
-end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Douglas Triggs (<doug@chef.io>)
+#
+# Copyright (C) 2014, Chef, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'chef/provisioning/action_handler'
+
+# This is included in provisioning drivers to proxy from generic requests needed
+# to specific driver actions
+class Chef
+module Provisioning
+  class ChefProviderActionHandler < ActionHandler
+    def initialize(provider)
+      @provider = provider
+    end
+
+    attr_reader :provider
+
+    def updated!
+      provider.new_resource.updated_by_last_action(true)
+    end
+
+    def should_perform_actions
+      !provider.run_context.config.why_run
+    end
+
+    def report_progress(description)
+      # TODO this seems wrong but Chef doesn't have another thing
+      provider.converge_by description do
+        # We already did the action, but we trust whoever told us that they did it.
+      end
+    end
+
+    def performed_action(description)
+      provider.converge_by description do
+        # We already did the action, but we trust whoever told us that they did it.
+      end
+    end
+
+    def perform_action(description, &block)
+      provider.converge_by(description, &block)
+    end
+
+    def open_stream(name, &block)
+      if provider.run_context.respond_to?(:open_stream)
+        provider.run_context.open_stream({ :name => name }, &block)
+      else
+        if block_given?
+          yield STDOUT
+        else
+          STDOUT
+        end
+      end
+    end
+
+    def host_node
+      "#{provider.run_context.config[:chef_server_url]}/nodes/#{provider.run_context.node['name']}"
+    end
+  end
+end
+end

data/lib/chef/provisioning/chef_run_data.rb

@@ -1,132 +1,132 @@
-require 'chef/mixin/deep_merge'
-require 'cheffish/merged_config'
-
-class Chef
-module Provisioning
-  class ChefRunData
-
-    def initialize(config)
-      @config = config
-      @drivers = {}
-    end
-
-    attr_reader :config
-    attr_reader :drivers
-    attr_reader :current_driver
-    attr_accessor :current_machine_options
-    attr_accessor :current_load_balancer_options
-    attr_accessor :current_image_options
-
-    def with_machine_options(value)
-      old_value = self.current_machine_options
-      self.current_machine_options = value
-      if block_given?
-        begin
-          yield
-        ensure
-          self.current_machine_options = old_value
-        end
-      end
-    end
-
-    def with_image_options(value)
-      old_value = self.current_image_options
-      self.current_image_options = value
-      if block_given?
-        begin
-          yield
-        ensure
-          self.current_image_options = old_value
-        end
-      end
-    end
-
-    def with_driver(driver, options = nil, &block)
-      if drivers[driver] && options
-        raise "Driver #{driver} has already been created, options #{options} would be ignored!"
-      end
-      old_driver, old_options = @current_driver, @current_driver_options
-      @current_driver, @current_driver_options = driver, options
-      if block_given?
-        begin
-          yield
-        ensure
-          @current_driver, @current_driver_options = old_driver, old_options
-        end
-      end
-    end
-
-    def current_driver
-      @current_driver || config[:driver]
-    end
-
-    def current_machine_options
-      if @current_machine_options
-        @current_machine_options
-      else
-        {}
-      end
-    end
-
-    def current_image_options
-      if @current_image_options
-        @current_image_options
-      else
-        {}
-      end
-    end
-
-    def add_machine_options(options, &block)
-      with_machine_options(Chef::Mixin::DeepMerge.hash_only_merge(current_machine_options, options), &block)
-    end
-
-    def driver_for(driver)
-      driver.is_a?(String) ? driver_for_url(driver) : driver
-    end
-
-    def connect_to_machine(name, chef_server = nil)
-      if name.is_a?(ManagedEntry)
-        machine_spec = name
-      else
-        machine_spec = Provisioning.chef_managed_entry_store(chef_server).get(:machine, name)
-      end
-      Chef::Provisioning.connect_to_machine(machine_spec, config)
-    end
-
-    private
-
-    def driver_for_url(driver_url)
-      drivers[driver_url] ||= begin
-        if driver_url == @current_driver && @current_driver_options
-          # Use the driver options if available
-          merged_config = Cheffish::MergedConfig.new({ :driver_options => @current_driver_options }, config)
-          driver = Chef::Provisioning.driver_for_url(driver_url, merged_config)
-        else
-          driver = Chef::Provisioning.driver_for_url(driver_url, config)
-        end
-        # Check the canonicalized driver_url from the driver
-        if driver.driver_url != driver_url
-          if drivers[driver.driver_url] && @current_driver_options
-            raise "Canonical driver #{driver.driver_url} for #{driver_url} has already been created!  Current options #{@current_driver_options} would be ignored."
-          end
-          drivers[driver.driver_url] ||= driver
-        else
-          driver
-        end
-      end
-    end
-
-    def keys
-      result = (config.keys || {}).dup
-      Array(config.key_path) do |key_path|
-        Dir.entries(key_path).each do |key|
-          if File.extname(key) == '.pem'
-            result[File.basename(key)[0..-5]] ||= key
-          end
-        end
-      end
-      result
-    end
-  end
-end
-end
+require 'chef/mixin/deep_merge'
+require 'cheffish/merged_config'
+
+class Chef
+module Provisioning
+  class ChefRunData
+
+    def initialize(config)
+      @config = config
+      @drivers = {}
+    end
+
+    attr_reader :config
+    attr_reader :drivers
+    attr_reader :current_driver
+    attr_accessor :current_machine_options
+    attr_accessor :current_load_balancer_options
+    attr_accessor :current_image_options
+
+    def with_machine_options(value)
+      old_value = self.current_machine_options
+      self.current_machine_options = value
+      if block_given?
+        begin
+          yield
+        ensure
+          self.current_machine_options = old_value
+        end
+      end
+    end
+
+    def with_image_options(value)
+      old_value = self.current_image_options
+      self.current_image_options = value
+      if block_given?
+        begin
+          yield
+        ensure
+          self.current_image_options = old_value
+        end
+      end
+    end
+
+    def with_driver(driver, options = nil, &block)
+      if drivers[driver] && options
+        raise "Driver #{driver} has already been created, options #{options} would be ignored!"
+      end
+      old_driver, old_options = @current_driver, @current_driver_options
+      @current_driver, @current_driver_options = driver, options
+      if block_given?
+        begin
+          yield
+        ensure
+          @current_driver, @current_driver_options = old_driver, old_options
+        end
+      end
+    end
+
+    def current_driver
+      @current_driver || config[:driver]
+    end
+
+    def current_machine_options
+      if @current_machine_options
+        @current_machine_options
+      else
+        {}
+      end
+    end
+
+    def current_image_options
+      if @current_image_options
+        @current_image_options
+      else
+        {}
+      end
+    end
+
+    def add_machine_options(options, &block)
+      with_machine_options(Chef::Mixin::DeepMerge.hash_only_merge(current_machine_options, options), &block)
+    end
+
+    def driver_for(driver)
+      driver.is_a?(String) ? driver_for_url(driver) : driver
+    end
+
+    def connect_to_machine(name, chef_server = nil)
+      if name.is_a?(ManagedEntry)
+        machine_spec = name
+      else
+        machine_spec = Provisioning.chef_managed_entry_store(chef_server).get(:machine, name)
+      end
+      Chef::Provisioning.connect_to_machine(machine_spec, config)
+    end
+
+    private
+
+    def driver_for_url(driver_url)
+      drivers[driver_url] ||= begin
+        if driver_url == @current_driver && @current_driver_options
+          # Use the driver options if available
+          merged_config = Cheffish::MergedConfig.new({ :driver_options => @current_driver_options }, config)
+          driver = Chef::Provisioning.driver_for_url(driver_url, merged_config)
+        else
+          driver = Chef::Provisioning.driver_for_url(driver_url, config)
+        end
+        # Check the canonicalized driver_url from the driver
+        if driver.driver_url != driver_url
+          if drivers[driver.driver_url] && @current_driver_options
+            raise "Canonical driver #{driver.driver_url} for #{driver_url} has already been created!  Current options #{@current_driver_options} would be ignored."
+          end
+          drivers[driver.driver_url] ||= driver
+        else
+          driver
+        end
+      end
+    end
+
+    def keys
+      result = (config.keys || {}).dup
+      Array(config.key_path) do |key_path|
+        Dir.entries(key_path).each do |key|
+          if File.extname(key) == '.pem'
+            result[File.basename(key)[0..-5]] ||= key
+          end
+        end
+      end
+      result
+    end
+  end
+end
+end

data/lib/chef/provisioning/convergence_strategy.rb

@@ -1,28 +1,28 @@
-class Chef
-module Provisioning
-  class ConvergenceStrategy
-    # convergence_options - a freeform hash of options to the converger.
-    # config - a Chef::Config-like object with global config like :log_level
-    def initialize(convergence_options, config)
-      @convergence_options = convergence_options || {}
-      @config = config
-    end
-
-    attr_reader :convergence_options
-    attr_reader :config
-
-    # Get the machine ready to converge, but do not converge.
-    def setup_convergence(action_handler, machine)
-      raise "setup_convergence not overridden on #{self.class}"
-    end
-
-    def converge(action_handler, machine)
-      raise "converge not overridden on #{self.class}"
-    end
-
-    def cleanup_convergence(action_handler, machine_spec)
-      raise "cleanup_convergence not overridden on #{self.class}"
-    end
-  end
-end
-end
+class Chef
+module Provisioning
+  class ConvergenceStrategy
+    # convergence_options - a freeform hash of options to the converger.
+    # config - a Chef::Config-like object with global config like :log_level
+    def initialize(convergence_options, config)
+      @convergence_options = convergence_options || {}
+      @config = config
+    end
+
+    attr_reader :convergence_options
+    attr_reader :config
+
+    # Get the machine ready to converge, but do not converge.
+    def setup_convergence(action_handler, machine)
+      raise "setup_convergence not overridden on #{self.class}"
+    end
+
+    def converge(action_handler, machine)
+      raise "converge not overridden on #{self.class}"
+    end
+
+    def cleanup_convergence(action_handler, machine_spec)
+      raise "cleanup_convergence not overridden on #{self.class}"
+    end
+  end
+end
+end