twurl 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 833ceb46ed18d449d282d4ef9ae820c31887ffe617a9d717f0319ba72071dc47
-  data.tar.gz: 59e6d7960c134eb4815108da8da7f7118c14e61cef3e6b322bb78ba2fff2b313
+  metadata.gz: 7e12cf717906fbf24bcd34598212105569647dbed1f6b5ee37a195ec0db8ca15
+  data.tar.gz: c5d7a22975a06fccc328a99323ead35584104e77fcf3827611d9cf279ccb22bf
 SHA512:
-  metadata.gz: d8bf943ed2cc90fb627edf90d4c0c991df8076e0c055c7b1be2ae8fd7b36f7f04f0ad2a273fb8d09489ae7beb08a60995119646ea366641b321e2e16dfb8f6e5
-  data.tar.gz: 6f22c2a87d1a6c0b1db8b696d0a3a79984b532497de618a2d17dc6f1677d91242818a9933e5e6255adb37cf19f049c8e4e72758b59011920b10ff6ab6941a3b1
+  metadata.gz: daf4dae500fb05b24eaed8413538420bf66d5f113982663e7e3bd416df6d4a98eef31b982eac9174eaa251421aef512db60bd3675c4ae55529ef009603a070de
+  data.tar.gz: 7ef9671671c1d946f0671147b49c8485b21da16837a1c890b2e67b28f5b3f4ed2065e9b896ae9a3533d92bb384908c79f0fd72543adb5a06626aec0390d98f2c

data/CONTRIBUTING.md

@@ -9,7 +9,21 @@ We follow the [GitHub Flow Workflow](https://guides.github.com/introduction/flow
 1. Fork the project
 2. Check out the `master` branch
 3. Create a feature branch
-4. Write code and tests for your change
+4. Write code and tests for your change  
+
+```sh
+$ cd ./twurl
+
+# install twurl from source
+$ bundle install
+
+# run twurl from source
+$ bundle exec twurl -v
+
+# run tests
+$ bundle exec rake
+```
+
 5. From your branch, make a pull request against `twitter/twurl/master`
 6. Work with repo maintainers to get your change reviewed
 7. Wait for your change to be pulled into `twitter/twurl/master`

data/INSTALL.md

@@ -10,7 +10,7 @@ $ gem install twurl
 ```sh
 # verify installation
 $ twurl -v
-0.9.4
+0.9.6
 ```
 
 ## 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.4
+0.9.6
 ```

data/README.md

@@ -2,6 +2,7 @@
 
 [![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)
 
 Twurl is like curl, but tailored specifically for the Twitter API.
 It knows how to grant an access token to a client application for
@@ -97,7 +98,7 @@ This will print a pair of consumer_key and its associated bearer token. Note, to
 You can access different hosts for other Twitter APIs using the -H flag.
 
 ```sh
-twurl -H "ads-api.twitter.com" "/5/accounts"
+twurl -H "ads-api.twitter.com" "/7/accounts"
 ```
 
 ## Uploading Media
@@ -164,7 +165,7 @@ twurl accounts
 
 ### Profiles and Bearer Tokens
 
-While changing the default profile allows you to select which access token (OAuth1.0a) to use, bearer tokens don't link to any user profiles as the Application-only authentication doesn't require user context. That is, you can make an application-only request regardless of your default profile if you specify the `-c` (--consumer-key) option once you generate a bearer token with this consumer key. By default, twurl reads the current profile's consumer key and its associated bearer token from `~/.twurlrc` file.
+While changing the default profile allows you to select which access token (OAuth1.0a) to use, bearer tokens don't link to any user profiles as the Application-only authentication doesn't require user context. That is, you can make an application-only request regardless of your default profile if you specify the `-c` (`--consumer-key`) option once you generate a bearer token with this consumer key. By default, twurl reads the current profile's consumer key and its associated bearer token from `~/.twurlrc` file.
 
 ## Contributors
 

data/lib/twurl/cli.rb

@@ -67,7 +67,6 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
 
           o.section "Authorization options:" do
             username
-            password
             consumer_key
             consumer_secret
             access_token
@@ -96,7 +95,15 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
           end
         end
 
-        arguments                 = option_parser.parse!(args)
+        begin
+          arguments               = option_parser.parse!(args)
+        rescue OptionParser::InvalidOption
+          CLI.puts "ERROR: undefined option"
+          exit
+        rescue
+          CLI.puts "ERROR: invalid argument"
+          exit
+        end
         Twurl.options.command     = extract_command!(arguments)
         Twurl.options.path        = extract_path!(arguments)
         Twurl.options.subcommands = arguments
@@ -219,12 +226,6 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
         end
       end
 
-      def password
-        on('-p', '--password [password]', 'Password of account to authorize (required)') do |password|
-          options.password = password ? password : CLI.prompt_for('Password')
-        end
-      end
-
       def trace
         on('-t', '--[no-]trace', 'Trace request/response traffic (default: --no-trace)') do |trace|
           options.trace = trace

data/lib/twurl/oauth_client.rb

@@ -9,7 +9,11 @@ module Twurl
       end
 
       def load_from_options(options)
-        if rcfile.has_oauth_profile_for_username_with_consumer_key?(options.username, options.consumer_key)
+        if options.command == 'request' && has_oauth_options?(options)
+          load_new_client_from_oauth_options(options)
+        elsif options.command == 'request' && options.app_only && options.consumer_key
+          load_client_for_non_profile_app_only_auth(options)
+        elsif rcfile.has_oauth_profile_for_username_with_consumer_key?(options.username, options.consumer_key)
           load_client_for_username_and_consumer_key(options.username, options.consumer_key)
         elsif options.username
           load_client_for_username(options.username)
@@ -17,10 +21,6 @@ module Twurl
           load_client_for_app_only_auth(options, options.consumer_key)
         elsif options.command == 'authorize'
           load_new_client_from_options(options)
-        elsif options.command == 'request' && has_oauth_options?(options)
-          load_new_client_from_oauth_options(options)
-        elsif options.command == 'request' && options.app_only && options.consumer_key
-          load_client_for_non_profile_app_only_auth(options)
         else
           load_default_client(options)
         end
@@ -52,7 +52,7 @@ module Twurl
       end
 
       def load_new_client_from_options(options)
-        new(options.oauth_client_options.merge('password' => options.password))
+        new(options.oauth_client_options)
       end
 
       def load_new_client_from_oauth_options(options)
@@ -106,10 +106,9 @@ module Twurl
 
     OAUTH_CLIENT_OPTIONS = %w[username consumer_key consumer_secret token secret]
     attr_reader *OAUTH_CLIENT_OPTIONS
-    attr_reader :username, :password
+    attr_reader :username
     def initialize(options = {})
       @username        = options['username']
-      @password        = options['password']
       @consumer_key    = options['consumer_key']
       @consumer_secret = options['consumer_secret']
       @token           = options['token']
@@ -192,7 +191,7 @@ module Twurl
 
     def exchange_credentials_for_access_token
       response = begin
-        consumer.token_request(:post, consumer.access_token_path, nil, {}, client_auth_parameters)
+        consumer.token_request(:post, consumer.access_token_path, nil, {})
       rescue OAuth::Unauthorized
         perform_pin_authorize_workflow
       end
@@ -200,10 +199,6 @@ module Twurl
       @secret  = response[:oauth_token_secret]
     end
 
-    def client_auth_parameters
-      {'x_auth_username' => username, 'x_auth_password' => password, 'x_auth_mode' => 'client_auth'}
-    end
-
     def perform_pin_authorize_workflow
       @request_token = consumer.get_request_token
       CLI.puts("Go to #{generate_authorize_url} and paste in the supplied PIN")

data/lib/twurl/rcfile.rb

@@ -72,7 +72,7 @@ module Twurl
     end
 
     def aliases
-      data['aliases']
+      data['aliases'] ||= {}
     end
 
     def bearer_token(consumer_key, bearer_token)

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 = 5 unless defined? Twurl::Version::PATCH
+    PATCH = 6 unless defined? Twurl::Version::PATCH
     PRE = nil unless defined? Twurl::Version::PRE # Time.now.to_i.to_s
 
     class << self

data/twurl.gemspec

@@ -7,16 +7,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oauth', '~> 0.4'
   spec.authors = ["Marcel Molina", "Erik Michaels-Ober", "@TwitterDev team"]
   spec.description = %q{Curl for the Twitter API}
-  spec.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  spec.extra_rdoc_files = %w(CODE_OF_CONDUCT.md CONTRIBUTING.md INSTALL.md LICENSE README.md)
-  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.start_with?('test/') }
-  spec.homepage = 'http://github.com/twitter/twurl'
+  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.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.rubyforge_project = 'twurl'
   spec.summary = spec.description
   spec.version = Twurl::Version
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: twurl
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Marcel Molina
 - Erik Michaels-Ober
 - "@TwitterDev team"
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -27,28 +27,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 description: Curl for the Twitter API
-email: 
+email:
 executables:
 - twurl
 extensions: []
 extra_rdoc_files:
 - CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
 - INSTALL.md
-- LICENSE
 - README.md
+- CONTRIBUTING.md
+- LICENSE
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".gitignore"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
-- Gemfile
 - INSTALL.md
 - LICENSE
 - README.md
-- Rakefile
 - bin/twurl
 - lib/twurl.rb
 - lib/twurl/abstract_command_controller.rb
@@ -68,7 +62,7 @@ homepage: http://github.com/twitter/twurl
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - twurl -- OAuth-enabled curl for the Twitter API
@@ -89,8 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Curl for the Twitter API
 test_files: []

data/.github/ISSUE_TEMPLATE.md

@@ -1,13 +0,0 @@
-One line summary of the issue here.
-
-### Expected behavior
-
-As concisely as possible, describe the expected behavior.
-
-### Actual behavior
-
-As concisely as possible, describe the observed behavior.
-
-### Steps to reproduce the behavior
-
-Please list all relevant steps to reproduce the observed behavior.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +0,0 @@
-Problem
-
-Explain the context and why you're making that change.  What is the
-problem you're trying to solve? In some cases there is not a problem
-and this can be thought of being the motivation for your change.
-
-Solution
-
-Describe the modifications you've done.
-
-Result
-
-What will change as a result of your pull request? Note that sometimes
-this section is unnecessary because it is self-explanatory based on
-the solution.

data/.gitignore

@@ -1,40 +0,0 @@
-*.gem
-*.rbc
-*.sw[a-p]
-*.tmproj
-*.tmproject
-*.un~
-*~
-.Spotlight-V100
-.Trashes
-._*
-.bundle
-.config
-.directory
-.elc
-.emacs.desktop
-.emacs.desktop.lock
-.redcar
-.yardoc
-Desktop.ini
-Gemfile.lock
-Icon?
-InstalledFiles
-Session.vim
-\#*\#
-_yardoc
-auto-save-list
-coverage
-doc
-lib/bundler/man
-pkg
-pkg/*
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-tmtags
-tramp
-.vscode
-vendor

data/.travis.yml

@@ -1,23 +0,0 @@
-dist: xenial
-language: ruby
-
-before_install:
-  - bundle config without 'development'
-
-branches:
-  only:
-    - master
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
-    - rvm: rbx-2
-  include:
-    - rvm: 2.6.5
-    - rvm: 2.5.7
-    - rvm: 2.4.9
-    - rvm: jruby-head
-    - rvm: ruby-head
-    - rvm: rbx-2

data/Gemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'jruby-openssl', :platforms => :jruby
-gem 'rake'
-
-group :test do
-  gem 'coveralls'
-  gem 'minitest', '>= 5'
-  gem 'rr', '>= 1.1'
-  gem 'simplecov', '>= 0.9'
-end
-
-gemspec

data/Rakefile

@@ -1,12 +0,0 @@
-require 'rake/testtask'
-require 'rubygems/package_task'
-require 'bundler'
-
-task :default => :test
-
-Rake::TestTask.new do |test|
-  test.pattern = 'test/*_test.rb'
-  test.verbose = true
-end
-
-Bundler::GemHelper.install_tasks