chef-cookie_cutter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d45998bf26c11743232d78a95b91bf8c7259dae
-  data.tar.gz: 9ebc37cde72d556674e004f67a6762fd3d5e0f22
+  metadata.gz: 19608086c935f6ee87d275ff9817d97da4438cc3
+  data.tar.gz: 6d84cc99f20811b7fe1844839707462602a24b7d
 SHA512:
-  metadata.gz: 3817bcbd6b32903a9fd086ad2f64cf932bef86d9d5d58978d8619e9b6101cf3c066d9fbe0a043b025f4b2e2ed9d8efa6977e90a306d6ffdd9a359c1afa8b2243
-  data.tar.gz: 6554d61d3d4bd5e37375a0b389550e75a1145c720ee26d98fe2ce4ee59d22c426e403668199a08fb636baa7e41eb26c287951d64d9db441bf27d26396a9d23d9
+  metadata.gz: 4257835cf95c912912e244ea69185b51002447e628ec0c23df1487128e880cd46a40b90e6539c098a3f563a952f62dace4afbe7e9eec2426555dced00ed5cfd7
+  data.tar.gz: e5c92a23027f27acf6be0bbdae83f6744c923d4605be2d93ee8edf1d323a71c8dd9f582c7c06ab4ae5c0acd0f33dc1342f5e6acb8fedf2b471439d4874b60460

data/lib/chef/cookie_cutter.rb

@@ -22,29 +22,34 @@ require 'chef/provider/lwrp_base'
 
 class Chef
   module CookieCutter
-    def self.chef_version(version)
-      ::Gem::Requirement.new(version).satisfied_by?(::Gem::Version.new(::Chef::VERSION))
+    def self.chef_version(constraint)
+      gem_version = ::Gem::Version.new(::Chef::VERSION)
+      ::Gem::Requirement.new(constraint).satisfied_by?(gem_version)
     end
 
     if chef_version('~> 12.5.0.alpha')
       require_relative 'cookie_cutter/fancy_property'
     end
 
+    require_relative 'cookie_cutter/lwrp_build_params'
     require_relative 'cookie_cutter/lwrp_include'
-    require_relative 'cookie_cutter/monkey_patches'
     require_relative 'cookie_cutter/namespace'
     require_relative 'cookie_cutter/run_state'
     require_relative 'cookie_cutter/shared_blocks'
   end
 end
 
+CC = Chef::CookieCutter
+
 # Register Monkey Patches
-Chef::Resource::LWRPBase.send(:prepend, Chef::CookieCutter::MonkeyPatches::LWRPResource)
-Chef::Provider::LWRPBase.send(:prepend, Chef::CookieCutter::MonkeyPatches::LWRPProvider)
+Chef::Node.send :prepend, CC::MonkeyPatches::Node
+Chef::Resource::LWRPBase.send :prepend, CC::MonkeyPatches::LWRPResource
+Chef::Provider::LWRPBase.send :prepend, CC::MonkeyPatches::LWRPProvider
 
 # Register DSL
-Chef::Recipe.send(:include, Chef::CookieCutter::DSL)
-Chef::Resource.send(:include, Chef::CookieCutter::DSL)
-Chef::Provider.send(:include, Chef::CookieCutter::DSL)
-Chef::Resource::LWRPBase.send(:extend, Chef::CookieCutter::ResourceDSL)
-Chef::Provider::LWRPBase.send(:extend, Chef::CookieCutter::ProviderDSL)
+Chef::Recipe.send :include, CC::DSL
+Chef::Resource.send :include, CC::DSL
+Chef::Provider.send :include, CC::DSL
+Chef::Node.send :include, CC::AttributeDSL
+Chef::Resource::LWRPBase.send :extend, CC::ResourceDSL
+Chef::Provider::LWRPBase.send :extend, CC::ProviderDSL

data/lib/chef/cookie_cutter/fancy_property.rb

@@ -44,14 +44,9 @@ class Chef
 
       def coerce(resource, *args, **kwargs, &blk)
         if options.key?(:coerce_class)
-          value = options[:coerce_class].new(*args, **kwargs)
-          value.instance_eval(&blk) if block_given?
-          value
+          coerce_class(options[:coerce_class], *args, **kwargs, &blk)
         elsif options.key?(:coerce)
-          value = resource.instance_exec(*args, **kwargs, &options[:coerce]) unless resource.nil?
-          value.instance_eval(&blk) if block_given?
-          value = coerce(resource, value) if value.is_a?(DelayedEvaluator)
-          value
+          coerce_proc(resource, options[:coerce], *args, **kwargs, &blk)
         elsif args.length == 1 && kwargs.empty?
           args[0]
         else
@@ -59,6 +54,19 @@ class Chef
         end
       end
 
+      def coerce_class(clazz, *args, **kwargs, &blk)
+        value = clazz.new(*args, **kwargs)
+        value.instance_eval(&blk) if block_given?
+        value
+      end
+
+      def coerce_proc(resource, coerce, *args, **kwargs, &blk)
+        value = resource.instance_exec(*args, **kwargs, &coerce) unless resource.nil?
+        value.instance_eval(&blk) if block_given?
+        value = coerce(resource, value) if value.is_a?(DelayedEvaluator)
+        value
+      end
+
       def emit_dsl
         return unless instance_variable_name
         # Holy shit, this looks evil. But Chef does it the same way so yeah.

