plz 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f816c8d4bae071f929bcf28be92356e8e0f09e6
-  data.tar.gz: 629ccafae62941b40f0bba8f2c940f930224db9e
+  metadata.gz: 438be4824e988fa0a6ee8c9d115d1a3f0a484a96
+  data.tar.gz: 3355e4e54c324e5bab8470a27b03f147c32ad17e
 SHA512:
-  metadata.gz: c89e94a5db1039fb38a36acdc2d1a73c5b36adc4789e8421b0436f314015b29e118bb773afa2c587d8451e60421ebd5f9918bab6b28b5740c0f6156dc08b7a7d
-  data.tar.gz: 52dc00c48044fd44de75551d6bd909eb9135381e6578f56ed6021147e120e941f2f857032fcb1d5f733c5adc83666aff8385f129ed7a7271341b82f54a4d9c13
+  metadata.gz: 97b85d081396b16d302f8bb6471526197ebdab8b4df168cdc7e4b6260443eb302b2183491548047cbbc8d70ca3741527715e4097edc0cb49d2aec72f710ed79b
+  data.tar.gz: 563281675be4f77725203203cb59e4a4306e51189b756f9d6bea9a2e06b8a4ee8ece3d3fae92425d1784491c1a65e1fe06317da54dfc597f14312e938ee5ba50

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.1
+* Provide support for reading STDIN
+
 ## 0.1.0
 * Shape up --help feature
 

data/README.md

@@ -54,6 +54,14 @@ while `key:=value` is parsed into JSON value (e.g. key:=17 will be `{"key":17}`)
 $ plz create user name=alice age:=17
 ```
 
+### Stdin
+You can pass params via STDIN, instead of command line arguments.
+
+```sh
+$ plz create user < params.json
+$ cat params.json | plz create user
+```
+
 ### Options
 Plz takes some command line options.
 

data/lib/plz.rb

@@ -20,6 +20,7 @@ require "plz/arguments"
 require "plz/command_builder"
 require "plz/commands/base_url_not_found"
 require "plz/commands/help"
+require "plz/commands/invalid_json_from_stdin"
 require "plz/commands/invalid_schema"
 require "plz/commands/link_not_found"
 require "plz/commands/no_action_name"

data/lib/plz/arguments.rb

@@ -15,10 +15,48 @@ module Plz
       ARGV[1]
     end
 
-    # @return [Hash] Params parsed from given arguments
+    # @return [Hash] Params parsed from given arguments & STDIN
     # @raise [Plz::UnparsableJsonParam]
     def params
-      @params ||= ARGV[2..-1].inject({}) do |result, section|
+      params_from_stdin.merge(params_from_argv)
+    end
+
+    # @return [Hash] Headers parsed from given arguments
+    def headers
+      ARGV[2..-1].inject({}) do |result, section|
+        case
+        when /(?<key>.+):(?<value>[^=]+)/ =~ section
+          result.merge(key => value)
+        else
+          result
+        end
+      end
+    end
+
+    # @return [true, false] true if invalid JSON input is given via STDIN
+    def has_invalid_json_input?
+      params_from_stdin
+      false
+    rescue JSON::ParserError
+      true
+    end
+
+    private
+
+    # @return [Hash] Params extracted from STDIN
+    def params_from_stdin
+      @params_from_stdin ||= begin
+        if has_input_from_stdin?
+          JSON.parse(STDIN.read)
+        else
+          {}
+        end
+      end
+    end
+
+    # @return [Hash] Params extracted from ARGV
+    def params_from_argv
+      @params_from_argv ||= ARGV[2..-1].inject({}) do |result, section|
         case
         when /(?<key>.+):=(?<value>.+)/ =~ section
           begin
@@ -34,16 +72,19 @@ module Plz
       end
     end
 
-    # @return [Hash] Headers parsed from given arguments
-    def headers
-      ARGV[2..-1].inject({}) do |result, section|
-        case
-        when /(?<key>.+):(?<value>[^=]+)/ =~ section
-          result.merge(key => value)
-        else
-          result
-        end
-      end
+    # @return [true, false] True if any input given via STDIN
+    def has_input_from_stdin?
+      has_pipe_input? || has_redirect_input?
+    end
+
+    # @return [true, false] True if any input given from redirection
+    def has_redirect_input?
+      File.select([STDIN], [], [], 0) != nil
+    end
+
+    # @return [true, false] True if any input given from pipe
+    def has_pipe_input?
+      File.pipe?(STDIN)
     end
   end
 end

data/lib/plz/command_builder.rb

@@ -16,6 +16,7 @@ module Plz
       :target_name,
       :headers,
       :params,
+      :has_invalid_json_input?,
       to: :arguments,
     )
 
@@ -47,6 +48,8 @@ module Plz
           action_name: action_name,
           target_name: target_name
         )
+      when has_invalid_json_input?
+        Commands::InvalidJsonFromStdin.new
       when has_unparsable_json_param?
         Commands::UnparsableJsonParam.new(error: @json_parse_error)
       else

data/lib/plz/commands/help.rb

@@ -23,9 +23,10 @@ module Plz
           end.map do |link|
             str = "  plz #{link.title.underscore} #{target_name}"
             if key = link.href[/{(.+)}/, 1]
-              name = CGI.unescape(key).gsub(/[()]/, "").split("/").last
-              if property = link.parent.properties[name]
-                if example = property.data["example"]
+              path = CGI.unescape(key).gsub(/[()]/, "")
+              name = path.split("/").last
+              if property = JsonPointer.evaluate(@schema.data, path)
+                if example = property["example"]
                   str << " #{name}=#{example}"
                 end
               end

data/lib/plz/commands/invalid_json_from_stdin.rb

@@ -0,0 +1,9 @@
+module Plz
+  module Commands
+    class InvalidJsonFromStdin
+      def call
+        puts "Invalid JSON was given from STDIN"
+      end
+    end
+  end
+end

data/lib/plz/version.rb

@@ -1,3 +1,3 @@
 module Plz
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/schema.yml

@@ -49,12 +49,12 @@ definitions:
       rel: create
       title: Create
     - description: Update the user
-      href: "/users/{(#/definitions/users/definitions/id)}"
+      href: "/users/{(#/definitions/user/definitions/id)}"
       method: PATCH
       rel: update
       title: Update
     - description: Delete the user
-      href: "/users/{(#/definitions/users/definitions/id)}"
+      href: "/users/{(#/definitions/user/definitions/id)}"
       method: DELETE
       rel: delete
       title: Delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -199,6 +199,7 @@ files:
 - lib/plz/command_builder.rb
 - lib/plz/commands/base_url_not_found.rb
 - lib/plz/commands/help.rb
+- lib/plz/commands/invalid_json_from_stdin.rb
 - lib/plz/commands/invalid_schema.rb
 - lib/plz/commands/link_not_found.rb
 - lib/plz/commands/no_action_name.rb