travis 1.10.1.travis.1311.9 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf07de268961f2fc5a04f64ca4d060de16c3854c4144f178d9d452341b4f8a0d
-  data.tar.gz: d40f634af879d427e99f3d749fd201f7f999b5a62488d8523517d55da390b046
+  metadata.gz: bd56aab41cadf71c5d3e17baa3e32ef92c12b47df8433885cd93bfcdeba0a3ac
+  data.tar.gz: 31dfb62475ae626176823ce90347915da42e601c44f570cac6ee338bb4a923c1
 SHA512:
-  metadata.gz: 38799cdd393e5c84733c389c2748f347b5692f72512d12c8b466af74c25c8af1055cce545978f043f982abc6cffa011ccc268f08e66ea821162be4d601125a43
-  data.tar.gz: b06eabf2b7f4efcdc557747a04d5f2d4cb9bc288f0c1e2456d44a93d95fede0ff2465145a713c8c738bd7ac9264ae9e1786352f95087bb481ea0ae4fe55f91c1
+  metadata.gz: 1f3035ba8ccbf3031a84796f3d16ca3f88d93512a7250b71a3d6f773e19b95b4662ccf96ee350331b89403c437ce98f1ae3f921cb4ec2249f6529a13c51eb258
+  data.tar.gz: c8277df2456d7e9386a6241804e91078a378014804073efaed2c5f6c91d75db8fe51ab4dd180f74cfe3242b4c4f3d55ccd0f04b6a2dbd89e2544b595e7fbfcc6

data/README.md

@@ -233,22 +233,11 @@ default API endpoint dropped (was https://api.travis-ci.com/)
 The `login` command will, well, log you in. That way, all subsequent commands that run against the same endpoint will be authenticated.
 
 ``` console
-$ travis login
-We need your GitHub login to identify you.
-This information will not be sent to Travis CI, only to GitHub.
-The password will not be displayed.
-
-Try running with --github-token or --auto if you don't want to enter your password anyway.
-
-Username: rkh
-Password: *******************
-
-Successfully logged in!
+$ travis login --pro --github-token ghp_********
+Successfully logged in as rkh!
 ```
 
-As you can see above, it will ask you for your GitHub user name and password, but not send these to Travis CI. Instead, it will use them to create a GitHub API token, show the token to Travis, which then on its own checks if you really are who you say you are, and gives you an access token for the Travis API in return. The client will then delete the GitHub token again, just to be sure. But don't worry, all that happens under the hood and fully automatic.
-
-If you don't want it to send your credentials to GitHub, you can create a GitHub token on your own and supply it via `--github-token`. In that case, the client will not delete the GitHub token (as it can't, it needs your password to do this). Travis CI will not store the token, though - after all, it already should have a valid token for you in the database.
+You need to use a GitHub token and supply it via `--github-token`. Travis CI will not store the token, though - after all, it already should have a valid token for you in the database.
 *NOTE*: When creating a GitHub token, see [GitHub Permissions used by travis-ci.com](https://docs.travis-ci.com/user/github-oauth-scopes/#travis-ci-for-private-projects) or [GitHub Permissions used by travis-ci.org](https://docs.travis-ci.com/user/github-oauth-scopes/#travis-ci-for-open-source-projects). The token permissions are dependent on use of travis-ci.com or travis-ci.org and not if they are public or private repositories.
 
 A third option is for the really lazy: `--auto`. In this mode the client will try to find a GitHub token for you and just use that. This will only work if you have a [global GitHub token](https://help.github.com/articles/git-over-https-using-oauth-token) stored in your [.netrc](http://blogdown.io/c4d42f87-80dd-45d5-8927-4299cbdf261c/posts/574baa68-f663-4dcf-88b9-9d41310baf2f). If you haven't heard of this, it's worth looking into in general. Again: Travis CI will not store that token.
@@ -1560,26 +1549,6 @@ puts "Hello #{Travis::User.current.name}!"
 
 Travis CI will not store that token.
 
-It also ships with a tool for generating a GitHub token from a user name and password via the GitHub API:
-
-``` ruby
-require 'travis'
-require 'travis/tools/github'
-
-# drop_token will make the token a temporary one
-github = Travis::Tools::Github.new(drop_token: true) do |g|
-  g.ask_login    = -> { print("GitHub login:     "); gets }
-  g.ask_password = -> { print("Password:         "); gets }
-  g.ask_otp      = -> { print("Two-factor token: "); gets }
-end
-
-github.with_token do |token|
-  Travis.github_auth(token)
-end
-
-puts "Hello #{Travis::User.current.name}!"
-```
-
 There is also `travis/auto_login`, which will try to read the CLI configuration or .netrc for a Travis CI or GitHub token to authenticate with automatically:
 
 ``` ruby
@@ -2022,6 +1991,12 @@ Now make sure everything is working:
 
 See also [Note on Ubuntu](#ubuntu) below.
 
+### Note on Ruby 2.3
+
+For Ruby 2.3.x, be sure to have a compatible version of `faraday` installed; e.g.,
+
+    $ gem install faraday -v 1.0.1
+
 ### Development Version
 
 You can also install the development version via RubyGems:
@@ -2078,8 +2053,23 @@ You can of course always compile Ruby from source, though then you are left with
 
 If you have the old `travis-cli` gem installed, you should `gem uninstall travis-cli`, just to be sure, as it ships with an executable that is also named `travis`.
 
+#### `uninitialized constant Faraday::Error::ConnectionFailed`
+
+You might see this error message if you have Typhoeus version prior to version 1.4.0
+and Faraday 1.0 and up.
+You can eradicate this problem by either:
+
+1. Update Typhoeus to version 1.4.0 or later
+1. Remove typhoeus entirely
+
+See https://github.com/travis-ci/travis.rb/issues/768#issuecomment-700220351 for more details.
+
 ## Version History
 
+### 1.10.1
+
+* Fix `travis monitor` command https://github.com/travis-ci/travis.rb/pull/770
+
 ### 1.10.0 (September 22, 2020)
 
 * Requires Ruby 2.3.0 or later (2.6.0 or later is recommended)
@@ -2091,7 +2081,7 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ### 1.9.1 (May 19, 2020)
 
-* Fix `--no-interactive` flag in `encrypt` and `encryt-file` commands https://github.com/travis-ci/travis.rb/pull/738
+* Fix `--no-interactive` flag in `encrypt` and `encrypt-file` commands https://github.com/travis-ci/travis.rb/pull/738
 * Display commit SHA in `show` https://github.com/travis-ci/travis.rb/pull/739
 * Display more helpful message when GitHub token given by `--github-token` is
   deficient https://github.com/travis-ci/travis.rb/issues/708
@@ -2182,7 +2172,7 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 * Fix SSL verification issue on OS X Yosemite and certain Linux setups.
 * Be more forgiving with outdated API version (Enterprise).
 * Better handling of multibyte characters in archived logs.
-* Use more restricitve permissions for the config file.
+* Use more restrictive permissions for the config file.
 
 ### 1.7.1 (August 9, 2014)
 

data/assets/travis.sh

@@ -20,7 +20,7 @@ _travis_complete() {
 if type compdef 1>/dev/null 2>/dev/null; then
   compdef _travis travis
   _travis()          { _travis_complete $((${#words} - 1)) "${words[2]}"; }
-  _travis_commands() { list=(accounts:"displays accounts and their subscription status" branches:"displays the most recent build for each branch" cache:"lists or deletes repository caches" cancel:"cancels a job or build" console:"interactive shell; requires `pry`" disable:"disables a project" enable:"enables a project" encrypt:"encrypts values for the .travis.yml" encrypt-file:"encrypts a file and adds decryption steps to .travis.yml" endpoint:"displays or changes the API endpoint" env:"show or modify build environment variables" help:"helps you out when in dire need of information" history:"displays a project's build history" init:"generates a .travis.yml and enables the project" lint:"display warnings for a .travis.yml" login:"authenticates against the API and stores the token" logout:"deletes the stored API token" logs:"streams test logs" monitor:"live monitor for what's going on" open:"opens a build or job in the browser" pubkey:"prints out a repository's public key" raw:"makes an (authenticated) API call and prints out the result" report:"generates a report useful for filing issues" repos:"lists repositories the user has certain permissions on" requests:"lists recent requests" restart:"restarts a build or job" settings:"access repository settings" setup:"sets up an addon or deploy target" show:"displays a build or job" sshkey:"checks, updates or deletes an SSH key" status:"checks status of the latest build" sync:"triggers a new sync with GitHub" token:"outputs the secret API token" version:"outputs the client version" whatsup:"lists most recent builds" whoami:"outputs the current user") _describe -t common-commands 'common commands' list; }
+  _travis_commands() { list=(accounts:"displays accounts and their subscription status" branches:"displays the most recent build for each branch" cache:"lists or deletes repository caches" cancel:"cancels a job or build" console:"interactive shell; requires `pry`" disable:"disables a project" enable:"enables a project" encrypt:"encrypts values for the .travis.yml" encrypt-file:"encrypts a file and adds decryption steps to .travis.yml" endpoint:"displays or changes the API endpoint" env:"show or modify build environment variables" help:"helps you out when in dire need of information" history:"displays a project's build history" init:"generates a .travis.yml and enables the project" lint:"display warnings for a .travis.yml" login:"authenticates against the API and stores the token" logout:"deletes the stored API token" logs:"streams test logs" open:"opens a build or job in the browser" pubkey:"prints out a repository's public key" raw:"makes an (authenticated) API call and prints out the result" report:"generates a report useful for filing issues" repos:"lists repositories the user has certain permissions on" requests:"lists recent requests" restart:"restarts a build or job" settings:"access repository settings" setup:"sets up an addon or deploy target" show:"displays a build or job" sshkey:"checks, updates or deletes an SSH key" status:"checks status of the latest build" sync:"triggers a new sync with GitHub" token:"outputs the secret API token" version:"outputs the client version" whatsup:"lists most recent builds" whoami:"outputs the current user") _describe -t common-commands 'common commands' list; }
   _travis_setup()    { list=(anynines:"automatic deployment to anynines" appfog:"automatic deployment to Appfog" artifacts:"automatic artifact shipping to S3" biicode:"automatic publish to biicode" cloudcontrol:"automatic deployment to cloudControl" cloudfiles:"automatic pushing to Rackspace Cloud Files" cloudfoundry:"automatic deployment to Cloud Foundry" cloud66:"Automatic deployment to Cloud 66" codedeploy:"triggering a new deployment on Amazon CodeDeploy" deis:"automatic deployment to a deis app" divshot:"deployment to Divshot.io" elasticbeanstalk:"deployment to AWS Elastic Beanstalk" engineyard:"automatic deployment to Engine Yard" gcs:"automatic pushing to Google Cloud Storage" hackage:"automatic deployment of hackage packages" heroku:"automatic deployment to Heroku" modulus:"deployment to Modulus" npm:"automatic release to npm" ninefold:"Automatic deployment to Ninefold" nodejitsu:"automatic deployment to Nodejitsu" openshift:"automatic deployment to OpenShfit" opsworks:"deployment to OpsWorks" pypi:"automatic deployment to PyPI" releases:"Upload Assets to GitHub Releases" rubygems:"automatic release to RubyGems" s3:"automatic pushing to S3" sauce_connect:"Sauce Connet addon for Sauce Labs integration") _describe -t common-commands 'common commands' list; }
   _travis_settings() { list=(builds_only_with_travis_yml:"Only run builds with a .travis.yml" build_pushes:"Build pushes" build_pull_requests:"Build pull requests" maximum_number_of_builds:"Maximum number of concurrent builds" auto_cancel_pushes:"Cancel older push builds that are not yet running" auto_cancel_pull_requests:"Cancel older pull request builds that are not yet running") _describe -t common-commands 'common commands' list; }
   _travis_init()     { list=(bash:'initialize bash project' c:'initialize c project' clojure:'initialize clojure project' cpp:'initialize cpp project' elixir:'initialize elixir project' erlang:'initialize erlang project' go:'initialize go project' groovy:'initialize groovy project' haskell:'initialize haskell project' java:'initialize java project' node_js:'initialize node_js project' objective-c:'initialize objective-c project' perl:'initialize perl project' php:'initialize php project' python:'initialize python project' ruby:'initialize ruby project' scala:'initialize scala project') _describe -t common-commands 'common commands' list; }
@@ -44,7 +44,6 @@ if type compdef 1>/dev/null 2>/dev/null; then
       login)     _arguments -s -S "-h[Display help]" "--help[Display help]" "-i[be interactive and colorful]" "--interactive[be interactive and colorful]" "--no-interactive[be interactive and colorful]" "-E[don't rescue exceptions]" "--explode[don't rescue exceptions]" "--no-explode[don't rescue exceptions]" "--skip-version-check[don't check if travis client is up to date]" "--skip-completion-check[don't check if auto-completion is set up]" "-e[Travis API server to talk to]" "--api-endpoint[Travis API server to talk to]" "-I[do not verify SSL certificate of API endpoint]" "--insecure[do not verify SSL certificate of API endpoint]" "--no-insecure[do not verify SSL certificate of API endpoint]" "--pro[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--com[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--org[short-cut for --api-endpoint 'https://api.travis-ci.org/']" "--staging[talks to staging system]" "-t[access token to use]" "--token[access token to use]" "--debug[show API requests]" "--debug-http[show HTTP(S) exchange]" "-X[use enterprise setup (optionally takes name for multiple setups)]" "--enterprise[use enterprise setup (optionally takes name for multiple setups)]" "--adapter[Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info]" "-g[identify by GitHub token]" "--github-token[identify by GitHub token]" "-T[try to figure out who you are automatically (might send another apps token to Travis, token will not be stored)]" "--auto-token[try to figure out who you are automatically (might send another apps token to Travis, token will not be stored)]" "-p[try to load password from OSX keychain (will not be stored)]" "--auto-password[try to load password from OSX keychain (will not be stored)]" "-a[shorthand for --auto-token --auto-password]" "--auto[shorthand for --auto-token --auto-password]" "-u[user to log in as]" "--user[user to log in as]" "-M[do not use interactive login]" "--no-manual[do not use interactive login]" "--list-github-token[instead of actually logging in, list found GitHub tokens]" "--skip-token-check[don't verify the token with github]" '*:file:_files' && return 0;;
       logout)    _arguments -s -S "-h[Display help]" "--help[Display help]" "-i[be interactive and colorful]" "--interactive[be interactive and colorful]" "--no-interactive[be interactive and colorful]" "-E[don't rescue exceptions]" "--explode[don't rescue exceptions]" "--no-explode[don't rescue exceptions]" "--skip-version-check[don't check if travis client is up to date]" "--skip-completion-check[don't check if auto-completion is set up]" "-e[Travis API server to talk to]" "--api-endpoint[Travis API server to talk to]" "-I[do not verify SSL certificate of API endpoint]" "--insecure[do not verify SSL certificate of API endpoint]" "--no-insecure[do not verify SSL certificate of API endpoint]" "--pro[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--com[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--org[short-cut for --api-endpoint 'https://api.travis-ci.org/']" "--staging[talks to staging system]" "-t[access token to use]" "--token[access token to use]" "--debug[show API requests]" "--debug-http[show HTTP(S) exchange]" "-X[use enterprise setup (optionally takes name for multiple setups)]" "--enterprise[use enterprise setup (optionally takes name for multiple setups)]" "--adapter[Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info]" '*:file:_files' && return 0;;
       logs)      _arguments -s -S "-h[Display help]" "--help[Display help]" "-i[be interactive and colorful]" "--interactive[be interactive and colorful]" "--no-interactive[be interactive and colorful]" "-E[don't rescue exceptions]" "--explode[don't rescue exceptions]" "--no-explode[don't rescue exceptions]" "--skip-version-check[don't check if travis client is up to date]" "--skip-completion-check[don't check if auto-completion is set up]" "-e[Travis API server to talk to]" "--api-endpoint[Travis API server to talk to]" "-I[do not verify SSL certificate of API endpoint]" "--insecure[do not verify SSL certificate of API endpoint]" "--no-insecure[do not verify SSL certificate of API endpoint]" "--pro[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--com[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--org[short-cut for --api-endpoint 'https://api.travis-ci.org/']" "--staging[talks to staging system]" "-t[access token to use]" "--token[access token to use]" "--debug[show API requests]" "--debug-http[show HTTP(S) exchange]" "-X[use enterprise setup (optionally takes name for multiple setups)]" "--enterprise[use enterprise setup (optionally takes name for multiple setups)]" "--adapter[Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info]" "-r[repository to use (will try to detect from current git clone)]" "--repo[repository to use (will try to detect from current git clone)]" "-R[like --repo, but remembers value for current directory]" "--store-repo[like --repo, but remembers value for current directory]" "-d[remove logs]" "--delete[remove logs]" "-f[do not ask user to confirm deleting the logs]" "--force[do not ask user to confirm deleting the logs]" "--stream[only print current logs, do not stream]" "--no-stream[only print current logs, do not stream]" '*:file:_files' && return 0;;
-      monitor)   _arguments -s -S "-h[Display help]" "--help[Display help]" "-i[be interactive and colorful]" "--interactive[be interactive and colorful]" "--no-interactive[be interactive and colorful]" "-E[don't rescue exceptions]" "--explode[don't rescue exceptions]" "--no-explode[don't rescue exceptions]" "--skip-version-check[don't check if travis client is up to date]" "--skip-completion-check[don't check if auto-completion is set up]" "-e[Travis API server to talk to]" "--api-endpoint[Travis API server to talk to]" "-I[do not verify SSL certificate of API endpoint]" "--insecure[do not verify SSL certificate of API endpoint]" "--no-insecure[do not verify SSL certificate of API endpoint]" "--pro[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--com[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--org[short-cut for --api-endpoint 'https://api.travis-ci.org/']" "--staging[talks to staging system]" "-t[access token to use]" "--token[access token to use]" "--debug[show API requests]" "--debug-http[show HTTP(S) exchange]" "-X[use enterprise setup (optionally takes name for multiple setups)]" "--enterprise[use enterprise setup (optionally takes name for multiple setups)]" "--adapter[Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info]" "-m[Only monitor my own repositories]" "--my-repos[Only monitor my own repositories]" "-r[monitor given repository (can be used more than once)]" "--repo[monitor given repository (can be used more than once)]" "-n[send out desktop notifications (optional type: osx, growl, libnotify)]" "--notify[send out desktop notifications (optional type: osx, growl, libnotify)]" "--no-notify[send out desktop notifications (optional type: osx, growl, libnotify)]" "-b[only monitor builds, not jobs]" "--builds[only monitor builds, not jobs]" "-p[monitor push events]" "--push[monitor push events]" "-P[monitor pull request events]" "--pull[monitor pull request events]" '*:file:_files' && return 0;;
       open)      _arguments -s -S "-h[Display help]" "--help[Display help]" "-i[be interactive and colorful]" "--interactive[be interactive and colorful]" "--no-interactive[be interactive and colorful]" "-E[don't rescue exceptions]" "--explode[don't rescue exceptions]" "--no-explode[don't rescue exceptions]" "--skip-version-check[don't check if travis client is up to date]" "--skip-completion-check[don't check if auto-completion is set up]" "-e[Travis API server to talk to]" "--api-endpoint[Travis API server to talk to]" "-I[do not verify SSL certificate of API endpoint]" "--insecure[do not verify SSL certificate of API endpoint]" "--no-insecure[do not verify SSL certificate of API endpoint]" "--pro[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--com[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--org[short-cut for --api-endpoint 'https://api.travis-ci.org/']" "--staging[talks to staging system]" "-t[access token to use]" "--token[access token to use]" "--debug[show API requests]" "--debug-http[show HTTP(S) exchange]" "-X[use enterprise setup (optionally takes name for multiple setups)]" "--enterprise[use enterprise setup (optionally takes name for multiple setups)]" "--adapter[Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info]" "-r[repository to use (will try to detect from current git clone)]" "--repo[repository to use (will try to detect from current git clone)]" "-R[like --repo, but remembers value for current directory]" "--store-repo[like --repo, but remembers value for current directory]" "-g[Open the corresponding project, compare view or pull request on GitHub]" "--github[Open the corresponding project, compare view or pull request on GitHub]" "-p[Print out the URL instead of opening it in a browser]" "--print[Print out the URL instead of opening it in a browser]" '*:file:_files' && return 0;;
       pubkey)    _arguments -s -S "-h[Display help]" "--help[Display help]" "-i[be interactive and colorful]" "--interactive[be interactive and colorful]" "--no-interactive[be interactive and colorful]" "-E[don't rescue exceptions]" "--explode[don't rescue exceptions]" "--no-explode[don't rescue exceptions]" "--skip-version-check[don't check if travis client is up to date]" "--skip-completion-check[don't check if auto-completion is set up]" "-e[Travis API server to talk to]" "--api-endpoint[Travis API server to talk to]" "-I[do not verify SSL certificate of API endpoint]" "--insecure[do not verify SSL certificate of API endpoint]" "--no-insecure[do not verify SSL certificate of API endpoint]" "--pro[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--com[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--org[short-cut for --api-endpoint 'https://api.travis-ci.org/']" "--staging[talks to staging system]" "-t[access token to use]" "--token[access token to use]" "--debug[show API requests]" "--debug-http[show HTTP(S) exchange]" "-X[use enterprise setup (optionally takes name for multiple setups)]" "--enterprise[use enterprise setup (optionally takes name for multiple setups)]" "--adapter[Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info]" "-r[repository to use (will try to detect from current git clone)]" "--repo[repository to use (will try to detect from current git clone)]" "-R[like --repo, but remembers value for current directory]" "--store-repo[like --repo, but remembers value for current directory]" "-p[encode in format used by pem]" "--pem[encode in format used by pem]" "-f[display fingerprint]" "--fingerprint[display fingerprint]" '*:file:_files' && return 0;;
       raw)       _arguments -s -S "-h[Display help]" "--help[Display help]" "-i[be interactive and colorful]" "--interactive[be interactive and colorful]" "--no-interactive[be interactive and colorful]" "-E[don't rescue exceptions]" "--explode[don't rescue exceptions]" "--no-explode[don't rescue exceptions]" "--skip-version-check[don't check if travis client is up to date]" "--skip-completion-check[don't check if auto-completion is set up]" "-e[Travis API server to talk to]" "--api-endpoint[Travis API server to talk to]" "-I[do not verify SSL certificate of API endpoint]" "--insecure[do not verify SSL certificate of API endpoint]" "--no-insecure[do not verify SSL certificate of API endpoint]" "--pro[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--com[short-cut for --api-endpoint 'https://api.travis-ci.com/']" "--org[short-cut for --api-endpoint 'https://api.travis-ci.org/']" "--staging[talks to staging system]" "-t[access token to use]" "--token[access token to use]" "--debug[show API requests]" "--debug-http[show HTTP(S) exchange]" "-X[use enterprise setup (optionally takes name for multiple setups)]" "--enterprise[use enterprise setup (optionally takes name for multiple setups)]" "--adapter[Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info]" "--json[display as json]" "--no-json[display as json]" '*:file:_files' && return 0;;
@@ -67,7 +66,7 @@ if type compdef 1>/dev/null 2>/dev/null; then
 elif type compctl 1>/dev/null 2>/dev/null; then
   compctl -K _travis travis
   _travis()          { read -cA words && _travis_complete $((${#words} - 1)) "${words[2]}"; }
-  _travis_commands() { reply=("accounts" "branches" "cache" "cancel" "console" "disable" "enable" "encrypt" "encrypt-file" "endpoint" "env" "help" "history" "init" "lint" "login" "logout" "logs" "monitor" "open" "pubkey" "raw" "report" "repos" "requests" "restart" "settings" "setup" "show" "sshkey" "status" "sync" "token" "version" "whatsup" "whoami"); }
+  _travis_commands() { reply=("accounts" "branches" "cache" "cancel" "console" "disable" "enable" "encrypt" "encrypt-file" "endpoint" "env" "help" "history" "init" "lint" "login" "logout" "logs" "open" "pubkey" "raw" "report" "repos" "requests" "restart" "settings" "setup" "show" "sshkey" "status" "sync" "token" "version" "whatsup" "whoami"); }
   _travis_setup()    { reply=("anynines" "appfog" "artifacts" "biicode" "cloudcontrol" "cloudfiles" "cloudfoundry" "cloud66" "codedeploy" "deis" "divshot" "elasticbeanstalk" "engineyard" "gcs" "hackage" "heroku" "modulus" "npm" "ninefold" "nodejitsu" "openshift" "opsworks" "pypi" "releases" "rubygems" "s3" "sauce_connect"); }
   _travis_settings() { reply=(builds_only_with_travis_yml build_pushes build_pull_requests maximum_number_of_builds auto_cancel_pushes auto_cancel_pull_requests); }
   _travis_init()     { reply=("bash" "c" "clojure" "cpp" "elixir" "erlang" "go" "groovy" "haskell" "java" "node_js" "objective-c" "perl" "php" "python" "ruby" "scala"); }
@@ -91,7 +90,6 @@ elif type compctl 1>/dev/null 2>/dev/null; then
       login)     reply=("--help" "-h" "--interactive" "--no-interactive" "-i" "--explode" "--no-explode" "-E" "--skip-version-check" "--skip-completion-check" "--api-endpoint" "-e" "--insecure" "--no-insecure" "-I" "--pro" "--com" "--org" "--staging" "--token" "-t" "--debug" "--debug-http" "--enterprise" "-X" "--adapter" "--github-token" "-g" "--auto-token" "-T" "--auto-password" "-p" "--auto" "-a" "--user" "-u" "--no-manual" "-M" "--list-github-token" "--skip-token-check");;
       logout)    reply=("--help" "-h" "--interactive" "--no-interactive" "-i" "--explode" "--no-explode" "-E" "--skip-version-check" "--skip-completion-check" "--api-endpoint" "-e" "--insecure" "--no-insecure" "-I" "--pro" "--com" "--org" "--staging" "--token" "-t" "--debug" "--debug-http" "--enterprise" "-X" "--adapter");;
       logs)      reply=("--help" "-h" "--interactive" "--no-interactive" "-i" "--explode" "--no-explode" "-E" "--skip-version-check" "--skip-completion-check" "--api-endpoint" "-e" "--insecure" "--no-insecure" "-I" "--pro" "--com" "--org" "--staging" "--token" "-t" "--debug" "--debug-http" "--enterprise" "-X" "--adapter" "--repo" "-r" "--store-repo" "-R" "--delete" "-d" "--force" "-f" "--stream" "--no-stream");;
-      monitor)   reply=("--help" "-h" "--interactive" "--no-interactive" "-i" "--explode" "--no-explode" "-E" "--skip-version-check" "--skip-completion-check" "--api-endpoint" "-e" "--insecure" "--no-insecure" "-I" "--pro" "--com" "--org" "--staging" "--token" "-t" "--debug" "--debug-http" "--enterprise" "-X" "--adapter" "--my-repos" "-m" "--repo" "-r" "--notify" "--no-notify" "-n" "--builds" "-b" "--push" "-p" "--pull" "-P");;
       open)      reply=("--help" "-h" "--interactive" "--no-interactive" "-i" "--explode" "--no-explode" "-E" "--skip-version-check" "--skip-completion-check" "--api-endpoint" "-e" "--insecure" "--no-insecure" "-I" "--pro" "--com" "--org" "--staging" "--token" "-t" "--debug" "--debug-http" "--enterprise" "-X" "--adapter" "--repo" "-r" "--store-repo" "-R" "--github" "-g" "--print" "-p");;
       pubkey)    reply=("--help" "-h" "--interactive" "--no-interactive" "-i" "--explode" "--no-explode" "-E" "--skip-version-check" "--skip-completion-check" "--api-endpoint" "-e" "--insecure" "--no-insecure" "-I" "--pro" "--com" "--org" "--staging" "--token" "-t" "--debug" "--debug-http" "--enterprise" "-X" "--adapter" "--repo" "-r" "--store-repo" "-R" "--pem" "-p" "--fingerprint" "-f");;
       raw)       reply=("--help" "-h" "--interactive" "--no-interactive" "-i" "--explode" "--no-explode" "-E" "--skip-version-check" "--skip-completion-check" "--api-endpoint" "-e" "--insecure" "--no-insecure" "-I" "--pro" "--com" "--org" "--staging" "--token" "-t" "--debug" "--debug-http" "--enterprise" "-X" "--adapter" "--json" "--no-json");;
@@ -114,7 +112,7 @@ elif type compctl 1>/dev/null 2>/dev/null; then
 elif type complete 1>/dev/null 2>/dev/null; then
   complete -F _travis travis
   _travis()          { _travis_complete "$COMP_CWORD" "${COMP_WORDS[1]}"; }
-  _travis_commands() { COMPREPLY=( $(compgen -W "accounts branches cache cancel console disable enable encrypt encrypt-file endpoint env help history init lint login logout logs monitor open pubkey raw report repos requests restart settings setup show sshkey status sync token version whatsup whoami" -- "${COMP_WORDS[COMP_CWORD]}") ); }
+  _travis_commands() { COMPREPLY=( $(compgen -W "accounts branches cache cancel console disable enable encrypt encrypt-file endpoint env help history init lint login logout logs open pubkey raw report repos requests restart settings setup show sshkey status sync token version whatsup whoami" -- "${COMP_WORDS[COMP_CWORD]}") ); }
   _travis_setup()    { COMPREPLY=( $(compgen -W "anynines appfog artifacts biicode cloudcontrol cloudfiles cloudfoundry cloud66 codedeploy deis divshot elasticbeanstalk engineyard gcs hackage heroku modulus npm ninefold nodejitsu openshift opsworks pypi releases rubygems s3 sauce_connect" -- "${COMP_WORDS[COMP_CWORD]}") ); }
   _travis_settings() { COMPREPLY=( $(compgen -W "builds_only_with_travis_yml build_pushes build_pull_requests maximum_number_of_builds auto_cancel_pushes auto_cancel_pull_requests" -- "${COMP_WORDS[COMP_CWORD]}") ); }
   _travis_init()     { COMPREPLY=( $(compgen -W ""bash" "c" "clojure" "cpp" "elixir" "erlang" "go" "groovy" "haskell" "java" "node_js" "objective-c" "perl" "php" "python" "ruby" "scala"" -- "${COMP_WORDS[COMP_CWORD]}") ); }
@@ -139,7 +137,6 @@ elif type complete 1>/dev/null 2>/dev/null; then
       login)     options="--help -h --interactive --no-interactive -i --explode --no-explode -E --skip-version-check --skip-completion-check --api-endpoint -e --insecure --no-insecure -I --pro --com --org --staging --token -t --debug --debug-http --enterprise -X --adapter --github-token -g --auto-token -T --auto-password -p --auto -a --user -u --no-manual -M --list-github-token --skip-token-check";;
       logout)    options="--help -h --interactive --no-interactive -i --explode --no-explode -E --skip-version-check --skip-completion-check --api-endpoint -e --insecure --no-insecure -I --pro --com --org --staging --token -t --debug --debug-http --enterprise -X --adapter";;
       logs)      options="--help -h --interactive --no-interactive -i --explode --no-explode -E --skip-version-check --skip-completion-check --api-endpoint -e --insecure --no-insecure -I --pro --com --org --staging --token -t --debug --debug-http --enterprise -X --adapter --repo -r --store-repo -R --delete -d --force -f --stream --no-stream";;
-      monitor)   options="--help -h --interactive --no-interactive -i --explode --no-explode -E --skip-version-check --skip-completion-check --api-endpoint -e --insecure --no-insecure -I --pro --com --org --staging --token -t --debug --debug-http --enterprise -X --adapter --my-repos -m --repo -r --notify --no-notify -n --builds -b --push -p --pull -P";;
       open)      options="--help -h --interactive --no-interactive -i --explode --no-explode -E --skip-version-check --skip-completion-check --api-endpoint -e --insecure --no-insecure -I --pro --com --org --staging --token -t --debug --debug-http --enterprise -X --adapter --repo -r --store-repo -R --github -g --print -p";;
       pubkey)    options="--help -h --interactive --no-interactive -i --explode --no-explode -E --skip-version-check --skip-completion-check --api-endpoint -e --insecure --no-insecure -I --pro --com --org --staging --token -t --debug --debug-http --enterprise -X --adapter --repo -r --store-repo -R --pem -p --fingerprint -f";;
       raw)       options="--help -h --interactive --no-interactive -i --explode --no-explode -E --skip-version-check --skip-completion-check --api-endpoint -e --insecure --no-insecure -I --pro --com --org --staging --token -t --debug --debug-http --enterprise -X --adapter --json --no-json";;

data/examples/pro_auth.rb

@@ -2,11 +2,11 @@ require 'travis/pro'
 require 'travis/tools/github'
 require 'highline/import' # so we can hide the password
 
+github_token = ask("GitHub token: ")
+
 # Set up GitHub tool for doing the login handshake.
 github = Travis::Tools::Github.new(drop_token: true) do |g|
-  g.ask_login    = -> { ask("GitHub login: ") }
-  g.ask_password = -> { ask("Password: ") { |q| q.echo = "*" } }
-  g.ask_otp      = -> { ask("Two-factor token: ") }
+  g.github_token = github_token
 end
 
 # Create temporary GitHub token and use it to authenticate against Travis CI.
@@ -16,7 +16,7 @@ end
 
 # Look up the current user.
 user = Travis::Pro::User.current
-puts "Hello #{user.name}!"
+puts "Hello #{user.login}!"
 
 # Display repositories the user is a member of.
 repos = Travis::Pro::Repository.find_all(member: user.login)

data/lib/travis/cli/env.rb

@@ -15,7 +15,7 @@ module Travis
       def setup
         super
         authenticate
-        error "not allowed to access environment variables for #{color(repository.slug, :bold)}" unless repository.admin?
+        error "not allowed to access environment variables for #{color(repository.slug, :bold)}" unless repository.push?
       end
 
       def set(name, value)
@@ -63,4 +63,4 @@ module Travis
       end
     end
   end
-end
+end

data/lib/travis/cli/login.rb

@@ -10,10 +10,6 @@ module Travis
       description "authenticates against the API and stores the token"
       on('-g', '--github-token TOKEN', 'identify by GitHub token')
       on('-T', '--auto-token',         'try to figure out who you are automatically (might send another apps token to Travis, token will not be stored)')
-      on('-p', '--auto-password',      'try to load password from OSX keychain (will not be stored)')
-      on('-a', '--auto',               'shorthand for --auto-token --auto-password') { |c| c.auto_token = c.auto_password = true }
-      on('-u', '--user LOGIN',         'user to log in as') { |c,n| c.user_login = n }
-      on('-M', '--no-manual',          'do not use interactive login')
       on('--list-github-token',        'instead of actually logging in, list found GitHub tokens')
       on('--skip-token-check',         'don\'t verify the token with github')
 
@@ -55,17 +51,11 @@ module Travis
           load_gh
           Tools::Github.new(session.config['github']) do |g|
             g.note          = "temporary token to identify with the travis command line client against #{api_endpoint}"
-            g.manual_login  = no_manual.nil?
             g.explode       = explode?
             g.github_token  = github_token
             g.auto_token    = auto_token
-            g.auto_password = auto_password
-            g.github_login  = user_login
             g.check_token   = !skip_token_check?
             g.drop_token    = !list_github_token
-            g.ask_login     = proc { ask("Username: ") }
-            g.ask_password  = proc { |user| ask("Password for #{user}: ") { |q| q.echo = "*" } }
-            g.ask_otp       = proc { |user| ask("Two-factor authentication code for #{user}: ") }
             g.login_header  = proc { login_header }
             g.debug         = proc { |log| debug(log) }
             g.after_tokens  = proc { g.explode = true and error("no suitable github token found") }
@@ -74,12 +64,9 @@ module Travis
       end
 
       def login_header
-        say "We need your #{color("GitHub login", :important)} to identify you."
-        say "This information will #{color("not be sent to Travis CI", :important)}, only to #{color(github_endpoint.host, :info)}."
-        say "The password will not be displayed."
-        empty_line
-        say "Try running with #{color("--github-token", :info)} or #{color("--auto", :info)} if you don't want to enter your password anyway."
-        empty_line
+        say "GitHub deprecated its Authorizations API exchanging a password for a token."
+        say "Please visit https://github.blog/2020-07-30-token-authentication-requirements-for-api-and-git-operations for more information."
+        say "Try running with #{color("--github-token", :info)} or #{color("--auto-token", :info)} ."
       end
     end
   end

data/lib/travis/cli/repo_command.rb

@@ -6,6 +6,7 @@ module Travis
     class RepoCommand < ApiCommand
       GIT_REGEX = %r{/?(.*/.+?)(\.git)?$}
       TRAVIS    = %r{^https://(staging-)?api\.travis-ci\.(org|com)}
+      on('-g', '--github-token TOKEN', 'identify by GitHub token')
       on('-r', '--repo SLUG', 'repository to use (will try to detect from current git clone)') do |c, slug|
         c.slug = slug
         c.error "SLUG should be of the form OWNER/REPO" unless slug.split('/').compact.size == 2

data/lib/travis/cli/setup/releases.rb

@@ -10,6 +10,10 @@ module Travis
         def run
           deploy 'releases' do |config|
             github.with_token { |t| config['api_key'] = t }
+            if config['api_key'].nil?
+              raise Travis::Client::GitHubLoginFailed, 'all GitHub tokens given were invalid'
+            end
+
             config['file'] = ask("File to Upload: ").to_s
           end
         end
@@ -19,9 +23,7 @@ module Travis
             load_gh
             Tools::Github.new(session.config['github']) do |g|
               g.drop_token    = false
-              g.ask_login     = proc { ask("Username: ") }
-              g.ask_password  = proc { |user| ask("Password for #{user}: ") { |q| q.echo = "*" } }
-              g.ask_otp       = proc { |user| ask("Two-factor authentication code for #{user}: ") }
+              g.github_token  = github_token
               g.debug         = proc { |log| debug(log) }
               g.after_tokens  = proc { g.explode = true and error("no suitable github token found") }
               g.scopes        = org? ? ['public_repo'] : ['repo']
@@ -32,4 +34,4 @@ module Travis
       end
     end
   end
-end
+end

data/lib/travis/cli/sshkey.rb

@@ -13,6 +13,7 @@ module Travis
       on '-c', '--check',                   'set exit code depending on key existing'
       on '-g', '--generate',                'generate SSH key and set up for given GitHub user'
       on '-p', '--passphrase PASSPHRASE',   'pass phrase to decrypt with when using --upload'
+      on '-g', '--github-token TOKEN',      'identify by GitHub token'
 
       def_delegators :repository, :ssh_key
 
@@ -51,27 +52,34 @@ module Travis
       end
 
       def generate_key
-        github.with_basic_auth do |gh|
-          login = gh['user']['login']
-          check_access(gh)
-          empty_line
+        access_token = nil
+        github.with_token do |token|
+          access_token = github_auth(token)
+        end
+        session.access_token = nil
+        unless access_token
+          raise Travis::Client::GitHubLoginFailed, "all GitHub tokens given were invalid"
+        end
+        gh = GH.with(token: github_token)
+        login = gh['user']['login']
+        check_access(gh)
+        empty_line
 
-          say "Generating RSA key."
-          private_key        = Tools::SSLKey.generate_rsa
-          self.description ||= "key for fetching dependencies for #{slug} via #{login}"
+        say "Generating RSA key."
+        private_key        = Tools::SSLKey.generate_rsa
+        self.description ||= "key for fetching dependencies for #{slug} via #{login}"
 
-          say "Uploading public key to GitHub."
-          gh.post("/user/keys", :title => "#{description} (Travis CI)", :key => Tools::SSLKey.rsa_ssh(private_key.public_key))
+        say "Uploading public key to GitHub."
+        gh.post("/user/keys", :title => "#{description} (Travis CI)", :key => Tools::SSLKey.rsa_ssh(private_key.public_key))
 
-          say "Uploading private key to Travis CI."
-          ssh_key.update(:value => private_key.to_s, :description => description)
+        say "Uploading private key to Travis CI."
+        ssh_key.update(:value => private_key.to_s, :description => description)
 
-          empty_line
-          say "You can store the private key to reuse it for other repositories (travis sshkey --upload FILE)."
-          if agree("Store private key? ") { |q| q.default = "no" }
-            path = ask("Path: ") { |q| q.default = "id_travis_rsa" }
-            File.write(path, private_key.to_s)
-          end
+        empty_line
+        say "You can store the private key to reuse it for other repositories (travis sshkey --upload FILE)."
+        if agree("Store private key? ") { |q| q.default = "no" }
+          path = ask("Path: ") { |q| q.default = "id_travis_rsa" }
+          File.write(path, private_key.to_s)
         end
       end
 
@@ -97,9 +105,7 @@ module Travis
           Tools::Github.new(session.config['github']) do |g|
             g.note          = "token for fetching dependencies for #{slug} (Travis CI)"
             g.explode       = explode?
-            g.ask_login     = proc { ask("Username: ") }
-            g.ask_password  = proc { |user| ask("Password for #{user}: ") { |q| q.echo = "*" } }
-            g.ask_otp       = proc { |user| ask("Two-factor authentication code for #{user}: ") }
+            g.github_token  = github_token
             g.login_header  = proc { login_header }
             g.debug         = proc { |log| debug(log) }
             g.after_tokens  = proc { g.explode = true and error("no suitable github token found") }
@@ -108,10 +114,9 @@ module Travis
       end
 
       def login_header
-        say "We need the #{color("GitHub login", :important)} for the account you want to add the key to."
-        say "This information will #{color("not be sent to Travis CI", :important)}, only to #{color(github_endpoint.host, :info)}."
-        say "The password will not be displayed."
-        empty_line
+        say "GitHub deprecated its Authorizations API exchanging a password for a token."
+        say "Please visit https://github.blog/2020-07-30-token-authentication-requirements-for-api-and-git-operations for more information."
+        say "Try running with #{color("--github-token", :info)} or #{color("--auto-token", :info)} ."
       end
     end
   end

data/lib/travis/client/auto_login.rb

@@ -24,7 +24,6 @@ module Travis
       def github
         @github         ||= Tools::Github.new(session.config['github']) do |g|
           g.explode       = true
-          g.manual_login  = false
           g.auto_token    = @auto_token
           g.after_tokens  = proc { raise NoTokenError, "no suitable github token found" } if @raise
         end

data/lib/travis/tools/github.rb

@@ -10,19 +10,15 @@ module Travis
       GITHUB_API  = 'api.github.com'
       GITHUB_HOST = 'github.com'
 
-      attr_accessor :api_url, :scopes, :github_token, :github_login, :drop_token, :callback, :explode, :after_tokens,
-        :ask_login, :ask_password, :ask_otp, :login_header, :auto_token, :auto_password, :manual_login, :note,
-        :netrc_path, :hub_path, :oauth_paths, :composer_path, :git_config_keys, :debug, :no_token, :check_token
+      attr_accessor :api_url, :scopes, :github_token, :drop_token, :callback, :explode, :after_tokens,
+        :login_header, :auto_token, :note,
+        :hub_path, :oauth_paths, :composer_path, :git_config_keys, :debug, :no_token, :check_token
 
       def initialize(options = nil)
         @check_token     = true
-        @manual_login    = true
         @ask_login       = proc { raise "ask_login callback not set" }
         @after_tokens    = proc { }
-        @ask_password    = proc { |_| raise "ask_password callback not set" }
-        @ask_otp         = proc { |_| raise "ask_otp callback not set" }
         @debug           = proc { |_| }
-        @netrc_path      = '~/.netrc'
         @hub_path        = ENV['HUB_CONFIG'] || '~/.config/hub'
         @oauth_paths     = ['~/.github-oauth-token']
         @composer_path   = "~/.composer/config.json"
@@ -37,14 +33,6 @@ module Travis
         each_token { |t| break yield(t) }
       end
 
-      def with_basic_auth(&block)
-        user, password = ask_credentials
-        basic_auth(user, password, true) do |gh, _|
-          gh['user'] # so otp kicks in
-          yield gh
-        end
-      end
-
       def each_token
         require 'gh' unless defined? GH
         possible_tokens { |t| yield(t) if acceptable?(t) }
@@ -61,7 +49,6 @@ module Travis
         return block[github_token] if github_token
 
         if auto_token
-          netrc_tokens(&block)
           git_tokens(&block)
           hub_tokens(&block)
           oauth_file_tokens(&block)
@@ -70,41 +57,10 @@ module Travis
           composer_token(&block)
         end
 
-        if auto_password
-          possible_logins do |user, password|
-            yield login(user, password, false)
-          end
-        end
-
-        if manual_login
-          user, password = ask_credentials
-          yield login(user, password, true)
-        end
-
-        after_tokens.call
-      end
-
-      def ask_credentials
-        login_header.call if login_header
-        user     = github_login || ask_login.call
-        password = ask_password.arity == 0 ? ask_password.call : ask_password.call(user)
-        [user, password]
-      end
-
-      def possible_logins(&block)
-        netrc_logins(&block)
-        hub_logins(&block)
-        keychain_login(&block)
-      end
-
-      def netrc_tokens
-        netrc.each do |entry|
-          next unless entry["machine"] == api_host or entry["machine"] == host
-          entry.values_at("token", "login", "password").each do |entry|
-            next if entry.to_s.size != TOKEN_SIZE
-            debug "found oauth token in netrc"
-            yield entry
-          end
+        if github_token || auto_token
+          after_tokens.call
+        elsif login_header
+          login_header.call
         end
       end
 
@@ -127,7 +83,6 @@ module Travis
 
       def hub_tokens
         hub.fetch(host, []).each do |entry|
-          next if github_login and github_login != entry["user"]
           yield entry["oauth_token"] if entry["oauth_token"]
         end
       end
@@ -141,45 +96,6 @@ module Travis
         end
       end
 
-      def netrc_logins
-        netrc.each do |entry|
-          next unless entry["machine"] == api_host or entry["machine"] == host
-          next if github_login and github_login != entry["login"]
-          yield entry["login"], entry["password"] if entry["login"] and entry["password"]
-        end
-      end
-
-      def hub_logins
-        hub.fetch(host, []).each do |entry|
-          next if github_login and github_login != entry["user"]
-          yield entry["user"], entry["password"] if entry["user"] and entry["password"]
-        end
-      end
-
-      def keychain_login
-        if github_login
-          security(:internet, :w, "-s #{host} -a #{github_login}", "#{host} password for #{github_login}") do |password|
-            yield github_login, password if password and not password.empty?
-          end
-        else
-          security(:internet, :g, "-s #{host}", "#{host} login and password") do |data|
-            username = data[/^\s+"acct"<blob>="(.*)"$/, 1].to_s
-            password = data[/^password: "(.*)"$/, 1].to_s
-            yield username, password unless username.empty? or password.empty?
-          end
-        end
-      end
-
-      def netrc
-        file(netrc_path, []) do |contents|
-          contents.scan(/^\s*(\S+)\s+(\S+)\s*$/).inject([]) do |mapping, (key, value)|
-            mapping << {} if key == "machine"
-            mapping.last[key] = value if mapping.last
-            mapping
-          end
-        end
-      end
-
       def hub
         file(hub_path, {}) do |contents|
           YAML.load(contents)
@@ -192,7 +108,6 @@ module Travis
 
       def github_for_mac_token(&block)
         command = '-s "github.com/mac"'
-        command << " -a #{github_login}" if github_login
         security(:internet, :w, command, "GitHub for Mac token", &block) if host == 'github.com'
       end
 
@@ -205,52 +120,12 @@ module Travis
         api_url[%r{^(?:https?://)?([^/]+)}, 1]
       end
 
-      def basic_auth(user, password, die = true, otp = nil, &block)
-        gh = GH.with(:username => user, :password => password)
-        with_otp(gh, user, otp, &block)
-      rescue GH::Error => error
-        raise gh_error(error) if die
-      end
-
-      def login(user, password, die = true, otp = nil)
-        basic_auth(user, password, die, otp) do |gh, new_otp|
-          reply         = create_token(gh)
-          auth_href     = reply['_links']['self']['href']
-          self.callback = proc { with_otp(gh, user, new_otp) { |g| g.delete(auth_href) } } if drop_token
-          reply['token']
-        end
-      end
-
-      def create_token(gh)
-        gh.post('/authorizations', :scopes => scopes, :note => note)
-      rescue GH::Error => error
-        # token might already exist due to bug in earlier CLI version, we'll have to delete it first
-        raise error unless error.info[:response_status] == 422 and error.info[:response_body].to_s =~ /already_exists/
-        raise error unless reply = gh['/authorizations'].detect { |a| a['note'] == note }
-        gh.delete(reply['_links']['self']['href'])
-        retry
-      end
-
-      def with_otp(gh, user, otp, &block)
-        gh = GH.with(gh.options.merge(:headers => { "X-GitHub-OTP" => otp })) if otp
-        block.call(gh, otp)
-      rescue GH::Error => error
-        raise error unless error.info[:response_status] == 401 and error.info[:response_headers]['x-github-otp'].to_s =~ /required/
-        otp = ask_otp.arity == 0 ? ask_otp.call : ask_otp.call(user)
-        retry
-      end
-
       def acceptable?(token)
         return true unless check_token
         gh   = GH.with(:token => token)
         user = gh['user']
 
-        if github_login and github_login != user['login']
-          debug "token is not acceptable: identifies %p instead of %p" % [user['login'], github_login]
-          false
-        else
-          true
-        end
+        true
       rescue GH::Error => error
         debug "token is not acceptable: #{gh_error(error)}"
         false

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.10.0'
+  VERSION = '1.11.0'
 end

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general info
   s.name        = "travis"
-  s.version     = "1.10.0"
+  s.version     = "1.11.0"
   s.required_ruby_version = ">= 2.3.0"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis.rb"
@@ -12,24 +12,34 @@ Gem::Specification.new do |s|
 
   # generated from git shortlog -sn
   s.authors = [
-    "Hiro Asari",
     "Konstantin Haase",
+    "Hiro Asari",
+    "Henrik Hodne",
+    "joshua-anderson",
+    "Aaron Hill",
     "Piotr Milcarz",
     "Buck Doyle",
+    "Peter Souter",
     "Christopher Grim",
     "Joe Corcoran",
+    "Peter van Dijk",
     "Sven Fuchs",
     "Aakriti Gupta",
     "Josh Kalderimis",
-    "Ke Zhu",
     "Piotr Sarnacki",
+    "Ke Zhu",
+    "Max Barnash",
     "Ren\xC3\xA9e Hendricksen",
     "carlad",
+    "Carlos Palhares",
+    "Dan Buch",
     "Mar\xC3\xADa de Ant\xC3\xB3n",
+    "Mathias Meyer",
     "Matt Toothman",
     "mariadeanton",
     "techgaun",
     "Alpha",
+    "Andreas Tiefenthaler",
     "Beau Bouchard",
     "Corinna Wiesner",
     "David Rodr\xC3\xADguez",
@@ -39,65 +49,102 @@ Gem::Specification.new do |s|
     "Ivan Pozdeev",
     "Joep van Delft",
     "Stefan Nordhausen",
+    "Thais Camilo and Konstantin Haase",
     "Tobias Bieniek",
     "Adam Baxter",
+    "Adam Lavin",
+    "Adrien Brault",
     "Alfie John",
     "Alo\xC3\xAFs Th\xC3\xA9venot",
     "Basarat Ali Syed",
+    "Benjamin Manns",
     "Christian H\xC3\xB6ltje",
     "Dani Hodovic",
+    "Daniel Chatfield",
     "Dominic Jodoin",
     "Eli Schwartz",
+    "Eric Herot",
     "Eugene K",
+    "George Millo",
     "Gunter Grodotzki",
     "Harald Nordgren",
     "HaraldNordgren",
     "Igor",
     "Iulian Onofrei",
     "Jacob Atzen",
+    "Jacob Burkhart",
     "James Nylen",
     "Joe Rafaniello",
+    "Jon-Erik Schneiderhan",
     "Jonas Chromik",
+    "Jonne Ha\xC3\x9F",
+    "Julia S.Simon",
+    "Justin Lambert",
+    "Laurent Petit",
+    "Maarten van Vliet",
     "Marco Craveiro",
-    "Marek Marczykowski-G\xC3\xB3recki",
+    "Mario Visic",
     "Matt",
     "Matteo Sumberaz",
+    "Matthias Bussonnier",
+    "Michael Mior",
     "Michael S. Fischer",
+    "Miro Hron\xC4\x8Dok",
+    "Neamar",
     "Nero Leung",
+    "Nicolas Bessi (nbessi)",
     "Nikhil Owalekar",
     "Peter Bengtsson",
     "Peter Drake",
+    "Rapha\xC3\xABl Pinson",
+    "Rob Hoelz",
     "Robert Grider",
     "Robert Van Voorhees",
     "Simon Cropp",
     "Tahsin Hasan",
     "Titus",
     "Titus Wormer",
+    "Tobias Wilken",
+    "Zachary Gershman",
+    "Zachary Scott",
     "designerror",
     "ia",
+    "jeffdh",
+    "john muhl",
     "slewt"
   ]
 
   # generated from git shortlog -sne
   s.email = [
-    "asari.ruby@gmail.com",
     "konstantin.mailinglists@googlemail.com",
+    "asari.ruby@gmail.com",
+    "j@zatigo.com",
+    "aa1ronham@gmail.com",
     "piotrm@travis-ci.org",
+    "me@henrikhodne.com",
     "b@chromatin.ca",
+    "henrik@hodne.io",
+    "p.morsou@gmail.com",
     "chrisg@luminal.io",
     "joe@corcoran.io",
+    "peter.van.dijk@netherlabs.nl",
     "me@svenfuchs.com",
     "josh.kalderimis@gmail.com",
-    "kzhu@us.ibm.com",
     "drogus@gmail.com",
+    "kzhu@us.ibm.com",
+    "i.am@anhero.ru",
     "renee@travis-ci.org",
     "aakritigupta@users.noreply.github.com",
+    "me@xjunior.me",
+    "dan@meatballhat.com",
     "mariadeanton@gmail.com",
+    "meyer@paperplanes.de",
     "matt.toothman@aver.io",
     "carlad@users.noreply.github.com",
     "coolsamar207@gmail.com",
     "aakriti@travis-ci.org",
     "AlphaWong@users.noreply.github.com",
+    "at@an-ti.eu",
     "127320+BeauBouchard@users.noreply.github.com",
     "wiesner@avarteq.de",
     "deivid.rodriguez@gmail.com",
@@ -106,43 +153,69 @@ Gem::Specification.new do |s|
     "igor@travis-ci.org",
     "vano@mail.mipt.ru",
     "stefan.nordhausen@immobilienscout24.de",
+    "dev+narwen+rkh@rkh.im",
     "tobias.bieniek@gmail.com",
     "github@voltagex.org",
+    "adam@lavoaster.co.uk",
+    "adrien.brault@gmail.com",
     "33c6c91f3bb4a391082e8a29642cafaf@alfie.wtf",
     "aloisthevenot@srxp.com",
     "basaratali@gmail.com",
+    "benmanns@gmail.com",
     "docwhat@gerf.org",
     "danihodovic@users.noreply.github.com",
+    "chatfielddaniel@gmail.com",
     "dominic@travis-ci.com",
     "eschwartz@archlinux.org",
+    "eric.github@herot.com",
     "34233075+eugene-kulak@users.noreply.github.com",
+    "georgejulianmillo@gmail.com",
     "gunter@grodotzki.co.za",
     "haraldnordgren@gmail.com",
     "igorwwwwwwwwwwwwwwwwwwww@users.noreply.github.com",
     "6d0847b9@opayq.com",
     "jatzen@gmail.com",
+    "jburkhart@engineyard.com",
     "jnylen@gmail.com",
     "jrafanie@users.noreply.github.com",
     "joep@travis-ci.org",
     "joepvd@users.noreply.github.com",
+    "jon-erik.schneiderhan@meyouhealth.com",
     "Jonas.Chromik@student.hpi.uni-potsdam.de",
+    "me@jhass.eu",
+    "julia.simon@biicode.com",
+    "jlambert@eml.cc",
+    "laurent.petit@gmail.com",
+    "maartenvanvliet@gmail.com",
     "marco.craveiro@gmail.com",
-    "marmarek@invisiblethingslab.com",
+    "mario@mariovisic.com",
     "mtoothman@users.noreply.github.com",
     "gnappoms@gmail.com",
+    "bussonniermatthias@gmail.com",
+    "mmior@uwaterloo.ca",
     "mfischer@zendesk.com",
+    "miro@hroncok.cz",
+    "neamar@neamar.fr",
     "neroleung@gmail.com",
+    "nbessi@users.noreply.github.com",
     "nowalekar@tigetext.com",
     "peterbe@mozilla.com",
     "peter.drake@acquia.com",
+    "raphael.pinson@camptocamp.com",
+    "rob@hoelz.ro",
     "robert.grider@northwestern.edu",
     "rcvanvo@gmail.com",
     "simon.cropp@gmail.com",
     "51903216+Tahsin-travis-ci@users.noreply.github.com",
     "tituswormer@gmail.com",
+    "tw@cloudcontrol.de",
+    "pair+zg@pivotallabs.com",
+    "e@zzak.io",
     "carla@travis-ci.org",
     "designerror@yandex.ru",
     "isaac.ardis@gmail.com",
+    "jeffdh@gmail.com",
+    "git@johnmuhl.com",
     "leland@lcweathers.net"
   ]
 
@@ -303,7 +376,6 @@ Gem::Specification.new do |s|
     "spec/cli/help_spec.rb",
     "spec/cli/history_spec.rb",
     "spec/cli/init_spec.rb",
-    "spec/cli/login_spec.rb",
     "spec/cli/logs_spec.rb",
     "spec/cli/open_spec.rb",
     "spec/cli/repo_command_spec.rb",

metadata

@@ -1,27 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.10.1.travis.1311.9
+  version: 1.11.0
 platform: ruby
 authors:
-- Hiro Asari
 - Konstantin Haase
+- Hiro Asari
+- Henrik Hodne
+- joshua-anderson
+- Aaron Hill
 - Piotr Milcarz
 - Buck Doyle
+- Peter Souter
 - Christopher Grim
 - Joe Corcoran
+- Peter van Dijk
 - Sven Fuchs
 - Aakriti Gupta
 - Josh Kalderimis
-- Ke Zhu
 - Piotr Sarnacki
+- Ke Zhu
+- Max Barnash
 - Renée Hendricksen
 - carlad
+- Carlos Palhares
+- Dan Buch
 - María de Antón
+- Mathias Meyer
 - Matt Toothman
 - mariadeanton
 - techgaun
 - Alpha
+- Andreas Tiefenthaler
 - Beau Bouchard
 - Corinna Wiesner
 - David Rodríguez
@@ -31,47 +41,73 @@ authors:
 - Ivan Pozdeev
 - Joep van Delft
 - Stefan Nordhausen
+- Thais Camilo and Konstantin Haase
 - Tobias Bieniek
 - Adam Baxter
+- Adam Lavin
+- Adrien Brault
 - Alfie John
 - Aloïs Thévenot
 - Basarat Ali Syed
+- Benjamin Manns
 - Christian Höltje
 - Dani Hodovic
+- Daniel Chatfield
 - Dominic Jodoin
 - Eli Schwartz
+- Eric Herot
 - Eugene K
+- George Millo
 - Gunter Grodotzki
 - Harald Nordgren
 - HaraldNordgren
 - Igor
 - Iulian Onofrei
 - Jacob Atzen
+- Jacob Burkhart
 - James Nylen
 - Joe Rafaniello
+- Jon-Erik Schneiderhan
 - Jonas Chromik
+- Jonne Haß
+- Julia S.Simon
+- Justin Lambert
+- Laurent Petit
+- Maarten van Vliet
 - Marco Craveiro
-- Marek Marczykowski-Górecki
+- Mario Visic
 - Matt
 - Matteo Sumberaz
+- Matthias Bussonnier
+- Michael Mior
 - Michael S. Fischer
+- Miro Hrončok
+- Neamar
 - Nero Leung
+- Nicolas Bessi (nbessi)
 - Nikhil Owalekar
 - Peter Bengtsson
 - Peter Drake
+- Raphaël Pinson
+- Rob Hoelz
 - Robert Grider
 - Robert Van Voorhees
 - Simon Cropp
 - Tahsin Hasan
 - Titus
 - Titus Wormer
+- Tobias Wilken
+- Zachary Gershman
+- Zachary Scott
 - designerror
 - ia
+- jeffdh
+- john muhl
 - slewt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -235,24 +271,35 @@ dependencies:
         version: '0.6'
 description: CLI and Ruby client library for Travis CI
 email:
-- asari.ruby@gmail.com
 - konstantin.mailinglists@googlemail.com
+- asari.ruby@gmail.com
+- j@zatigo.com
+- aa1ronham@gmail.com
 - piotrm@travis-ci.org
+- me@henrikhodne.com
 - b@chromatin.ca
+- henrik@hodne.io
+- p.morsou@gmail.com
 - chrisg@luminal.io
 - joe@corcoran.io
+- peter.van.dijk@netherlabs.nl
 - me@svenfuchs.com
 - josh.kalderimis@gmail.com
-- kzhu@us.ibm.com
 - drogus@gmail.com
+- kzhu@us.ibm.com
+- i.am@anhero.ru
 - renee@travis-ci.org
 - aakritigupta@users.noreply.github.com
+- me@xjunior.me
+- dan@meatballhat.com
 - mariadeanton@gmail.com
+- meyer@paperplanes.de
 - matt.toothman@aver.io
 - carlad@users.noreply.github.com
 - coolsamar207@gmail.com
 - aakriti@travis-ci.org
 - AlphaWong@users.noreply.github.com
+- at@an-ti.eu
 - 127320+BeauBouchard@users.noreply.github.com
 - wiesner@avarteq.de
 - deivid.rodriguez@gmail.com
@@ -261,43 +308,69 @@ email:
 - igor@travis-ci.org
 - vano@mail.mipt.ru
 - stefan.nordhausen@immobilienscout24.de
+- dev+narwen+rkh@rkh.im
 - tobias.bieniek@gmail.com
 - github@voltagex.org
+- adam@lavoaster.co.uk
+- adrien.brault@gmail.com
 - 33c6c91f3bb4a391082e8a29642cafaf@alfie.wtf
 - aloisthevenot@srxp.com
 - basaratali@gmail.com
+- benmanns@gmail.com
 - docwhat@gerf.org
 - danihodovic@users.noreply.github.com
+- chatfielddaniel@gmail.com
 - dominic@travis-ci.com
 - eschwartz@archlinux.org
+- eric.github@herot.com
 - 34233075+eugene-kulak@users.noreply.github.com
+- georgejulianmillo@gmail.com
 - gunter@grodotzki.co.za
 - haraldnordgren@gmail.com
 - igorwwwwwwwwwwwwwwwwwwww@users.noreply.github.com
 - 6d0847b9@opayq.com
 - jatzen@gmail.com
+- jburkhart@engineyard.com
 - jnylen@gmail.com
 - jrafanie@users.noreply.github.com
 - joep@travis-ci.org
 - joepvd@users.noreply.github.com
+- jon-erik.schneiderhan@meyouhealth.com
 - Jonas.Chromik@student.hpi.uni-potsdam.de
+- me@jhass.eu
+- julia.simon@biicode.com
+- jlambert@eml.cc
+- laurent.petit@gmail.com
+- maartenvanvliet@gmail.com
 - marco.craveiro@gmail.com
-- marmarek@invisiblethingslab.com
+- mario@mariovisic.com
 - mtoothman@users.noreply.github.com
 - gnappoms@gmail.com
+- bussonniermatthias@gmail.com
+- mmior@uwaterloo.ca
 - mfischer@zendesk.com
+- miro@hroncok.cz
+- neamar@neamar.fr
 - neroleung@gmail.com
+- nbessi@users.noreply.github.com
 - nowalekar@tigetext.com
 - peterbe@mozilla.com
 - peter.drake@acquia.com
+- raphael.pinson@camptocamp.com
+- rob@hoelz.ro
 - robert.grider@northwestern.edu
 - rcvanvo@gmail.com
 - simon.cropp@gmail.com
 - 51903216+Tahsin-travis-ci@users.noreply.github.com
 - tituswormer@gmail.com
+- tw@cloudcontrol.de
+- pair+zg@pivotallabs.com
+- e@zzak.io
 - carla@travis-ci.org
 - designerror@yandex.ru
 - isaac.ardis@gmail.com
+- jeffdh@gmail.com
+- git@johnmuhl.com
 - leland@lcweathers.net
 executables:
 - travis
@@ -459,7 +532,6 @@ files:
 - spec/cli/help_spec.rb
 - spec/cli/history_spec.rb
 - spec/cli/init_spec.rb
-- spec/cli/login_spec.rb
 - spec/cli/logs_spec.rb
 - spec/cli/open_spec.rb
 - spec/cli/repo_command_spec.rb
@@ -495,7 +567,7 @@ homepage: https://github.com/travis-ci/travis.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -506,12 +578,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Travis CI client
 test_files: []

data/spec/cli/login_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe Travis::CLI::Login do
-  example "travis login", :unless => Travis::Tools::System.windows? do
-    run_cli('login', '-E', '--skip-token-check') { |i| i.puts('rkh', 'password') }.should be_success
-    run_cli('whoami').out.should be == "rkh\n"
-  end
-
-  example "travis login (with bad credentials)", :unless => Travis::Tools::System.windows? do
-    run_cli('login') { |i| i.puts('rkh', 'wrong password') }.should_not be_success
-    run_cli('whoami').should_not be_success
-  end
-end