cheffish 1.4.1 → 1.4.2

data/lib/cheffish/merged_config.rb

@@ -1,94 +1,94 @@
-module Cheffish
-  class MergedConfig
-    def initialize(*configs)
-      @configs = configs
-      @merge_arrays = {}
-    end
-
-    include Enumerable
-
-    attr_reader :configs
-    def merge_arrays(*symbols)
-      if symbols.size > 0
-        symbols.each do |symbol|
-          @merge_arrays[symbol] = true
-        end
-      else
-        @merge_arrays
-      end
-    end
-
-    def [](name)
-      if @merge_arrays[name]
-        configs.select { |c| !c[name].nil? }.collect_concat { |c| c[name] }
-      else
-        result_configs = []
-        configs.each do |config|
-          value = config[name]
-          if !value.nil?
-            if value.respond_to?(:keys)
-              result_configs << value
-            elsif result_configs.size > 0
-              return result_configs[0]
-            else
-              return value
-            end
-          end
-        end
-        if result_configs.size > 1
-          MergedConfig.new(*result_configs)
-        elsif result_configs.size == 1
-          result_configs[0]
-        else
-          nil
-        end
-      end
-    end
-
-    def method_missing(name, *args)
-      if args.count > 0
-        raise NoMethodError, "Unexpected method #{name} for MergedConfig with arguments #{args}"
-      else
-        self[name]
-      end
-    end
-
-    def key?(name)
-      configs.any? { |config| config.has_key?(name) }
-    end
-
-    alias_method :has_key?, :key?
-
-    def keys
-      configs.map { |c| c.keys }.flatten(1).uniq
-    end
-
-    def values
-      keys.map { |key| self[key] }
-    end
-
-    def each_pair(&block)
-      each(&block)
-    end
-
-    def each
-      keys.each do |key|
-        if block_given?
-          yield key, self[key]
-        end
-      end
-    end
-
-    def to_hash
-      result = {}
-      each_pair do |key, value|
-        result[key] = value
-      end
-      result
-    end
-
-    def to_s
-      to_hash.to_s
-    end
-  end
-end
+module Cheffish
+  class MergedConfig
+    def initialize(*configs)
+      @configs = configs
+      @merge_arrays = {}
+    end
+
+    include Enumerable
+
+    attr_reader :configs
+    def merge_arrays(*symbols)
+      if symbols.size > 0
+        symbols.each do |symbol|
+          @merge_arrays[symbol] = true
+        end
+      else
+        @merge_arrays
+      end
+    end
+
+    def [](name)
+      if @merge_arrays[name]
+        configs.select { |c| !c[name].nil? }.collect_concat { |c| c[name] }
+      else
+        result_configs = []
+        configs.each do |config|
+          value = config[name]
+          if !value.nil?
+            if value.respond_to?(:keys)
+              result_configs << value
+            elsif result_configs.size > 0
+              return result_configs[0]
+            else
+              return value
+            end
+          end
+        end
+        if result_configs.size > 1
+          MergedConfig.new(*result_configs)
+        elsif result_configs.size == 1
+          result_configs[0]
+        else
+          nil
+        end
+      end
+    end
+
+    def method_missing(name, *args)
+      if args.count > 0
+        raise NoMethodError, "Unexpected method #{name} for MergedConfig with arguments #{args}"
+      else
+        self[name]
+      end
+    end
+
+    def key?(name)
+      configs.any? { |config| config.has_key?(name) }
+    end
+
+    alias_method :has_key?, :key?
+
+    def keys
+      configs.map { |c| c.keys }.flatten(1).uniq
+    end
+
+    def values
+      keys.map { |key| self[key] }
+    end
+
+    def each_pair(&block)
+      each(&block)
+    end
+
+    def each
+      keys.each do |key|
+        if block_given?
+          yield key, self[key]
+        end
+      end
+    end
+
+    def to_hash
+      result = {}
+      each_pair do |key, value|
+        result[key] = value
+      end
+      result
+    end
+
+    def to_s
+      to_hash.to_s
+    end
+  end
+end

