itamae 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7c058fb908e33acf3e8c5f97bd56b39532df70a
-  data.tar.gz: 5c8164aad7d68c4a745cc14eb7a6903e3acc1401
+  metadata.gz: b5a45cfaeda3bb5e4e61661cd767be084f659e72
+  data.tar.gz: 1803f3503284299d63e2d2e428022b90415505a5
 SHA512:
-  metadata.gz: 2781bd7cd7f012c464b6ba484e8c3a287c71a1e52d020838ab6b94c1941493347b53f366a3dce36ac0284ee5e474b3043a947b332aee9a7202698faf280106af
-  data.tar.gz: 2c40ca0c74cb5d735f854495aa28d453069c3ca24b15f775b63240bb819f861a91fd7d6067fc29c2d9825b8291a5af5b7952cf6d3b4e8da5ac33028243822d63
+  metadata.gz: 8f3297c41caf1822b2d3862ff362e283a2eef44d8f08be4cffeb6f2925d9ec6ba514c1c9a6934140f1fd31bfaa2ad2d29022dc0f7d932dd8acfa33571899024a
+  data.tar.gz: 91d5ab6005863e347d9e48682872d33d3c1fdaf040ebdf81f75f9281647253c7eadbc7fb42f6cf345f081351c51505501c0271199c5c4aca7c312a89663fe70e

data/itamae.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", "~> 2.1.0"
+  spec.add_runtime_dependency "specinfra", "~> 2.1"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "serverspec", "~> 2.1.0"
+  spec.add_development_dependency "serverspec", "~> 2.1"
   spec.add_development_dependency "pry-byebug"
 end

data/lib/itamae/cli.rb

@@ -15,6 +15,7 @@ module Itamae
 
     desc "local RECIPE [RECIPE...]", "Run Itamae locally"
     option :node_json, type: :string, aliases: ['-j']
+    option :node_yaml, type: :string, aliases: ['-y']
     option :dry_run, type: :boolean, aliases: ['-n']
     option :ohai, type: :boolean, default: false
     def local(*recipe_files)
@@ -27,6 +28,7 @@ module Itamae
 
     desc "ssh RECIPE [RECIPE...]", "Run Itamae via ssh"
     option :node_json, type: :string, aliases: ['-j']
+    option :node_yaml, type: :string, aliases: ['-y']
     option :dry_run, type: :boolean, aliases: ['-n']
     option :host, required: true, type: :string, aliases: ['-h']
     option :user, type: :string, aliases: ['-u']

data/lib/itamae/runner.rb

@@ -1,5 +1,6 @@
 require 'itamae'
 require 'json'
+require 'yaml'
 
 module Itamae
   class Runner
@@ -35,6 +36,12 @@ module Itamae
           hash.merge!(JSON.load(open(path)))
         end
 
+        if options[:node_yaml]
+          path = File.expand_path(options[:node_yaml])
+          Logger.info "Loading node data from #{path}..."
+          hash.merge!(YAML.load(open(path)))
+        end
+
         Node.new(hash)
       end
 

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.7
+1.0.8

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement