faraday-cli 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65b179f90f061bf3461ab30bea1a8c336eeec630
-  data.tar.gz: 60dfd772c68e2f907d063437a65edede32740651
+  metadata.gz: a7d7f7b331f42287d4e254f99ed969523bfa8b00
+  data.tar.gz: a0e11ea299acc38652d59ed5a31e03b250dfbbac
 SHA512:
-  metadata.gz: 8d1f2be329eb7ad8d0e926bbb00bc6116fa9fb8bb298b662ed9e74bbbfa4be9a9b3df0d24ab9154727132f886c67ac667f816985225591542cab3805ba1a36d8
-  data.tar.gz: 158bee6daa08f7ee9c96d3309bcc9320055d5e78415213ec9b8db16401aab492a7942e0da55655af2312d88841678caeec1055c192edcab1ad695463be9eb463
+  metadata.gz: f02c69445e412156866be56c6f137b2d19783dd37315f559beac5efe1ca1ca52aff2dc23e194e93560d7b8b2fcd375e9c43ec0c6d7bc39d562c17d2127adca9d
+  data.tar.gz: b43111af4766aa36d744f4108d50bc72333f967752532ce6c3731735f1eb047eee65bfa554ec8a4ea238a96859d1fcc52c349acb708fadf8888059b24eabbb50

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/bin/faraday-cli

@@ -64,22 +64,27 @@ OptionParser.new do |o|
   #   CLI_OPTIONS[:proxy]= {host: host, port: port}
   # end
 
-  o.on('-v','--verbose','Make the operation more talkative') do
+  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)") { CLI_OPTIONS[:flags] << :silent }
+  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
+  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
+  o.on('-W', '--without_middlewares', 'Make request without consuming middleware file(s)') do
     CLI_OPTIONS[:flags] << :without_middlewares
   end
 
@@ -91,18 +96,23 @@ 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)
 
 connection = Faraday.new do |builder|
+  builder.use Faraday::Response::RaiseError
 
   unless CLI_OPTIONS[:flags].include?(:without_middlewares)
     Faraday::CLI::MiddlewareFetcher.extend!(builder, *CLI_OPTIONS[:config_file_paths])
   end
 
   builder.request(:multipart) if CLI_OPTIONS[:flags].include?(:multipart)
-  builder.response :logger if !CLI_OPTIONS[:flags].include?(:silent) && CLI_OPTIONS[:flags].include?(:verbose)
 
-  builder.adapter(:net_http)
+  if is_verbose
+    builder.use Faraday::CLI::Middleware::VerboseRequest
+    builder.response :logger
+  end
 
+  builder.adapter(:net_http)
 end
 
 if CLI_OPTIONS[:flags].include?(:show_middlewares)
@@ -110,22 +120,38 @@ if CLI_OPTIONS[:flags].include?(:show_middlewares)
   exit
 end
 
-response = connection.public_send(CLI_OPTIONS[:http_method].downcase) do |request|
+FARADAY_ACTIVE_CONNECTION= connection
+def active_connection
+  FARADAY_ACTIVE_CONNECTION
+end
 
-  raise('Missing URL for request!') if ARGV[0].nil?
-  request.url(ARGV[0])
+begin
 
-  CLI_OPTIONS[:http_headers].each do |key, value|
-    request.headers[key]=value
-  end
+  response = connection.public_send(CLI_OPTIONS[:http_method].downcase) do |request|
+
+    raise('Missing URL for request!') if ARGV[0].nil?
+    request.url(ARGV[0])
+
+    CLI_OPTIONS[:http_headers].each do |key, value|
+      request.headers[key]=value
+    end
+
+    CLI_OPTIONS[:params].each do |key, value|
+      request.params[key]=value
+    end
+
+    request.body = CLI_OPTIONS[:body] unless CLI_OPTIONS[:body].nil?
 
-  CLI_OPTIONS[:params].each do |key, value|
-    request.params[key]=value
   end
 
-  request.body = CLI_OPTIONS[:body] unless CLI_OPTIONS[:body].nil?
+  $stdout.puts(Faraday::CLI::ResponseFormatter.format(response, *CLI_OPTIONS[:flags]))
 
-end
+rescue Faraday::Error => ex
+  $stdout.puts(ex.message)
+  exit(1)
+
+rescue URI::InvalidURIError => ex
+  $stdout.puts(ex.message)
+  exit(1)
 
-$stdout.puts Faraday::CLI::ResponseFormatter.format(response,*CLI_OPTIONS[:flags]) unless CLI_OPTIONS[:flags].include?(:silent)
-exit(1) if (400..599).include?(response.status)
+end

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

@@ -0,0 +1,10 @@
+require 'yaml'
+class Faraday::CLI::Middleware::VerboseRequest < Faraday::Middleware
+
+  def call(request_env)
+    $stdout.puts(YAML.dump(request_env),"\n")
+
+    @app.call(request_env)
+  end
+
+end

data/lib/faraday/cli/middleware.rb

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

data/lib/faraday/cli.rb

@@ -3,6 +3,7 @@ module Faraday::CLI
 
   require 'faraday/cli/version'
   require 'faraday/cli/client'
+  require 'faraday/cli/middleware'
   require 'faraday/cli/response_formatter'
   require 'faraday/cli/middleware_fetcher'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,8 @@ files:
 - faraday-cli.gemspec
 - lib/faraday/cli.rb
 - lib/faraday/cli/client.rb
+- lib/faraday/cli/middleware.rb
+- lib/faraday/cli/middleware/verbose_request.rb
 - lib/faraday/cli/middleware_fetcher.rb
 - lib/faraday/cli/middleware_fetcher/container.rb
 - lib/faraday/cli/response_formatter.rb
@@ -149,4 +151,3 @@ signing_key:
 specification_version: 4
 summary: Console line interface for faraday gem.
 test_files: []
-has_rdoc: