itamae 1.5.1 → 1.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/lib/itamae/recipe.rb +15 -4
- data/lib/itamae/version.txt +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a9a88eb1a68fe13f014e07cde5131b7a6cf727cc
|
|
4
|
+
data.tar.gz: b04a15f83fd79aa5c864c0c18ed10daeb9017ba7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dff569014024f7fb87b1ada251dc4d8ad9d0644856e0aa81884cf478b3735381ab62c6165630720de0e365d3839b99db39ed5d2033d3c53129815028aaa3875c
|
|
7
|
+
data.tar.gz: 30a4ca3e1b41fd0be3b650178df65819831fba91476a8246f6b664f35eba146ed4360220f84c0d57bd4875063c63dac1df8c74ebe55ae9abaf2bd1c059ffc48c
|
data/CHANGELOG.md
CHANGED
data/lib/itamae/recipe.rb
CHANGED
|
@@ -11,9 +11,7 @@ module Itamae
|
|
|
11
11
|
|
|
12
12
|
class << self
|
|
13
13
|
def find_recipe_in_gem(recipe)
|
|
14
|
-
|
|
15
|
-
target += '.rb' if target !~ /\.rb$/
|
|
16
|
-
plugin_name = recipe.split('::')[0]
|
|
14
|
+
plugin_name, recipe_file = recipe.split('::')
|
|
17
15
|
|
|
18
16
|
gem_name = "itamae-plugin-recipe-#{plugin_name}"
|
|
19
17
|
begin
|
|
@@ -26,7 +24,20 @@ module Itamae
|
|
|
26
24
|
|
|
27
25
|
return nil unless spec
|
|
28
26
|
|
|
29
|
-
|
|
27
|
+
candidate_files = []
|
|
28
|
+
if recipe_file
|
|
29
|
+
recipe_file += '.rb' unless recipe_file.end_with?('.rb')
|
|
30
|
+
candidate_files << "#{plugin_name}/#{recipe_file}"
|
|
31
|
+
else
|
|
32
|
+
candidate_files << "#{plugin_name}/default.rb"
|
|
33
|
+
candidate_files << "#{plugin_name}.rb"
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
candidate_files.map do |file|
|
|
37
|
+
File.join(spec.lib_dirs_glob, 'itamae', 'plugin', 'recipe', file)
|
|
38
|
+
end.find do |path|
|
|
39
|
+
File.exist?(path)
|
|
40
|
+
end
|
|
30
41
|
end
|
|
31
42
|
end
|
|
32
43
|
|
data/lib/itamae/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.5.
|
|
1
|
+
1.5.2
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: itamae
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.5.
|
|
4
|
+
version: 1.5.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ryota Arai
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-09-
|
|
11
|
+
date: 2015-09-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: thor
|