itamae 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 616cfc3511d0ccaed6104add74b3502120fc80a5
-  data.tar.gz: fdec38243e8406d3646df667690fd19129ff61cd
+  metadata.gz: 54ac557a58fa9efee07fc0dce29f5a6dc4746f64
+  data.tar.gz: 6e8a44e41dd103d32aaebd84f51e4de1c6029291
 SHA512:
-  metadata.gz: 22cec5cb03fe430522b6afbd3f2159ff626f79cc8787d398224d69a6a78dd9ef801c937e0a056cd015d840113080a9b42b4c0afe60c268e87007173f34501b5b
-  data.tar.gz: 300eead221e03c2e58c6604e150a6d1149646d826bfb1266fb527ceeed8dcdef0ad88790a70c6c2b0bf2b8775ea464b5f9ba3e7d809e33b3a29ffc5113d85e59
+  metadata.gz: e5193dc0d26d428f634030d966e2b4f59d59c2e4d582546ef808c5f8d78ac4b77a97ec8cce231288206a8aa3ea745ed2114bd36431604622e2894b087409d677
+  data.tar.gz: 122321d75100144a5bd5295e385bbd3addc4d30795d890cfc0c35a8f0edbaebb81aebfb2414e6970a301f3fd9dd0b24d90b74a20cff5a37f871ba9263337ef12

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.11
+
+Bugfixes
+
+- [Do not include recipes which are already included.](https://github.com/itamae-kitchen/itamae/pull/85)
+    - This may break backward compatibility.
+
 ## v1.1.10
 
 Feature

data/README.md

@@ -49,7 +49,8 @@ Further example is here: [spec/integration/recipes/default.rb](spec/integration/
 
 ## Documentations
 
-https://github.com/ryotarai/itamae/wiki
+- http://itamae.kitchen/docs.html
+- https://github.com/ryotarai/itamae/wiki
 
 ## Run tests
 

data/lib/itamae/recipe.rb

@@ -29,9 +29,11 @@ module Itamae
       @runner = runner
       @path = path
       @delayed_notifications = []
+      @children = RecipeChildren.new
+    end
 
-      context = EvalContext.new(self)
-      @children = context.children
+    def load
+      EvalContext.new(self)
     end
 
     def run(options = {})
@@ -49,11 +51,8 @@ module Itamae
     end
 
     class EvalContext
-      attr_reader :children
-
       def initialize(recipe)
         @recipe = recipe
-        @children = RecipeChildren.new
 
         instance_eval(File.read(@recipe.path), @recipe.path, 1)
       end
@@ -76,7 +75,7 @@ module Itamae
         end
 
         resource = klass.new(@recipe, name, &block)
-        @children << resource
+        @recipe.children << resource
       end
 
       def define(name, params = {}, &block)
@@ -104,12 +103,13 @@ module Itamae
         end
 
         if runner.children.find_recipe_by_path(path)
-          Logger.debug "Recipe, #{target}, is skipped because it is already included"
+          Logger.debug "Recipe, #{path}, is skipped because it is already included"
           return
         end
 
         recipe = Recipe.new(runner, path)
-        @children << recipe
+        @recipe.children << recipe
+        recipe.load
       end
 
       def node

data/lib/itamae/recipe_children.rb

@@ -68,6 +68,7 @@ module Itamae
     def deps_in_dot
       result = ""
       result << "digraph recipes {\n"
+      result << "  rankdir=LR;\n"
       result << _deps_in_dot
       result << "}"
 

data/lib/itamae/runner.rb

@@ -101,7 +101,9 @@ module Itamae
 
     def load_recipes(paths)
       paths.each do |path|
-        children << Recipe.new(self, File.expand_path(path))
+        recipe = Recipe.new(self, File.expand_path(path))
+        children << recipe
+        recipe.load
       end
     end
 

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.10
+1.1.11

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool