faraday-cli 0.7.3 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10f23b45623e436e3fd3f1d259dacb9febe5db0e
-  data.tar.gz: 84c772819e2ceb4350bf4b9e450a8d8f364415a5
+  metadata.gz: 33f57152ba258d34004fe9f2a687aa170b7c8494
+  data.tar.gz: f634659c2b2e36e9a9a7de928c67870d57eccec9
 SHA512:
-  metadata.gz: 38a73c9a321ac886c0da6e75c9fb40c4178ae7f61f618e47793133e770ecfecdd0f6bce71ac2dc03319e4a673f0a47b32126e4abccc52d66ddb109664e435340
-  data.tar.gz: 8f4baaac0c925b221b3259224e0a019448e196105f6827983f36d7d17e11737ad25ea40fabd24bac4ef1652444b7fd5f1f4e49ad305cd94795088c51e460447b
+  metadata.gz: 1efe3302cf27e69356689154f60bcf0b9b9276feb71f53d237f1ad8fa146c55214a036b65c73a343ef13e109697555de9da7bd4a9e0ea953597b09c20b506aa8
+  data.tar.gz: 7bc37644f7c14caac610d4988a32a804a7c4e7167973a840d2fb6769fb2f51fbfb5829805d7c9f46a3b9566ba3beca4f7bf8df57eb418c1b1a230f7e12a8cf84

data/README.md

@@ -55,16 +55,19 @@ you can use any faraday middlewares as how you pleased.
  
 ```ruby
 
-class MyAwesomeMiddleware
+class MyAwesomeMiddleware < Faraday::Middleware
 
-  def initialize(app)
-    @app = app
-  end
+  def call(request_env)
 
-  def call(env)
-    puts env.object_id
-    @app.call(env)
-  end
+    # before main request
+
+    @app.call(request_env).on_complete do |response_env|
+
+      # after main request
+  
+    end
+
+  end 
 
 end
 

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.8.3

data/exec/faraday-cli

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+lib_folder = File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift(lib_folder) if Dir.exists?(lib_folder)
+
+require 'faraday/cli'
+Faraday::CLI::Client.start(ARGV)

data/faraday-cli.gemspec

@@ -12,12 +12,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/adamluzsi/faraday-cli.rb'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'bin'
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-                           .select{|cli_command| cli_command =~ /^faraday\-cli/  }
-
   spec.require_paths = ['lib']
 
+  spec.bindir        = 'exec'
+  spec.executables   = spec.files.grep(%r{^exec/}) { |f| File.basename(f) }
+
   spec.add_development_dependency 'bundler', '>= 1.10'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/faraday/cli/client.rb

@@ -1,3 +1,79 @@
 class Faraday::CLI::Client
 
-end
+  def self.start(argv)
+    new(argv).start
+  end
+
+  def start
+
+    cli_options = Faraday::CLI::Option::Parser.new.parse!
+
+    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)
+
+      if cli_options[:flags].include?(:verbose)
+        builder.response :logger
+      end
+
+      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)
+      $stdout.puts(connection.builder.handlers.map(&:inspect))
+      exit
+    end
+
+    Faraday::CLI::Option::Validator.validate(@argv,cli_options)
+    Faraday::CLI.active_connection = connection.dup
+
+    begin
+
+      response = connection.public_send(cli_options[:http_method].downcase) do |request|
+
+        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?
+
+      end
+
+      $stdout.puts(response.body)
+
+    rescue Faraday::ClientError => ex
+      $stdout.puts(ex.message)
+      $stdout.puts(ex.response[:body]) unless ex.response.nil?
+      exit(1)
+
+    rescue URI::InvalidURIError => ex
+      $stdout.puts(ex.message)
+      exit(1)
+
+    end
+    
+  end
+
+  protected
+
+  def initialize(argv)
+    @argv = argv
+  end
+
+end

data/lib/faraday/cli/core_ext/object.rb

@@ -0,0 +1,9 @@
+module Faraday::CLI::CoreExt::Object
+
+  def active_connection
+    ::Faraday::CLI.active_connection
+  end
+
+end
+
+Object.__send__(:include,Faraday::CLI::CoreExt::Object)

data/lib/faraday/cli/core_ext.rb

@@ -0,0 +1,3 @@
+module Faraday::CLI::CoreExt
+  require 'faraday/cli/core_ext/object'
+end

data/lib/faraday/cli/middleware_fetcher.rb

@@ -2,6 +2,8 @@ require 'pwd'
 module Faraday::CLI::MiddlewareFetcher
   extend self
 
+  NAME_PATH_MATCHER = '{.faraday,.faraday.rb,.faraday-cli}'
+
   require 'faraday/cli/middleware_fetcher/container'
 
   def extend!(faraday_connection_builder, *config_file_paths)
@@ -12,9 +14,6 @@ module Faraday::CLI::MiddlewareFetcher
   protected
 
   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?
@@ -26,22 +25,22 @@ module Faraday::CLI::MiddlewareFetcher
           file_paths.push(*Dir.glob(given_path)); file_paths
         end
 
-      when !(file_paths = Dir.glob(File.join(Dir.pwd, file_name))).empty?
+      when !(file_paths = fetch_file_paths(Dir.pwd)).empty?
         file_paths
 
-      when !(file_paths = folder_content(Dir.pwd, folder_name)).empty?
+      when !(file_paths = fetch_file_paths_from_folder(Dir.pwd)).empty?
         file_paths
 
-      when !(file_paths = Dir.glob(File.join(PWD.pwd, file_name))).empty?
+      when !(file_paths = fetch_file_paths(PWD.pwd)).empty?
         file_paths
 
-      when !(file_paths = folder_content(PWD.pwd, folder_name)).empty?
+      when !(file_paths = fetch_file_paths_from_folder(PWD.pwd)).empty?
         file_paths
 
-      when !(file_paths = Dir.glob(File.join(ENV['HOME'], file_name))).empty?
+      when !(file_paths = fetch_file_paths(ENV['HOME'])).empty?
         file_paths
 
-      when !(file_paths = folder_content(ENV['HOME'], folder_name)).empty?
+      when !(file_paths = fetch_file_paths_from_folder(ENV['HOME'])).empty?
         file_paths
 
       else
@@ -50,11 +49,18 @@ module Faraday::CLI::MiddlewareFetcher
     end
   end
 
+  private
 
-  protected
+  def fetch_file_paths_from_folder(*from_folder)
+    select_file_paths(Dir.glob(File.join(*from_folder,NAME_PATH_MATCHER, '*.{rb,ru}')))
+  end
+
+  def fetch_file_paths(*from_folder)
+    select_file_paths(Dir.glob(File.join(*from_folder, NAME_PATH_MATCHER)))
+  end
 
-  def folder_content(main_path, folder_name)
-    Dir.glob(File.join(main_path, folder_name, '*.rb')).select { |path| not File.directory?(path) }
+  def select_file_paths(file_paths)
+    file_paths.select { |path| File.exists?(path) and not File.directory?(path)  }
   end
 
 end

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

@@ -15,7 +15,7 @@ class Faraday::CLI::Option::Parser
       end
 
       o.on('-H', '--header HEADER:VALUE', 'Pass custom header LINE to server (H)') do |header|
-        options[:http_headers].push(header.split(/: */))
+        options[:http_headers].push(header.split(/:\s*/))
       end
 
       o.on('-q', '--query key=value', 'Pass Query key values to use in the request') do |raw_query_pair|

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

@@ -6,23 +6,30 @@ module Faraday::CLI::Option::Validator
   def validate(argv,options_hash)
     validate_url(argv[0])
     validate_http_method(options_hash)
+    validate_http_headers(options_hash)
   end
 
+  def validate_http_headers(options_hash)
+    alert('header is in malformed format!') if options_hash[:http_headers].any?{|pairs| pairs.length != 2  }
+  end
 
   protected
 
   def validate_url(url_str)
-    if url_str.nil? || url_str == ''
-      $stderr.puts('Missing URL to make request!')
-      exit(1)
-    end
+    alert('Missing URL to make request!') if url_str.nil? || url_str == ''
   end
 
   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)
+      alert("invalid http method given: #{options_hash[:http_method].inspect}")
     end
   end
 
+  private
+
+  def alert(message)
+    $stderr.puts(message)
+    exit(1)
+  end
+
 end

data/lib/faraday/cli.rb

@@ -1,7 +1,12 @@
 require 'faraday'
 module Faraday::CLI
 
+  class << self
+    attr_accessor :active_connection
+  end
+
   require 'faraday/cli/version'
+  require 'faraday/cli/core_ext'
 
   require 'faraday/cli/client'
   require 'faraday/cli/option'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.3
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
-bindir: bin
+bindir: exec
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,11 +113,13 @@ files:
 - TODO
 - VERSION
 - bin/console
-- bin/faraday-cli
 - bin/setup
+- exec/faraday-cli
 - faraday-cli.gemspec
 - lib/faraday/cli.rb
 - lib/faraday/cli/client.rb
+- lib/faraday/cli/core_ext.rb
+- lib/faraday/cli/core_ext/object.rb
 - lib/faraday/cli/middleware.rb
 - lib/faraday/cli/middleware/verbose_request.rb
 - lib/faraday/cli/middleware/verbose_response.rb
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Console line interface for faraday gem.

data/bin/faraday-cli

@@ -1,72 +0,0 @@
-#!/usr/bin/env ruby
-if ENV['FARADAY_CLI_DEVELOPER_ENV'] == 'true'
-  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-end
-
-require 'faraday/cli'
-
-CLI_OPTIONS = Faraday::CLI::Option::Parser.new.parse!
-Faraday::CLI::Option::Validator.validate(ARGV,CLI_OPTIONS)
-
-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)
-
-  if CLI_OPTIONS[:flags].include?(:verbose)
-    builder.response :logger
-  end
-
-  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)
-  $stdout.puts(connection.builder.handlers.map(&:inspect))
-  exit
-end
-
-FARADAY_ACTIVE_CONNECTION= connection
-
-def active_connection
-  FARADAY_ACTIVE_CONNECTION
-end
-
-begin
-
-  response = connection.public_send(CLI_OPTIONS[:http_method].downcase) do |request|
-
-    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?
-
-  end
-
-  $stdout.puts(response.body)
-
-rescue Faraday::ClientError => ex
-  $stdout.puts(ex.message)
-  $stdout.puts(ex.response[:body]) unless ex.response.nil?
-  exit(1)
-
-rescue URI::InvalidURIError => ex
-  $stdout.puts(ex.message)
-  exit(1)
-
-end