rrrspec-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bb28a7f4856de6b9c3a5651ffc7f00113a45ad5
-  data.tar.gz: 1348d0ce0fcde3155807c68e93433a7b4d3b230e
+  metadata.gz: 42574e076b04542d0eecc44df4febbd998269773
+  data.tar.gz: f9a29a0cb9f874a766368a881aafb83286f61ffb
 SHA512:
-  metadata.gz: f4fc4ea1c4d9748a1b34111dd056335f728a3564c56ee62db67f5f9e131ea01facf9a19ba4a289619a78326257771dd44ace25d9c6a36c6e511f297f9461bb75
-  data.tar.gz: 6a0d664af9ac6ba07a436417eebe8c533b27bac28c5f7186410df28a6970cdbe28a7a44229c8107e1d5ebd33b2641d39cdf450f44870fc9192282b63fb313d93
+  metadata.gz: 95afaea9791ba051201805f13bd390138183f12990c1b1214b251533edba3067bd33848c3f1adb36d4ee784e6598db6ca2a8a32dcb9927749a7936083606be20
+  data.tar.gz: 64937c8e6eea66d34f45df44f550c0f65e298a403e69d86d0600b86be1b1662af7ca2709309d10aa0aa0c9672ff69cbba4fd252e974ef196025f06d70a78d6cc

data/lib/rrrspec/client/cli.rb

@@ -114,12 +114,13 @@ module RRRSpec
 
       option :'failure-exit-code', type: :numeric, default: 1
       option :verbose, type: :boolean, default: false
+      option :'show-errors', type: :boolean, default: false
       desc 'show', 'show the result of the taskset'
       def show(taskset_id)
         setup(Configuration.new)
         taskset = Taskset.new(taskset_id)
         exit 1 unless taskset.exist?
-        Support.show_result(taskset, options[:verbose])
+        Support.show_result(taskset, options[:verbose], options[:'show-errors'])
 
         if taskset.status != 'succeeded'
           exit options[:'failure-exit-code']
@@ -128,7 +129,7 @@ module RRRSpec
 
       desc 'slave', 'run RRRSpec as a slave'
       def slave(working_dir=nil, taskset_key=nil)
-        $0 = 'rrrspec slave'
+        $0 = "rrrspec slave[#{ENV['SLAVE_NUMBER']}]"
         working_dir ||= ENV['RRRSPEC_WORKING_DIR']
         taskset_key ||= ENV['RRRSPEC_TASKSET_KEY']
         exit 1 unless taskset_key && working_dir

data/lib/rrrspec/client/slave_runner.rb

@@ -58,6 +58,7 @@ module RRRSpec
           trial = Trial.create(task, @slave)
 
           @rspec_runner.reset
+          $0 = "rrrspec slave[#{ENV['SLAVE_NUMBER']}]: setting up #{task.spec_file}"
           status, outbuf, errbuf = @rspec_runner.setup(File.join(@working_path, task.spec_file))
           unless status
             trial.finish('error', outbuf, errbuf, nil, nil, nil)
@@ -69,6 +70,7 @@ module RRRSpec
 
           formatter = RedisReportingFormatter
           trial.start
+          $0 = "rrrspec slave[#{ENV['SLAVE_NUMBER']}]: running #{task.spec_file}"
           status, outbuf, errbuf = ExtremeTimeout::timeout(
             hard_timeout_sec, TIMEOUT_EXITCODE
           ) do
@@ -85,6 +87,8 @@ module RRRSpec
 
           ArbiterQueue.trial(trial)
         end
+      ensure
+        $0 = "rrrspec slave[#{ENV['SLAVE_NUMBER']}]"
       end
 
       class RedisReportingFormatter

data/lib/rrrspec/client/support.rb

@@ -40,7 +40,29 @@ module RRRSpec
         return taskset
       end
 
-      def show_result(taskset, verbose=false)
+      def show_result(taskset, verbose=false, show_errors=false)
+        if show_errors
+          puts "Failed Tasks:\n\n"
+          taskset.tasks.each do |task|
+            if task.status == "failed"
+              trial = task.trials.detect { |t| t.status == "failed" }
+              stdout = trial.stdout
+              puts "Task: #{task.spec_file}\n\n"
+              unless stdout.blank?
+                puts "\tSTDOUT:"
+                stdout.each_line { |line| puts "\t#{line}" }
+              end
+              stderr = trial.stderr
+              unless stderr.blank?
+                puts "STDERR:"
+                stderr.each_line { |line| puts "\t#{line}" }
+              end
+              puts "\n"
+            end
+          end
+          puts
+        end
+
         puts "Status:    #{taskset.status}"
         puts "Created:   #{taskset.created_at}"
         puts "Finished:  #{taskset.finished_at}"
@@ -52,7 +74,7 @@ module RRRSpec
           puts
 
           puts "Log:"
-          taskset.log.split("\n").each { |line| puts "\t#{line}" }
+          taskset.log.each_line { |line| puts "\t#{line}" }
           puts
 
           puts "Workers:"
@@ -63,7 +85,7 @@ module RRRSpec
             puts "\tSetup Finished: #{worker_log.setup_finished_at}"
             puts "\tFinished:       #{worker_log.finished_at}"
             puts "\tLog:"
-            worker_log.log.split("\n").each { |line| puts "\t\t#{line}" }
+            worker_log.log.each_line { |line| puts "\t\t#{line}" }
           end
           puts
 
@@ -76,7 +98,7 @@ module RRRSpec
               puts "\t\t#{trial.key}"
             end
             puts "\tLog:"
-            slave.log.split("\n").each { |line| puts "\t\t#{line}" }
+            slave.log.each_line { |line| puts "\t\t#{line}" }
           end
           puts
 
@@ -98,12 +120,12 @@ module RRRSpec
               stdout = trial.stdout
               if stdout
                 puts "\t\tSTDOUT:"
-                stdout.split("\n").each { |line| puts "\t\t\t#{line}" }
+                stdout.each_line { |line| puts "\t\t\t#{line}" }
               end
               stderr = trial.stderr
               if stderr
                 puts "\t\tSTDERR:"
-                stderr.split("\n").each { |line| puts "\t\t\t#{line}" }
+                stderr.each_line { |line| puts "\t\t\t#{line}" }
               end
             end
           end

data/lib/rrrspec/client/version.rb

@@ -1,5 +1,5 @@
 module RRRSpec
   module Client
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrrspec-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Masaya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler