pups 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cf30e6638af5d5e6618c872c48c916485a8d75f2
-  data.tar.gz: 28da8c64dc283ad29a17cfd02cdb92703c91e296
+SHA256:
+  metadata.gz: 981fde4b2d6a70bad81c500abd0f9a11c8ec8161601f919765fbe8ac55fec3ab
+  data.tar.gz: fc29d1fdecf62a137f37f32f570e7ce635ec95c6fa817e166c022b701052cce7
 SHA512:
-  metadata.gz: b6f37ce6dff5423dcae7b9e92816d6618693d6bb9fdd4e8af70e6e052f6ef31bc4c8397920b183ff985b1a4b0ee42150c812f0a4f5a48c922f9cc818b1ff885c
-  data.tar.gz: b3bdbd36b7a2cb327c27f7fc691296ded3a9e63044665939845b0165727259eee49a5664ea5de4674c68ca1f9024bdb16ce7b686397e51522b7eac1d83900a9e
+  metadata.gz: 9fb37fb5c1e2f88d18a1d8a2f307cae341b0d4a7780363c7338acd8f891b3b0d21c9ba47333be3cf06760073d40aa30cb988c262649ad88d373cb54a1027beb4
+  data.tar.gz: 6f71a5c0684e80623eb7d10612fd0aa6b93950d31d42fa018d3db6c0689f1109077fbd89797f0d0ce9b88608a667aeae0bad48dde51b27976d2518a67b580095

data/README.md

@@ -28,7 +28,7 @@ params:
   hello: hello world
 
 run:
-  - exec: /bin/bash -c 'echo $hello >>> hello'
+  - exec: /bin/bash -c 'echo $hello >> hello'
 ```
 
 Running: `pups somefile.yaml` will execute the shell script resulting in a file called "hello" with the contents "hello world".

data/lib/pups.rb

@@ -12,6 +12,10 @@ require "pups/file_command"
 require "pups/runit"
 
 module Pups
+  class ExecError < RuntimeError
+    attr_accessor :exit_code
+  end
+
   def self.log
     # at the moment docker likes this
     @logger ||= Logger.new(STDERR)

data/lib/pups/cli.rb

@@ -29,7 +29,6 @@ class Pups::Cli
       config = Pups::Config.load_file(args[0])
     end
     config.run
-
   ensure
     Pups::ExecCommand.terminate_async
   end

data/lib/pups/config.rb

@@ -3,7 +3,14 @@ class Pups::Config
   attr_reader :config, :params
 
   def self.load_file(config_file)
-    new YAML.load_file(config_file)
+    begin
+      new YAML.load_file(config_file)
+    rescue Exception
+      STDERR.puts "Failed to parse #{config_file}"
+      STDERR.puts "This is probably a formatting error in #{config_file}"
+      STDERR.puts "Cannot continue. Edit #{config_file} and try again."
+      raise
+    end
   end
 
   def self.load_config(config)
@@ -70,16 +77,22 @@ class Pups::Config
   def run
     run_commands
   rescue => e
-    puts
-    puts
-    puts "FAILED"
-    puts "-" * 20
-    puts "#{e.class}: #{e}"
-    puts "Location of failure: #{e.backtrace[0]}"
-    if @last_command
-      puts "#{@last_command[:command]} failed with the params #{@last_command[:params].inspect}"
+    exit_code = 1
+    if Pups::ExecError === e
+      exit_code = e.exit_code
+    end
+    unless exit_code == 77
+      puts
+      puts
+      puts "FAILED"
+      puts "-" * 20
+      puts "#{e.class}: #{e}"
+      puts "Location of failure: #{e.backtrace[0]}"
+      if @last_command
+        puts "#{@last_command[:command]} failed with the params #{@last_command[:params].inspect}"
+      end
     end
-    exit 1
+    exit exit_code
   end
 
   def run_commands

data/lib/pups/exec_command.rb

@@ -85,7 +85,11 @@ class Pups::ExecCommand < Pups::Command
       pid = Process.spawn(command)
       (@@asyncs ||= []) << {pid: pid, command: command, stop_signal: (stop_signal || "TERM")}
       Thread.new do
-        Process.wait(pid)
+        begin
+          Process.wait(pid)
+        rescue Errno::ECHILD
+          # already exited so skip
+        end
         @@asyncs.delete_if{|async| async[:pid] == pid}
       end
       return pid
@@ -102,7 +106,11 @@ class Pups::ExecCommand < Pups::Command
       end
     end
 
-    raise RuntimeError.new("#{command} failed with return #{$?.inspect}") unless $? == 0
+    unless $? == 0
+      err = Pups::ExecError.new("#{command} failed with return #{$?.inspect}")
+      err.exit_code = $?.exitstatus
+      raise err
+    end
 
     nil
 

data/lib/pups/version.rb

@@ -1,3 +1,3 @@
 module Pups
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/exec_command_test.rb

@@ -78,7 +78,7 @@ module Pups
     end
 
     def test_fails_for_non_zero_exit
-      assert_raises(RuntimeError) do
+      assert_raises(Pups::ExecError) do
         ExecCommand.from_str("chgrp -a",{}).run
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pups
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Process orchestrator