itamae 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 695ebf9f7ebb344b40750c528481e0add589f95b
-  data.tar.gz: 96e0796a64cfb046e3859a7cd2ad7e0c2748a9f1
+  metadata.gz: 167d45d181120c9a6aa4b7323c20681d925680b7
+  data.tar.gz: e8e0218836135ffdb4d9684ed07a5ee3027fca0f
 SHA512:
-  metadata.gz: eff7cb14160244b020f104b04039219693fc337c43689e437f22caf368b91111453db497d6a5fdb823be6050442864669dc7967025b8e737be4a94483de6740c
-  data.tar.gz: 1fba254f6d7e019d9d6b6129fea557efcbdb9afab3ab4197f4aec5e2bbd1d8e16ffed84332b4673e525ff12d19cd2b5ceab63a76fe83eb91c7b242244abcd4dd
+  metadata.gz: f0e733d5d7adce8fdbab8a02a3c147b3e2ca6c000a05926d3144a2b8f0ba4f9d744bb59ce41d6586853d12fddca50ce7657e97856ac5dd5cf205307f86ce5859
+  data.tar.gz: 1ca5a89dc112249321a75a831482eb679252ec5a3854dd8f9ea9d20009b60ebffe65eb577977442fab2588f1e3c9447b44e3db82be4a1a77d17d53fd24fffb0e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.2.5
+
+Bugfixes
+
+- Bugs in definition feature.
+
+## v1.2.4
+
+Improvements
+
+- Use specinfra/core instead of specinfra.
+
 ## v1.2.3
 
 Bugfixes

data/lib/itamae.rb

@@ -1,3 +1,10 @@
+require 'tracer'
+
+Tracer.add_filter {|event, file, line, id, binding, klass|
+  file.include?(File.expand_path('../..', __FILE__))
+}
+#Tracer.on
+
 require "itamae/version"
 require "itamae/runner"
 require "itamae/cli"

data/lib/itamae/definition.rb

@@ -3,9 +3,13 @@ require 'itamae'
 module Itamae
   class Definition < Resource::Base
     class << self
-      def create_class(name, params, &block)
+      attr_accessor :definition_block
+      attr_accessor :defined_in_recipe
+
+      def create_class(name, params, defined_in_recipe, &block)
         Class.new(self).tap do |klass|
           klass.definition_block = block
+          klass.defined_in_recipe = defined_in_recipe
 
           klass.define_attribute :action, default: :run
           params.each_pair do |key, value|
@@ -13,62 +17,23 @@ module Itamae
           end
         end
       end
-
-      def definition_block=(block)
-        @definition_block = block
-      end
-
-      def definition_block
-        @definition_block
-      end
     end
 
     def initialize(*args)
       super
 
-      construct_resources
-    end
-
-    def action_run(options)
-      @children.run(options)
-    end
-
-    private
+      r = Recipe::RecipeFromDefinition.new(
+        runner,
+        self.class.defined_in_recipe.path,
+      )
+      recipe.children << r
 
-    def construct_resources
-      block = self.class.definition_block
-
-      context = Context.new(self, @attributes.merge(name: resource_name))
-      context.instance_exec(&block)
-      @children = context.children
+      r.definition = self
+      r.load(params: @attributes.merge(name: resource_name))
     end
 
-    class Context
-      attr_reader :params
-      attr_reader :children
-
-      def initialize(definition, params, &block)
-        @definition = definition
-        @params = params
-        @children = RecipeChildren.new
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        Resource.get_resource_class(method)
-        true
-      rescue NameError
-        false
-      end
-
-      def method_missing(method, name, &block)
-        klass = Resource.get_resource_class(method)
-        resource = klass.new(@definition.recipe, name, &block)
-        @children << resource
-      end
-
-      def node
-        @definition.recipe.runner.node
-      end
+    def run(*args)
+      # nothing
     end
   end
 end

data/lib/itamae/recipe.rb

@@ -36,12 +36,13 @@ module Itamae
       ::File.dirname(@path)
     end
 
-    def load
-      EvalContext.new(self)
+    def load(variables = {})
+      context = EvalContext.new(self, variables)
+      context.instance_eval(File.read(path), path, 1)
     end
 
     def run(options = {})
-      Logger.info "Recipe: #{@path}"
+      show_banner
 
       Logger.formatter.with_indent do
         @children.run(options)
@@ -54,11 +55,19 @@ module Itamae
       end
     end
 
+    private
+
+    def show_banner
+      Logger.info "Recipe: #{@path}"
+    end
+
     class EvalContext
-      def initialize(recipe)
+      def initialize(recipe, variables)
         @recipe = recipe
 
-        instance_eval(File.read(@recipe.path), @recipe.path, 1)
+        variables.each do |k, v|
+          define_singleton_method(k) { v }
+        end
       end
 
       def respond_to_missing?(method, include_private = false)
@@ -83,16 +92,7 @@ module Itamae
       end
 
       def define(name, params = {}, &block)
-        class_name = Resource.get_resource_class_name(name)
-        if Resource.const_defined?(class_name)
-          Logger.warn "Redefine class. (#{class_name})"
-          return
-        end
-
-        Resource.const_set(
-          Resource.get_resource_class_name(name),
-          Definition.create_class(name, params, &block)
-        )
+        Resource.define_resource(name, Definition.create_class(name, params, @recipe, &block))
       end
 
       def include_recipe(target)
@@ -124,5 +124,20 @@ module Itamae
         @recipe.runner
       end
     end
+
+    class RecipeFromDefinition < Recipe
+      attr_accessor :definition
+
+      def load(variables = {})
+        context = EvalContext.new(self, variables)
+        context.instance_eval(&@definition.class.definition_block)
+      end
+
+      private
+
+      def show_banner
+        Logger.debug "#{@definition.resource_type}[#{@definition.resource_name}]"
+      end
+    end
   end
 end

data/lib/itamae/resource.rb

@@ -23,26 +23,32 @@ module Itamae
     ParseError = Class.new(StandardError)
 
     class << self
-      def get_resource_class_name(method)
-        to_camel_case(method.to_s)
-      end
-
-      def get_resource_plugin_class_name(method)
-        '::Itamae::Plugin::Resource::' + to_camel_case(method.to_s)
-      end
-
       def to_camel_case(str)
         str.split('_').map {|part| part.capitalize}.join
       end
 
       def get_resource_class(method)
         begin
-          const_get(get_resource_class_name(method))
-        rescue NameError => e
-          const_get(get_resource_plugin_class_name(method))
+          self.const_get(to_camel_case(method.to_s))
+        rescue NameError
+          begin
+            ::Itamae::Plugin::Resource.const_get(to_camel_case(method.to_s))
+          rescue NameError
+            raise Error, "#{method} resource is missing."
+          end
         end
       end
 
+      def define_resource(name, klass)
+        class_name = to_camel_case(name.to_s)
+        if Resource.const_defined?(class_name)
+          Logger.warn "Redefine class. (#{class_name})"
+          return
+        end
+
+        Resource.const_set(class_name, klass)
+      end
+
       def parse_description(desc)
         if /\A([^\[]+)\[([^\]]+)\]\z/ =~ desc
           [$1, $2]

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.4
+1.2.5

data/spec/integration/default_spec.rb

@@ -130,3 +130,8 @@ describe file('/tmp/created_by_definition') do
   it { should be_file }
   its(:content) { should eq("name:name,key:value,message:Hello, Itamae\n") }
 end
+
+describe file('/tmp/remote_file_in_definition') do
+  it { should be_file }
+  its(:content) { should eq("definition_example\n") }
+end

data/spec/integration/recipes/default.rb

@@ -207,9 +207,7 @@ end
 
 #####
 
-define :definition_example, key: 'default' do
-  execute "echo 'name:#{params[:name]},key:#{params[:key]},message:#{node[:message]}' > /tmp/created_by_definition"
-end
+include_recipe "define/default.rb"
 
 definition_example "name" do
   key 'value'

data/spec/integration/recipes/define/default.rb

@@ -0,0 +1,6 @@
+define :definition_example, key: 'default' do
+  execute "echo 'name:#{params[:name]},key:#{params[:key]},message:#{node[:message]}' > /tmp/created_by_definition"
+
+  remote_file "/tmp/remote_file_in_definition"
+end
+

data/spec/integration/recipes/define/files/remote_file_in_definition

@@ -0,0 +1 @@
+definition_example

data/spec/unit/lib/itamae/resource_spec.rb

@@ -2,14 +2,6 @@ require 'spec_helper'
 
 module Itamae
   describe Resource do
-    describe ".get_resource_class_name" do
-      let(:method) { :foo_bar_baz }
-      it "returns camel-cased string" do
-        expect(described_class.get_resource_class_name(method)).
-          to eq("FooBarBaz")
-      end
-    end
-
     describe ".parse_description" do
       context "with valid description" do
         it "returns type and name" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -223,6 +223,8 @@ files:
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
 - spec/integration/recipes/default2.rb
+- spec/integration/recipes/define/default.rb
+- spec/integration/recipes/define/files/remote_file_in_definition
 - spec/integration/recipes/files/remote_file_auto
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
@@ -269,6 +271,8 @@ test_files:
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
 - spec/integration/recipes/default2.rb
+- spec/integration/recipes/define/default.rb
+- spec/integration/recipes/define/files/remote_file_in_definition
 - spec/integration/recipes/files/remote_file_auto
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt