hotdog 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9389d9529203f20a278c0446d57c1ae72e57cb99
-  data.tar.gz: 807eab226a18b286a38a7968bfb98ed27525b657
+  metadata.gz: 4fbfa980ec0c4cb06df790c420adc03aafc5a71e
+  data.tar.gz: c348fd469bd7acc63c0e85ecd7e53db1c30d16d7
 SHA512:
-  metadata.gz: ef097ee620a3e70d38195b5f4f6ea32f4d7f439962f68495e7d6997e2e667f963d3ef6bff1395ab524cf5ac0f3a60b812a783a542f5bd74082e207971b96a821
-  data.tar.gz: e97de69542e3559ea62b19d1a35fb3d3c2ec30102719596050e15b66ab6e7cff06f05a202670a3a9ce054eac576938f8ebbc698fde046009c4d4036327e652d0
+  metadata.gz: ef1af21553c95bc8cc2c9043441416fd4d167b2da04d0fadd724bd446f4633d248632cfd096d3349129815b9e654761dd08f2052a7d450bae8f1105f4c07566d
+  data.tar.gz: 457b99d664a0f96be234f52787b2d8343f3fad0bbb550196990a916433179718d57fb109915b2d076dc6c1367d956af29bfd7976171696cc98b513e6385dca51

data/lib/hotdog/commands/pssh.rb

@@ -10,26 +10,40 @@ module Hotdog
   module Commands
     class Pssh < SshAlike
       def define_options(optparse, options={})
-        default_option(options, :show_identifier, true)
         super
+        default_option(options, :show_identifier, true)
         optparse.on("--[no-]identifier", "Each output line will be prepended with identifier.") do |identifier|
           options[:show_identifier] = identifier
         end
+        optparse.on("--stop-on-error", "Stop execution when a remote command fails (valid only if -P is set)") do |v|
+          options[:stop_on_error] = v
+        end
       end
 
       private
       def run_main(hosts, options={})
-        stats = Parallel.map(hosts.each_with_index.to_a, in_threads: parallelism(hosts)) { |host, i|
-          cmdline = build_command_string(host, @remote_command, options)
-          identifier = options[:show_identifier] ? host : nil
-          exec_command(identifier, cmdline, index: i, output: true)
-        }
-        if stats.all?
-          exit(0)
-        else
+        begin
+          stats = Parallel.map(hosts.each_with_index.to_a, in_threads: parallelism(hosts)) { |host, i|
+            cmdline = build_command_string(host, @remote_command, options)
+            identifier = options[:show_identifier] ? host : nil
+            success = exec_command(identifier, cmdline, index: i, output: true)
+            if !success && options[:stop_on_error]
+              raise StopException.new
+            end
+          }
+          if stats.all?
+            exit(0)
+          else
+            exit(1)
+          end
+        rescue StopException
+          logger.info("stopped.")
           exit(1)
         end
       end
+
+      class StopException < StandardError
+      end
     end
   end
 end

data/lib/hotdog/commands/search.rb

@@ -196,8 +196,8 @@ module Hotdog
         }
         rule(:identifier_glob) {
           ( binary_op.absent? >> unary_op.absent? >> identifier.repeat(0) >> (glob >> identifier.maybe).repeat(1) \
-          | binary_op >> identifier.repeat(1) >> (glob >> identifier.maybe).repeat(1) \
-          | unary_op >> identifier.repeat(1) >> (glob >> identifier.maybe).repeat(1) \
+          | binary_op >> (glob >> identifier.maybe).repeat(1) \
+          | unary_op >> (glob >> identifier.maybe).repeat(1) \
           )
         }
         rule(:identifier) {
@@ -217,8 +217,8 @@ module Hotdog
         }
         rule(:attribute_glob) {
           ( binary_op.absent? >> unary_op.absent? >> attribute.repeat(0) >> (glob >> attribute.maybe).repeat(1) \
-          | binary_op >> attribute.repeat(1) >> (glob >> attribute.maybe).repeat(1) \
-          | unary_op >> attribute.repeat(1) >> (glob >> attribute.maybe).repeat(1) \
+          | binary_op >> (glob >> attribute.maybe).repeat(1) \
+          | unary_op >> (glob >> attribute.maybe).repeat(1) \
           )
         }
         rule(:attribute) {

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler