travis_parallel_sentinel 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aa5ab88dfac88344db98e17462a68bcd8177a6c
-  data.tar.gz: beb3c18247afc7947c573a9942f8842a3577c0dd
+  metadata.gz: 9d4c31bdf6e1827e31b044b60cd9b0cae57fd165
+  data.tar.gz: 0e26eff5c5db4f56435d7a029922fb6d1d4843db
 SHA512:
-  metadata.gz: 4220e44851f77b6bcda39d37addbfe62651de07ef0209fee751620abc1fd02533d3ffcb582cefc1cf1133b9252aef5d2b5ec8967e5182ab68596a23704f36b79
-  data.tar.gz: 907375f09fc7aaa077a0064aafd6fb357f2370f8783b1c141b9643431a9e6632637f0fa318f59386705a80105cca00c44d6172523ca6303f75326a9ff2136c06
+  metadata.gz: 9510cca75f2b3edbe1dac428f6d9a0334f0cde90e369e3e0258a180be888a50825036aed74814d388f3741bf019a17e1a69d95a1c98c0179387729c64decddde
+  data.tar.gz: 770590fa4e0faae85677fb1ee21e7fa334ce9aa1012254702cf2d4e6bbcce1d13150d1f4a2b520bd627d939876a5f93ff80c1d7410b74f734c45381934674d4f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis_parallel_sentinel (0.1.0)
+    travis_parallel_sentinel (0.1.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -5,29 +5,17 @@ Simple parallel build coordination for Travis.
 Until https://github.com/travis-ci/travis-ci/issues/929 is resolved, you can use this to coordinate your builds. Install
 the gem, and you can do the following in your build scripts:
 
-    STATUS=$(travis_parallel_sentinel)
-    case $STATUS in
-      ok)
-        echo 'All clear'
-        exit 0
-        ;;
-      deploy)
-        echo 'All builds green'
-        ;;
-      *)
-        echo "Unexpected build status $STATUS"
-        exit 1
-        ;;
-    esac
-    
-    # do your deploy work here
-
-The bundled script will return `ok` for anything but the primary build; for the primary build, it will error out if any
+    if [ "$(travis_parallel_sentinel script)" = "deploy" ]; then
+      :
+      # do your deploy work here
+    fi
+
+The bundled script will return no output for anything but the primary build; for the primary build, it will error out if any
 of the other builds have, and will return `deploy` if all went well. This is meant to run *as part of your tests*, as
 that will cause your build to error out if the deploy fails.
 
 If you want to have the standard Travis behavior, that is, have builds go green even if the deploy step fails, run the
-above in your after\_X step, but do `STATUS=$(travis_parallel_sentinel include)` to include the primary build status in
+above in your after\_X step, but do `$(travis_parallel_sentinel after)` to include the primary build status in
 the success assessment.
 
 ## Installation

data/bin/travis_parallel_sentinel

@@ -3,11 +3,12 @@
 require "bundler/setup"
 require "travis_parallel_sentinel"
 
-if ARGV[0] == 'include'
-  puts TravisParallelSentinel::status(true)
-elsif ARGV[0].to_s == ''
-  puts TravisParallelSentinel::status(false)
-else
-  STDERR.puts "Unexpected argument #{ARGV[0]}, expected none or 'include'"
-  exit 1
+begin
+  status = TravisParallelSentinel::status(ARGV[0])
+  status = '' if status == :ok
+  puts status
+  exit(0)
+rescue => e
+  STDERR.puts "#{e}"
+  exit(1)
 end

data/lib/travis_parallel_sentinel/version.rb

@@ -1,3 +1,3 @@
 module TravisParallelSentinel
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/travis_parallel_sentinel.rb

@@ -1,23 +1,37 @@
 require "travis_parallel_sentinel/version"
 require 'open-uri'
 require 'json'
+require 'ostruct'
 
 TRAVIS_JOB_NUMBER = ENV['TRAVIS_JOB_NUMBER'].to_s.strip
 TRAVIS_BUILD_ID   = ENV['TRAVIS_BUILD_ID'].to_s.strip
 
 module TravisParallelSentinel
-  def status(include_deployer=false)
+  def result(job)
+    prefix = "#{job.number}="
+    return prefix + 'running' if job.result.nil?
+    return prefix + 'ok' if job.result == 0
+    return prefix + 'failed'
+  end
+  def results(jobs)
+    return jobs.collect{|job| result(job)}.join(', ')
+  end
+
+  def status(phase)
+    raise "Unexpected phase #{phase}, expected 'script' or 'after'" unless %w{script after}.include?(phase.to_s.downcase)
+    phase = phase.to_s.downcase.to_sym
+
     return :deploy  if TRAVIS_JOB_NUMBER == '' # no build matrix, so good to go
-    return :ok      unless TRAVIS_JOB_NUMBER =~ /\.1$/ # first job in the sequence is the deployment container
+    return :ignore  unless TRAVIS_JOB_NUMBER =~ /\.1$/ # first job in the sequence is the deployment container
 
     while true
       builds = JSON.parse(open("https://api.travis-ci.org/builds/#{TRAVIS_BUILD_ID}").read)
-      jobs = status['matrix'].select{|job| job['number'] != TRAVIS_JOB_NUMBER || include_deployer}.collect{|job| job['result']}
-      if jobs.detect{|s| s.nil?}
-        puts "waiting... #{jobs.inspect}"
+      jobs = status['matrix'].collect{|job| OpenStruct.new(job)}
+      if jobs.select{|job| job.number != TRAVIS_JOB_NUMBER || phase == :after}.detect{|job| job.result.nil?}
+        STDERR.puts "waiting... #{results(jobs)}"
         sleep 5
-      elsif jobs.detect{|s| s != 0}
-        throw "One or more jobs failed"
+      elsif jobs.detect{|job| job.result != 0}
+        throw "Some jobs failed: #{results(jobs)}"
       else
         return :deploy
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis_parallel_sentinel
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - retorquere
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Coordinate parallel Travis builds