travis 1.6.4.travis.410.4 → 1.6.4.travis.411.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTU4NGZjNTZmZDFmZjNmODkzOWMwNTQyYzljZjUyMTIxMWM3NzJlZg==
+    OTVmNWY5ZWVjOGE3MjAxYjAxZDFmZWJlZTM4MjVlMTQxNWJkZGIyYQ==
   data.tar.gz: !binary |-
-    MTE0ZTQwMjA2MjI5NzcxYWQxNzNhNzhkMzFlMjIxOTI2MTc5YzhkZQ==
+    ZjFlYjIwMzEzYTNjOGVhZGQ5ZTdiMGU4Nzk4ZGZiNGM0ZGUwMjBkNg==
 SHA512:
   metadata.gz: !binary |-
-    ZDkzMDJmZjY5MWU3MDQyNzQ2MWMyOTExODliNmRkZjY1NGI5NTQ2NTQ2ZjZl
-    ZjFkMTZkMjU2MzkwYWM5OTZmMzMxNWU2NDkyM2EyMjkwZmQzN2Y0OTkzMTc0
-    NzdlMjcwZDU1M2FjNTBmNzQwOWRkMGRjZjlmZmM2YTc2YTkxMDc=
+    MTkwZmZkZTA0ZjIwNGExZDEzM2ZhZWY3MmI1YmI1MTM4ZjMzN2U5YjBkMjZh
+    N2Y0ZDdiOTVkNWYxNzQ0NGE1NGIyZjZjNGVhYTM4ZGEwYmIzNTkzZDhhYmFj
+    MGY0YjQwMzVkNDJjMTQyOTNhOWUwZjg5ODdjZGMzZWRmYzJjOWM=
   data.tar.gz: !binary |-
-    ZDY5MjAwN2U0Mjk4MWRhODE5OTY2OGUxODVlMGQwMWI1NTQ5ZmIxMDJiNTM3
-    ZDc0ODdmMjNlYWJjM2RmNjkyY2JmYjkyNGU0MGU2NWNhODk2YzA0OGU5Njcw
-    MzA4NzViYjE4NjczNTdiZTFiOTA1ZWY2NTIwODFmODY4MjlkMGM=
+    N2FmM2JlZmYzN2MxNTA3ZGNjMGVjZmEzYzZlZjhjNTAwNGRhNzM0NWJkNDVh
+    ZDY2NDhlOTJmNzBiZDNhODI5ZmUyNGMzOTI4ODJhNTJmM2ZiZjFjY2JkMzAy
+    OTk2MWY4MDNmMjAxNDVlMzc4MTQzODk0MWY4MDAwMTE1YTBmNmE=

data/assets/travis.sh

@@ -36,7 +36,7 @@ if type compdef 1>/dev/null 2>/dev/null; then
       help)      _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]" '*:file:_files' && return 0;;
       history)   _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/']" "--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]" "-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]" "-r[repository to use (will try to detect from current git clone)]" "--repo[repository to use (will try to detect from current git clone)]" "-a[Only show history after a given build number]" "--after[Only show history after a given build number]" "-p[Only show history for the given Pull Request]" "--pull-request[Only show history for the given Pull Request]" "-b[Only show history for the given branch]" "--branch[Only show history for the given branch]" "-l[Maximum number of history items]" "--limit[Maximum number of history items]" "-d[Include date in output]" "--date[Include date in output]" "--all[Display all history items]" "--no-all[Display all history items]" '*:file:_files' && return 0;;
       init)      _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/']" "--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]" "-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]" "-r[repository to use (will try to detect from current git clone)]" "--repo[repository to use (will try to detect from current git clone)]" "-s[don't trigger a sync if the repo is unknown]" "--skip-sync[don't trigger a sync if the repo is unknown]" "-f[override .travis.yml if it already exists]" "--force[override .travis.yml if it already exists]" "-k[do not enable project, only add .travis.yml]" "--skip-enable[do not enable project, only add .travis.yml]" "-p[print generated config instead of writing to file]" "--print-conf[print generated config instead of writing to file]" "--script[sets script option in .travis.yml (can be used more than once)]" "--before-script[sets before_script option in .travis.yml (can be used more than once)]" "--after-script[sets after_script option in .travis.yml (can be used more than once)]" "--after-success[sets after_success option in .travis.yml (can be used more than once)]" "--install[sets install option in .travis.yml (can be used more than once)]" "--before-install[sets before_install option in .travis.yml (can be used more than once)]" "--compiler[sets compiler option in .travis.yml (can be used more than once)]" "--otp-release[sets otp_release option in .travis.yml (can be used more than once)]" "--go[sets go option in .travis.yml (can be used more than once)]" "--jdk[sets jdk option in .travis.yml (can be used more than once)]" "--node-js[sets node_js option in .travis.yml (can be used more than once)]" "--perl[sets perl option in .travis.yml (can be used more than once)]" "--php[sets php option in .travis.yml (can be used more than once)]" "--python[sets python option in .travis.yml (can be used more than once)]" "--rvm[sets rvm option in .travis.yml (can be used more than once)]" "--scala[sets scala option in .travis.yml (can be used more than once)]" "--env[sets env option in .travis.yml (can be used more than once)]" "--gemfile[sets gemfile option in .travis.yml (can be used more than once)]" '*:file:_files' && return 0;;
-      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/']" "--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]" "-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]" "--github-token[identify by GitHub token]" "--auto[try to figure out who you are automatically (might send another apps token to Travis, token will not be stored)]" '*:file:_files' && return 0;;
+      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/']" "--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]" "-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]" "-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/']" "--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]" "-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]" '*: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/']" "--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]" "-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]" "-r[repository to use (will try to detect from current git clone)]" "--repo[repository to use (will try to detect from current git clone)]" '*: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/']" "--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]" "-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]" "-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;;
@@ -76,7 +76,7 @@ elif type compctl 1>/dev/null 2>/dev/null; then
       help)      reply=("--help" "-h" "--interactive" "--no-interactive" "-i" "--explode" "--no-explode" "-E" "--skip-version-check" "--skip-completion-check");;
       history)   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" "--org" "--staging" "--token" "-t" "--debug" "--enterprise" "-X" "--adapter" "--repo" "-r" "--after" "-a" "--pull-request" "-p" "--branch" "-b" "--limit" "-l" "--date" "-d" "--all" "--no-all");;
       init)      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" "--org" "--staging" "--token" "-t" "--debug" "--enterprise" "-X" "--adapter" "--repo" "-r" "--skip-sync" "-s" "--force" "-f" "--skip-enable" "-k" "--print-conf" "-p" "--script" "--before-script" "--after-script" "--after-success" "--install" "--before-install" "--compiler" "--otp-release" "--go" "--jdk" "--node-js" "--perl" "--php" "--python" "--rvm" "--scala" "--env" "--gemfile");;
-      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" "--org" "--staging" "--token" "-t" "--debug" "--enterprise" "-X" "--adapter" "--github-token" "--auto");;
+      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" "--org" "--staging" "--token" "-t" "--debug" "--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" "--org" "--staging" "--token" "-t" "--debug" "--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" "--org" "--staging" "--token" "-t" "--debug" "--enterprise" "-X" "--adapter" "--repo" "-r");;
       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" "--org" "--staging" "--token" "-t" "--debug" "--enterprise" "-X" "--adapter" "--my-repos" "-m" "--repo" "-r" "--notify" "--no-notify" "-n" "--builds" "-b" "--push" "-p" "--pull" "-P");;
@@ -117,7 +117,7 @@ elif type complete 1>/dev/null 2>/dev/null; then
       help)      options="--help -h --interactive --no-interactive -i --explode --no-explode -E --skip-version-check --skip-completion-check";;
       history)   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 --org --staging --token -t --debug --enterprise -X --adapter --repo -r --after -a --pull-request -p --branch -b --limit -l --date -d --all --no-all";;
       init)      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 --org --staging --token -t --debug --enterprise -X --adapter --repo -r --skip-sync -s --force -f --skip-enable -k --print-conf -p --script --before-script --after-script --after-success --install --before-install --compiler --otp-release --go --jdk --node-js --perl --php --python --rvm --scala --env --gemfile";;
-      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 --org --staging --token -t --debug --enterprise -X --adapter --github-token --auto";;
+      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 --org --staging --token -t --debug --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 --org --staging --token -t --debug --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 --org --staging --token -t --debug --enterprise -X --adapter --repo -r";;
       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 --org --staging --token -t --debug --enterprise -X --adapter --my-repos -m --repo -r --notify --no-notify -n --builds -b --push -p --pull -P";;

data/lib/travis/cli/api_command.rb

@@ -124,6 +124,7 @@ module Travis
           gh_config     ||= {}
           gh_config[:ssl] = Travis::Client::Session::SSL_OPTIONS
           gh_config[:ssl] = { :verify => false } if gh_config[:api_url] and gh_config[:api_url] != "https://api.github.com"
+          gh_config.delete :scopes
 
           gh_config[:instrumenter] = proc do |type, payload, &block|
             next block.call unless type == 'http.gh'

data/lib/travis/cli/login.rb

@@ -1,71 +1,72 @@
 require 'travis/cli'
-require 'travis/tools/token_finder'
+require 'travis/tools/github'
 require 'json'
 
 module Travis
   module CLI
     class Login < ApiCommand
       description "authenticates against the API and stores the token"
-      on '--github-token TOKEN', 'identify by GitHub token'
-      on '--auto', 'try to figure out who you are automatically (might send another apps token to Travis, token will not be stored)'
+      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')
 
-      skip :authenticate
-      attr_accessor :github_login, :github_password, :github_token, :github_otp, :callback
+      attr_accessor :user_login
 
-      def run
-        self.github_token ||= Travis::Tools::TokenFinder.find(:explode => explode?, :github => github_endpoint.host) if auto?
-        generate_github_token unless github_token
-        endpoint_config['access_token'] = github_auth(github_token)
-        success("Successfully logged in!")
-      ensure
-        callback.call if callback
+      def list_token
+        github.after_tokens = proc { }
+        github.each_token do |token|
+          say token
+        end
       end
 
-      private
-
-        def generate_github_token
-          load_gh
-          ask_info
-
-          options = { :username => github_login, :password => github_password }
-          options[:headers] = { "X-GitHub-OTP" => github_otp } if github_otp
-          gh = GH.with(options)
-
-          reply = gh.post('/authorizations', :scopes => github_scopes, :note => "temporary token to identify on #{api_endpoint}")
-
-          self.github_token = reply['token']
-          self.callback     = proc { gh.delete reply['_links']['self']['href'] }
-        rescue GH::Error => error
-          if error.info[:response_status] == 401
-            ask_2fa
-            generate_github_token
-          else
-            raise error if explode?
-            error(JSON.parse(error.info[:response_body])["message"])
-          end
+      def login
+        github.with_token do |token|
+          endpoint_config['access_token'] = github_auth(token)
+          error("user mismatch: logged in as %p instead of %p" % [user.login, user_login]) if user_login and user.login != user_login
+          success("Successfully logged in as #{user.login}!")
         end
+      end
 
-        def github_scopes
-          ['user:email', org? ? 'public_repo' : 'repo']
-        end
+      def run
+        list_github_token ? list_token : login
+      end
 
-        def ask_info
-          return if !github_login.nil?
-          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 anyways."
-          empty_line
-          self.github_login    = ask("Username: ")
-          self.github_password = ask("Password: ") { |q| q.echo = "*" }
-          empty_line
+      def github
+        @github ||= begin
+          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    = true
+            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") }
+          end
         end
+      end
 
-        def ask_2fa
-          self.github_otp = ask "Two-factor authentication code: "
-          empty_line
-        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 anyways."
+        empty_line
+      end
     end
   end
 end

data/lib/travis/tools/github.rb

@@ -0,0 +1,260 @@
+require 'travis/tools/system'
+require 'yaml'
+require 'json'
+
+module Travis
+  module Tools
+    class Github
+      TOKEN_SIZE  = 40
+      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
+
+      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"
+        @note            = 'temporary token'
+        @git_config_keys = %w[github.token github.oauth-token]
+        @scopes          = ['user', 'user:email', 'repo'] # overridden by value from /config
+        options.each_pair { |k,v| send("#{k}=", v) if respond_to? "#{k}=" } if options
+        yield self if block_given?
+      end
+
+      def with_token
+        each_token { |t| break yield(t) }
+      end
+
+      def each_token
+        require 'gh' unless defined? GH
+        possible_tokens { |t| yield(t) if acceptable?(t) }
+      ensure
+        callback, self.callback = self.callback, nil
+        callback.call if callback
+      end
+
+      def with_session(&block)
+        with_token { |t| GH.with(:token => t, &block) }
+      end
+
+      def possible_tokens(&block)
+        return block[github_token] if github_token
+
+        if auto_token
+          netrc_tokens(&block)
+          git_tokens(&block)
+          hub_tokens(&block)
+          oauth_file_tokens(&block)
+          github_for_mac_token(&block)
+          issuepost_token(&block)
+          composer_token(&block)
+        end
+
+        if auto_password
+          possible_logins do |user, password|
+            yield login(user, password, false)
+          end
+        end
+
+        if manual_login
+          login_header.call if login_header
+          user     = github_login || ask_login.call
+          password = ask_password.call(user)
+          yield login(user, password, true)
+        end
+
+        after_tokens.call
+      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
+        end
+      end
+
+      def git_tokens
+        return unless System.has? 'git'
+        git_config_keys.each do |key|
+          `git config --get-all #{key}`.each_line do |line|
+            token = line.strip
+            yield token unless token.empty?
+          end
+        end
+      end
+
+      def composer_token
+        file(composer_path) do |content|
+          token = JSON.parse(content)['config'].fetch('github-oauth', {})[host]
+          yield token if token
+        end
+      end
+
+      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
+
+      def oauth_file_tokens(&block)
+        oauth_paths.each do |path|
+          file(path) do |content|
+            token = content.strip
+            yield token unless token.empty?
+          end
+        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)
+        end
+      end
+
+      def issuepost_token(&block)
+        security(:generic, :w, "-l issuepost.github.access_token",  "issuepost token", &block) if host == 'github.com'
+      end
+
+      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
+
+      def host
+        api_host == GITHUB_API ? GITHUB_HOST : api_host
+      end
+
+      def api_host
+        return GITHUB_API unless api_url
+        api_url[%r{^(?:https?://)?([^/]+)}, 1]
+      end
+
+      def login(user, password, die = true, otp = nil)
+        opt           = { :username => user, :password => password }
+        opt[:headers] = { "X-GitHub-OTP" => otp } if otp
+        gh            = GH.with(opt)
+        reply         = gh.post('/authorizations', :scopes => scopes, :note => note)
+        self.callback = proc { gh.delete reply['_links']['self']['href'] }
+        reply['token']
+      rescue GH::Error => error
+        if error.info[:response_status] == 401
+          login(user, password, die, ask_otp.call(user))
+        elsif die
+          raise gh_error(error)
+        end
+      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
+      rescue GH::Error => error
+        debug "token is not acceptable: #{gh_error(error)}"
+        false
+      end
+
+      private
+
+        def gh_error(error)
+          raise error if explode
+          JSON.parse(error.info[:response_body])["message"].to_s
+        end
+
+        def debug(line)
+          return unless @debug
+          @debug.call "Tools::Github: #{line}"
+        end
+
+        def security(type, key, arg, name)
+          return false unless System.has? 'security'
+          return false unless system "security find-#{type}-password #{arg} 2>/dev/null >/dev/null"
+          debug "requesting to load #{name} from keychain"
+          result = %x[security find-#{type}-password #{arg} -#{key} 2>&1].chomp
+          $?.success? ? yield(result) : debug("request denied")
+        rescue => e
+          raise e if explode
+        end
+
+        def file(path, default = nil)
+          path        &&= File.expand_path(path)
+          @file       ||= {}
+          @file[path] ||= if path and File.readable?(path)
+            debug "reading #{path}"
+            yield File.read(path)
+          end
+          @file[path] || default
+        rescue => e
+          raise e if explode
+        end
+    end
+  end
+end

data/spec/cli/login_spec.rb

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

data/spec/support/fake_github.rb

@@ -7,6 +7,10 @@ module GH
       super
     end
 
+    def http(*)
+      raise NotImplementedError
+    end
+
     def post(key, body)
       raise GH::Error unless @authenticated and key == '/authorizations'
       frontend.load("url" => "https://api.github.com/authorizations/1", "token" => "github_token")

data/travis.gemspec

@@ -171,10 +171,10 @@ Gem::Specification.new do |s|
     "lib/travis/tools/assets.rb",
     "lib/travis/tools/completion.rb",
     "lib/travis/tools/formatter.rb",
+    "lib/travis/tools/github.rb",
     "lib/travis/tools/notification.rb",
     "lib/travis/tools/safe_string.rb",
     "lib/travis/tools/system.rb",
-    "lib/travis/tools/token_finder.rb",
     "lib/travis/version.rb",
     "spec/cli/cancel_spec.rb",
     "spec/cli/encrypt_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.6.4.travis.410.4
+  version: 1.6.4.travis.411.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -364,10 +364,10 @@ files:
 - lib/travis/tools/assets.rb
 - lib/travis/tools/completion.rb
 - lib/travis/tools/formatter.rb
+- lib/travis/tools/github.rb
 - lib/travis/tools/notification.rb
 - lib/travis/tools/safe_string.rb
 - lib/travis/tools/system.rb
-- lib/travis/tools/token_finder.rb
 - lib/travis/version.rb
 - spec/cli/cancel_spec.rb
 - spec/cli/encrypt_spec.rb

data/lib/travis/tools/token_finder.rb

@@ -1,52 +0,0 @@
-require 'netrc'
-require 'yaml'
-
-module Travis
-  module Tools
-    # This is used when running `travis login --auto`
-    class TokenFinder
-      attr_accessor :netrc, :hub, :explode, :github
-
-      def self.find(options = {})
-        new(options).find
-      end
-
-      def initialize(options = {})
-        self.netrc   = options[:netrc]  || Netrc.default_path
-        self.hub     = options[:hub]    || ENV['HUB_CONFIG'] || '~/.config/hub'
-        self.github  = options[:github]
-        self.github  = 'github.com' if github.nil? or github == 'api.github.com'
-        self.explode = options[:explode]
-      end
-
-      def hub=(file)
-        @hub = File.expand_path(file)
-      end
-
-      def netrc=(file)
-        @netrc = File.expand_path(file)
-      end
-
-      def find
-        find_netrc || find_hub
-      end
-
-      def find_netrc
-        return unless File.readable? netrc
-        data = Netrc.read(netrc)[github]
-        data.detect { |e| e.size == 40 } if data
-      rescue => e
-        raise e if explode
-      end
-
-      def find_hub
-        return unless File.readable? hub
-        data   = YAML.load_file(File.expand_path(hub))
-        data &&= Array(data[github])
-        data.first['oauth_token'] if data.size == 1
-      rescue => e
-        raise e if explode
-      end
-    end
-  end
-end