itamae 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bab606a429b8dcf5fcaa424ffc3a9a62c778ef0
-  data.tar.gz: 8ee54b6444e9932e3018dbfbd2a0c6cea1781219
+  metadata.gz: a1702b011e6985d136ff6cd8d86d962a0ecb4c0a
+  data.tar.gz: a6e3caf02febbc6229fc4762abe498626c734b6f
 SHA512:
-  metadata.gz: 54c65502fc518537dd3cb0b3c5efcb38373a7489cef722c05cd52ac4ad8e61b7a9b9c768fa900c519be10dc3b2f6abf626617c4937e96365518c3983c8709fed
-  data.tar.gz: d1b0d44adbd650e2e8f014d979047bffddfc4062efff750910f5cd7b92c0ae15309112cd39a5846889346695353ce5691ef34eb03de2b6679e2b2e2f917f7526
+  metadata.gz: dfda34ba80a5c2f0bc1eaa7a8070c07387b44e9cfcea7d86ab5edc5dff9a06772a82f6f290d17191b3c35f6d42f179185a95183d1c31962034c2a69ec504ea28
+  data.tar.gz: c558ee700af41b9fec212cffc761bc90859f4236e57583363fbd7ea8a4adb4e54884c467919a8896c515f34dcc64d53d987d9941e8e65617a74eff2d6972fc2e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.4.5
+
+Improvements
+
+- [Load `default.rb` if `include_recipe` is called with directory path. (by @Rudolph-Miller)](https://github.com/itamae-kitchen/itamae/pull/156)
+
 ## v1.4.4
 
 Features

data/lib/itamae/recipe.rb

@@ -106,8 +106,9 @@ module Itamae
       end
 
       def include_recipe(target)
+        expanded_path = ::File.expand_path(target, File.dirname(@recipe.path))
         candidate_paths = [
-          ::File.expand_path(target, File.dirname(@recipe.path)),
+          ::Dir.exists?(expanded_path) ? ::File.join(expanded_path, "default.rb") : expanded_path,
           Recipe.find_recipe_in_gem(target),
         ].compact
         path = candidate_paths.find {|path| File.exist?(path) }

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.4.4
+1.4.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor