faraday-cli 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f05a956dccfc757f41470e2d83a9073c992b1959
-  data.tar.gz: b9e8b968189f9034bf5ce6d3511c684f3c06a9b6
+  metadata.gz: fd56916e841f94acb051ef3bba61c781365b4a33
+  data.tar.gz: 5e082dcee9e28df98d2f42d5a56b1c1c73424875
 SHA512:
-  metadata.gz: 3205560b172da216bc751eccd3e9c92416cedede685212d949357c2dc3d3482857bcf873aef60a196ded4e42b628ec857c381a7c193019ad2ea020ebf30b0490
-  data.tar.gz: f9b823c5abf8358688beeb0a41d58847055dd32047fee9b5c97c2b75a50d14841f655138da1984b594e5670d480f9a6d9edd13096ae194923a211b4f18f86f11
+  metadata.gz: a3829febeef5abbaa2b29f870e8a936c643a6ecea4c07621b076ca0ddcb8379af78f20aff2d78b66b18d4ce9b2363cfa25564fa3e595b67f4b9c5d302bcdd02a
+  data.tar.gz: 3647c38fe784742544750f762687538c803ecca19801ec05900602cbedbe2e28fe9794732a5d0ebcebf0cb9bbff33a6608a84556783d512d2bb50d3ec72aeeac

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in faraday-cli.gemspec
 gemspec
+
+gem 'rack'
+gem 'escher'
+gem 'escher-keypool'
+gem 'escher-rack_middleware'
+gem 'faraday_middleware-escher'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/faraday-cli

@@ -1,14 +1,13 @@
 #!/usr/bin/env ruby
-
-if ENV['DEVELOPER_ENV'] == 'true'
-  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-end
+# if ENV['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>')
@@ -26,21 +25,38 @@ OptionParser.new do |o|
   end
 
   CLI_OPTIONS[:params]= []
-  o.on('-q','--query key=value','Pass Query key values to use in the request') do |raw_query_pair|
+  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[:payload]= payload }
-  # o.on('--data_file FILE_PATH', 'Read file content for use as payload') do |payload_file|
-  #   CLI_OPTIONS[:payload]= File.read(payload_file)
-  # end
-  #
-  # o.on('-A', '--user-agent STRING', 'Send User-Agent STRING to server (H)') do |user_agent|
-  #   CLI_OPTIONS[:user_agent]= user_agent
-  # end
-  #
-  # o.on('-o', '--output FILE_PATH', 'Write to FILE instead of stdout') { |out_file_path| CLI_OPTIONS[:out_file]= out_file_path }
-  #
+  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?
@@ -48,31 +64,46 @@ OptionParser.new do |o|
   #   CLI_OPTIONS[:proxy]= {host: host, port: port}
   # 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)
+  end
+
   o.parse!
 
 end
 
-# p CLI_OPTIONS
-# p ARGV
-
 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])
-conn = Faraday.new
 
-Faraday::CLI::MiddlewareFetcher.extend!(conn)
+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.adapter(:net_http)
+
+end
+
+response = connection.public_send(CLI_OPTIONS[:http_method].downcase) do |request|
 
-response = conn.public_send(CLI_OPTIONS[:http_method]) 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|
+  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 Faraday::CLI::ResponseFormatter.format(response)
+$stdout.puts Faraday::CLI::ResponseFormatter.format(response) unless CLI_OPTIONS[:flags].include?(:silent)
+exit(1) unless (200..299).include?(response.status)

data/faraday-cli.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Console line interface for faraday gem.}
   spec.description   = %q{Console line interface for faraday gem client so you can use your favorite middleware based ruby http client on the terminal!}
-  spec.homepage      = "https://github.com/adamluzsi/faraday-cli.rb"
+  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'

data/lib/faraday/cli/middleware_fetcher.rb

@@ -4,12 +4,15 @@ module Faraday::CLI::MiddlewareFetcher
 
   require 'faraday/cli/middleware_fetcher/container'
 
-  def extend!(faraday_connection)
+  def extend!(faraday_connection_builder, *config_file_paths)
 
     file_name = '.faraday.rb'
-    container = Faraday::CLI::MiddlewareFetcher::Container.new(faraday_connection)
+    container = Faraday::CLI::MiddlewareFetcher::Container.new(faraday_connection_builder)
 
-    case true
+    case
+
+      when !config_file_paths.empty?
+        config_file_paths.each { |path| container.merge!(path) }
 
       when File.exist?(File.join(Dir.pwd, file_name))
         container.merge!(File.join(Dir.pwd, file_name))

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

@@ -2,14 +2,16 @@ require 'forwardable'
 class Faraday::CLI::MiddlewareFetcher::Container
 
   extend Forwardable
-  def_delegator :@builder, :use
+  def_delegators :@builder, :use, :request, :response, :adapter
 
-  def initialize(conn)
-    @builder = conn.builder
+  def initialize(builder)
+    @builder = builder
   end
 
   def merge!(file_path)
-    instance_eval(File.read(file_path))
+    Dir.chdir(File.dirname(file_path)) do
+      instance_eval(File.read(file_path))
+    end
   end
 
 end

data/prototype/.faraday.rb

@@ -0,0 +1,8 @@
+require './credentials'
+
+require 'faraday_middleware/escher'
+
+use FaradayMiddleware::Escher::RequestSigner,
+    credential_scope: CredentialScope,
+    options: AuthOptions,
+    active_key: -> { Escher::Keypool.new.get_active_key('EscherExample') }

data/prototype/config.ru

@@ -0,0 +1,29 @@
+require_relative 'credentials'
+
+require 'yaml'
+require 'rack'
+require 'escher/rack_middleware'
+Escher::RackMiddleware.config do |c|
+  c.add_escher_authenticator { Escher::Auth.new(CredentialScope, AuthOptions) }
+  c.add_credential_updater { Escher::Keypool.new.get_key_db }
+end
+
+class YourAwesomeApp
+
+  def call(env)
+    puts YAML.dump(env)
+    response = Rack::Response.new
+    response.write 'OK'
+    response.status = 200
+
+    response.finish
+  end
+
+end
+
+use ECHO
+use Escher::RackMiddleware
+run YourAwesomeApp.new
+
+#Rack::Server.start :app => YourAwesomeApp,
+#                   :Port => ARGV[0].to_i

data/prototype/credentials.rb

@@ -0,0 +1,21 @@
+require 'escher-keypool'
+
+ENV['KEY_POOL'] = '[{"keyId":"EscherExample","secret":"TheBeginningOfABeautifulFriendship","acceptOnly":0}]'
+ENV['ESCHEREXAMPLE_KEYID'] = 'EscherExample'
+
+CredentialScope = 'example/credential/scope'
+AuthOptions = {}
+ESCHER_KEY = {api_key_id: 'EscherExample', api_secret: 'TheBeginningOfABeautifulFriendship'}
+
+class ECHO
+
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    puts YAML.dump env
+    @app.call(env)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -123,6 +123,9 @@ files:
 - lib/faraday/cli/middleware_fetcher/container.rb
 - lib/faraday/cli/response_formatter.rb
 - lib/faraday/cli/version.rb
+- prototype/.faraday.rb
+- prototype/config.ru
+- prototype/credentials.rb
 homepage: https://github.com/adamluzsi/faraday-cli.rb
 licenses: []
 metadata: {}