rrrspec-client 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fb74dbf9aa3e2b12c2d51c63e46632d6d2b992a
-  data.tar.gz: 80cec3673033f7a65805551e7abece532e879f6f
+  metadata.gz: bc0bd45192864107abed41a62aaad984c9641377
+  data.tar.gz: 7fb8b34606f62919981cbf09abd27ac92d0d75c8
 SHA512:
-  metadata.gz: b68cb648b7a1d79a36e771780341cff32d3a118cde5b7419486c1cfa23b5625bf301e577069ad37b9ecbeea9342fbf90421bf749519807fbe27b76c533b865f9
-  data.tar.gz: 4c7c3eac4c52f74156fe76723d7ae6c97ff15bef513a75d5ee3105e25a3a397586b84598db6c022bdb042521f7b7700d4d6a5c147096e63318ebd14a53f580c1
+  metadata.gz: ee417362100dec1e4de63f7bf7c88edcf5edca3f14cf3b927a5936112eccfed0560021ab22baaa9175f3e7511853c391cb896568cd2a11f4d616a7dbc1575d6f
+  data.tar.gz: a65069cdd02e5986f1de031021137ff77324e32a46aa43760fcdc7679244d775de6a6d17ea615ecbe47a7c2dade986a8eb3c009c0eb52ac87acbea22a37d82f6

data/lib/rrrspec.rb

@@ -2,6 +2,7 @@ require 'redis'
 # XXX: With activesupport 4.1, we cannot require active_support/core_ext due to
 # "uninitialized constant ActiveSupport::Autoload (NameError)".
 require 'active_support/dependencies/autoload'
+require 'active_support/deprecation'
 require 'active_support/core_ext'
 require 'active_support/time'
 require 'socket'

data/lib/rrrspec/client/cli.rb

@@ -68,7 +68,16 @@ module RRRSpec
       def nodes
         setup(Configuration.new)
         puts "Workers:"
-        Worker.list.each { |worker| puts "\t#{worker.key}" }
+        workers = Hash.new { |h, k| h[k] = [] }
+        Worker.list.each do |worker|
+          workers[worker.worker_type] << worker.key
+        end
+        workers.keys.sort.each do |k|
+          puts "  #{k}:"
+          workers[k].sort.each do |name|
+            puts "    #{name}"
+          end
+        end
       end
 
       option :pollsec, type: :numeric, default: WAIT_POLLING_SEC
@@ -79,8 +88,17 @@ module RRRSpec
         exit(1) unless taskset.exist?
 
         rd, wt = IO.pipe
-        Signal.trap(:TERM) { wt.write("1") }
-        Signal.trap(:INT) { wt.write("1") }
+
+        cancelled = false
+        do_cancel = proc {
+          exit(1) if cancelled
+
+          $stderr.puts "Cancelling taskset... (will force quit on next signal)"
+          wt.write '1'
+          cancelled = true
+        }
+        Signal.trap(:TERM, do_cancel)
+        Signal.trap(:INT, do_cancel)
 
         loop do
           rs, ws, = IO.select([rd], [], [], options[:pollsec])
@@ -89,6 +107,7 @@ module RRRSpec
           elsif rs.size != 0
             rs[0].getc
             taskset.cancel
+            break
           end
         end
       end

data/lib/rrrspec/client/support.rb

@@ -4,7 +4,7 @@ module RRRSpec
       module_function
 
       def start_taskset(conf, rsync_name)
-        $stderr.puts '1/3) Making a package...'
+        $stderr.puts '1/3) Start rsync...'
         if is_using_rsync?(rsync_name)
           $stderr.puts 'It seems you are running rrrspec already'
           $stderr.puts 'Please wait until the previous run finishes'
@@ -15,7 +15,7 @@ module RRRSpec
           exit 1
         end
 
-        $stderr.puts '2/3) Uploading the package...'
+        $stderr.puts '2/3) Creating a new taskset...'
         taskset = Taskset.create(
           rsync_name,
           conf.setup_command,

data/lib/rrrspec/client/version.rb

@@ -1,5 +1,5 @@
 module RRRSpec
   module Client
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrrspec-client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Masaya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler