itamae 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527c1c2c9aac7484eb00454e1d66d91d57e07f45
-  data.tar.gz: 557aa8fead8d4aeb0cfc289050548231e0b3fa33
+  metadata.gz: a9a88eb1a68fe13f014e07cde5131b7a6cf727cc
+  data.tar.gz: b04a15f83fd79aa5c864c0c18ed10daeb9017ba7
 SHA512:
-  metadata.gz: 9f66b1c4369c7a72f4cad09cda136e8f83667ed83fe70e0dc46f1347ac7412c7d24114ae46414cbe5103fc02edc8bbf962d7c07118cb77191e92258d805fab43
-  data.tar.gz: e0d54f47e26b8765299a61c573b82204cbada17b1a541e85223e56da717cc9cccd71975c93d07f21480ed4924e0ed37627a9ae501789bc2bab7d7a3ab264060e
+  metadata.gz: dff569014024f7fb87b1ada251dc4d8ad9d0644856e0aa81884cf478b3735381ab62c6165630720de0e365d3839b99db39ed5d2033d3c53129815028aaa3875c
+  data.tar.gz: 30a4ca3e1b41fd0be3b650178df65819831fba91476a8246f6b664f35eba146ed4360220f84c0d57bd4875063c63dac1df8c74ebe55ae9abaf2bd1c059ffc48c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.5.2
+
+Improvements
+
+- [`include_recipe 'plugin_name'` loads `itamae/plugin/recipe/plugin_name/default.rb` too](https://github.com/itamae-kitchen/itamae/pull/162)
+
 ## v1.5.1
 
 Improvements

data/lib/itamae/recipe.rb

@@ -11,9 +11,7 @@ module Itamae
 
     class << self
       def find_recipe_in_gem(recipe)
-        target = recipe.gsub('::', '/')
-        target += '.rb' if target !~ /\.rb$/
-        plugin_name = recipe.split('::')[0]
+        plugin_name, recipe_file = recipe.split('::')
 
         gem_name = "itamae-plugin-recipe-#{plugin_name}"
         begin
@@ -26,7 +24,20 @@ module Itamae
 
         return nil unless spec
 
-        File.join(spec.lib_dirs_glob, 'itamae', 'plugin', 'recipe', target)
+        candidate_files = []
+        if recipe_file
+          recipe_file += '.rb' unless recipe_file.end_with?('.rb')
+          candidate_files << "#{plugin_name}/#{recipe_file}"
+        else
+          candidate_files << "#{plugin_name}/default.rb"
+          candidate_files << "#{plugin_name}.rb"
+        end
+
+        candidate_files.map do |file|
+          File.join(spec.lib_dirs_glob, 'itamae', 'plugin', 'recipe', file)
+        end.find do |path|
+          File.exist?(path)
+        end
       end
     end
 

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.5.1
+1.5.2

metadata

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