twurl 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e12cf717906fbf24bcd34598212105569647dbed1f6b5ee37a195ec0db8ca15
-  data.tar.gz: c5d7a22975a06fccc328a99323ead35584104e77fcf3827611d9cf279ccb22bf
+  metadata.gz: 9120a8daa09529e8e484e2bc15da6042ea1ced1100b1a23c8ea2a2481e194f2b
+  data.tar.gz: 549c25417c3e00e35bab15fb9299a6103b3a01717a3a56b9c78cc388cd1c20fb
 SHA512:
-  metadata.gz: daf4dae500fb05b24eaed8413538420bf66d5f113982663e7e3bd416df6d4a98eef31b982eac9174eaa251421aef512db60bd3675c4ae55529ef009603a070de
-  data.tar.gz: 7ef9671671c1d946f0671147b49c8485b21da16837a1c890b2e67b28f5b3f4ed2065e9b896ae9a3533d92bb384908c79f0fd72543adb5a06626aec0390d98f2c
+  metadata.gz: 3df6c245df33cccfaec2ed2a28d370b5ed3de81a1f96bfb17b5852b4cce209bae975bdbfe9d9fdf7bd117f8bbd8826b4265a3acb5cc509103032ebcf2dc405ac
+  data.tar.gz: 300977ca1182b02d1f1673754b49e015a9e38b5c064967044f5243252097e6caf29a4d37ec0c385e35460a1db34265e2d7947449427abf83bc868d75cfb5833f

data/INSTALL.md

@@ -10,7 +10,7 @@ $ gem install twurl
 ```sh
 # verify installation
 $ twurl -v
-0.9.6
+0.9.7
 ```
 
 ## Install from source
@@ -32,5 +32,5 @@ If you don't want to install Twurl globally on your system, use `--path` [option
 ```
 $ bundle install --path path/to/directory
 $ bundle exec twurl -v
-0.9.6
+0.9.7
 ```

data/README.md

