mudbug 0.5.1.3 → 0.5.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg5MjE2ZjY2M2ZjNDg0YTYxNGI3MzA3YWVhY2M5ZjMyYzk3OTVhZA==
+    ODU1YmNjZGVkYjY0MDQ3MmYyMmRkOTBiMDBmNmM2ZDllOGY4ODg3Yg==
   data.tar.gz: !binary |-
-    ZDhiNWRkYzlmZTBlNTc0NzEyMWY2ZmM3ODFiZjRiZThjZjUwYjgwMw==
+    N2RhYWNmNWE0ZjU5NTRmZWIyZTA5MTQ4OGQzYjQwMTdlMDdiMDIyNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2M1ZTFhNjUxOGEwZDNhODBkMDA5ZmY4ZGVmMGIzMTkyMDBlNDZiMDlhYzhj
-    NTYxMDk0ZGFjY2VjODc0ZmYwNWMxMTZmYWVkNDc0ODYyNjg2MzgzMWU3MzZk
-    MDA2NGQxMDk3MThkNzNhMWYyYjZlMzY5ZjAyZDdjOGQ5MWFmMjk=
+    YjdlYmQ5YmYyNzNhZmVlNTQ1NmU5YWQwZmMzMTBjNWM5OGNhZDg5MGNiNDg2
+    NmJlNGUwYmNkNThhMWZhNjNmMTIwNWIwODViOThhNGI1OGQ1ODNlZmI5MDFl
+    NjM1NjM4ZDJlNzE0NmM2YTM1ZTc0MDFjOTIxN2IxM2Y3OGVkNGE=
   data.tar.gz: !binary |-
-    YTA1YjE4Y2I0ODQ0YWY1YmM3YTJlYmQ1ZGQ0ZGMzNWJmZTRkMmE1ZTg2ZjEz
-    NWRmZjQyOTFhNjRkNjY3MjlhMzkyNDk0ZDU1MTRiOGQ5MWI1YWFhMTVjMjcz
-    NmU2ODgyN2Q2N2QzM2QwNWFjNDc2MDcxMTY5ZmY0NDUyYTY1MzE=
+    MWZlYmYyZWRhNDdlMzQ1ZTQ2ODhlNWJmMzBkMmUzNjNjY2UzNGNiYTgyNGY1
+    NTZlNWNjZDVjZThlMTBiYjRlOGM1ZWNkMmQwMzI3YTBjMjdiZTUzZWExMjA3
+    YjUwNjA4YTk5NzFiYWIxYjFlMzFkMTZkMDU0NjRkOWY4NzIxNzE=

data/MANIFEST.txt

@@ -5,5 +5,6 @@ README.md
 LICENSE.txt
 rakefile.rb
 lib/mudbug.rb
+lib/mb_config.rb
 test/mudbug.rb
 examples/accepts_and_methods.rb

data/VERSION

@@ -1 +1 @@
-0.5.1.3
+0.5.2.1

data/bin/mb

@@ -4,18 +4,20 @@ def usage(msg = nil)
   puts "ERROR: #{msg}" if msg
   puts <<USAGE
 USAGE:
-  mb host|method|path|payload [VAL] - Set or display the current config item
-  mb accept [ACC1] [ACC2] [etc]     - Set or display the accept config item
-  mb config                         - Display the current config
-  mb [get|delete] [PATH]            - GET or DELETE PATH
-  mb [post|put] [PATH] [PAYLOAD]    - POST or PUT PAYLOAD to PATH
+  mb [get|delete] [PATH]         - GET or DELETE PATH
+  mb [post|put] [PATH] -         - POST or PUT payload (STDIN) to PATH
+
+  mb host|method|path [VAL]      - Set or display current config item
+  mb accept [ACC1] [ACC2] [etc]  - Set or display accept types
+  mb payload [-]                 - Set (from STDIN) or display payload config
+  mb config                      - Display current config
 
   * A host must be configured for mb to operate
   * method, path, and payload, if configured, can be omitted as CLI arguments
   * accept is optional; valid values include json, html, text
 USAGE
   puts
-  puts "CONFIG: #{Mudbug.load.inspect}" if Mudbug.fresh?
+  puts "CONFIG: #{MbConfig.dump}"
 
   exit 1
 end
