itamae 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a88eb1a68fe13f014e07cde5131b7a6cf727cc
-  data.tar.gz: b04a15f83fd79aa5c864c0c18ed10daeb9017ba7
+  metadata.gz: 7645dcbc25524977716925e4fd25ff38b384b9fe
+  data.tar.gz: 8794a7a72b0f04f54a44bfa1c77f9abaf0d9c2fd
 SHA512:
-  metadata.gz: dff569014024f7fb87b1ada251dc4d8ad9d0644856e0aa81884cf478b3735381ab62c6165630720de0e365d3839b99db39ed5d2033d3c53129815028aaa3875c
-  data.tar.gz: 30a4ca3e1b41fd0be3b650178df65819831fba91476a8246f6b664f35eba146ed4360220f84c0d57bd4875063c63dac1df8c74ebe55ae9abaf2bd1c059ffc48c
+  metadata.gz: 22979a7c43b6251c5c5351645c3806286b10f2e9c9474d33ba5072b3ce54ea5e10cac902dbb25963ccf5a5f5f8f42523db0e959c83c4e7d788d4d696623d036a
+  data.tar.gz: 96a6a28449318915eab6331b83502904a8514d015ae23e151a1ae876822696812a6207b954602f3a7bbb4da8f862b82b42dc9034cb3835582b675d8331fc772e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v1.6.0
+
+Improvements
+
+- [Ignore `--node-yaml` when the result is false (by @k0kubun)](https://github.com/itamae-kitchen/itamae/pull/165)
+- [Allow `include_recipe` to omit `.rb` extension (by @k0kubun)](https://github.com/itamae-kitchen/itamae/pull/166)
+  - This is backward-compatible change
+- [Allow `load_recipes` to load plugin recipes directly (by @k0kubun)](https://github.com/itamae-kitchen/itamae/pull/167)
+
 ## v1.5.2
 
 Improvements

data/lib/itamae/recipe.rb

@@ -118,10 +118,9 @@ module Itamae
 
       def include_recipe(target)
         expanded_path = ::File.expand_path(target, File.dirname(@recipe.path))
-        candidate_paths = [
-          ::Dir.exists?(expanded_path) ? ::File.join(expanded_path, "default.rb") : expanded_path,
-          Recipe.find_recipe_in_gem(target),
-        ].compact
+        expanded_path = ::File.join(expanded_path, 'default.rb') if ::Dir.exists?(expanded_path)
+        expanded_path.concat('.rb') unless expanded_path.end_with?('.rb')
+        candidate_paths = [expanded_path, Recipe.find_recipe_in_gem(target)].compact
         path = candidate_paths.find {|path| File.exist?(path) }
 
         unless path

data/lib/itamae/runner.rb

@@ -43,7 +43,13 @@ module Itamae
 
     def load_recipes(paths)
       paths.each do |path|
-        recipe = Recipe.new(self, File.expand_path(path))
+        expanded_path = File.expand_path(path)
+        if path.include?('::')
+          gem_path = Recipe.find_recipe_in_gem(path)
+          expanded_path = gem_path if gem_path
+        end
+
+        recipe = Recipe.new(self, expanded_path)
         children << recipe
         recipe.load
       end
@@ -78,7 +84,7 @@ module Itamae
       if @options[:node_yaml]
         path = File.expand_path(@options[:node_yaml])
         Itamae.logger.info "Loading node data from #{path}..."
-        hash.merge!(YAML.load(open(path)))
+        hash.merge!(YAML.load(open(path)) || {})
       end
 
       Node.new(hash, @backend)

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.5.2
+1.6.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor