itamae 1.4.4 → 1.4.5

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/lib/itamae/recipe.rb +2 -1
  4. data/lib/itamae/version.txt +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8bab606a429b8dcf5fcaa424ffc3a9a62c778ef0
4
- data.tar.gz: 8ee54b6444e9932e3018dbfbd2a0c6cea1781219
3
+ metadata.gz: a1702b011e6985d136ff6cd8d86d962a0ecb4c0a
4
+ data.tar.gz: a6e3caf02febbc6229fc4762abe498626c734b6f
5
5
  SHA512:
6
- metadata.gz: 54c65502fc518537dd3cb0b3c5efcb38373a7489cef722c05cd52ac4ad8e61b7a9b9c768fa900c519be10dc3b2f6abf626617c4937e96365518c3983c8709fed
7
- data.tar.gz: d1b0d44adbd650e2e8f014d979047bffddfc4062efff750910f5cd7b92c0ae15309112cd39a5846889346695353ce5691ef34eb03de2b6679e2b2e2f917f7526
6
+ metadata.gz: dfda34ba80a5c2f0bc1eaa7a8070c07387b44e9cfcea7d86ab5edc5dff9a06772a82f6f290d17191b3c35f6d42f179185a95183d1c31962034c2a69ec504ea28
7
+ data.tar.gz: c558ee700af41b9fec212cffc761bc90859f4236e57583363fbd7ea8a4adb4e54884c467919a8896c515f34dcc64d53d987d9941e8e65617a74eff2d6972fc2e
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## v1.4.5
2
+
3
+ Improvements
4
+
5
+ - [Load `default.rb` if `include_recipe` is called with directory path. (by @Rudolph-Miller)](https://github.com/itamae-kitchen/itamae/pull/156)
6
+
1
7
  ## v1.4.4
2
8
 
3
9
  Features
data/lib/itamae/recipe.rb CHANGED
@@ -106,8 +106,9 @@ module Itamae
106
106
  end
107
107
 
108
108
  def include_recipe(target)
109
+ expanded_path = ::File.expand_path(target, File.dirname(@recipe.path))
109
110
  candidate_paths = [
110
- ::File.expand_path(target, File.dirname(@recipe.path)),
111
+ ::Dir.exists?(expanded_path) ? ::File.join(expanded_path, "default.rb") : expanded_path,
111
112
  Recipe.find_recipe_in_gem(target),
112
113
  ].compact
113
114
  path = candidate_paths.find {|path| File.exist?(path) }
data/lib/itamae/version.txt CHANGED
@@ -1 +1 @@
1
- 1.4.4
1
+ 1.4.5
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.4.4
4
+ version: 1.4.5
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-08-13 00:00:00.000000000 Z
11
+ date: 2015-08-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor