boxci 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e661cf01c31229dc620f079e0aa25f6b326896
-  data.tar.gz: 7825e3a9b747d14ae42f4022535fb11e3e80d02c
+  metadata.gz: 5041f190911bcff97ac407b11a23db3e1a111c55
+  data.tar.gz: 8f520eedb1cf219b07f150277f4b94285c3b4edf
 SHA512:
-  metadata.gz: 82e80eb6e40c69376e38c12d8341015804bb14332da029a12affaca3d1cbac50f32c456876fd1752765143b4eac2aaa36dbdf1a6481f2c8b4ea37c33c4edbcef
-  data.tar.gz: 028da3757df04c794693b799b85eb08489addeb09b5a1e022146993ad24cbb48545358cb6815a001ac7f00d5baadfe9759f7371c2659a29566853cd8cbe27140
+  metadata.gz: bec88ff45d7655b91f6b640f99c83caaac6cc1f913778f95d70d56c2cdab289baad78c6594282212b34a462955c447d1de5e337211343f3cfa9fd66f90348c89
+  data.tar.gz: b020392c1548ed7bcaf59f2595eae0c1167197608d3f4dad8bdd287b99ac20e5c6d672426c0963a53f4ab8eb4ce8177b453a028990b56263c75d47f3d3c0b661

data/CHANGELOG.md

@@ -6,6 +6,12 @@ versions as well as provide a rough history.
 
 #### Next Release
 
+#### v0.0.37
+
+- Re-enable cleanup
+- Modified command success detection to rasie Boxci::CommandFailed error on
+  failure so that it triggers cleanup and short-circuit.
+
 #### v0.0.36
 
 - Fixed command success detection so it actually works properly.

data/lib/boxci/tester.rb

@@ -26,7 +26,7 @@ module Boxci
         File.open('/tmp/boxci.log', 'a+') { |f| f.write("Got SIGTERM, going to cleanup...\n") }
 
         begin
-          # cleanup
+          cleanup
         rescue Errno::EPIPE => e
           File.open('/tmp/boxci.log', 'a+') { |f| f.write("SIGTERM handler swallowed Errno::EPIPE exception\n") }
         rescue => e
@@ -44,7 +44,7 @@ module Boxci
       end
 
       Signal.trap('SIGINT') do
-        # cleanup
+        cleanup
         exit 255
       end
 
@@ -67,14 +67,8 @@ module Boxci
           install_vagrant_plugin
           add_provider_box
         end
-        if !spin_up_box
-          say "ERROR: Failed to spin up box", :red
-          exit 1
-        end
-        if !setup_ssh_config
-          say "ERROR: Failed to setup ssh config", :red
-          exit 1
-        end
+        spin_up_box
+        setup_ssh_config
         install_puppet_on_box
         provision_box
         create_artifact_directory
@@ -87,7 +81,7 @@ module Boxci
           f.write("test() method swallowed Errno::EPIPE exception\n")
         end
       ensure
-        # cleanup
+        cleanup
       end
 
       exit @tester_exit_code
@@ -172,9 +166,13 @@ module Boxci
     def spin_up_box
       inside @project_workspace_folder do
         if verbose?
-          return run "vagrant up --no-provision --provider #{provider}", :verbose => verbose?
+          if !run "vagrant up --no-provision --provider #{provider}", :verbose => verbose?
+            raise Boxci::CommandFailed, "Failed to successfully run vagrant up --no-provision --provider #{provider}"
+          end
         else
-          return run "vagrant up --no-provision --provider #{provider}"
+          if !run "vagrant up --no-provision --provider #{provider}"
+            raise Boxci::CommandFailed, "Failed to successfully run vagrant up --no-provision --provider #{provider}"
+          end
         end
       end
     end
@@ -182,9 +180,13 @@ module Boxci
     def setup_ssh_config
       inside @project_workspace_folder do
         if verbose?
-          return run "vagrant ssh-config > ssh-config.local", :verbose => verbose?
+          if !run "vagrant ssh-config > ssh-config.local", :verbose => verbose?
+            raise Boxci::CommandFailed, "Failed to successfully run vagrant ssh-config > ssh-config.local"
+          end
         else
-          return run "vagrant ssh-config > ssh-config.local"
+          if !run "vagrant ssh-config > ssh-config.local"
+            raise Boxci::CommandFailed, "Failed to successfully run vagrant ssh-config > ssh-config.local"
+          end
         end
       end
     end

data/lib/boxci/version.rb

@@ -1,3 +1,3 @@
 module Boxci
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/lib/boxci.rb

@@ -23,6 +23,7 @@ require 'boxci/test_runner'
 module Boxci
   class MissingDependency < StandardError; end
   class PureVirtualMethod < StandardError; end
+  class CommandFailed < StandardError; end
 
   def self.project_config
     if @project_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxci
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Andrew De Ponte