faraday-cli 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d7f7b331f42287d4e254f99ed969523bfa8b00
-  data.tar.gz: a0e11ea299acc38652d59ed5a31e03b250dfbbac
+  metadata.gz: 8f4d394529ed718ce41e89f26fb9263c3ebaaf07
+  data.tar.gz: 26d37f005429916ac2991e7c80f4bc182d291414
 SHA512:
-  metadata.gz: f02c69445e412156866be56c6f137b2d19783dd37315f559beac5efe1ca1ca52aff2dc23e194e93560d7b8b2fcd375e9c43ec0c6d7bc39d562c17d2127adca9d
-  data.tar.gz: b43111af4766aa36d744f4108d50bc72333f967752532ce6c3731735f1eb047eee65bfa554ec8a4ea238a96859d1fcc52c349acb708fadf8888059b24eabbb50
+  metadata.gz: 6db00733558102de7f8b984db34d53ad9e369ef1cc352d14f02da469d6e426fa8d6b8c4b51ff995c6e1c521bb802fa0c47a122061e670c84efe6232ff6a028a7
+  data.tar.gz: 380aab8b2a7cdd5d7d328e22876348551976acd80501a3964dfaaeb12007e57c9af0da70ab25d0b475b8808e265e674bc44fb3225a378aa23a11b612224c404a

data/TODO

@@ -4,3 +4,4 @@
  -D, --dump-header FILE  Write the headers to FILE
  -H, --header LINE   Pass custom header LINE to server (H)
  -x, --proxy [PROTOCOL://]HOST[:PORT]  Use proxy on given port
+ -:, --next          Allows the following URL to use a separate set of options

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/bin/faraday-cli

@@ -3,100 +3,10 @@ if ENV['FARADAY_CLI_DEVELOPER_ENV'] == 'true'
   $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 end
 
-require 'optparse'
 require 'faraday/cli'
 
-CLI_OPTIONS = {}
-CLI_OPTIONS[:flags]= []
-OptionParser.new do |o|
-
-  o.banner.concat(' <url>')
-
-  o.on('-V', '--version', 'Show version number and quit') { $stdout.puts(Faraday::CLI::VERSION); exit }
-
-  CLI_OPTIONS[:http_method]= 'get'
-  o.on('-X', '--request COMMAND', 'Specify http request command to use') do |http_method|
-    CLI_OPTIONS[:http_method]= http_method.to_s.strip.downcase
-  end
-
-  CLI_OPTIONS[:http_headers]= []
-  o.on('-H', '--header HEADER:VALUE', 'Pass custom header LINE to server (H)') do |header|
-    CLI_OPTIONS[:http_headers].push(header.split(':'))
-  end
-
-  CLI_OPTIONS[:params]= []
-  o.on('-q', '--query key=value', 'Pass Query key values to use in the request') do |raw_query_pair|
-    CLI_OPTIONS[:params].push(raw_query_pair.split('='))
-  end
-
-  o.on('-d', '--data PAYLOAD_STRING', 'HTTP POST data (H)') { |payload| CLI_OPTIONS[:body]= payload }
-
-  o.on('--upload_file KEY=FILE_PATH[:CONTENT_TYPE]', 'Pass File upload io in the request pointing to the given file') do |payload_file_path|
-
-    CLI_OPTIONS[:flags] << :multipart
-
-    parts = payload_file_path.split('=')
-    raw_file_path = parts.pop
-    key = parts.first
-
-    file_path, content_type = raw_file_path.split(':')
-    content_type ||= 'application/octet-stream'
-
-    file_stream_io = Faraday::UploadIO.new(File.realpath(file_path), content_type)
-
-    CLI_OPTIONS[:body] = {key => file_stream_io}
-
-  end
-
-  o.on('-A', '--user-agent STRING', 'Send User-Agent STRING to server (H)') do |user_agent|
-    CLI_OPTIONS[:http_headers] << ['User-Agent', user_agent]
-  end
-
-  o.on('-o', '--output FILE_PATH', 'Write to FILE instead of stdout') do |out_file_path|
-    $stdout.reopen(out_file_path, 'a+')
-    $stderr.reopen(out_file_path, 'a+')
-  end
-
-  # o.on('-x', '--proxy HOST:PORT', 'HOST[:PORT] Use proxy on given port') do |host_port_str|
-  #   host, port = host_port_str.split(':')
-  #   port = '80' if port.nil?
-  #
-  #   CLI_OPTIONS[:proxy]= {host: host, port: port}
-  # end
-
-  o.on('-v', '--verbose', 'Make the operation more talkative') do
-    CLI_OPTIONS[:flags] << :verbose
-  end
-
-  o.on('-s', '--silent', "Silent mode (don't output anything)") do
-    CLI_OPTIONS[:flags] << :silent
-    $stdout.reopen('/dev/null', 'a+')
-    $stderr.reopen('/dev/null', 'a+')
-
-  end
-
-  CLI_OPTIONS[:config_file_paths]= []
-  o.on('-K', '--config FILE_PATH', 'File path to the .faraday.rb if you want use other than default') do |file_path|
-    CLI_OPTIONS[:config_file_paths] << File.absolute_path(file_path)
-  end
-
-  o.on('-M', '--middlewares', 'Show current middleware stack') do
-    CLI_OPTIONS[:flags] << :show_middlewares
-  end
-
-  o.on('-W', '--without_middlewares', 'Make request without consuming middleware file(s)') do
-    CLI_OPTIONS[:flags] << :without_middlewares
-  end
-
-  # Z
-
-  o.parse!
-
-end
-
-ALLOWED_HTTP_METHODS = %w(get head post put patch delete options)
-raise('invalid http method given') unless ALLOWED_HTTP_METHODS.include?(CLI_OPTIONS[:http_method])
-is_verbose = !CLI_OPTIONS[:flags].include?(:silent) && CLI_OPTIONS[:flags].include?(:verbose)
+CLI_OPTIONS = Faraday::CLI::Option::Parser.new.parse!
+Faraday::CLI::Option::Validator.validate(CLI_OPTIONS)
 
 connection = Faraday.new do |builder|
   builder.use Faraday::Response::RaiseError
@@ -107,12 +17,16 @@ connection = Faraday.new do |builder|
 
   builder.request(:multipart) if CLI_OPTIONS[:flags].include?(:multipart)
 
-  if is_verbose
-    builder.use Faraday::CLI::Middleware::VerboseRequest
+  if CLI_OPTIONS[:flags].include?(:verbose)
     builder.response :logger
   end
 
-  builder.adapter(:net_http)
+  if CLI_OPTIONS[:flags].include?(:super_verbose)
+    builder.use Faraday::CLI::Middleware::VerboseRequest
+    builder.use Faraday::CLI::Middleware::VerboseResponse
+  end
+
+  builder.adapter(Faraday.default_adapter)
 end
 
 if CLI_OPTIONS[:flags].include?(:show_middlewares)
@@ -121,6 +35,7 @@ if CLI_OPTIONS[:flags].include?(:show_middlewares)
 end
 
 FARADAY_ACTIVE_CONNECTION= connection
+
 def active_connection
   FARADAY_ACTIVE_CONNECTION
 end
@@ -144,10 +59,11 @@ begin
 
   end
 
-  $stdout.puts(Faraday::CLI::ResponseFormatter.format(response, *CLI_OPTIONS[:flags]))
+  $stdout.puts(response.body)
 
-rescue Faraday::Error => ex
+rescue Faraday::ClientError => ex
   $stdout.puts(ex.message)
+  $stdout.puts(ex.response[:body]) unless ex.response.nil?
   exit(1)
 
 rescue URI::InvalidURIError => ex

data/lib/faraday/cli/middleware/verbose_request.rb

@@ -2,7 +2,7 @@ require 'yaml'
 class Faraday::CLI::Middleware::VerboseRequest < Faraday::Middleware
 
   def call(request_env)
-    $stdout.puts(YAML.dump(request_env),"\n")
+    $stdout.puts(YAML.dump({'request' => request_env}),"\n")
 
     @app.call(request_env)
   end

data/lib/faraday/cli/middleware/verbose_response.rb

@@ -0,0 +1,12 @@
+class Faraday::CLI::Middleware::VerboseResponse < Faraday::Middleware
+
+  def call(request_env)
+    @app.call(request_env).on_complete do |src_response_env|
+      response_env = src_response_env.dup
+      response_env.delete(:body)
+
+      $stdout.puts(YAML.dump({'response' => response_env}),"\n")
+    end
+  end
+
+end

data/lib/faraday/cli/middleware.rb

@@ -1,3 +1,4 @@
 module Faraday::CLI::Middleware
   require 'faraday/cli/middleware/verbose_request'
+  require 'faraday/cli/middleware/verbose_response'
 end

data/lib/faraday/cli/option/parser.rb

@@ -0,0 +1,106 @@
+require 'optparse'
+class Faraday::CLI::Option::Parser
+
+  def parse!
+    options = {}
+    merge_defaults(options)
+    OptionParser.new do |o|
+
+      o.banner.concat(' <url>')
+
+      o.on('-V', '--version', 'Show version number and quit') { $stdout.puts(Faraday::CLI::VERSION); exit }
+
+      o.on('-X', '--request COMMAND', 'Specify http request command to use') do |http_method|
+        options[:http_method]= http_method.to_s.strip.downcase
+      end
+
+      o.on('-H', '--header HEADER:VALUE', 'Pass custom header LINE to server (H)') do |header|
+        options[:http_headers].push(header.split(':'))
+      end
+
+      o.on('-q', '--query key=value', 'Pass Query key values to use in the request') do |raw_query_pair|
+        options[:params].push(raw_query_pair.split('='))
+      end
+
+      o.on('-d', '--data PAYLOAD_STRING', 'HTTP POST data (H)') { |payload| options[:body]= payload }
+
+      o.on('--upload_file KEY=FILE_PATH[:CONTENT_TYPE]', 'Pass File upload io in the request pointing to the given file') do |payload_file_path|
+
+        options[:flags] << :multipart
+
+        parts = payload_file_path.split('=')
+        raw_file_path = parts.pop
+        key = parts.first
+
+        file_path, content_type = raw_file_path.split(':')
+        content_type ||= 'application/octet-stream'
+
+        file_stream_io = Faraday::UploadIO.new(File.realpath(file_path), content_type)
+
+        options[:body] = {key => file_stream_io}
+
+      end
+
+      o.on('-A', '--user-agent STRING', 'Send User-Agent STRING to server (H)') do |user_agent|
+        options[:http_headers] << ['User-Agent', user_agent]
+      end
+
+      o.on('-o', '--output FILE_PATH', 'Write to FILE instead of stdout') do |out_file_path|
+        $stdout.reopen(out_file_path, 'a+')
+        $stderr.reopen(out_file_path, 'a+')
+      end
+
+      # o.on('-x', '--proxy HOST:PORT', 'HOST[:PORT] Use proxy on given port') do |host_port_str|
+      #   host, port = host_port_str.split(':')
+      #   port = '80' if port.nil?
+      #
+      #   options[:proxy]= {host: host, port: port}
+      # end
+
+      o.on('-v', '--verbose', 'Make the operation more talkative') do
+        options[:flags] << :verbose
+      end
+
+      o.on('--super-verbose', 'Make the operation even more talkative') do
+        options[:flags] << :super_verbose
+      end
+
+      o.on('-s', '--silent', "Silent mode (don't output anything)") do
+        options[:flags] << :silent
+        $stdout.reopen('/dev/null', 'a+')
+        $stderr.reopen('/dev/null', 'a+')
+
+      end
+
+      options[:config_file_paths]= []
+      o.on('-K', '--config FILE_PATH', 'File path to the .faraday.rb if you want use other than default') do |file_path|
+        options[:config_file_paths] << File.absolute_path(file_path)
+      end
+
+      o.on('-M', '--middlewares', 'Show current middleware stack') do
+        options[:flags] << :show_middlewares
+      end
+
+      o.on('-W', '--without_middlewares', 'Make request without consuming middleware file(s)') do
+        options[:flags] << :without_middlewares
+      end
+
+      # Z
+
+      o.parse!
+
+    end
+
+    options
+  end
+
+  protected
+
+  def merge_defaults(options_hash)
+    options_hash[:flags]= []
+    options_hash[:params]= []
+    options_hash[:http_method]= 'get'
+    options_hash[:http_headers]= []
+  end
+
+end

data/lib/faraday/cli/option/validator.rb

@@ -0,0 +1,19 @@
+module Faraday::CLI::Option::Validator
+  extend self
+
+  ALLOWED_HTTP_METHODS = %w(get head post put patch delete options)
+
+  def validate(options_hash)
+    validate_http_method(options_hash)
+  end
+
+  protected
+
+  def validate_http_method(options_hash)
+    unless ALLOWED_HTTP_METHODS.include?(options_hash[:http_method])
+      $stderr.puts("invalid http method given: #{options_hash[:http_method].inspect}")
+      exit(1)
+    end
+  end
+
+end

data/lib/faraday/cli/option.rb

@@ -0,0 +1,4 @@
+module Faraday::CLI::Option
+  require 'faraday/cli/option/parser'
+  require 'faraday/cli/option/validator'
+end

data/lib/faraday/cli.rb

@@ -2,9 +2,10 @@ require 'faraday'
 module Faraday::CLI
 
   require 'faraday/cli/version'
+
   require 'faraday/cli/client'
+  require 'faraday/cli/option'
   require 'faraday/cli/middleware'
-  require 'faraday/cli/response_formatter'
   require 'faraday/cli/middleware_fetcher'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -120,9 +120,12 @@ files:
 - lib/faraday/cli/client.rb
 - lib/faraday/cli/middleware.rb
 - lib/faraday/cli/middleware/verbose_request.rb
+- lib/faraday/cli/middleware/verbose_response.rb
 - lib/faraday/cli/middleware_fetcher.rb
 - lib/faraday/cli/middleware_fetcher/container.rb
-- lib/faraday/cli/response_formatter.rb
+- lib/faraday/cli/option.rb
+- lib/faraday/cli/option/parser.rb
+- lib/faraday/cli/option/validator.rb
 - lib/faraday/cli/version.rb
 - prototype/.faraday.rb
 - prototype/config.ru

data/lib/faraday/cli/response_formatter.rb

@@ -1,24 +0,0 @@
-require 'yaml'
-module Faraday::CLI::ResponseFormatter
-  extend self
-
-  def format(faraday_response,*flags)
-    formatted_message_parts = []
-    formatted_message_parts << YAML.dump(response_hash_by(faraday_response)) if flags.include?(:verbose)
-    formatted_message_parts << faraday_response.body
-
-    formatted_message_parts.join("\n")
-  end
-
-  protected
-
-  def response_hash_by(faraday_response)
-    {
-        'response' => {
-            'status' => faraday_response.status,
-            'headers' => Hash[faraday_response.headers]
-        }
-    }
-  end
-
-end