@@ -1,8 +1,8 @@
 # Twurl
 
 [![MIT License](https://img.shields.io/apm/l/atomic-design-ui.svg?)](https://github.com/twitter/twurl/blob/master/LICENSE)
- [![Gem Version](https://badge.fury.io/rb/twurl.svg)](https://badge.fury.io/rb/twurl)
-  [![Build Status](https://travis-ci.com/twitter/twurl.svg?branch=master)](https://travis-ci.com/twitter/twurl)
+[![Gem Version](https://badge.fury.io/rb/twurl.svg)](https://badge.fury.io/rb/twurl)
+[![CI](https://github.com/twitter/twurl/actions/workflows/ci.yml/badge.svg)](https://github.com/twitter/twurl/actions/workflows/ci.yml)
 
 Twurl is like curl, but tailored specifically for the Twitter API.
 It knows how to grant an access token to a client application for

data/lib/twurl/aliases_controller.rb

@@ -15,9 +15,13 @@ module Twurl
         end
       when 1
         if options.path
-          OAuthClient.rcfile.alias(options.subcommands.first, options.path)
+          if Twurl::CLI::SUPPORTED_COMMANDS.include?(options.subcommands.first)
+            raise Exception, "ERROR: '#{options.subcommands.first}' is reserved for commands. Please use different alias name."
+          else
+            OAuthClient.rcfile.alias(options.subcommands.first, options.path)
+          end
         else
-          CLI.puts NO_PATH_PROVIDED_MESSAGE
+          raise Exception, NO_PATH_PROVIDED_MESSAGE
         end
       end
     end

data/lib/twurl/app_only_oauth_client.rb

@@ -57,12 +57,9 @@ module Twurl
       http.set_debug_output(Twurl.options.debug_output_io) if Twurl.options.trace
       http.read_timeout = http.open_timeout = Twurl.options.timeout || 60
       http.open_timeout = Twurl.options.connection_timeout if Twurl.options.connection_timeout
-      # Only override if Net::HTTP support max_retries (since Ruby >= 2.5)
-      http.max_retries = 0 if http.respond_to?(:max_retries=)
-      if Twurl.options.ssl?
-        http.use_ssl     = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
+      http.max_retries = 0
+      http.use_ssl     = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       http
     end
 

data/lib/twurl/cli.rb

@@ -6,8 +6,6 @@ module Twurl
     PROTOCOL_PATTERN       = /^\w+:\/\//
     README                 = File.dirname(__FILE__) + '/../../README.md'
     @output              ||= STDOUT
-    class NoPathFound < Exception
-    end
 
     class << self
       attr_accessor :output
@@ -15,8 +13,8 @@ module Twurl
       def run(args)
         begin
           options = parse_options(args)
-        rescue NoPathFound => e
-          exit
+        rescue Twurl::Exception => exception
+          abort(exception.message)
         end
         dispatch(options)
       end
@@ -80,7 +78,6 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
             headers
             host
             quiet
-            disable_ssl
             request_method
             help
             version
@@ -98,11 +95,11 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
         begin
           arguments               = option_parser.parse!(args)
         rescue OptionParser::InvalidOption
-          CLI.puts "ERROR: undefined option"
-          exit
+          raise Exception "ERROR: undefined option"
+        rescue Twurl::Exception
+          raise
         rescue
-          CLI.puts "ERROR: invalid argument"
-          exit
+          raise Exception "ERROR: invalid argument"
         end
         Twurl.options.command     = extract_command!(arguments)
         Twurl.options.path        = extract_path!(arguments)
@@ -110,7 +107,7 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
         
         if Twurl.options.command == DEFAULT_COMMAND and Twurl.options.path.nil? and Twurl.options.args.empty?
           CLI.puts option_parser
-          raise NoPathFound, "No path found"
+          raise Exception, "No path found"
         end
 
         Twurl.options
@@ -172,7 +169,7 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
 
         def escape_params(params)
           CGI::parse(params).map do |key, value|
-            "#{CGI.escape key}=#{CGI.escape value.first}"
+            "#{CGI.escape(key)}=#{CGI.escape(value.first)}"
           end.join("&")
         end
     end
@@ -234,12 +231,12 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
 
       def data
         on('-d', '--data [data]', 'Sends the specified data in a POST request to the HTTP server.') do |data|
-          if options.args.count { |item| /content-type: (.*)/i.match(item) } > 0
-            options.data[data] = nil
+          if options.args.count { |item| /^content-type:\s+application\/json/i.match(item) } > 0
+            options.json_data = true
+            options.data = data
           else
-            data.split('&').each do |pair|
-              key, value = pair.split('=', 2)
-              options.data[key] = value
+            CGI.parse(data).each_pair do |key, value|
+              options.data[key] = value.first
             end
           end
         end
@@ -247,9 +244,13 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
 
       def raw_data
         on('-r', '--raw-data [data]', 'Sends the specified data as it is in a POST request to the HTTP server.') do |data|
-          CGI::parse(data).each_pair do |key, value|
-            options.data[key] = value.first
+          if options.raw_data
+            raise Exception, "ERROR: can't specify '-r' option more than once"
+          elsif options.args.include?('-d') || options.args.include?('--data')
+            raise Exception, "ERROR: can't use '-r' and '-d' options together"
           end
+          options.raw_data = true
+          options.data = data
         end
       end
 
@@ -277,12 +278,6 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
         end
       end
 
-      def disable_ssl
-        on('-U', '--no-ssl', 'Disable SSL (default: SSL is enabled)') do |use_ssl|
-          options.protocol = 'http'
-        end
-      end
-
       def request_method
         on('-X', '--request-method [method]', 'Request method (default: GET)') do |request_method|
           options.request_method = request_method.downcase
@@ -298,7 +293,7 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
 
       def version
         on_tail("-v", "--version", "Show version") do
-          CLI.puts Version
+          CLI.puts "twurl version: #{Version}\nplatform: #{RUBY_ENGINE} #{RUBY_VERSION} (#{RUBY_PLATFORM})"
           exit
         end
       end
@@ -374,10 +369,6 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
       "#{protocol}://#{host}"
     end
 
-    def ssl?
-      protocol == 'https'
-    end
-
     def debug_output_io
       super || STDERR
     end

data/lib/twurl/oauth_client.rb

@@ -162,16 +162,20 @@ module Twurl
 
         request.body = multipart_body.join
         request.content_type = "multipart/form-data, boundary=\"#{boundary}\""
-      elsif request.content_type && options.data
-        request.body = options.data.keys.first
+      elsif options.json_data
+        request.body = options.data
       elsif options.data
-        request.content_type = "application/x-www-form-urlencoded"
-        if options.data.length == 1 && options.data.values.first == nil
-          request.body = options.data.keys.first
+        request.content_type = "application/x-www-form-urlencoded" unless request.content_type
+        if options.raw_data
+          request.body = options.data
         else
-          request.body = options.data.map do |key, value|
-            "#{key}=#{CGI.escape value}"
-          end.join("&")
+          begin
+            request.body = options.data.map do |key, value|
+              "#{key}" + (value.nil? ? "" : "=#{CGI.escape(value)}")
+            end.join("&")
+          rescue
+            raise Exception, "ERROR: failed to parse POST request body"
+          end
         end
       end
       request
@@ -202,7 +206,11 @@ module Twurl
     def perform_pin_authorize_workflow
       @request_token = consumer.get_request_token
       CLI.puts("Go to #{generate_authorize_url} and paste in the supplied PIN")
-      pin = STDIN.gets
+      begin
+        pin = STDIN.gets.chomp
+      rescue SystemExit, Interrupt
+        raise Exception, "Operation cancelled"
+      end
       access_token = @request_token.get_access_token(:oauth_verifier => pin.chomp)
       {:oauth_token => access_token.token, :oauth_token_secret => access_token.secret}
     end
@@ -212,7 +220,7 @@ module Twurl
       params = request['Authorization'].sub(/^OAuth\s+/, '').split(/,\s+/).map { |p|
         k, v = p.split('=')
         v =~ /"(.*?)"/
-        "#{k}=#{CGI::escape($1)}"
+        "#{k}=#{CGI.escape($1)}"
       }.join('&')
       "#{Twurl.options.base_url}#{request.path}?#{params}"
     end
@@ -260,12 +268,9 @@ module Twurl
       consumer.http.set_debug_output(Twurl.options.debug_output_io) if Twurl.options.trace
       consumer.http.read_timeout = consumer.http.open_timeout = Twurl.options.timeout || 60
       consumer.http.open_timeout = Twurl.options.connection_timeout if Twurl.options.connection_timeout
-      # Only override if Net::HTTP support max_retries (since Ruby >= 2.5)
-      consumer.http.max_retries = 0 if consumer.http.respond_to?(:max_retries=)
-      if Twurl.options.ssl?
-        consumer.http.use_ssl     = true
-        consumer.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
+      consumer.http.max_retries = 0
+      consumer.http.use_ssl     = true
+      consumer.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
 
     def consumer

data/lib/twurl/request_controller.rb

@@ -22,11 +22,11 @@ module Twurl
         }
       }
     rescue URI::InvalidURIError
-      CLI.puts INVALID_URI_MESSAGE
+      raise Exception, INVALID_URI_MESSAGE
     rescue Net::ReadTimeout
-      CLI.puts READ_TIMEOUT_MESSAGE
+      raise Exception, READ_TIMEOUT_MESSAGE
     rescue Net::OpenTimeout
-      CLI.puts OPEN_TIMEOUT_MESSAGE
+      raise Exception, OPEN_TIMEOUT_MESSAGE
     end
   end
 

data/lib/twurl/version.rb

@@ -2,7 +2,7 @@ module Twurl
   class Version
     MAJOR = 0 unless defined? Twurl::Version::MAJOR
     MINOR = 9 unless defined? Twurl::Version::MINOR
-    PATCH = 6 unless defined? Twurl::Version::PATCH
+    PATCH = 7 unless defined? Twurl::Version::PATCH
     PRE = nil unless defined? Twurl::Version::PRE # Time.now.to_i.to_s
 
     class << self

data/twurl.gemspec

@@ -1,22 +1,22 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'twurl/version'
 
 Gem::Specification.new do |spec|
   spec.add_dependency 'oauth', '~> 0.4'
+  spec.add_dependency 'ostruct', '>= 0.3.3'
   spec.authors = ["Marcel Molina", "Erik Michaels-Ober", "@TwitterDev team"]
   spec.description = %q{Curl for the Twitter API}
   spec.bindir = 'bin'
   spec.executables << 'twurl'
   spec.extra_rdoc_files = Dir["*.md", "LICENSE"]
   spec.files = Dir["*.md", "LICENSE", "twurl.gemspec", "bin/*", "lib/**/*"]
-  spec.homepage = 'http://github.com/twitter/twurl' 
+  spec.homepage = 'https://github.com/twitter/twurl'
   spec.licenses = ['MIT']
   spec.name = 'twurl'
   spec.rdoc_options = ['--title', 'twurl -- OAuth-enabled curl for the Twitter API', '--main', 'README.md', '--line-numbers', '--inline-source']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.summary = spec.description
   spec.version = Twurl::Version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twurl
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Marcel Molina
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 description: Curl for the Twitter API
 email:
 executables:
@@ -33,9 +47,9 @@ executables:
 extensions: []
 extra_rdoc_files:
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - INSTALL.md
 - README.md
-- CONTRIBUTING.md
 - LICENSE
 files:
 - CODE_OF_CONDUCT.md
@@ -58,7 +72,7 @@ files:
 - lib/twurl/request_controller.rb
 - lib/twurl/version.rb
 - twurl.gemspec
-homepage: http://github.com/twitter/twurl
+homepage: https://github.com/twitter/twurl
 licenses:
 - MIT
 metadata: {}
@@ -76,14 +90,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Curl for the Twitter API