faraday-cli 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5ef5d377a91ad8e8eabdda498fcad557a29db2e
-  data.tar.gz: 9c35a33ccb6620728fd954a277ec5ee5d7eb7ff8
+  metadata.gz: 05529b7985588b2a66295f2a98ef00c1d73715e0
+  data.tar.gz: 830ed39a7103a5b1c15c706a4e35213946f99f33
 SHA512:
-  metadata.gz: e6fa22cfa76b24c399d4d23a475c261645b561829e42425f42e86c32e915952be0e857dfaef085307789472e67fe46bec4457d284fbcbd6149d264807aa6f86f
-  data.tar.gz: c51b1ec867372bd33d75f993f6b00d18e4b1c13e13c99bc8aed6cf4f4563f88aa2467ec3a479d2995606a5ef380aab8b4aa2e9a48d132bdf4653ddad74ecb872
+  metadata.gz: 0f36c52ae2b8d68eda145fab01e46d5bef2395e403daafe8cc9c520b9a0c56366ab42bba0ea5d67f538d4a671d80b8bf7c6889930dbb92ff8b848c826a271c7b
+  data.tar.gz: e8197d7a109a9865e1766d7520d800af4322efda5baffffb325e999ed65c5005355b9a22ffae64d43900c95248e52fcdc14ba987ce95a7df0dfd5959a0bab546

data/README.md

@@ -36,8 +36,10 @@ Usage: faraday-cli [options] <url>
     -o, --output FILE_PATH           Write to FILE instead of stdout
     -s, --silent                     Silent mode (don't output anything)
     -c, --config FILE_PATH           File path to the .faraday.rb if you want use other than default
-
-faraday-cli http://www.google.com -q "q=hello world"
+    -M, --middlewares                Show current middleware stack
+    
+faraday-cli http://www.google.com -q q=foo
+faraday-cli http://example.org -d "payload string"
 ```
 
 ### Middleware use

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/faraday-cli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# if ENV['DEVELOPER_ENV'] == 'true'
-#   $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-# end
+if ENV['FARADAY_CLI_DEVELOPER_ENV'] == 'true'
+  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+end
 
 require 'optparse'
 require 'faraday/cli'
@@ -64,11 +64,15 @@ OptionParser.new do |o|
   #   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)") { CLI_OPTIONS[:flags] << :silent }
 
   CLI_OPTIONS[:config_file_paths]= []
   o.on('-c', '--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.realpath(file_path)
+    CLI_OPTIONS[:config_file_paths] << File.absolute_path(file_path)
   end
 
   o.on('-M','--middlewares','Show current middleware stack') do
@@ -86,7 +90,7 @@ connection = Faraday.new do |builder|
   Faraday::CLI::MiddlewareFetcher.extend!(builder, *CLI_OPTIONS[:config_file_paths])
 
   builder.request(:multipart) if CLI_OPTIONS[:flags].include?(:multipart)
-  builder.response :logger unless CLI_OPTIONS[:flags].include?(:silent)
+  builder.response :logger if !CLI_OPTIONS[:flags].include?(:silent) && CLI_OPTIONS[:flags].include?(:verbose)
 
   builder.adapter(:net_http)
 
@@ -115,5 +119,5 @@ response = connection.public_send(CLI_OPTIONS[:http_method].downcase) do |reques
 end
 
 
-$stdout.puts Faraday::CLI::ResponseFormatter.format(response) unless CLI_OPTIONS[:flags].include?(:silent)
+$stdout.puts Faraday::CLI::ResponseFormatter.format(response,*CLI_OPTIONS[:flags]) unless CLI_OPTIONS[:flags].include?(:silent)
 exit(1) unless (200..299).include?(response.status)

data/faraday-cli.gemspec

@@ -1,11 +1,9 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'faraday/cli'
+VERSION = File.read(File.join(File.dirname(__FILE__),'VERSION')).strip
 
 Gem::Specification.new do |spec|
   spec.name          = "faraday-cli"
-  spec.version       = Faraday::CLI::VERSION
+  spec.version       = VERSION
   spec.authors       = ["Adam Luzsi"]
   spec.email         = ["adamluzsi@gmail.com"]
 

data/lib/faraday/cli/middleware_fetcher.rb

@@ -13,24 +13,44 @@ module Faraday::CLI::MiddlewareFetcher
 
   def get_file_paths(config_file_paths)
     file_name = '{.faraday.rb,.faraday}'
+    folder_name = '{.faraday.rb,.faraday,.faraday-cli}'
+
     case
 
       when !config_file_paths.empty?
-        config_file_paths
+        config_file_paths.reduce([]) do |file_paths, given_path|
+          file_paths.push(*Dir.glob(given_path)); file_paths
+        end
 
       when !(file_paths = Dir.glob(File.join(Dir.pwd, file_name))).empty?
         file_paths
 
+      when !(file_paths = folder_content(Dir.pwd, folder_name)).empty?
+        file_paths
+
       when !(file_paths = Dir.glob(File.join(PWD.pwd, file_name))).empty?
         file_paths
 
+      when !(file_paths = folder_content(PWD.pwd, folder_name)).empty?
+        file_paths
+
       when !(file_paths = Dir.glob(File.join(ENV['HOME'], file_name))).empty?
         file_paths
 
+      when !(file_paths = folder_content(ENV['HOME'], folder_name)).empty?
+        file_paths
+
       else
         []
 
     end
   end
 
+
+  protected
+
+  def folder_content(main_path, folder_name)
+    Dir.glob(File.join(main_path, folder_name, '*.rb')).select { |path| not File.directory?(path) }
+  end
+
 end

data/lib/faraday/cli/response_formatter.rb

@@ -2,9 +2,9 @@ require 'yaml'
 module Faraday::CLI::ResponseFormatter
   extend self
 
-  def format(faraday_response)
+  def format(faraday_response,*flags)
     formatted_message_parts = []
-    formatted_message_parts << YAML.dump(response_hash_by(faraday_response))
+    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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Luzsi