gorgon 0.10.5 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe52cba1d84d676b228d5a80486de29a191e036
-  data.tar.gz: 0d2b782f2957592f67bd27b307421faeb35f7180
+  metadata.gz: 4c7715c6f11333845258e304eec73544db11135d
+  data.tar.gz: f4f2c0ca24b61ebd1e238673dbba746bb30a787f
 SHA512:
-  metadata.gz: b987bad8d1d4ef05df182d97b3617e02991cc8b0e99a3337c3948eb72ed4995838e44d269d1eb9d74e6a5a662536d5674b43a8bdbd99e8decd49f406691e12f8
-  data.tar.gz: 059f7e2f0be2d86d78c37903d2490634afe85e86956b4cfce6845056e09e876f6f772a750c4864689cc59d6b5a5cf1914249bd3ab826c996f24f24d9aba74288
+  metadata.gz: 16092b5b748104343f172c539d2dd0a8e625ce2c06bb628d717e4140729c2e77536e91c68914774241eb0ba242fd9c523434915d8908239c79e1ddf2061f16e8
+  data.tar.gz: 2a08a60a432b19c46ab7170cb2c4e0061fa9a8c1cc2b42b635a54d2d342457ba92929dbc936a460c97bf8aef20b24148e9108548ef9fa7c49222575ddae148b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gorgon (0.10.5)
+    gorgon (0.11.0)
       amq-protocol (~> 1.9.2)
       amqp (~> 1.1.0)
       awesome_print
@@ -48,4 +48,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.12.5
+   1.13.1

data/bin/gorgon

@@ -16,7 +16,7 @@ WELCOME_MSG = "Welcome to Gorgon #{Gorgon::VERSION}"
 
 def start
   o = Originator.new
-  o.originate
+  exit o.originate
 end
 
 def listen
@@ -77,7 +77,7 @@ end
 case ARGV[0] # special case for 'version', because we don't need the welcome message telling us the version when we're explicitly asking for it
 when "version", "--version"
   puts Gorgon::VERSION
-  exit 0
+  exit
 end
 
 puts WELCOME_MSG
@@ -87,7 +87,7 @@ when nil
   start
 when "help", "--help"
   usage
-  exit 0
+  exit
 when "start"
   start
 when "listen"

data/lib/gorgon/originator.rb

@@ -18,6 +18,12 @@ require 'socket'
 class Originator
   include Configuration
 
+  SPEC_SUCCESS_EXIT_STATUS = 0
+  SPEC_FAILURE_EXIT_STATUS = 1
+  SYNC_ERROR_EXIT_STATUS = 2
+  ERROR_EXIT_STATUS = 3
+
+
   def initialize
     @configuration = nil
   end
@@ -27,8 +33,9 @@ class Originator
       Signal.trap("INT") { ctrl_c }
       Signal.trap("TERM") { ctrl_c }
 
-      publish
+      exit_status = publish
       @logger.log "Originator finished successfully"
+      exit_status
     rescue StandardError
       $stderr.puts "Unhandled exception in originator:"
       $stderr.puts $!.message
@@ -37,7 +44,7 @@ class Originator
       $stderr.puts "Now attempting to cancel the job."
       @logger.log_error "Unhandled Exception!" if @logger
       cancel_job
-      exit 2
+      exit ERROR_EXIT_STATUS
     end
   end
 
@@ -51,11 +58,13 @@ class Originator
   end
 
   def publish
+    exit_status = SPEC_SUCCESS_EXIT_STATUS
+
     @logger = OriginatorLogger.new configuration[:originator_log_file]
 
     if files.empty?
       $stderr.puts "There are no files to test! Quitting."
-      exit 2
+      exit ERROR_EXIT_STATUS
     end
 
     cluster_id = callback_handler.before_originate
@@ -68,7 +77,7 @@ class Originator
       publish_files_and_job
 
       @protocol.receive_payloads do |payload|
-        handle_reply(payload)
+        exit_status |= handle_reply(payload)
       end
 
       @protocol.receive_new_listener_notifications do |payload|
@@ -77,6 +86,7 @@ class Originator
     end
 
     callback_handler.after_job_finishes
+    exit_status
   end
 
   def publish_files_and_job
@@ -105,7 +115,7 @@ class Originator
       $stderr.puts "Command '#{syncer.sys_command}' failed!"
       $stderr.puts "Stdout:\n#{syncer.output}"
       $stderr.puts "Stderr:\n#{syncer.errors}"
-      exit 1
+      exit SYNC_ERROR_EXIT_STATUS
     end
   end
 
@@ -138,6 +148,7 @@ class Originator
     # ap payload
 
     cleanup_if_job_complete
+    exit_status(payload)
   end
 
   def handle_new_listener_notification(payload)
@@ -181,6 +192,11 @@ class Originator
 
   private
 
+  def exit_status(payload)
+    return SPEC_FAILURE_EXIT_STATUS if ["crash", "exception", "fail"].include?(payload[:type])
+    SPEC_SUCCESS_EXIT_STATUS
+  end
+
   def sync_configuration
     configuration[:job].
       fetch(:sync, {}).

data/lib/gorgon/version.rb

@@ -1,3 +1,3 @@
 module Gorgon
-  VERSION = "0.10.5"
+  VERSION = "0.11.0"
 end

data/spec/originator_spec.rb

@@ -33,6 +33,17 @@ describe Originator do
       @originator.publish
     end
 
+    it "propagates the success result of handle_reply" do
+      @originator.publish.should eq Originator::SPEC_SUCCESS_EXIT_STATUS
+    end
+
+    it "propagates the error result of handle_reply" do
+      OriginatorProtocol.should_receive(:new).and_return(protocol)
+      protocol.should_receive(:receive_payloads).and_yield(Yajl::Encoder.encode({:type => 'fail'}))
+
+      @originator.publish.should eq Originator::SPEC_FAILURE_EXIT_STATUS
+    end
+
     it "creates a ProgressBarView and show" do
       JobState.stub(:new).and_return job_state
       ProgressBarView.should_receive(:new).with(job_state).and_return progress_bar_view
@@ -83,7 +94,7 @@ describe Originator do
 
     it "exits with a non-zero status code when the originator crashes" do
       originator_logger.stub(:log_error)
-      $stderr = StringIO.new # slurp up the error output so we don't pollute the rsync run
+      $stderr = StringIO.new # slurp up the error output so we don't pollute the rspec run
       CallbackHandler.any_instance.should_receive(:before_originate).and_throw("I'm an unhandled exception")
 
       expect { @originator.originate }.to raise_error(SystemExit) do |error|
@@ -138,6 +149,29 @@ describe Originator do
       @originator.publish
     end
 
+    it "returns SPEC_SUCCESS_EXIT_STATUS when payload[:action] is start" do
+      job_state.stub(:file_started)
+      @originator.handle_reply(start_payload).should eq Originator::SPEC_SUCCESS_EXIT_STATUS
+    end
+
+    it "returns SPEC_SUCCESS_EXIT_STATUS when payload[:action] is finish" do
+      job_state.stub(:file_finished)
+      @originator.handle_reply(finish_payload).should eq Originator::SPEC_SUCCESS_EXIT_STATUS
+    end
+
+    it "returns SPEC_FAILURE_EXIT_STATUS when payload[:action] is crash" do
+      job_state.stub(:gorgon_crash_message)
+      @originator.handle_reply(Yajl::Encoder.encode(gorgon_crash_message)).should eq Originator::SPEC_FAILURE_EXIT_STATUS
+    end
+
+    it "returns SPEC_FAILURE_EXIT_STATUS when payload[:action] is exception" do
+      @originator.handle_reply(Yajl::Encoder.encode({:type => 'exception'})).should eq Originator::SPEC_FAILURE_EXIT_STATUS
+    end
+
+    it "returns SPEC_FAILURE_EXIT_STATUS when payload[:action] is fail" do
+      @originator.handle_reply(Yajl::Encoder.encode({:type => 'fail'})).should eq Originator::SPEC_FAILURE_EXIT_STATUS
+    end
+
     it "calls cleanup_if_job_complete" do
       @originator.should_receive(:cleanup_if_job_complete)
       @originator.handle_reply finish_payload

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.11.0
 platform: ruby
 authors:
 - Justin Fitzsimmons
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -400,8 +400,87 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gorgon
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Distributed testing for ruby with centralized management
-test_files: []
+test_files:
+- spec/acceptance_spec_helper.rb
+- spec/callback_handler_spec.rb
+- spec/crash_reporter_spec.rb
+- spec/failures_printer_spec.rb
+- spec/gem_command_handler_spec.rb
+- spec/gem_service_spec.rb
+- spec/gorgon_rspec_formatter_spec.rb
+- spec/host_state_spec.rb
+- spec/job_definition_spec.rb
+- spec/job_state_spec.rb
+- spec/listener_spec.rb
+- spec/mini_test_runner_spec.rb
+- spec/originator_logger_spec.rb
+- spec/originator_protocol_spec.rb
+- spec/originator_spec.rb
+- spec/ping_service_spec.rb
+- spec/pipe_forker_spec.rb
+- spec/progress_bar_view_spec.rb
+- spec/rspec_runner_spec.rb
+- spec/rsync_daemon_spec.rb
+- spec/runtime_file_reader_spec.rb
+- spec/runtime_recorder_spec.rb
+- spec/shutdown_manager_spec.rb
+- spec/source_tree_syncer_spec.rb
+- spec/support/mock_app/.gitignore
+- spec/support/mock_app/Gemfile
+- spec/support/mock_app/Gemfile.lock
+- spec/support/mock_app/README.rdoc
+- spec/support/mock_app/Rakefile
+- spec/support/mock_app/app/assets/images/rails.png
+- spec/support/mock_app/app/assets/javascripts/application.js
+- spec/support/mock_app/app/assets/stylesheets/application.css
+- spec/support/mock_app/app/controllers/application_controller.rb
+- spec/support/mock_app/app/helpers/application_helper.rb
+- spec/support/mock_app/app/mailers/.gitkeep
+- spec/support/mock_app/app/models/.gitkeep
+- spec/support/mock_app/app/views/layouts/application.html.erb
+- spec/support/mock_app/config.ru
+- spec/support/mock_app/config/application.rb
+- spec/support/mock_app/config/boot.rb
+- spec/support/mock_app/config/database.yml
+- spec/support/mock_app/config/environment.rb
+- spec/support/mock_app/config/environments/development.rb
+- spec/support/mock_app/config/environments/production.rb
+- spec/support/mock_app/config/environments/test.rb
+- spec/support/mock_app/config/initializers/backtrace_silencers.rb
+- spec/support/mock_app/config/initializers/inflections.rb
+- spec/support/mock_app/config/initializers/mime_types.rb
+- spec/support/mock_app/config/initializers/secret_token.rb
+- spec/support/mock_app/config/initializers/session_store.rb
+- spec/support/mock_app/config/initializers/wrap_parameters.rb
+- spec/support/mock_app/config/locales/en.yml
+- spec/support/mock_app/config/routes.rb
+- spec/support/mock_app/db/seeds.rb
+- spec/support/mock_app/doc/README_FOR_APP
+- spec/support/mock_app/lib/assets/.gitkeep
+- spec/support/mock_app/lib/tasks/.gitkeep
+- spec/support/mock_app/log/.gitkeep
+- spec/support/mock_app/public/404.html
+- spec/support/mock_app/public/422.html
+- spec/support/mock_app/public/500.html
+- spec/support/mock_app/public/favicon.ico
+- spec/support/mock_app/public/index.html
+- spec/support/mock_app/public/robots.txt
+- spec/support/mock_app/script/rails
+- spec/support/mock_app/test/fixtures/.gitkeep
+- spec/support/mock_app/test/functional/.gitkeep
+- spec/support/mock_app/test/integration/.gitkeep
+- spec/support/mock_app/test/performance/browsing_test.rb
+- spec/support/mock_app/test/test_helper.rb
+- spec/support/mock_app/test/unit/.gitkeep
+- spec/support/mock_app/test/unit/passing_test.rb
+- spec/support/mock_app/vendor/assets/javascripts/.gitkeep
+- spec/support/mock_app/vendor/assets/stylesheets/.gitkeep
+- spec/support/mock_app/vendor/plugins/.gitkeep
+- spec/support/originator_handler.rb
+- spec/unknown_runner_spec.rb
+- spec/worker_manager_spec.rb
+- spec/worker_spec.rb