runsible 0.1.3.1 → 0.1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f31a8f06a0427b8f580a9240bc5698bc87e1b439
-  data.tar.gz: bf3daedd7b2e648992ced1ea3ec8140f83e9f30c
+  metadata.gz: 992cc2b427ff134560b9c8439424ab133f3f3087
+  data.tar.gz: 386a88d858b494970ae9b1eb05fc5980a57c68ef
 SHA512:
-  metadata.gz: 3c43fd82babf3dd5630fa2d1e69b82ff141a33ac23781b670a51d50e893e5313f8ad45305de6f9cd779176e720cf047e9c25866b8b66e59a5eebd6e79665b230
-  data.tar.gz: 539a72b37cab94eba245b16fdd5d67bbd31ade5cecadd84cd10f34a5457a29b3a3eca3b4085c1ec5c8b3f865fef52cd515ace50f45e5ee92a27cd6e455617823
+  metadata.gz: fd5abe43d8ad3bcdf2f8ceb928a94043d573ae9733680124afb503dfc2827ffe798a9c399970520155adf98b7915b6ab0dac6ebf23b2fc2342b58fb963f53268
+  data.tar.gz: a5ccfbf8a493274aabaa9ee9f7cb0c495543660a533f6c489190444a1dee44aef0b328864af6e3a6c78ddc1735fb60df16cfd5c35e5955cf563ab1dec23efa13

data/VERSION

@@ -1 +1 @@
-0.1.3.1
+0.1.4.1

data/lib/runsible.rb

@@ -1,14 +1,7 @@
 require 'yaml'
-require 'slop'
-require 'pony'
-require 'net/ssh'
-
-# for nonzero exit status of a remote command
-class CommandFailure < RuntimeError
-  def to_s(*args)
-    "#{self.class}: #{super(*args)}"
-  end
-end
+autoload :Net, 'net/ssh'
+autoload :Pony, 'pony'
+autoload :Slop, 'slop'
 
 # - this module is deliberately written without private state
 # - it is meant to be used in the helper style
@@ -19,7 +12,7 @@ end
 #
 module Runsible
   class Error < RuntimeError; end
-  SSH_CNX_TIMEOUT = 10
+  class CommandFailure < Runsible::Error; end # nonzero exit
 
   SETTINGS = {
     user: ENV['USER'],
@@ -28,11 +21,16 @@ module Runsible
     retries: 0,
     vars: [],
   }
+  SSH_CNX_TIMEOUT = 10
 
   #
   # Utility stuff
   #
 
+  def self.excp(excp)
+    "#{excp.class}: #{excp.message}"
+  end
+
   def self.default_settings
     hsh = {}
     SETTINGS.each { |sym, v|
@@ -45,13 +43,6 @@ module Runsible
     File.read(File.join(__dir__, '..', 'VERSION'))
   end
 
-  def self.usage(opts, msg=nil)
-    puts opts
-    puts
-    puts msg if msg
-    exit 1
-  end
-
   def self.alert(topic, message, settings)
     backend = settings['alerts'] && settings['alerts']['backend']
     case backend
@@ -126,11 +117,18 @@ module Runsible
     begin
       yaml = YAML.load_file(yaml_filename)
     rescue RuntimeError => e
-      Runsible.usage(opts, "could not load yaml_file\n#{e}")
+      Runsible.usage(opts, "could not load yaml_file\n#{self.excp(e)}")
     end
     yaml
   end
 
+  def self.usage(opts, msg=nil)
+    puts opts
+    puts
+    puts msg if msg
+    exit 1
+  end
+
   #
   # Library stuff
   #
@@ -164,10 +162,11 @@ module Runsible
       begin
         self.exec_retry(ssh, cmd, retries)
       rescue CommandFailure, Net::SSH::Exception => e
-        self.warn e
+        excp = self.excp(e)
+        self.warn excp
         msg = "#{retries} retries exhausted; on_failure: #{on_failure}"
         self.warn msg
-        self.alert(settings['email'], "retries exhausted", e.to_s)
+        self.alert(settings['email'], "retries exhausted", excp)
 
         case on_failure
         when 'continue'
@@ -227,7 +226,8 @@ module Runsible
       end
     end
     ssh.loop # nothing actually executes until this call
-    exit_code == 0 or raise(CommandFailure, "[exit #{exit_code}] #{cmd}")
+    raise(CommandFailure, "[exit #{exit_code}] #{cmd}") unless exit_code == 0
+    true
   end
 
 
@@ -257,7 +257,8 @@ module Runsible
 
   def self.banner_wrap(msg)
     self.warn self.begin_banner(msg)
-    yield if block_given?
+    val = block_given? ? yield : true
     self.warn self.end_banner(msg)
+    val
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runsible
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1
+  version: 0.1.4.1
 platform: ruby
 authors:
 - Rick Hull