mudbug 0.7.0.1 → 0.7.1.1

data/MANIFEST.txt

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

data/README.md

@@ -14,13 +14,13 @@ Features
 Installation
 ------------
 Install the gem:
-
-    $ gem install mudbug
-
-Or, if using bundler, add to your Gemfile:
-
-    gem 'mudbug', '~> 0.6'
-
+```
+$ gem install mudbug       # sudo as necessary
+```
+Or, if using [Bundler](http://bundler.io/), add to your Gemfile:
+```ruby
+gem 'mudbug', '~> 0.6'
+```
 Quick Start
 -----------
 Initialize it with a host:
@@ -89,7 +89,7 @@ resp = Mudbug.new('google.com').resource('/').get
 # etc.
 ```
 
-Here is the heart of Mudbug's [response processing](https://github.com/rickhull/mudbug/blob/master/lib/mudbug.rb#L45):
+Here is the heart of Mudbug's [response processing](https://github.com/rickhull/mudbug/blob/master/lib/mudbug.rb#L51):
 
 ```ruby
 # this structure declares what we support in the request Accept: header
@@ -116,8 +116,7 @@ Careful with that axe, Eugene.
 
 Examples
 --------
-* accepts_and_methods [sample script](https://github.com/rickhull/mudbug/blob/master/examples/accepts_and_methods.rb)
-* accepts_and_methods [sample output](https://github.com/rickhull/mudbug/blob/master/examples/accepts_and_methods.txt)
+* [accepts_and_methods](https://github.com/rickhull/mudbug/blob/master/examples/accepts_and_methods.rb) [(sample output)](https://github.com/rickhull/mudbug/blob/master/examples/accepts_and_methods.txt)
 
 Funny, that
 -----------

data/VERSION

@@ -1 +1 @@
-0.7.0.1
+0.7.1.1

data/bin/mb

@@ -1,9 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'mb_config'
+require 'dotcfg'
+require 'mudbug'
+
+CONFIG = DotCfg.new '~/.mudbug', :json
 
 def usage(msg = nil)
-  puts "ERROR: #{msg}" if msg
+  print "ERROR: #{msg}\n\n" if msg
   puts <<EOF
 USAGE:
   mb [get|delete] [PATH]         - GET or DELETE PATH
@@ -20,7 +23,7 @@ USAGE:
   * `accept` is optional; valid values include json, html, text
 EOF
   puts
-  puts "CONFIG: #{MbConfig.dump}"
+  puts "CONFIG: #{CONFIG.pretty}"
 
   exit 1
 end
@@ -31,7 +34,7 @@ def conclude(msg)
 end
 
 #
-# Config section: handle commands that manipulate MbConfig
+# Config section: handle commands that manipulate CONFIG
 # Should exit in all cases with conclude()
 #
 
@@ -47,20 +50,20 @@ if cfg_cmd
     val = ARGV.shift
     if val and !val.empty?
       if val.downcase == 'nil'
-        MbConfig.delete cfg_cmd
-        MbConfig.save
+        CONFIG.delete cfg_cmd
+        CONFIG.save
         conclude "removed config for #{cfg_cmd}"
       else
-        MbConfig[cfg_cmd] = val
-        MbConfig.save
+        CONFIG[cfg_cmd] = val
+        CONFIG.save
       end
     else
-      val = MbConfig[cfg_cmd] or conclude "no #{cfg_cmd} is set"
+      val = CONFIG[cfg_cmd] or conclude "no #{cfg_cmd} is set"
     end
     conclude "Using #{cfg_cmd}: #{val}"
 
   when 'reset'
-    MbConfig.reset
+    CONFIG.reset
     conclude "config was reset"
 
   when 'payload'
@@ -69,17 +72,17 @@ if cfg_cmd
     if val and !val.empty?
       case val.downcase
       when '-'
-        MbConfig['payload'] = JSON.parse $stdin.read
-        MbConfig.save
+        CONFIG['payload'] = JSON.parse $stdin.read
+        CONFIG.save
       when 'nil'
-        MbConfig.delete 'payload'
-        MbConfig.save
+        CONFIG.delete 'payload'
+        CONFIG.save
         conclude "removed config for payload"
       end
     else
-      MbConfig['payload'] or conclude "no payload is set"
+      CONFIG['payload'] or conclude "no payload is set"
     end
-    conclude "Using payload:\n#{JSON.pretty_generate MbConfig['payload']}"
+    conclude "Using payload:\n#{JSON.pretty_generate CONFIG['payload']}"
 
   when 'accept'
     ARGV.shift # confirmed cfg_cmd, go ahead and shift
@@ -90,8 +93,8 @@ if cfg_cmd
 
     case accepts.length
     when 0
-      if MbConfig['accept']
-        conclude "Using accept: #{MbConfig['accept'].join(' ')}"
+      if CONFIG['accept']
+        conclude "Using accept: #{CONFIG['accept'].join(' ')}"
       else
         conclude "no accept is set"
       end
@@ -101,26 +104,26 @@ if cfg_cmd
     else
       accepts.map! { |s| s.gsub %r{[ ,:]+}, '' }
     end
-    MbConfig['accept'] = accepts
-    MbConfig.save
-    conclude "using accept: #{MbConfig['accept']}"
+    CONFIG['accept'] = accepts
+    CONFIG.save
+    conclude "using accept: #{CONFIG['accept']}"
 
   when 'config'
-    conclude MbConfig.dump
+    conclude CONFIG.pretty
   end
 end
 
 #
-# OK, we're not manipulating MbConfig
-# Create Mudbug, determine method and path - from MbConfig and cmd line args
+# OK, we're not manipulating CONFIG
+# Create Mudbug, determine method and path - from CONFIG and cmd line args
 #
 
-# set the host, always from MbConfig
+# set the host, always from CONFIG
 #
-usage "no host is set" unless MbConfig['host']
-mb = Mudbug.new MbConfig['host']
+usage "no host is set" unless CONFIG['host']
+mb = Mudbug.new CONFIG['host']
 
-mb.accept MbConfig['accept'].map(&:to_sym) if MbConfig['accept']
+mb.accept CONFIG['accept'].map(&:to_sym) if CONFIG['accept']
 
 # set the method, possibly from CLI args
 #
@@ -128,7 +131,7 @@ case ARGV.first
 when 'get', 'post', 'put', 'delete'# , 'patch'   # Soon(tm)
   method = ARGV.shift
 else
-  method = MbConfig['method'] or usage "no method provided"
+  method = CONFIG['method'] or usage "no method provided"
 end
 
 # set the path, possibly from CLI args
@@ -137,7 +140,7 @@ case ARGV.first
 when %r{^\/} # starts with a slash
   path = ARGV.shift
 else
-  path = MbConfig['path'] or usage "no path provided"
+  path = CONFIG['path'] or usage "no path provided"
 end
 
 # determine method
@@ -151,7 +154,7 @@ when 'post', 'put', 'patch'
   # get payload
   case ARGV.first
   when nil
-    payload = MbConfig['payload'] or usage "no payload provided"
+    payload = CONFIG['payload'] or usage "no payload provided"
   when '-'
     begin
       payload = JSON.parse $stdin.read

data/mudbug.gemspec

@@ -9,11 +9,12 @@ Gem::Specification.new do |s|
 
   s.executables << 'mb'
 
-  s.add_runtime_dependency  "rest-client", ["~> 1"]
-  s.add_runtime_dependency         "json", ["~> 1"]
-  s.add_runtime_dependency        "lager", [">= 0.2"]
-  s.add_development_dependency "minitest", [">= 0"]
-  s.add_development_dependency  "buildar", ["~> 1.4"]
+  s.add_runtime_dependency  "rest-client", "~> 1"
+  s.add_runtime_dependency         "json", "~> 1"
+  s.add_runtime_dependency        "lager", ">= 0.2"
+  s.add_runtime_dependency       "dotcfg", "~> 0.2"
+  s.add_development_dependency "minitest", ">= 0"
+  s.add_development_dependency  "buildar", "~> 1.4"
 
   # dynamic setup
   this_dir = File.expand_path('..', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mudbug
 version: !ruby/object:Gem::Version
-  version: 0.7.0.1
+  version: 0.7.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: dotcfg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +122,6 @@ files:
 - LICENSE.txt
 - rakefile.rb
 - lib/mudbug.rb
-- lib/mb_config.rb
 - test/mudbug.rb
 - examples/accepts_and_methods.rb
 - bin/mb

data/lib/mb_config.rb

@@ -1,60 +0,0 @@
-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)
-    rescues = 0
-    begin
-      File.open(FILE, 'r') { |f|
-        CFG.merge! JSON.parse f.read
-      }
-    rescue JSON::ParserError => e
-      rescues += 1
-      puts "#{e} (#{e.class})"
-      if rescues < 2
-        puts "Resetting #{FILE}"
-        reset
-        retry
-      end
-      Mudbug.lager.fatal { "MbConfig.load failed!" }
-      raise e
-    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