mudbug 0.7.1.1 → 0.7.3.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzczZGM4MGZkMWIxMjI3NDg5Y2ZiYzVjM2UyNmRlM2FhM2E5OTQxYw==
+  data.tar.gz: !binary |-
+    MGVjNzE3MTBiMmU3MzA3YTJmOWRkNjJiYTkxYmEwNWE0OTMyMGVkMg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2M2OTBjMDVjODE1OTIwMmQ3ZjcwOGM1YmUxYzlmYzBjOTRhY2I1MWIwZTQ5
+    MzI5MWY3YWI1ZjRiOTBiNTJmMGE4MDM0NDNhMmRlMjc1MjMzZDMyMzg1ZmM5
+    MjUyZDIxMzQ2NTk5ZGFmYTkxZjQ3MWU2N2IwOTk0ZDU1YzA3NDU=
+  data.tar.gz: !binary |-
+    YjcxOWU0OWIyZjZjNzEwN2JiNjhiMDdhZTQ2NThkN2ViOTFlOWIzMjY4ODlj
+    YzQ0MmU2Yjg1NGYwZDRiNWIwZDQ3NTdmMmQ1M2QzMzNiZWFjMmZkZmYwNmNk
+    ZjBjYTY5YTRmMjQ0ZDg2YjNiOTc0MmM5MjI4ODIyZjFhYzBmNGM=

data/VERSION

@@ -1 +1 @@
-0.7.1.1
+0.7.3.1

data/bin/mb

@@ -1,26 +1,53 @@
 #!/usr/bin/env ruby
 
+bef_require = Time.now
+
 require 'dotcfg'
 require 'mudbug'
 
+$VERBOSE = ARGV.delete '--verbose'
+Mudbug.log_level = :info if $VERBOSE
+if ARGV.delete '--debug'
+  Mudbug.log_level = :debug
+  $VERBOSE = true
+end
+
+puts "Required in #{Time.now - bef_require} seconds" if $VERBOSE
+bef_config = Time.now
+
 CONFIG = DotCfg.new '~/.mudbug', :json
+RESET_ARG = '--reset'
+
+puts "Loaded in #{Time.now - bef_config} seconds" if $VERBOSE
+
+START = Time.now
 
 def usage(msg = nil)
   print "ERROR: #{msg}\n\n" if msg
   puts <<EOF
 USAGE:
-  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, are not required arguments
-  * Set a config item to nil in order to remove it
-  * `accept` is optional; valid values include json, html, text
+  mb [get|delete] [$path]           - GET or DELETE $path
+  mb [post|put] [$path] [-|"$json"] - POST or PUT payload to $path
+
+  * method, path, and payload, if configured, are not required arguments
+  * valid methods: get, post, put, patch, delete
+  * path may be a path like /foo or a full URL like http://foo.com/bar
+  * payload must be valid JSON
+  * payload should be provided via STDIN or a properly escaped quoted arg
+
+CONFIGURATION:
+  mb config [--reset]               - Display or reset the overall config
+  mb config $CONFIG_ITEM [--reset]  - Display or reset $CONFIG_ITEM
+  mb config host|method|path $val   - set host to $val
+  mb config accept $val1 [$val2]    - set accept to multiple values
+  mb config payload -|"$json"       - set payload from STDIN or $json
+
+  * CONFIG_ITEMS: host, accept, method, path, payload
+  * valid accepts: json, html, text
+
+OPTIONS:
+  --verbose     - log level INFO and extra output
+  --debug       - log level DEBUG
 EOF
   puts
   puts "CONFIG: #{CONFIG.pretty}"
@@ -30,87 +57,98 @@ end
 
 def conclude(msg)
   puts msg
+  puts "Completed in #{Time.now - START} seconds" if $VERBOSE
   exit 0
 end
 
 #
 # Config section: handle commands that manipulate CONFIG
-# Should exit in all cases with conclude()
+# Should exit in all recognized cases with conclude()
 #
 
 # don't consume ARGV here
 cfg_cmd = ARGV.first
 
-if cfg_cmd
-  cfg_cmd = cfg_cmd.downcase
+if cfg_cmd and cfg_cmd.downcase == 'config'
+  ARGV.shift
+
+  cfg_key = ARGV.shift
+  conclude "CONFIG: #{CONFIG.pretty}" unless cfg_key
+
+  cfg_key = cfg_key.downcase
+  case cfg_key
+  when RESET_ARG
+    CONFIG.reset
+    puts "CONFIG was reset"
 
-  case cfg_cmd
   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'
-        CONFIG.delete cfg_cmd
+      if val.downcase == RESET_ARG
+        CONFIG.delete cfg_key
         CONFIG.save
-        conclude "removed config for #{cfg_cmd}"
+        puts "#{cfg_key} was reset"
       else
-        CONFIG[cfg_cmd] = val
+        CONFIG[cfg_key] = val
         CONFIG.save
       end
     else
-      val = CONFIG[cfg_cmd] or conclude "no #{cfg_cmd} is set"
+      val = CONFIG[cfg_key]
+      puts (val ? "#{cfg_key}: #{val}" : "#{cfg_key} is not set")
     end
-    conclude "Using #{cfg_cmd}: #{val}"
-
-  when 'reset'
-    CONFIG.reset
-    conclude "config was reset"
 
   when 'payload'
-    ARGV.shift # confirmed
     val = ARGV.shift
     if val and !val.empty?
       case val.downcase
-      when '-'
-        CONFIG['payload'] = JSON.parse $stdin.read
-        CONFIG.save
-      when 'nil'
+      when RESET_ARG
         CONFIG.delete 'payload'
         CONFIG.save
-        conclude "removed config for payload"
+        puts 'payload was reset'
+      when '-'
+        begin
+          CONFIG['payload'] = JSON.parse $stdin.read
+          CONFIG.save
+        rescue JSON::ParserError => e
+          puts "#{e.class} - #{e}"
+        end
+      else
+        begin
+          CONFIG['payload'] = JSON.parse val
+          CONFIG.save
+        rescue JSON::ParserError => e
+          puts "#{e.class} - #{e}"
+        end
       end
     else
-      CONFIG['payload'] or conclude "no payload is set"
+      val = CONFIG['payload'] && JSON.pretty_generate(CONFIG['payload'])
+      puts (val ? "payload: #{val}" : "payload is not set")
     end
-    conclude "Using payload:\n#{JSON.pretty_generate CONFIG['payload']}"
 
   when 'accept'
-    ARGV.shift # confirmed cfg_cmd, go ahead and shift
     accepts = []
-    until ARGV.empty?
-      accepts << ARGV.shift
-    end
+    accepts << ARGV.shift until ARGV.empty?
 
-    case accepts.length
-    when 0
-      if CONFIG['accept']
-        conclude "Using accept: #{CONFIG['accept'].join(' ')}"
+    if accepts.length == 1
+      if accepts.first == RESET_ARG
+        accepts.shift
+        CONFIG.delete 'accept'
+        CONFIG.save
+        puts 'accept was reset'
       else
-        conclude "no accept is set"
+        # did they provide a quoted or CSV list? or pseudo-symbols with colons?
+        accepts = accepts.first.split(/[ ,:]+/).select { |s| !s.empty? }
       end
-    when 1
-      # did they provide a quoted or CSV list? or pseudo-symbols with colons?
-      accepts = accepts.first.split(/[ ,:]+/).select { |s| !s.empty? }
+    end
+    if accepts.length > 0
+      CONFIG['accept'] = accepts.map { |s| s.gsub /[ ,:]+/, '' }
+      CONFIG.save
     else
-      accepts.map! { |s| s.gsub %r{[ ,:]+}, '' }
+      val = CONFIG['accept']
+      puts (val ? "accept: " + val.join(' ') : "accept is not set")
     end
-    CONFIG['accept'] = accepts
-    CONFIG.save
-    conclude "using accept: #{CONFIG['accept']}"
-
-  when 'config'
-    conclude CONFIG.pretty
   end
+  conclude "CONFIG: #{CONFIG.pretty}"
 end
 
 #
@@ -118,11 +156,11 @@ end
 # Create Mudbug, determine method and path - from CONFIG and cmd line args
 #
 
-# set the host, always from CONFIG
-#
-usage "no host is set" unless CONFIG['host']
-mb = Mudbug.new CONFIG['host']
+mb = Mudbug.new
 
+# set the host and Accept if configured
+#
+mb.host = CONFIG['host'] if CONFIG['host']
 mb.accept CONFIG['accept'].map(&:to_sym) if CONFIG['accept']
 
 # set the method, possibly from CLI args
@@ -137,7 +175,7 @@ end
 # set the path, possibly from CLI args
 #
 case ARGV.first
-when %r{^\/} # starts with a slash
+when %r{^\/|http} # starts with a slash or http
   path = ARGV.shift
 else
   path = CONFIG['path'] or usage "no path provided"
@@ -171,6 +209,8 @@ end
 # finally!
 #
 
+puts "Configured in #{Time.now - START} seconds" if $VERBOSE
+
 begin
   data = mb.send(*args)
 rescue RuntimeError => e

data/lib/mudbug.rb

@@ -83,7 +83,7 @@ class Mudbug
   attr_reader :options
   attr_accessor :host
 
-  def initialize(host, options = {})
+  def initialize(host = 'localhost', options = {})
     @host = host
     @options = options
     accept :json, :html, :text

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mudbug
 version: !ruby/object:Gem::Version
-  version: 0.7.1.1
-  prerelease: 
+  version: 0.7.3.1
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lager
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dotcfg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: buildar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -128,26 +115,25 @@ files:
 homepage: http://github.com/rickhull/mudbug
 licenses:
 - LGPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This hardy creature consumes JSON / REST APIs
 test_files: []