jazor 0.0.3 → 0.0.4

data/bin/jazor

@@ -9,56 +9,57 @@ require 'jazor'
 
 module Jazor
 
-  options = {
-    :tests        => [],
-    :rest_data    => '',
-    :rest_headers => {},
-    :rest_request => 'GET'
-  }
-
-  OptionParser.new do |opts|
-    opts.version = VERSION
-    opts.banner = "Usage: #{$0} [options] [source] [slice]\n" \
-    + "Example: #{$0} http://example.com/example.json a.b.c\n\n"
-
-    opts.on('-d', '--data DATA', 'Data sent with REST request') do |opt|
-      options[:rest_data] = opt
-    end
+  begin
 
-    opts.on('-H', '--header HEADER', 'Header sent with REST request') do |opt|
-      key, value = opt.split(':')
-      options[:rest_headers][key.strip] = value.strip
-    end
+    options = {
+      :tests        => [],
+      :rest_data    => {},
+      :rest_headers => {},
+      :rest_request => 'GET'
+    }
+
+    OptionParser.new do |opts|
+      opts.version = VERSION
+      opts.banner = "Usage: #{$0} [options] [source] [slice]\n" \
+      + "Example: #{$0} http://example.com/example.json a.b.c\n\n"
+
+      opts.on('-d', '--data DATA', 'Data sent with REST request (e.g. <name>=<value>)') do |opt|
+        key, value = opt.split('=')
+        options[:rest_data][key] = value
+      end
 
-    opts.on('-t', '--test EXPRESSION', 'Test expression') do |opt|
-      options[:tests] << opt
-    end
+      opts.on('-H', '--header HEADER', 'Header sent with REST request (e.g. <name>:<value>)') do |opt|
+        key, value = opt.split(':')
+        options[:rest_headers][key.strip] = value.strip
+      end
 
-    opts.on('-v', '--verbose', 'Turn on verbose logging') do |opt|
-      LOG.level = Logger::DEBUG
-    end
+      opts.on('-t', '--test EXPRESSION', 'Test expression (e.g. "a.b.c == 123")') do |opt|
+        options[:tests] << opt
+      end
 
-    opts.on('-X', '--request REQUEST', 'REST request method (default: %s)' % options[:rest_request]) do |opt|
-      options[:rest_request] = opt
-    end
+      opts.on('-v', '--verbose', 'Turn on verbose logging') do |opt|
+        LOG.level = Logger::DEBUG
+      end
 
-    opts.on_tail('-h', '--help', 'Show this message') do
-      puts opts.help
-      exit
-    end
+      opts.on('-X', '--request REQUEST', 'REST request method (default: %s)' % options[:rest_request]) do |opt|
+        options[:rest_request] = opt
+      end
 
-    opts.on_tail('--version', 'Show version') do
-      puts "%s %s\n%s <%s>\n%s" % [opts.program_name, opts.version, AUTHOR, AUTHOR_EMAIL, URL]
-      exit
-    end
+      opts.on_tail('-h', '--help', 'Show this message') do
+        puts opts.help
+        exit
+      end
 
-    if ARGV.length == 0 && STDIN.fcntl(Fcntl::F_GETFL, 0) != 0
-      puts opts.help
-      exit(1)
-    end
-  end.parse!
+      opts.on_tail('--version', 'Show version') do
+        puts "%s %s\n%s <%s>\n%s" % [opts.program_name, opts.version, AUTHOR, AUTHOR_EMAIL, URL]
+        exit
+      end
 
-  begin
+      if ARGV.length == 0 && STDIN.fcntl(Fcntl::F_GETFL, 0) != 0
+        puts opts.help
+        exit(1)
+      end
+    end.parse!
 
     jazor = if STDIN.fcntl(Fcntl::F_GETFL, 0) == 0
       json = STDIN.read
@@ -85,20 +86,19 @@ module Jazor
       puts [Hash, Array].include?(obj.class) ? JSON.pretty_generate(obj) : obj
     end
 
+    options[:tests].each do |test|
+      if jazor.instance_eval(test)
+        LOG.info("Test passed: %s" % test)
+      else
+        LOG.error("Test failed: %s" % test)
+        exit(1)
+      end
+    end
+
   rescue StandardError => e
-    #puts e
-    #puts e.backtrace
     LOG.error(e.message)
+    puts e.backtrace if LOG.level == Logger::DEBUG
     exit(1)
   end
 
-  options[:tests].each do |test|
-    if jazor.instance_eval(test)
-      LOG.info("Test passed: %s" % test)
-    else
-      LOG.error("Test failed: %s" % test)
-      exit(1)
-    end
-  end
-
 end

data/lib/jazor.rb

@@ -8,7 +8,7 @@ require 'uri'
 module Jazor
 
   NAME = 'jazor'
-  VERSION_INFO = ['0', '0', '3']
+  VERSION_INFO = ['0', '0', '4']
   VERSION = VERSION_INFO.join('.')
   AUTHOR = 'Michael T. Conigliaro'
   AUTHOR_EMAIL = 'mike [at] conigliaro [dot] org'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jazor
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Michael T. Conigliaro
@@ -47,9 +47,9 @@ files:
 - README.rdoc
 - bin/jazor
 - lib/jazor.rb
+- test/test_jazor_bin.rb
 - test/test.json
 - test/test_jazor.rb
-- test/test_jazor_bin.rb
 - test/test_rest_client.rb
 has_rdoc: true
 homepage: http://github.com/mconigliaro/jazor