faraday-cli 0.7.1 → 0.9.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: daf7bed634eb91d053706c958f8447416cdb399b
4
- data.tar.gz: 09f346257fbbfdaf6c05702d3a4a44be9722f80e
2
+ SHA256:
3
+ metadata.gz: ac9775a5c9c98a6202ca67413e2f96d06e7ed72105f7a27c625c6abfc2f119fc
4
+ data.tar.gz: 2c42c6e1a4ffcdb6f1aa1ee0a6e92f53ebd40b937df28225b6d241614cbfb58e
5
5
  SHA512:
6
- metadata.gz: 28430eca7f01bc760f87f3b52bd96bac610598cd4f80645bbf90303f7aa703a9e9a42215ac227f746f36911a7d1247f3660c6a47f932a9157acd8986d02e9cc1
7
- data.tar.gz: 54e9e40b4744ea0afa404d2c867843cd227d544c6f576ed7c42487d014b7bc337735dc07f2394aa60d170cf4fd3bc8501c84727a550e71ce25f90a8a2ed0b222
6
+ metadata.gz: 49b90c44348a46f512756f3793bdb3ebdb526025f8030b2f9eb89da57ee029f6f3cee12359e0ed1ba731cc2b9b9178cfc4c8e69766ea8dcbc4ad07b85f6f5069
7
+ data.tar.gz: f7f644c17e1d666f9b0c47211184de6b39386419daa7775aa594643de66fdfda14e011af9526d2e59f3e8ebf526d3e30f1cc623ff03397699f5cc406c9819238
data/LICENSE ADDED
@@ -0,0 +1,201 @@
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "[]"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright [yyyy] [name of copyright owner]
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
data/README.md CHANGED
@@ -34,10 +34,13 @@ Usage: faraday-cli [options] <url>
34
34
  Pass File upload io in the request pointing to the given file
35
35
  -A, --user-agent STRING Send User-Agent STRING to server (H)
36
36
  -o, --output FILE_PATH Write to FILE instead of stdout
37
+ -v, --verbose Make the operation more talkative
38
+ --super-verbose Make the operation even more talkative
37
39
  -s, --silent Silent mode (don't output anything)
38
- -c, --config FILE_PATH File path to the .faraday.rb if you want use other than default
40
+ -K, --config FILE_PATH File path to the .faraday.rb if you want use other than default
39
41
  -M, --middlewares Show current middleware stack
40
-
42
+ -W, --without_middlewares Make request without consuming middleware file(s)
43
+
41
44
  faraday-cli http://www.google.com -q q=foo
42
45
  faraday-cli http://example.org -d "payload string"
43
46
  ```
@@ -52,16 +55,19 @@ you can use any faraday middlewares as how you pleased.
52
55
 
53
56
  ```ruby
54
57
 
55
- class MyAwesomeMiddleware
58
+ class MyAwesomeMiddleware < Faraday::Middleware
59
+
60
+ def call(request_env)
61
+
62
+ # before main request
63
+
64
+ @app.call(request_env).on_complete do |response_env|
56
65
 
57
- def initialize(app)
58
- @app = app
59
- end
66
+ # after main request
67
+
68
+ end
60
69
 
61
- def call(env)
62
- puts env.object_id
63
- @app.call(env)
64
- end
70
+ end
65
71
 
66
72
  end
67
73
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.7.1
1
+ 0.9.1
@@ -0,0 +1,5 @@
1
+ #!/usr/bin/env ruby
2
+ PROJECT_ROOT = File.realpath(File.join(File.dirname(__FILE__),'..'))
3
+ lib_folder = File.join(PROJECT_ROOT, 'lib')
4
+ $LOAD_PATH.unshift(lib_folder) if Dir.exists?(lib_folder)
5
+ load(File.join(PROJECT_ROOT,'exec','faraday-cli'))
@@ -0,0 +1,3 @@
1
+ #!/usr/bin/env ruby
2
+ require 'faraday/cli'
3
+ Faraday::CLI::Client.start(ARGV)
@@ -6,18 +6,18 @@ Gem::Specification.new do |spec|
6
6
  spec.version = VERSION
7
7
  spec.authors = ["Adam Luzsi"]
8
8
  spec.email = ["adamluzsi@gmail.com"]
9
+ spec.license = 'Apache License 2.0'
9
10
 
10
11
  spec.summary = %q{Console line interface for faraday gem.}
11
12
  spec.description = %q{Console line interface for faraday gem client so you can use your favorite middleware based ruby http client on the terminal!}
12
13
  spec.homepage = 'https://github.com/adamluzsi/faraday-cli.rb'
13
14
 
14
15
  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
15
- spec.bindir = 'bin'
16
- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
17
- .select{|cli_command| cli_command =~ /^faraday\-cli/ }
18
-
19
16
  spec.require_paths = ['lib']
20
17
 
18
+ spec.bindir = 'exec'
19
+ spec.executables = spec.files.grep(%r{^exec/}) { |f| File.basename(f) }
20
+
21
21
  spec.add_development_dependency 'bundler', '>= 1.10'
22
22
  spec.add_development_dependency 'rake'
23
23
  spec.add_development_dependency 'rspec'
@@ -1,7 +1,12 @@
1
1
  require 'faraday'
2
2
  module Faraday::CLI
3
3
 
4
+ class << self
5
+ attr_accessor :active_connection
6
+ end
7
+
4
8
  require 'faraday/cli/version'
9
+ require 'faraday/cli/core_ext'
5
10
 
6
11
  require 'faraday/cli/client'
7
12
  require 'faraday/cli/option'
@@ -1,3 +1,80 @@
1
1
  class Faraday::CLI::Client
2
2
 
3
- end
3
+ def self.start(argv)
4
+ new(argv).start
5
+ end
6
+
7
+ def start
8
+
9
+ cli_options = Faraday::CLI::Option::Parser.new.parse!
10
+
11
+ connection = Faraday.new do |builder|
12
+ builder.use Faraday::Response::RaiseError
13
+
14
+ unless cli_options[:flags].include?(:without_middlewares)
15
+ Faraday::CLI::MiddlewareFetcher.extend!(builder, *cli_options[:config_file_paths])
16
+ end
17
+
18
+ builder.request(:multipart) if cli_options[:flags].include?(:multipart)
19
+
20
+ if cli_options[:flags].include?(:verbose)
21
+ builder.response :logger
22
+ end
23
+
24
+ if cli_options[:flags].include?(:super_verbose)
25
+ builder.use Faraday::CLI::Middleware::VerboseRequest
26
+ builder.use Faraday::CLI::Middleware::VerboseResponse
27
+ end
28
+
29
+ builder.adapter(Faraday.default_adapter)
30
+ end
31
+
32
+ if cli_options[:flags].include?(:show_middlewares)
33
+ $stdout.puts(connection.builder.handlers.map(&:inspect))
34
+ exit
35
+ end
36
+
37
+ Faraday::CLI::Option::Validator.validate(@argv,cli_options)
38
+ Faraday::CLI.active_connection = connection.dup
39
+
40
+ begin
41
+
42
+ response = connection.public_send(cli_options[:http_method].downcase) do |request|
43
+
44
+ request.url(@argv[0])
45
+ request.proxy(cli_options[:proxy_url]) unless cli_options[:proxy_url].nil?
46
+
47
+ cli_options[:http_headers].each do |key, value|
48
+ request.headers[key]=value
49
+ end
50
+
51
+ cli_options[:params].each do |key, value|
52
+ request.params[key]=value
53
+ end
54
+
55
+ request.body = cli_options[:body] unless cli_options[:body].nil?
56
+
57
+ end
58
+
59
+ $stdout.puts(response.body)
60
+
61
+ rescue Faraday::ClientError => ex
62
+ $stdout.puts(ex.message)
63
+ $stdout.puts(ex.response[:body]) unless ex.response.nil?
64
+ exit(1)
65
+
66
+ rescue URI::InvalidURIError => ex
67
+ $stdout.puts(ex.message)
68
+ exit(1)
69
+
70
+ end
71
+
72
+ end
73
+
74
+ protected
75
+
76
+ def initialize(argv)
77
+ @argv = argv
78
+ end
79
+
80
+ end
@@ -0,0 +1,3 @@
1
+ module Faraday::CLI::CoreExt
2
+ require 'faraday/cli/core_ext/object'
3
+ end
@@ -0,0 +1,9 @@
1
+ module Faraday::CLI::CoreExt::Object
2
+
3
+ def active_connection
4
+ ::Faraday::CLI.active_connection
5
+ end
6
+
7
+ end
8
+
9
+ Object.__send__(:include,Faraday::CLI::CoreExt::Object)
@@ -2,6 +2,8 @@ require 'pwd'
2
2
  module Faraday::CLI::MiddlewareFetcher
3
3
  extend self
4
4
 
5
+ NAME_PATH_MATCHER = '{.faraday,.faraday.rb,.faraday-cli}'
6
+
5
7
  require 'faraday/cli/middleware_fetcher/container'
6
8
 
7
9
  def extend!(faraday_connection_builder, *config_file_paths)
@@ -12,9 +14,6 @@ module Faraday::CLI::MiddlewareFetcher
12
14
  protected
13
15
 
14
16
  def get_file_paths(config_file_paths)
15
- file_name = '{.faraday.rb,.faraday}'
16
- folder_name = '{.faraday.rb,.faraday,.faraday-cli}'
17
-
18
17
  case
19
18
 
20
19
  when !config_file_paths.empty?
@@ -26,22 +25,22 @@ module Faraday::CLI::MiddlewareFetcher
26
25
  file_paths.push(*Dir.glob(given_path)); file_paths
27
26
  end
28
27
 
29
- when !(file_paths = Dir.glob(File.join(Dir.pwd, file_name))).empty?
28
+ when !(file_paths = fetch_file_paths(Dir.pwd)).empty?
30
29
  file_paths
31
30
 
32
- when !(file_paths = folder_content(Dir.pwd, folder_name)).empty?
31
+ when !(file_paths = fetch_file_paths_from_folder(Dir.pwd)).empty?
33
32
  file_paths
34
33
 
35
- when !(file_paths = Dir.glob(File.join(PWD.pwd, file_name))).empty?
34
+ when !(file_paths = fetch_file_paths(PWD.pwd)).empty?
36
35
  file_paths
37
36
 
38
- when !(file_paths = folder_content(PWD.pwd, folder_name)).empty?
37
+ when !(file_paths = fetch_file_paths_from_folder(PWD.pwd)).empty?
39
38
  file_paths
40
39
 
41
- when !(file_paths = Dir.glob(File.join(ENV['HOME'], file_name))).empty?
40
+ when !(file_paths = fetch_file_paths(ENV['HOME'])).empty?
42
41
  file_paths
43
42
 
44
- when !(file_paths = folder_content(ENV['HOME'], folder_name)).empty?
43
+ when !(file_paths = fetch_file_paths_from_folder(ENV['HOME'])).empty?
45
44
  file_paths
46
45
 
47
46
  else
@@ -50,11 +49,18 @@ module Faraday::CLI::MiddlewareFetcher
50
49
  end
51
50
  end
52
51
 
52
+ private
53
53
 
54
- protected
54
+ def fetch_file_paths_from_folder(*from_folder)
55
+ select_file_paths(Dir.glob(File.join(*from_folder,NAME_PATH_MATCHER, '*.{rb,ru}')))
56
+ end
57
+
58
+ def fetch_file_paths(*from_folder)
59
+ select_file_paths(Dir.glob(File.join(*from_folder, NAME_PATH_MATCHER)))
60
+ end
55
61
 
56
- def folder_content(main_path, folder_name)
57
- Dir.glob(File.join(main_path, folder_name, '*.rb')).select { |path| not File.directory?(path) }
62
+ def select_file_paths(file_paths)
63
+ file_paths.select { |path| File.exists?(path) and not File.directory?(path) }
58
64
  end
59
65
 
60
66
  end
@@ -15,13 +15,21 @@ class Faraday::CLI::Option::Parser
15
15
  end
16
16
 
17
17
  o.on('-H', '--header HEADER:VALUE', 'Pass custom header LINE to server (H)') do |header|
18
- options[:http_headers].push(header.split(/: */))
18
+ options[:http_headers].push(header.split(/:\s*/))
19
19
  end
20
20
 
21
21
  o.on('-q', '--query key=value', 'Pass Query key values to use in the request') do |raw_query_pair|
22
- options[:params].push(raw_query_pair.split('='))
22
+ separator = '='
23
+
24
+ parts = raw_query_pair.split(separator)
25
+ query_key = parts.shift
26
+ query_value = parts.join(separator)
27
+
28
+ options[:params].push([query_key,query_value])
23
29
  end
24
30
 
31
+ text = get_stdin_content
32
+ options[:body]= text unless text.nil?
25
33
  o.on('-d', '--data PAYLOAD_STRING', 'HTTP POST data (H)') { |payload| options[:body]= payload }
26
34
 
27
35
  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|
@@ -50,12 +58,16 @@ class Faraday::CLI::Option::Parser
50
58
  $stderr.reopen(out_file_path, 'a+')
51
59
  end
52
60
 
53
- # o.on('-x', '--proxy HOST:PORT', 'HOST[:PORT] Use proxy on given port') do |host_port_str|
54
- # host, port = host_port_str.split(':')
55
- # port = '80' if port.nil?
56
- #
57
- # options[:proxy]= {host: host, port: port}
58
- # end
61
+ # --proxy-anyauth Pick "any" proxy authentication method (H)
62
+ # --proxy-basic Use Basic authentication on the proxy (H)
63
+ # --proxy-digest Use Digest authentication on the proxy (H)
64
+ # --proxy-negotiate Use HTTP Negotiate (SPNEGO) authentication on the proxy (H)
65
+ # --proxy-ntlm Use NTLM authentication on the proxy (H)
66
+ # --proxy-service-name NAME SPNEGO proxy service name
67
+ # -U, --proxy-user USER[:PASSWORD] Proxy user and password
68
+ o.on('-x', '--proxy [PROTOCOL://]HOST[:PORT] Use proxy on given port') do |proxy_url|
69
+ options[:proxy_url]= proxy_url.to_s
70
+ end
59
71
 
60
72
  o.on('-v', '--verbose', 'Make the operation more talkative') do
61
73
  options[:flags] << :verbose
@@ -83,8 +95,6 @@ class Faraday::CLI::Option::Parser
83
95
  options[:flags] << :without_middlewares
84
96
  end
85
97
 
86
- # Z
87
-
88
98
  o.parse!
89
99
 
90
100
  end
@@ -92,14 +102,19 @@ class Faraday::CLI::Option::Parser
92
102
  options
93
103
  end
94
104
 
105
+ def get_stdin_content
106
+ ($stdin.tty? ? nil : $stdin.read)
107
+ end
108
+
95
109
  protected
96
110
 
97
- def merge_defaults(options_hash)
98
- options_hash[:flags]= []
99
- options_hash[:params]= []
100
- options_hash[:http_method]= 'get'
101
- options_hash[:http_headers]= []
102
- options_hash[:config_file_paths]= []
111
+ def merge_defaults(hash)
112
+ hash[:flags]= []
113
+ hash[:params]= []
114
+ hash[:http_method]= 'get'
115
+ hash[:http_headers]= []
116
+ hash[:config_file_paths]= []
117
+ hash
103
118
  end
104
119
 
105
120
  end
@@ -3,17 +3,33 @@ module Faraday::CLI::Option::Validator
3
3
 
4
4
  ALLOWED_HTTP_METHODS = %w(get head post put patch delete options)
5
5
 
6
- def validate(options_hash)
6
+ def validate(argv,options_hash)
7
+ validate_url(argv[0])
7
8
  validate_http_method(options_hash)
9
+ validate_http_headers(options_hash)
10
+ end
11
+
12
+ def validate_http_headers(options_hash)
13
+ alert('header is in malformed format!') if options_hash[:http_headers].any?{|pairs| pairs.length != 2 }
8
14
  end
9
15
 
10
16
  protected
11
17
 
18
+ def validate_url(url_str)
19
+ alert('Missing URL to make request!') if url_str.nil? || url_str == ''
20
+ end
21
+
12
22
  def validate_http_method(options_hash)
13
23
  unless ALLOWED_HTTP_METHODS.include?(options_hash[:http_method])
14
- $stderr.puts("invalid http method given: #{options_hash[:http_method].inspect}")
15
- exit(1)
24
+ alert("invalid http method given: #{options_hash[:http_method].inspect}")
16
25
  end
17
26
  end
18
27
 
28
+ private
29
+
30
+ def alert(message)
31
+ $stderr.puts(message)
32
+ exit(1)
33
+ end
34
+
19
35
  end
@@ -9,9 +9,10 @@ Escher::RackMiddleware.config do |c|
9
9
  end
10
10
 
11
11
  class YourAwesomeApp
12
-
13
12
  def call(env)
14
13
  puts YAML.dump(env)
14
+ puts_payload(env)
15
+
15
16
  response = Rack::Response.new
16
17
  response.write 'OK'
17
18
  response.status = 200
@@ -19,11 +20,19 @@ class YourAwesomeApp
19
20
  response.finish
20
21
  end
21
22
 
23
+ def puts_payload(env)
24
+ payload = ''
25
+ while chunk = env['rack.input'].gets
26
+ payload.concat(chunk)
27
+ end
28
+
29
+ puts "payload:\n", payload
30
+ end
22
31
  end
23
32
 
24
33
  use ECHO
25
34
  use Escher::RackMiddleware
26
35
  run YourAwesomeApp.new
27
36
 
28
- #Rack::Server.start :app => YourAwesomeApp,
37
+ # Rack::Server.start :app => YourAwesomeApp,
29
38
  # :Port => ARGV[0].to_i
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: faraday-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.1
4
+ version: 0.9.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Luzsi
8
- autorequire:
9
- bindir: bin
8
+ autorequire:
9
+ bindir: exec
10
10
  cert_chain: []
11
- date: 2015-09-24 00:00:00.000000000 Z
11
+ date: 2020-09-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -108,16 +108,20 @@ files:
108
108
  - ".travis.yml"
109
109
  - CODE_OF_CONDUCT.md
110
110
  - Gemfile
111
+ - LICENSE
111
112
  - README.md
112
113
  - Rakefile
113
114
  - TODO
114
115
  - VERSION
115
116
  - bin/console
116
- - bin/faraday-cli
117
+ - bin/dev-exec
117
118
  - bin/setup
119
+ - exec/faraday-cli
118
120
  - faraday-cli.gemspec
119
121
  - lib/faraday/cli.rb
120
122
  - lib/faraday/cli/client.rb
123
+ - lib/faraday/cli/core_ext.rb
124
+ - lib/faraday/cli/core_ext/object.rb
121
125
  - lib/faraday/cli/middleware.rb
122
126
  - lib/faraday/cli/middleware/verbose_request.rb
123
127
  - lib/faraday/cli/middleware/verbose_response.rb
@@ -131,9 +135,10 @@ files:
131
135
  - prototype/config.ru
132
136
  - prototype/credentials.rb
133
137
  homepage: https://github.com/adamluzsi/faraday-cli.rb
134
- licenses: []
138
+ licenses:
139
+ - Apache License 2.0
135
140
  metadata: {}
136
- post_install_message:
141
+ post_install_message:
137
142
  rdoc_options: []
138
143
  require_paths:
139
144
  - lib
@@ -148,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
148
153
  - !ruby/object:Gem::Version
149
154
  version: '0'
150
155
  requirements: []
151
- rubyforge_project:
152
- rubygems_version: 2.2.2
153
- signing_key:
156
+ rubygems_version: 3.0.3
157
+ signing_key:
154
158
  specification_version: 4
155
159
  summary: Console line interface for faraday gem.
156
160
  test_files: []
@@ -1,73 +0,0 @@
1
- #!/usr/bin/env ruby
2
- if ENV['FARADAY_CLI_DEVELOPER_ENV'] == 'true'
3
- $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
4
- end
5
-
6
- require 'faraday/cli'
7
-
8
- CLI_OPTIONS = Faraday::CLI::Option::Parser.new.parse!
9
- Faraday::CLI::Option::Validator.validate(CLI_OPTIONS)
10
-
11
- connection = Faraday.new do |builder|
12
- builder.use Faraday::Response::RaiseError
13
-
14
- unless CLI_OPTIONS[:flags].include?(:without_middlewares)
15
- Faraday::CLI::MiddlewareFetcher.extend!(builder, *CLI_OPTIONS[:config_file_paths])
16
- end
17
-
18
- builder.request(:multipart) if CLI_OPTIONS[:flags].include?(:multipart)
19
-
20
- if CLI_OPTIONS[:flags].include?(:verbose)
21
- builder.response :logger
22
- end
23
-
24
- if CLI_OPTIONS[:flags].include?(:super_verbose)
25
- builder.use Faraday::CLI::Middleware::VerboseRequest
26
- builder.use Faraday::CLI::Middleware::VerboseResponse
27
- end
28
-
29
- builder.adapter(Faraday.default_adapter)
30
- end
31
-
32
- if CLI_OPTIONS[:flags].include?(:show_middlewares)
33
- $stdout.puts(connection.builder.handlers.map(&:inspect))
34
- exit
35
- end
36
-
37
- FARADAY_ACTIVE_CONNECTION= connection
38
-
39
- def active_connection
40
- FARADAY_ACTIVE_CONNECTION
41
- end
42
-
43
- begin
44
-
45
- response = connection.public_send(CLI_OPTIONS[:http_method].downcase) do |request|
46
-
47
- raise('Missing URL for request!') if ARGV[0].nil?
48
- request.url(ARGV[0])
49
-
50
- CLI_OPTIONS[:http_headers].each do |key, value|
51
- request.headers[key]=value
52
- end
53
-
54
- CLI_OPTIONS[:params].each do |key, value|
55
- request.params[key]=value
56
- end
57
-
58
- request.body = CLI_OPTIONS[:body] unless CLI_OPTIONS[:body].nil?
59
-
60
- end
61
-
62
- $stdout.puts(response.body)
63
-
64
- rescue Faraday::ClientError => ex
65
- $stdout.puts(ex.message)
66
- $stdout.puts(ex.response[:body]) unless ex.response.nil?
67
- exit(1)
68
-
69
- rescue URI::InvalidURIError => ex
70
- $stdout.puts(ex.message)
71
- exit(1)
72
-
73
- end