wadl 0.2.0 → 0.2.1

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to wadl version 0.2.0
+This documentation refers to wadl version 0.2.1
 
 
 == DESCRIPTION

data/lib/wadl/cli.rb

@@ -26,6 +26,7 @@
 
 require 'optparse'
 require 'yaml'
+require 'cgi'
 require 'highline'
 require 'stringio'
 require 'wadl'
@@ -51,7 +52,7 @@ module WADL
       :authorize_url     => '%s/oauth/authorize'
     }
 
-    OPTION_RE = %r{\A--?(\w+)}
+    OPTION_RE = %r{\A--?(.+?)(?:=(.+))?\z}
     RESOURCE_PATH_RE = %r{[. /]}
 
     def self.execute(*args)
@@ -104,8 +105,8 @@ module WADL
 
     def resource
       @resource ||= begin
-        path = [options[:api_base], *resource_path].compact.join('/')
-        path.split(RESOURCE_PATH_RE).inject(api) { |m, n| m.send(:find_resource_by_path, n) }
+        path = [options[:api_base], *resource_path].compact.join('/').split(RESOURCE_PATH_RE)
+        path.inject(api) { |m, n| m.send(:find_resource_by_path, n) } or abort "Resource not found: #{path.join('/')}"
       end
     end
 
@@ -143,23 +144,25 @@ module WADL
     end
 
     def parse_arguments(arguments)
-      @resource_path, @opts, skip = [], {}, false
+      @resource_path, @opts, skip_next = [], {}, false
+      @opts.update(options[:query]) if options[:query]
 
       arguments.each_with_index { |arg, index|
-        if skip
-          skip = false
+        if skip_next
+          skip_next = false
           next
         end
 
-        case arg
-          when OPTION_RE
-            key, value = $1, arguments[index + 1]
-
-            value =~ OPTION_RE ? value = '1' : skip = true
-
-            opts[key] = value
+        if arg =~ OPTION_RE
+          key, value, next_arg = $1, $2, arguments[index + 1]
+          opts[key] = value || if next_arg =~ OPTION_RE
+            '1'  # "true"
           else
-            resource_path << arg
+            skip_next = true
+            next_arg
+          end
+        else
+          resource_path << arg
         end
       }
     end
@@ -248,6 +251,12 @@ module WADL
           options[:api_base] = api_base
         }
 
+        opts.on('-q', '--query QUERY', "Query string to pass to request") { |query|
+          options[:query] = CGI.parse(query).inject({}) { |params, (key, values)|
+            params[key] = values.last; params
+          }
+        }
+
         opts.separator ''
 
         opts.on('--skip-auth', "Skip any authentication") {

data/lib/wadl/version.rb

@@ -4,7 +4,7 @@ module WADL
 
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wadl
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Leonard Richardson