data/lib/cheffish/recipe_dsl.rb

@@ -1,157 +1,157 @@
-require 'cheffish'
-
-require 'chef/version'
-require 'chef_zero/server'
-require 'chef/chef_fs/chef_fs_data_store'
-require 'chef/chef_fs/config'
-require 'cheffish/chef_run_data'
-require 'cheffish/chef_run_listener'
-require 'chef/client'
-require 'chef/config'
-require 'chef_zero/version'
-require 'cheffish/merged_config'
-require 'chef/resource/chef_acl'
-require 'chef/resource/chef_client'
-require 'chef/resource/chef_container'
-require 'chef/resource/chef_data_bag'
-require 'chef/resource/chef_data_bag_item'
-require 'chef/resource/chef_environment'
-require 'chef/resource/chef_group'
-require 'chef/resource/chef_mirror'
-require 'chef/resource/chef_node'
-require 'chef/resource/chef_organization'
-require 'chef/resource/chef_role'
-require 'chef/resource/chef_user'
-require 'chef/resource/private_key'
-require 'chef/resource/public_key'
-require 'chef/provider/chef_acl'
-require 'chef/provider/chef_client'
-require 'chef/provider/chef_container'
-require 'chef/provider/chef_data_bag'
-require 'chef/provider/chef_data_bag_item'
-require 'chef/provider/chef_environment'
-require 'chef/provider/chef_group'
-require 'chef/provider/chef_mirror'
-require 'chef/provider/chef_node'
-require 'chef/provider/chef_organization'
-require 'chef/provider/chef_role'
-require 'chef/provider/chef_user'
-require 'chef/provider/private_key'
-require 'chef/provider/public_key'
-
-
-class Chef
-  module DSL
-    module Recipe
-      def with_chef_data_bag(name)
-        run_context.cheffish.with_data_bag(name, &block)
-      end
-
-      def with_chef_environment(name, &block)
-        run_context.cheffish.with_environment(name, &block)
-      end
-
-      def with_chef_data_bag_item_encryption(encryption_options, &block)
-        run_context.cheffish.with_data_bag_item_encryption(encryption_options, &block)
-      end
-
-      def with_chef_server(server_url, options = {}, &block)
-        run_context.cheffish.with_chef_server({ :chef_server_url => server_url, :options => options }, &block)
-      end
-
-      def with_chef_local_server(options, &block)
-        options[:host] ||= '127.0.0.1'
-        options[:log_level] ||= Chef::Log.level
-        options[:port] ||= ChefZero::VERSION.to_f >= 2.2 ? 8901.upto(9900) : 8901
-
-        # Create the data store chef-zero will use
-        options[:data_store] ||= begin
-          if !options[:chef_repo_path]
-            raise "chef_repo_path must be specified to with_chef_local_server"
-          end
-
-          # Ensure all paths are given
-          %w(acl client cookbook container data_bag environment group node role).each do |type|
-            # Set the options as symbol keys and then copy to string keys
-            string_key = "#{type}_path"
-            symbol_key = "#{type}_path".to_sym
-
-            options[symbol_key] ||= begin
-              if options[:chef_repo_path].kind_of?(String)
-                Chef::Util::PathHelper.join(options[:chef_repo_path], "#{type}s")
-              else
-                options[:chef_repo_path].map { |path| Chef::Util::PathHelper.join(path, "#{type}s")}
-              end
-            end
-
-            # Copy over to string keys for things that use string keys (ChefFS)...
-            # TODO: Fix ChefFS to take symbols or use something that is insensitive to the difference
-            options[string_key] = options[symbol_key]
-          end
-
-          chef_fs = Chef::ChefFS::Config.new(options).local_fs
-          chef_fs.write_pretty_json = true
-          Chef::ChefFS::ChefFSDataStore.new(chef_fs)
-        end
-
-        # Start the chef-zero server
-        Chef::Log.info("Starting chef-zero on port #{options[:port]} with repository at #{options[:data_store].chef_fs.fs_description}")
-        chef_zero_server = ChefZero::Server.new(options)
-        chef_zero_server.start_background
-
-        run_context.cheffish.local_servers << chef_zero_server
-
-        with_chef_server(chef_zero_server.url, &block)
-      end
-
-      def get_private_key(name)
-        Cheffish.get_private_key(name, run_context.config)
-      end
-    end
-  end
-
-  class Config
-    default(:profile) { ENV['CHEF_PROFILE'] || 'default' }
-    configurable(:private_keys)
-    default(:private_key_paths) { [ Chef::Util::PathHelper.join(config_dir, 'keys'), Chef::Util::PathHelper.join(user_home, '.ssh') ] }
-    default(:private_key_write_path) { private_key_paths.first }
-  end
-
-  class RunContext
-    def cheffish
-      node.run_state[:cheffish] ||= begin
-        run_data = Cheffish::ChefRunData.new(config)
-        events.register(Cheffish::ChefRunListener.new(node))
-        run_data
-      end
-    end
-
-    def config
-      node.run_state[:chef_config] ||= Cheffish.profiled_config(Chef::Config)
-    end
-  end
-
-  Chef::Client.when_run_starts do |run_status|
-    # Pulling on cheffish_run_data makes it initialize right now
-    run_status.node.run_state[:chef_config] = config = Cheffish.profiled_config(Chef::Config)
-    run_status.node.run_state[:cheffish] = run_data = Cheffish::ChefRunData.new(config)
-    run_status.events.register(Cheffish::ChefRunListener.new(run_status.node))
-  end
-
-end
-
-# Chef 12 moved Chef::Config.path_join to PathHelper.join
-if Chef::VERSION.to_i >= 12
-  require 'chef/util/path_helper'
-else
-  require 'chef/config'
-  class Chef
-    class Util
-      class PathHelper
-        def self.join(*args)
-          Chef::Config.path_join(*args)
-        end
-      end
-    end
-  end
-end
+require 'cheffish'
+
+require 'chef/version'
+require 'chef_zero/server'
+require 'chef/chef_fs/chef_fs_data_store'
+require 'chef/chef_fs/config'
+require 'cheffish/chef_run_data'
+require 'cheffish/chef_run_listener'
+require 'chef/client'
+require 'chef/config'
+require 'chef_zero/version'
+require 'cheffish/merged_config'
+require 'chef/resource/chef_acl'
+require 'chef/resource/chef_client'
+require 'chef/resource/chef_container'
+require 'chef/resource/chef_data_bag'
+require 'chef/resource/chef_data_bag_item'
+require 'chef/resource/chef_environment'
+require 'chef/resource/chef_group'
+require 'chef/resource/chef_mirror'
+require 'chef/resource/chef_node'
+require 'chef/resource/chef_organization'
+require 'chef/resource/chef_role'
+require 'chef/resource/chef_user'
+require 'chef/resource/private_key'
+require 'chef/resource/public_key'
+require 'chef/provider/chef_acl'
+require 'chef/provider/chef_client'
+require 'chef/provider/chef_container'
+require 'chef/provider/chef_data_bag'
+require 'chef/provider/chef_data_bag_item'
+require 'chef/provider/chef_environment'
+require 'chef/provider/chef_group'
+require 'chef/provider/chef_mirror'
+require 'chef/provider/chef_node'
+require 'chef/provider/chef_organization'
+require 'chef/provider/chef_role'
+require 'chef/provider/chef_user'
+require 'chef/provider/private_key'
+require 'chef/provider/public_key'
+
+
+class Chef
+  module DSL
+    module Recipe
+      def with_chef_data_bag(name)
+        run_context.cheffish.with_data_bag(name, &block)
+      end
+
+      def with_chef_environment(name, &block)
+        run_context.cheffish.with_environment(name, &block)
+      end
+
+      def with_chef_data_bag_item_encryption(encryption_options, &block)
+        run_context.cheffish.with_data_bag_item_encryption(encryption_options, &block)
+      end
+
+      def with_chef_server(server_url, options = {}, &block)
+        run_context.cheffish.with_chef_server({ :chef_server_url => server_url, :options => options }, &block)
+      end
+
+      def with_chef_local_server(options, &block)
+        options[:host] ||= '127.0.0.1'
+        options[:log_level] ||= Chef::Log.level
+        options[:port] ||= ChefZero::VERSION.to_f >= 2.2 ? 8901.upto(9900) : 8901
+
+        # Create the data store chef-zero will use
+        options[:data_store] ||= begin
+          if !options[:chef_repo_path]
+            raise "chef_repo_path must be specified to with_chef_local_server"
+          end
+
+          # Ensure all paths are given
+          %w(acl client cookbook container data_bag environment group node role).each do |type|
+            # Set the options as symbol keys and then copy to string keys
+            string_key = "#{type}_path"
+            symbol_key = "#{type}_path".to_sym
+
+            options[symbol_key] ||= begin
+              if options[:chef_repo_path].kind_of?(String)
+                Chef::Util::PathHelper.join(options[:chef_repo_path], "#{type}s")
+              else
+                options[:chef_repo_path].map { |path| Chef::Util::PathHelper.join(path, "#{type}s")}
+              end
+            end
+
+            # Copy over to string keys for things that use string keys (ChefFS)...
+            # TODO: Fix ChefFS to take symbols or use something that is insensitive to the difference
+            options[string_key] = options[symbol_key]
+          end
+
+          chef_fs = Chef::ChefFS::Config.new(options).local_fs
+          chef_fs.write_pretty_json = true
+          Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+        end
+
+        # Start the chef-zero server
+        Chef::Log.info("Starting chef-zero on port #{options[:port]} with repository at #{options[:data_store].chef_fs.fs_description}")
+        chef_zero_server = ChefZero::Server.new(options)
+        chef_zero_server.start_background
+
+        run_context.cheffish.local_servers << chef_zero_server
+
+        with_chef_server(chef_zero_server.url, &block)
+      end
+
+      def get_private_key(name)
+        Cheffish.get_private_key(name, run_context.config)
+      end
+    end
+  end
+
+  class Config
+    default(:profile) { ENV['CHEF_PROFILE'] || 'default' }
+    configurable(:private_keys)
+    default(:private_key_paths) { [ Chef::Util::PathHelper.join(config_dir, 'keys'), Chef::Util::PathHelper.join(user_home, '.ssh') ] }
+    default(:private_key_write_path) { private_key_paths.first }
+  end
+
+  class RunContext
+    def cheffish
+      node.run_state[:cheffish] ||= begin
+        run_data = Cheffish::ChefRunData.new(config)
+        events.register(Cheffish::ChefRunListener.new(node))
+        run_data
+      end
+    end
+
+    def config
+      node.run_state[:chef_config] ||= Cheffish.profiled_config(Chef::Config)
+    end
+  end
+
+  Chef::Client.when_run_starts do |run_status|
+    # Pulling on cheffish_run_data makes it initialize right now
+    run_status.node.run_state[:chef_config] = config = Cheffish.profiled_config(Chef::Config)
+    run_status.node.run_state[:cheffish] = run_data = Cheffish::ChefRunData.new(config)
+    run_status.events.register(Cheffish::ChefRunListener.new(run_status.node))
+  end
+
+end
+
+# Chef 12 moved Chef::Config.path_join to PathHelper.join
+if Chef::VERSION.to_i >= 12
+  require 'chef/util/path_helper'
+else
+  require 'chef/config'
+  class Chef
+    class Util
+      class PathHelper
+        def self.join(*args)
+          Chef::Config.path_join(*args)
+        end
+      end
+    end
+  end
+end

