itamae 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8815e26260fcdb26ad53e3dfef5d0fffb1282244
-  data.tar.gz: 0db4ddf34079e91eab44ea5a39338e9591e92d8b
+  metadata.gz: c5514849fd07f64a8e08cddcd429e6dbd366ad79
+  data.tar.gz: 7844bbff4c0e017f03bcb540e18ae797499903af
 SHA512:
-  metadata.gz: 5479683a14d33546ef79cec19304e37bc9b1b1bd69a95ca72c2e29f7cbb4131ec6482646c5934aa34208dbc064f143bc392cac5593635822bd192c1f4ff35a60
-  data.tar.gz: 16b612e907f4c981e42b9964d322423413244ba55ac53777cf71f171b0da590c249031cb6c67b2d7e65c56592061810b31edb1a15e9618451bf4e35d51137fa6
+  metadata.gz: c59c0be2d8f9b0270ec042ee839f6766d7f832aac8fb0c3724c2c3de3647348983264b747f251dfd89528b50fbdfbfbb50dfd528dff7e6c40e181d46b00d4ce4
+  data.tar.gz: e4d08541ddf828cd2d716a8bd13640c4a67ef16cb2fce234281538146a34cc238c6a8ac56dd0991b507d255c20c1433e53b3acc077b9da9564e589d8f8144d62

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## v1.2.9
+
+Bugfixes
+
+- Do not use local variable named `variables`.
+
+If `variables` is used as local variable's name, the following causes a syntax error.
+
+```
+template "..." do
+  variables foo: bar
+  # variables(foo: bar) # This never cause a syntax error
+end
+```
+
+See also: https://bugs.ruby-lang.org/issues/11016
+
 ## v1.2.8
 
 Improvements

data/lib/itamae/recipe.rb

@@ -36,8 +36,8 @@ module Itamae
       ::File.dirname(@path)
     end
 
-    def load(variables = {})
-      context = EvalContext.new(self, variables)
+    def load(vars = {})
+      context = EvalContext.new(self, vars)
       context.instance_eval(File.read(path), path, 1)
     end
 
@@ -62,10 +62,10 @@ module Itamae
     end
 
     class EvalContext
-      def initialize(recipe, variables)
+      def initialize(recipe, vars)
         @recipe = recipe
 
-        variables.each do |k, v|
+        vars.each do |k, v|
           define_singleton_method(k) { v }
         end
       end
@@ -128,8 +128,8 @@ module Itamae
     class RecipeFromDefinition < Recipe
       attr_accessor :definition
 
-      def load(variables = {})
-        context = EvalContext.new(self, variables)
+      def load(vars = {})
+        context = EvalContext.new(self, vars)
         context.instance_eval(&@definition.class.definition_block)
       end
 

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.8
+1.2.9

data/spec/integration/recipes/default.rb

@@ -103,12 +103,12 @@ end
 
 template "/tmp/template" do
   source "hello.erb"
-  variables(goodbye: "Good bye")
+  variables goodbye: "Good bye"
 end
 
 template "/tmp/template_auto" do
   source :auto
-  variables(goodbye: "Good bye")
+  variables goodbye: "Good bye"
 end
 
 file "/tmp/file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Ryota Arai