@@ -25,33 +27,11 @@ def conclude(msg)
   exit 0
 end
 
-require 'mudbug'
-
-CFG_FILE = File.expand_path '~/.mudbug'
-FILE_EXPIRY = 3600 # seconds
-
-class Mudbug
-  def self.save config
-    raise "unable to write to #{CFG_FILE}" unless File.writable? CFG_FILE
-    File.open(CFG_FILE, 'w') { |f| f.write config.to_json }
-  end
-
-  def self.load
-    if self.fresh?
-      File.open(CFG_FILE, 'r') { |f| JSON.parse(f.read) rescue nil }
-    end
-  end
-
-  def self.fresh?
-    File.exists?(CFG_FILE) and File.readable?(CFG_FILE) and
-      Time.now - File.mtime(CFG_FILE) < FILE_EXPIRY
-  end
-end
-
-CFG = Mudbug.load || {}
+require 'mb_config'
 
 #
-# Stage 1: handle commands that manipulate CFG / CFG_FILE
+# Config section: handle commands that manipulate MbConfig
+# Should exit in all cases with conclude()
 #
 
 # don't consume ARGV here
@@ -61,23 +41,45 @@ if cfg_cmd
   cfg_cmd = cfg_cmd.downcase
 
   case cfg_cmd
-  when 'host', 'method', 'path', 'payload'
+  when 'host', 'method', 'path'
     ARGV.shift # confirmed cfg_cmd, go ahead and shift
     val = ARGV.shift
     if val and !val.empty?
       if val.downcase == 'nil'
-        CFG.delete cfg_cmd
-        Mudbug.save CFG
+        MbConfig.delete cfg_cmd
+        MbConfig.save
         conclude "removed config for #{cfg_cmd}"
       else
-        CFG[cfg_cmd] = val
-        Mudbug.save CFG
+        MbConfig[cfg_cmd] = val
+        MbConfig.save
       end
     else
-      val = CFG[cfg_cmd] or conclude "no #{cfg_cmd} is set"
+      val = MbConfig[cfg_cmd] or conclude "no #{cfg_cmd} is set"
     end
     conclude "Using #{cfg_cmd}: #{val}"
 
+  when 'reset'
+    MbConfig.reset
+    conclude "config was reset"
+
+  when 'payload'
+    ARGV.shift # confirmed
+    val = ARGV.shift
+    if val and !val.empty?
+      case val.downcase
+      when '-'
+        MbConfig['payload'] = JSON.parse $stdin.read
+        MbConfig.save
+      when 'nil'
+        MbConfig.delete 'payload'
+        MbConfig.save
+        conclude "removed config for payload"
+      end
+    else
+      MbConfig['payload'] or conclude "no payload is set"
+    end
+    conclude "Using payload:\n#{JSON.pretty_generate MbConfig['payload']}"
+
   when 'accept'
     ARGV.shift # confirmed cfg_cmd, go ahead and shift
     accepts = []
@@ -87,8 +89,8 @@ if cfg_cmd
 
     case accepts.length
     when 0
-      if CFG['accept']
-        conclude "Using accept: #{CFG['accept'].join(' ')}"
+      if MbConfig['accept']
+        conclude "Using accept: #{MbConfig['accept'].join(' ')}"
       else
         conclude "no accept is set"
       end
@@ -100,28 +102,28 @@ if cfg_cmd
     else
       accepts.map! { |s| s.gsub %r{[ ,:]+}, '' }
     end
-    CFG['accept'] = accepts
-    Mudbug.save CFG
-    conclude "using accept: #{CFG['accept']}"
+    MbConfig['accept'] = accepts
+    MbConfig.save
+    conclude "using accept: #{MbConfig['accept']}"
 
   when 'config'
-    conclude Mudbug.load.inspect
+    conclude MbConfig.dump
   end
 end
 
 #
-# Done with manipulating CFG and CFG_FILE
+# Done with manipulating MbConfig
 #
 
 #
-# Stage 2: create Mudbug based on CFG and command line options
+# Stage 2: create Mudbug based on MbConfig and command line options
 #
 