data/lib/cheffish/rspec/chef_run_support.rb

@@ -1,83 +1,83 @@
-require 'chef_zero/rspec'
-require 'chef/server_api'
-require 'cheffish/rspec/repository_support'
-require 'uri'
-require 'cheffish/chef_run'
-require 'cheffish/rspec/recipe_run_wrapper'
-require 'cheffish/rspec/matchers'
-
-module Cheffish
-  module RSpec
-    module ChefRunSupport
-      include ChefZero::RSpec
-      include RepositorySupport
-
-      def self.extended(klass)
-        klass.class_eval do
-          include ChefRunSupportInstanceMethods
-        end
-      end
-
-      def when_the_chef_12_server(*args, **options, &block)
-        if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
-          when_the_chef_server(*args, :osc_compat => false, :single_org => false, **options, &block)
-        end
-      end
-
-      def with_converge(&recipe)
-        before :each do
-          r = recipe(&recipe)
-          r.converge
-        end
-      end
-
-      module ChefRunSupportInstanceMethods
-        def rest
-          ::Chef::ServerAPI.new
-        end
-
-        def get(path, *args)
-          if path[0] == '/'
-            path = URI.join(rest.url, path)
-          end
-          rest.get(path, *args)
-        end
-
-        def chef_config
-          {}
-        end
-
-        def expect_recipe(str=nil, file=nil, line=nil, &recipe)
-          r = recipe(str, file, line, &recipe)
-          r.converge
-          expect(r)
-        end
-
-        def expect_converge(str=nil, file=nil, line=nil, &recipe)
-          expect { converge(str, file, line, &recipe) }
-        end
-
-        def recipe(str=nil, file=nil, line=nil, &recipe)
-          if !recipe
-            if file && line
-              recipe = proc { eval(str, nil, file, line) }
-            else
-              recipe = proc { eval(str) }
-            end
-          end
-          RecipeRunWrapper.new(chef_config, &recipe)
-        end
-
-        def converge(str=nil, file=nil, line=nil, &recipe)
-          r = recipe(str, file, line, &recipe)
-          r.converge
-          r
-        end
-
-        def chef_client
-          @chef_client ||= ChefRun.new(chef_config)
-        end
-      end
-    end
-  end
-end
+require 'chef_zero/rspec'
+require 'chef/server_api'
+require 'cheffish/rspec/repository_support'
+require 'uri'
+require 'cheffish/chef_run'
+require 'cheffish/rspec/recipe_run_wrapper'
+require 'cheffish/rspec/matchers'
+
+module Cheffish
+  module RSpec
+    module ChefRunSupport
+      include ChefZero::RSpec
+      include RepositorySupport
+
+      def self.extended(klass)
+        klass.class_eval do
+          include ChefRunSupportInstanceMethods
+        end
+      end
+
+      def when_the_chef_12_server(*args, **options, &block)
+        if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
+          when_the_chef_server(*args, :osc_compat => false, :single_org => false, **options, &block)
+        end
+      end
+
+      def with_converge(&recipe)
+        before :each do
+          r = recipe(&recipe)
+          r.converge
+        end
+      end
+
+      module ChefRunSupportInstanceMethods
+        def rest
+          ::Chef::ServerAPI.new
+        end
+
+        def get(path, *args)
+          if path[0] == '/'
+            path = URI.join(rest.url, path)
+          end
+          rest.get(path, *args)
+        end
+
+        def chef_config
+          {}
+        end
+
+        def expect_recipe(str=nil, file=nil, line=nil, &recipe)
+          r = recipe(str, file, line, &recipe)
+          r.converge
+          expect(r)
+        end
+
+        def expect_converge(str=nil, file=nil, line=nil, &recipe)
+          expect { converge(str, file, line, &recipe) }
+        end
+
+        def recipe(str=nil, file=nil, line=nil, &recipe)
+          if !recipe
+            if file && line
+              recipe = proc { eval(str, nil, file, line) }
+            else
+              recipe = proc { eval(str) }
+            end
+          end
+          RecipeRunWrapper.new(chef_config, &recipe)
+        end
+
+        def converge(str=nil, file=nil, line=nil, &recipe)
+          r = recipe(str, file, line, &recipe)
+          r.converge
+          r
+        end
+
+        def chef_client
+          @chef_client ||= ChefRun.new(chef_config)
+        end
+      end
+    end
+  end
+end