data/lib/chef/cookie_cutter/lwrp_include.rb

@@ -20,6 +20,11 @@ class Chef
     module LWRPInclude
       module_function
 
+      def try_file(filename)
+        return if File.exist?(filename) && File.readable?(filename)
+        fail IOError, "Cannot open or read #{filename}"
+      end
+
       def filename_for_record(run_context, cookbook_name, segment, name)
         name += '.rb' unless name.end_with?('.rb')
         cookbook_version = run_context.cookbook_collection[cookbook_name]
@@ -29,8 +34,7 @@ class Chef
       end
 
       def build_resource_module_from_file(filename)
-        fail IOError, "Cannot open or read #{filename}" unless File.exist?(filename) && File.readable?(filename)
-
+        try_file(filename)
         resource_module = Module.new
         resource_module.instance_variable_set('@filename', filename)
         def resource_module.included(cls)

data/lib/chef/cookie_cutter/namespace.rb

@@ -43,6 +43,36 @@ EOH
       end
     end
 
+    module AttributeDSL
+      def namespace(*args, **kwargs, &blk)
+        @namespace_options = namespace_options.merge(kwargs)
+        keys = args.map(&:to_s)
+        @current_namespace = current_namespace + keys
+        instance_eval(&blk) if block_given?
+        @current_namespace = current_namespace - keys
+        @namespace_options = nil if @current_namespace.empty?
+        nil
+      end
+
+      private
+
+      def namespace_options
+        @namespace_options ||= { precedence: default }
+      end
+
+      def current_namespace
+        @current_namespace ||= []
+      end
+
+      def vivified
+        precedence = namespace_options[:precedence]
+        current_namespace.inject(precedence) do |hash, item|
+          hash[item] ||= {}
+          hash[item]
+        end
+      end
+    end
+
     module DSL
       def namespace(*args)
         keys = args.map(&:to_s)
@@ -50,36 +80,20 @@ EOH
         yield attribute if block_given?
       end
     end
-  end
-
-  class Node
-    def namespace(*args, **kwargs, &blk)
-      @namespace_options ||= { precedence: default }
-      @namespace_options = @namespace_options.merge(kwargs)
-      keys = args.map(&:to_s)
-      @current_namespace ||= []
-      @current_namespace += keys
-      instance_eval(&blk) if block_given?
-      @current_namespace -= keys
-      @namespace_options = nil if @current_namespace.empty?
-      nil
-    end
 
-    def method_missing(method_name, *args)
-      attributes.send(method_name, *args)
-    rescue NoMethodError
-      @current_namespace ||= []
-      @namespace_options ||= { precedence: default }
-      if args.empty?
-        deep_key = @current_namespace.dup << method_name.to_s
-        return ::Chef::CookieCutter::Namespace.deep_fetch!(attributes, deep_key)
-      else
-        vivified = @current_namespace.inject(@namespace_options[:precedence]) do |hash, item|
-          hash[item] ||= {}
-          hash[item]
+    module MonkeyPatches
+      module Node
+        def method_missing(method_name, *args)
+          super
+        rescue NoMethodError
+          if args.empty?
+            deep_key = current_namespace.dup << method_name.to_s
+            return ::Chef::CookieCutter::Namespace.deep_fetch!(attributes, deep_key)
+          else
+            vivified[method_name.to_s] = args.size == 1 ? args.first : args
+            return nil
+          end
         end
-        vivified[method_name.to_s] = args.size == 1 ? args.first : args
-        return nil
       end
     end
   end

data/lib/chef/cookie_cutter/shared_blocks.rb

@@ -40,17 +40,17 @@ EOH
 
     module DSL
       def shared?(name)
-        exist_state?(:dotfiles, :shared_blocks, name)
+        exist_state?(:cookie_cutter, :shared_blocks, name)
       end
 
       def shared(name, &block)
         fail Chef::CookieCutter::SharedBlocks::SharedBlockAlreadyDefined, name if shared? name
-        store_state(:dotfiles, :shared_blocks, name, block)
+        store_state(:cookie_cutter, :shared_blocks, name, block)
       end
 
       def include_shared(name)
         fail Chef::CookieCutter::SharedBlocks::SharedBlockNotDefined, name unless shared? name
-        block = fetch_state(:dotfiles, :shared_blocks, name)
+        block = fetch_state(:cookie_cutter, :shared_blocks, name)
         instance_eval(&block)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cookie_cutter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ole Claussen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -74,8 +74,8 @@ extra_rdoc_files: []
 files:
 - lib/chef/cookie_cutter.rb
 - lib/chef/cookie_cutter/fancy_property.rb
+- lib/chef/cookie_cutter/lwrp_build_params.rb
 - lib/chef/cookie_cutter/lwrp_include.rb
-- lib/chef/cookie_cutter/monkey_patches.rb
 - lib/chef/cookie_cutter/namespace.rb
 - lib/chef/cookie_cutter/run_state.rb
 - lib/chef/cookie_cutter/shared_blocks.rb