-# set the host, always from CFG
-conclude "no host is set" unless CFG['host']
-mb = Mudbug.new CFG['host']
+# set the host, always from MbConfig
+usage "no host is set" unless MbConfig['host']
+mb = Mudbug.new MbConfig['host']
 
-mb.accept CFG['accept'].map(&:to_sym) if CFG['accept']
+mb.accept MbConfig['accept'].map(&:to_sym) if MbConfig['accept']
 
 # set the method, possibly from CLI args
 meth_cmd = ARGV.first
@@ -130,7 +132,7 @@ when 'get', 'post', 'put', 'delete', 'del'
   ARGV.shift # confirmed meth_cmd, go ahead and shift
   method = meth_cmd
 else
-  method = CFG['method'] or usage "no method provided"
+  method = MbConfig['method'] or usage "no method provided"
 end
 
 # set the path, possibly from CLI args
@@ -140,15 +142,29 @@ when %r{^\/} # starts with a slash
   ARGV.shift # confirmed path_cmd, go ahead and shift
   path = path_cmd
 else
-  path = CFG['path'] or usage "no path provided"
+  path = MbConfig['path'] or usage "no path provided"
 end
 
+#
+# no payload yet; run GET and DELETE
+#
+
 case method
 when 'get'
-  data = mb.get path
+  begin
+    data = mb.get path
+  rescue RuntimeError => e
+    puts "#{e} - #{e.class}"
+    exit 1
+  end
   conclude JSON.pretty_generate data
 when 'del', 'delete'
-  data = mb.delete path
+  begin
+    data = mb.delete path
+  rescue RuntimeError => e
+    puts "#{e} - #{e.class}"
+    exit 1
+  end
   conclude JSON.pretty_generate data
 when 'post', 'put', 'patch'
   # do nothing for now
@@ -162,8 +178,9 @@ end
 payload = ARGV.first
 case payload
 when nil
-  payload = CFG['payload'] or usage "no payload provided"
-else
+  payload = MbConfig['payload'] or usage "no payload provided"
+when '-'
+  payload = $stdin.read
   begin
     JSON.parse payload
   rescue
@@ -171,5 +188,11 @@ else
   end
 end
 
-data = mb.send(method, path, payload)
+begin
+  data = mb.send(method, path, payload)
+rescue RuntimeError => e
+  puts "#{e} - #{e.class}"
+  exit 1
+end
+
 conclude JSON.pretty_generate data

data/lib/mb_config.rb

@@ -0,0 +1,55 @@
+require 'mudbug'
+
+module MbConfig
+  FILE = File.expand_path '~/.mudbug'
+  CFG = {}
+
+  def self.[] key
+    CFG[key]
+  end
+
+  def self.[]= key, value
+    CFG[key] = value
+  end
+
+  def self.delete key
+    CFG.delete key
+  end
+
+  # write CFG to FILE
+  #
+  def self.save
+    File.open(FILE, 'w') { |f| f.write CFG.to_json }
+  end
+
+  # call reset as necessary
+  #
+  def self.load
+    reset unless File.exists?(FILE)
+    begin
+      File.open(FILE, 'r') { |f|
+        CFG.merge! JSON.parse f.read
+      }
+    rescue JSON::ParserError => e
+      puts "#{e} (#{e.class})"
+      puts "Resetting #{FILE}"
+      reset
+      # recursion; depends on .reset writing parseable JSON to stop
+      load
+    end
+  end
+
+  # write an empty hash/object
+  #
+  def self.reset
+    File.open(FILE, 'w') { |f| f.write '{}' }
+  end
+
+  # dump the current CFG (may differ from FILE contents!)
+  #
+  def self.dump
+    JSON.pretty_generate CFG
+  end
+end
+
+MbConfig.load

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mudbug
 version: !ruby/object:Gem::Version
-  version: 0.5.1.3
+  version: 0.5.2.1
 platform: ruby
 authors:
 - Rick Hull
@@ -95,6 +95,7 @@ files:
 - LICENSE.txt
 - rakefile.rb
 - lib/mudbug.rb
+- lib/mb_config.rb
 - test/mudbug.rb
 - examples/accepts_and_methods.rb
 - bin/mb