runsible 0.1.4.5 → 0.1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c6e97e7684c0473f0b015ef7458fd181e3758aa
-  data.tar.gz: 0683c11734db25fb288d7c27ccc0ec15dfb607c1
+  metadata.gz: 3555f9e44cc10f2dd93aaa61d532c2094db9c210
+  data.tar.gz: aa837e80e9aff3ff4e852dad7ddd1291a6f9c120
 SHA512:
-  metadata.gz: ec0617e974d77b203aeb318c14c9ec132e1f3907cde4ef02b4e68185559d018931993eb33b7fb82bf630b0abc509e750ea749a6909d789df136eaa15180e8302
-  data.tar.gz: efea1d51af58e32a02ff17a49b85ecc8b29da012c47357245d681e78b053ea9c31cfc990355d575a4f3bffecf310d8044baaa772ab236a44316f1fd7c14977f9
+  metadata.gz: 1c7d9e19f63ae44c4183170cca0783017fceec93c0f497a6cab2979cabc0ca48c2b33dc96ed63e0d193d1e6bd922350f400913e81fc0fc821dd5a8c9954d938f
+  data.tar.gz: 58aecf9c8b625cb252264e6281f46943775a14ebf674938ffd331302777c858dd5a58da371fb3baa8d9b48ba5fb4fc383637728fffc101e41322ecc028418371

data/VERSION

@@ -1 +1 @@
-0.1.4.5
+0.1.5.1

data/lib/runsible.rb

@@ -6,13 +6,14 @@ autoload :Slop, 'slop'
 # - this module is deliberately written without private state
 # - whenever a remote command sends data to STDOUT or STDERR, Runsible will
 #   immediately send it to the corresponding local IO
-# - Runsible itself writes some warnings and timestamped command delimeters to
+# - Runsible itself writes some warnings and timestamped command delimiters to
 #   STDOUT and STDERR
 #
 module Runsible
   class Error < RuntimeError; end
   class CommandFailure < Runsible::Error; end # nonzero exit
 
+  # defaults
   SETTINGS = {
     user: ENV['USER'],
     host: '127.0.0.1',
@@ -22,20 +23,18 @@ module Runsible
   }
   SSH_CNX_TIMEOUT = 10
 
-  #
-  # Utility stuff
-  #
+  ### Utility stuff ###
 
   # provide a better string representation for all Exceptions
   def self.excp(excp)
     "#{excp.class}: #{excp.message}"
   end
 
-  # return SETTINGS with string keys
-  def self.default_settings
-    hsh = {}
+  # return SETTINGS with string keys, using values from hsh if passed in
+  def self.apply_defaults(hsh = nil)
+    hsh ||= Hash.new
     SETTINGS.each { |sym, v|
-      hsh[sym.to_s] = v
+      hsh[sym.to_s] ||= v
     }
     hsh
   end
@@ -45,7 +44,7 @@ module Runsible
     File.read(File.join(__dir__, '..', 'VERSION'))
   end
 
-  # send alert depending on settings['alerts']['backend']
+  # send alert depending on settings
   def self.alert(topic, message, settings)
     backend = settings['alerts'] && settings['alerts']['backend']
     case backend
@@ -77,19 +76,7 @@ module Runsible
     exit 1
   end
 
-
-  #
-  # CLI or bin/runsible stuff
-  #
-
-  # bin/runsible entry point
-  def self.spoon(ssh_options = Hash.new)
-    opts = Runsible.slop_parse
-    yaml = self.extract_yaml(opts)
-    settings = Runsible.default_settings.merge(yaml['settings'] || Hash.new)
-    settings = self.merge(opts, settings)
-    self.ssh_runlist(settings, yaml['runlist'] || Array.new, ssh_options, yaml)
-  end
+  ### CLI or bin/runsible stuff ###
 
   # parse CLI arguments
   def self.slop_parse
@@ -137,15 +124,21 @@ module Runsible
     exit 1
   end
 
-  #
-  # Library stuff
-  #
+  # bin/runsible entry point
+  def self.spoon(ssh_options = Hash.new)
+    opts = Runsible.slop_parse
+    yaml = self.extract_yaml(opts)
+    settings = self.merge(opts, Runsible.apply_defaults(yaml['settings']))
+    self.ssh_runlist(settings, yaml['runlist'], ssh_options, yaml)
+  end
+
+  ### Library stuff ###
 
   # run a YAML file without any consideration for command line options
   def self.run_yaml(yaml_filename, ssh_options = Hash.new)
     yaml = YAML.load_file(yaml_filename)
-    self.ssh_runlist(self.default_settings, yaml['runlist'] || Array.new,
-                     ssh_options, yaml)
+    settings = self.apply_defaults(yaml['settings'])
+    self.ssh_runlist(settings, yaml['runlist'], ssh_options, yaml)
   end
 
   # initiate ssh connection, perform the runlist
@@ -161,8 +154,9 @@ module Runsible
   end
 
   # execute runlist with failure handling, retries, alerting, etc.
+  # runlist can be nil
   def self.exec_runlist(ssh, runlist, settings, yaml = Hash.new)
-    runlist.each { |run|
+    (runlist || Array.new).each { |run|
       cmd = run.fetch('command')
       retries = run['retries'] || settings['retries']
       on_failure = run['on_failure'] || 'exit'
@@ -238,10 +232,7 @@ module Runsible
     true
   end
 
-
-  #
-  # Necessities
-  #
+  ### Necessities ###
 
   # opts has symbol keys, overrides settings (string keys)
   # return a hash with string keys

metadata

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