rundock-plugin-operation-itamae 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2010cef61246f61f4a878f4b8070ce7ec3ddd058
-  data.tar.gz: cc00a387057c70085701d46f96044191330de5a3
+  metadata.gz: 2b429255d4f8e9e4b4b0e6678c80f243dd118918
+  data.tar.gz: 64ef23ea60e8ee08e570370e67375dfa37723e28
 SHA512:
-  metadata.gz: 5d88ecc29bcc80247037e3b289a15e43dcbc0f8ac13f8ea4c3852e4cc3a695d1fe2343de7e91f32427ba6ec3fe205d3b1a679599391599ff8524f92f3942672d
-  data.tar.gz: 0ef1f8369ac66c766802725c00f80c75e9cf26724ab279de628bbbd6d7c7cf5635ddf04f58f328bc9b8e2db01ec80ef599122712f20f34e638fc8d57c1d43ad1
+  metadata.gz: d78377d56d7f61e62b0d6f99a4eb1689f48334078357acc69bebdc2910cd6073f8c7b7569d07918c842540ac71baa508b8190a760ae7df1a5f0a95897ea4c117
+  data.tar.gz: 6cf74a382fa32936388aa0b1b91c0c9ed04440e461a7f58e836246323253890499483d4781c2535cf4a369817073037dba7b317bfddf27afa302bc287905c5d0

data/.gitignore

@@ -8,6 +8,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+Gemfile.lock
 
 ## Specific to RubyMotion:
 .dat*

data/lib/rundock/plugin/operation/itamae.rb

@@ -28,10 +28,29 @@ module Rundock
           arg.each { |k, v| options[k] = v } if arg.is_a?(Hash)
         end
 
-        options[:log_level] = 'info' unless options[:log_level]
-        ::Itamae::Logger.level = ::Logger.const_get(options[:log_level].upcase)
-        ::Itamae::Logger.formatter.colored = options[:color]
-        ::Itamae::Runner.run(recipe_files, :local, options)
+        unless recipe_files.empty?
+          options.merge!(filter_itamae_ssh_opts(attributes[:nodeinfo])) if attributes[:nodeinfo]
+          options[:log_level] = 'info' unless options[:log_level]
+          options[:color] = true unless options[:color]
+          ::Itamae::Logger.level = ::Logger.const_get(options[:log_level].upcase)
+          ::Itamae::Logger.formatter.colored = options[:color]
+
+          if options[:host] == 'localhost' || options[:host] == '127.0.1'
+            type = :local
+          else
+            type = :ssh
+          end
+
+          ::Itamae::Runner.run(recipe_files, type, options)
+        end
+      end
+
+      private
+
+      def filter_itamae_ssh_opts(options)
+        opts = {}
+        [:host, :user, :key, :port].each { |o| opts[o] = options[o] }
+        opts
       end
     end
   end

data/lib/rundock/plugin/operation/itamae/version.rb

@@ -2,7 +2,7 @@ module Rundock
   module Plugin
     module Operation
       module Itamae
-        VERSION = "0.1.1"
+        VERSION = "0.1.2"
       end
     end
   end

data/scenario_sample.yml

@@ -1,14 +1,14 @@
 - node: anyhost-01
   itamae:
-    - /tmp/nginx.rb
-    - /tmp/mysql.rb
-    - node_json: /tmp/attr.js
+    - /local/path/to/nginx.rb
+    - /local/path/to/mysql.rb
+    - node_json: /local/path/to/attr.js
       log_level: info
 ---
 anyhost-01:
-  host: 172.30.4.225
+  host: 192.168.10.11
   ssh_opts:
-    port: 10022
-    user: hiraishi_yosuke
-    key:  ~/.ssh/id_rsa_hiraishi
+    port: 22
+    user: anyuser
+    key:  ~/.ssh/id_rsa
 ---

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock-plugin-operation-itamae
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,71 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rundock-plugin-operation-itamae (0.1.0)
-      itamae
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.5.0)
-    diff-lcs (1.2.5)
-    hashie (3.4.2)
-    itamae (1.4.3)
-      ansi
-      hashie
-      schash (~> 0.1.0)
-      specinfra (>= 2.37.0, < 3.0.0)
-      thor
-    multi_json (1.11.2)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    net-telnet (0.1.1)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.3.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rundock (0.2.5)
-      ansi
-      net-ssh
-      specinfra (>= 2.31.0, < 3.0.0)
-      thor
-    schash (0.1.2)
-    serverspec (2.20.0)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.38)
-    sfl (2.2)
-    specinfra (2.40.0)
-      net-scp
-      net-ssh (~> 2.7)
-      net-telnet
-      sfl
-    thor (0.19.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.9)
-  rake (~> 10.0)
-  rundock
-  rundock-plugin-operation-itamae!
-  serverspec (~> 2.1)
-
-BUNDLED WITH
-   1.10.6