itamae 1.0.7 → 1.0.8
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/itamae.gemspec +2 -2
- data/lib/itamae/cli.rb +2 -0
- data/lib/itamae/runner.rb +7 -0
- data/lib/itamae/version.txt +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b5a45cfaeda3bb5e4e61661cd767be084f659e72
|
|
4
|
+
data.tar.gz: 1803f3503284299d63e2d2e428022b90415505a5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8f3297c41caf1822b2d3862ff362e283a2eef44d8f08be4cffeb6f2925d9ec6ba514c1c9a6934140f1fd31bfaa2ad2d29022dc0f7d932dd8acfa33571899024a
|
|
7
|
+
data.tar.gz: 91d5ab6005863e347d9e48682872d33d3c1fdaf040ebdf81f75f9281647253c7eadbc7fb42f6cf345f081351c51505501c0271199c5c4aca7c312a89663fe70e
|
data/itamae.gemspec
CHANGED
|
@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
|
|
|
18
18
|
spec.require_paths = ["lib"]
|
|
19
19
|
|
|
20
20
|
spec.add_runtime_dependency "thor"
|
|
21
|
-
spec.add_runtime_dependency "specinfra", "~> 2.1
|
|
21
|
+
spec.add_runtime_dependency "specinfra", "~> 2.1"
|
|
22
22
|
spec.add_runtime_dependency "hashie"
|
|
23
23
|
spec.add_runtime_dependency "ansi"
|
|
24
24
|
|
|
25
25
|
spec.add_development_dependency "bundler", "~> 1.3"
|
|
26
26
|
spec.add_development_dependency "rake"
|
|
27
27
|
spec.add_development_dependency "rspec", "~> 3.0"
|
|
28
|
-
spec.add_development_dependency "serverspec", "~> 2.1
|
|
28
|
+
spec.add_development_dependency "serverspec", "~> 2.1"
|
|
29
29
|
spec.add_development_dependency "pry-byebug"
|
|
30
30
|
end
|
data/lib/itamae/cli.rb
CHANGED
|
@@ -15,6 +15,7 @@ module Itamae
|
|
|
15
15
|
|
|
16
16
|
desc "local RECIPE [RECIPE...]", "Run Itamae locally"
|
|
17
17
|
option :node_json, type: :string, aliases: ['-j']
|
|
18
|
+
option :node_yaml, type: :string, aliases: ['-y']
|
|
18
19
|
option :dry_run, type: :boolean, aliases: ['-n']
|
|
19
20
|
option :ohai, type: :boolean, default: false
|
|
20
21
|
def local(*recipe_files)
|
|
@@ -27,6 +28,7 @@ module Itamae
|
|
|
27
28
|
|
|
28
29
|
desc "ssh RECIPE [RECIPE...]", "Run Itamae via ssh"
|
|
29
30
|
option :node_json, type: :string, aliases: ['-j']
|
|
31
|
+
option :node_yaml, type: :string, aliases: ['-y']
|
|
30
32
|
option :dry_run, type: :boolean, aliases: ['-n']
|
|
31
33
|
option :host, required: true, type: :string, aliases: ['-h']
|
|
32
34
|
option :user, type: :string, aliases: ['-u']
|
data/lib/itamae/runner.rb
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
require 'itamae'
|
|
2
2
|
require 'json'
|
|
3
|
+
require 'yaml'
|
|
3
4
|
|
|
4
5
|
module Itamae
|
|
5
6
|
class Runner
|
|
@@ -35,6 +36,12 @@ module Itamae
|
|
|
35
36
|
hash.merge!(JSON.load(open(path)))
|
|
36
37
|
end
|
|
37
38
|
|
|
39
|
+
if options[:node_yaml]
|
|
40
|
+
path = File.expand_path(options[:node_yaml])
|
|
41
|
+
Logger.info "Loading node data from #{path}..."
|
|
42
|
+
hash.merge!(YAML.load(open(path)))
|
|
43
|
+
end
|
|
44
|
+
|
|
38
45
|
Node.new(hash)
|
|
39
46
|
end
|
|
40
47
|
|
data/lib/itamae/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.0.
|
|
1
|
+
1.0.8
|
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.0.
|
|
4
|
+
version: 1.0.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ryota Arai
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-11-
|
|
11
|
+
date: 2014-11-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: thor
|
|
@@ -30,14 +30,14 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 2.1
|
|
33
|
+
version: '2.1'
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - "~>"
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 2.1
|
|
40
|
+
version: '2.1'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: hashie
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -114,14 +114,14 @@ dependencies:
|
|
|
114
114
|
requirements:
|
|
115
115
|
- - "~>"
|
|
116
116
|
- !ruby/object:Gem::Version
|
|
117
|
-
version: 2.1
|
|
117
|
+
version: '2.1'
|
|
118
118
|
type: :development
|
|
119
119
|
prerelease: false
|
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
|
121
121
|
requirements:
|
|
122
122
|
- - "~>"
|
|
123
123
|
- !ruby/object:Gem::Version
|
|
124
|
-
version: 2.1
|
|
124
|
+
version: '2.1'
|
|
125
125
|
- !ruby/object:Gem::Dependency
|
|
126
126
|
name: pry-byebug
|
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|