plz 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 642e6be4ba4938db67f02e0bfc072f0d2bf3291f
-  data.tar.gz: fac1d6ec41c76c29a54deebb6a9296643f56daab
+  metadata.gz: 8341580e74e32f97c3702d6b9f783086329c036b
+  data.tar.gz: '08c81ffb4009bf9f42ec68042e08a620387933a4'
 SHA512:
-  metadata.gz: 1592d03c612d45db63045cf60ddc01d0f682b4b682b4fdd6f4d5678c04bc53571829fcb10d7edbc61c64d9e5421c7ad8dc05f4af5b93c7611416871d0fc4d732
-  data.tar.gz: 079242cf0921724a56a0dc74efc3d27d22976963ed2323e596b0101a5b03d6773e376a487f4ea6c423d3982792ff15d0422752ccfb365534f4576a58766db27d
+  metadata.gz: 7f9d1fddcc0b9e8db67399251e0a010da7acdd9cedce82d0ab6cacf1bb4638bcd852b245f27eb644bdedcf83f07488ffb8d01e2e1db3962c0d2d163c825b8af2
+  data.tar.gz: d10b8a62fad862d4551d46a6efb6bf60f9175120593caee05801a59affa839c01f780b3e5d1b2bc2cdc1aabee9dd9508abf7e193e66f8299478da6c577852057

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.1.7
+
+- Support multi path parameters
+- Improve program name on help message
+
 ## v0.1.6
 
 - Fix rouge version with `< 2.0.0`

data/lib/plz/arguments.rb

@@ -7,12 +7,12 @@ module Plz
 
     # @return [String, nil] Given action name
     def action_name
-      ARGV[0]
+      @argv[0]
     end
 
     # @return [String, nil] Given target name
     def target_name
-      ARGV[1]
+      @argv[1]
     end
 
     # @return [Hash] Params parsed from given arguments & STDIN
@@ -23,7 +23,7 @@ module Plz
 
     # @return [Hash] Headers parsed from given arguments
     def headers
-      ARGV[2..-1].inject({}) do |result, section|
+      @argv[2..-1].inject({}) do |result, section|
         case
         when /(?<key>.+):(?<value>[^=]+)/ =~ section
           result.merge(key => value)
@@ -56,7 +56,7 @@ module Plz
 
     # @return [Hash] Params extracted from ARGV
     def params_from_argv
-      @params_from_argv ||= ARGV[2..-1].inject({}) do |result, section|
+      @params_from_argv ||= @argv[2..-1].inject({}) do |result, section|
         case
         when /(?<key>.+):=(?<value>.+)/ =~ section
           begin

data/lib/plz/command_builder.rb

@@ -45,8 +45,8 @@ module Plz
       when !has_link?
         Commands::LinkNotFound.new(
           pathname: schema_file_pathname,
-          action_name: nil,
-          target_name: nil
+          action_name: action_name,
+          target_name: target_name,
         )
       when has_invalid_json_input?
         Commands::InvalidJsonFromStdin.new
@@ -148,7 +148,7 @@ module Plz
     # @example
     #   path_with_template #=> "/apps/%{id}"
     def path_with_template
-      link.href.gsub(/{(.+)}/) do |matched|
+      link.href.gsub(/{(.+?)}/) do |matched|
         key = CGI.unescape($1).gsub(/[()]/, "").split("/").last
         "%{#{key}}"
       end
@@ -158,8 +158,8 @@ module Plz
     # @exmaple
     #   path_keys #=> ["id"]
     def path_keys
-      link.href.scan(/{(.+)}/).map do |str|
-        CGI.unescape($1).gsub(/[()]/, "").split("/").last
+      link.href.scan(/{(.+?)}/).map do |gr|
+        CGI.unescape(gr.first).gsub(/[()]/, "").split("/").last
       end
     end
 

data/lib/plz/commands/help.rb

@@ -17,11 +17,12 @@ module Plz
 
       # @return [Array<String>]
       def links
+        prog_name = File.basename($0)
         @schema.properties.map do |target_name, schema|
           schema.links.select do |link|
             link.href && link.method && link.title
           end.map do |link|
-            str = "  plz #{link.title.underscore} #{target_name}"
+            str = "  #{prog_name} #{link.title.underscore} #{target_name}"
             if key = link.href[/{(.+?)}/, 1]
               path = CGI.unescape(key).gsub(/[()]/, "")
               name = path.split("/").last

data/lib/plz/error.rb

@@ -1,6 +1,6 @@
 module Plz
   class Error < StandardError
-    USAGE = "Usage: plz <action> <target> [headers|params] [options]"
+    USAGE = "Usage: #{File.basename($0)} <action> <target> [headers|params] [options]"
   end
 
   class UnparsableJsonParam < Error

data/lib/plz/version.rb

@@ -1,3 +1,3 @@
 module Plz
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plz
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: JSON Schema based command line HTTP client.