faraday-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd56916e841f94acb051ef3bba61c781365b4a33
-  data.tar.gz: 5e082dcee9e28df98d2f42d5a56b1c1c73424875
+  metadata.gz: e5ef5d377a91ad8e8eabdda498fcad557a29db2e
+  data.tar.gz: 9c35a33ccb6620728fd954a277ec5ee5d7eb7ff8
 SHA512:
-  metadata.gz: a3829febeef5abbaa2b29f870e8a936c643a6ecea4c07621b076ca0ddcb8379af78f20aff2d78b66b18d4ce9b2363cfa25564fa3e595b67f4b9c5d302bcdd02a
-  data.tar.gz: 3647c38fe784742544750f762687538c803ecca19801ec05900602cbedbe2e28fe9794732a5d0ebcebf0cb9bbff33a6608a84556783d512d2bb50d3ec72aeeac
+  metadata.gz: e6fa22cfa76b24c399d4d23a475c261645b561829e42425f42e86c32e915952be0e857dfaef085307789472e67fe46bec4457d284fbcbd6149d264807aa6f86f
+  data.tar.gz: c51b1ec867372bd33d75f993f6b00d18e4b1c13e13c99bc8aed6cf4f4563f88aa2467ec3a479d2995606a5ef380aab8b4aa2e9a48d132bdf4653ddad74ecb872

data/README.md

@@ -21,21 +21,32 @@ Or install it yourself as:
 
 ## Usage
 
-#### Basic 
+### CLI options
+
+```shell
+Usage: faraday-cli [options] <url>
+    -V, --version                    Show version number and quit
+    -X, --request COMMAND            Specify http request command to use
+    -H, --header HEADER:VALUE        Pass custom header LINE to server (H)
+    -q, --query key=value            Pass Query key values to use in the request
+    -d, --data PAYLOAD_STRING        HTTP POST data (H)
+        --upload_file KEY=FILE_PATH[:CONTENT_TYPE]
+                                     Pass File upload io in the request pointing to the given file
+    -A, --user-agent STRING          Send User-Agent STRING to server (H)
+    -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"
+```
 
-    $ faraday-cli --help
-      Usage: faraday-cli [options] <url>
-          -V, --version                    Show version number and quit
-          -X, --request COMMAND            Specify http request command to use
-          -H, --header HEADER:VALUE        Pass custom header LINE to server (H)
-          -q, --query key=value            Pass Query key values to use in the request
-   
-    $ faraday-cli http://www.google.com -q "q=hello world"
+### Middleware use
 
-#### Advanced 
+You can use middlewares with ".faraday.rb" file. 
+Put any middleware related configuration into the file,
+and use the 'use' method to include into the faraday connection.
 
-because it's faraday, you can use faraday middlewares as how you pleased
-just make a file with the following name: ".faraday.rb"
+you can use any faraday middlewares as how you pleased.
  
 ```ruby
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/faraday-cli

@@ -71,6 +71,10 @@ OptionParser.new do |o|
     CLI_OPTIONS[:config_file_paths] << File.realpath(file_path)
   end
 
+  o.on('-M','--middlewares','Show current middleware stack') do
+    CLI_OPTIONS[:flags] << :show_middlewares
+  end
+
   o.parse!
 
 end
@@ -88,6 +92,12 @@ connection = Faraday.new do |builder|
 
 end
 
+if CLI_OPTIONS[:flags].include?(:show_middlewares)
+  $stdout.puts(connection.builder.handlers.map(&:inspect))
+  exit
+end
+
+
 response = connection.public_send(CLI_OPTIONS[:http_method].downcase) do |request|
 
   request.url(ARGV[0])

data/lib/faraday/cli/middleware_fetcher.rb

@@ -5,29 +5,32 @@ module Faraday::CLI::MiddlewareFetcher
   require 'faraday/cli/middleware_fetcher/container'
 
   def extend!(faraday_connection_builder, *config_file_paths)
-
-    file_name = '.faraday.rb'
     container = Faraday::CLI::MiddlewareFetcher::Container.new(faraday_connection_builder)
+    get_file_paths(config_file_paths).each { |file_path| container.merge!(file_path) }
+  end
 
+  protected
+
+  def get_file_paths(config_file_paths)
+    file_name = '{.faraday.rb,.faraday}'
     case
 
       when !config_file_paths.empty?
-        config_file_paths.each { |path| container.merge!(path) }
+        config_file_paths
 
-      when File.exist?(File.join(Dir.pwd, file_name))
-        container.merge!(File.join(Dir.pwd, file_name))
+      when !(file_paths = Dir.glob(File.join(Dir.pwd, file_name))).empty?
+        file_paths
 
-      when File.exist?(File.join(PWD.pwd, file_name))
-        container.merge!(File.join(PWD.pwd, file_name))
+      when !(file_paths = Dir.glob(File.join(PWD.pwd, file_name))).empty?
+        file_paths
 
-      when File.exist?(File.join(ENV['HOME'], file_name))
-        container.merge!(File.join(ENV['HOME'], file_name))
+      when !(file_paths = Dir.glob(File.join(ENV['HOME'], file_name))).empty?
+        file_paths
 
       else
-        nil
+        []
 
     end
-
   end
 
 end

data/lib/faraday/cli/middleware_fetcher/container.rb

@@ -1,6 +1,7 @@
 require 'forwardable'
 class Faraday::CLI::MiddlewareFetcher::Container
 
+  #TODO: remove support for adapter set
   extend Forwardable
   def_delegators :@builder, :use, :request, :response, :adapter
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".faraday.rb"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"

data/.faraday.rb

@@ -1,14 +0,0 @@
-class MW
-
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    puts env.object_id
-    @app.call(env)
-  end
-
-end
-
-use MW