travis 1.5.3 → 1.5.4

data/completion/travis.sh.erb

@@ -0,0 +1,60 @@
+# implements tab completion for complete (bash), compsys (new zsh) and compctl (old zsh)
+# this file is generated by `rake completion`
+
+_travis_complete() {
+  case $1 in
+  1) _travis_commands;;
+  2)
+    case "$2" in
+      # commands with smart completions (in addition to command line flags)
+      help)  _travis_commands;;
+      setup) _travis_setup;;
+      init)  _travis_init;;
+      *)     _travis_option;;
+    esac;;
+  *) _travis_option;;
+  esac
+}
+
+if type compdef 1>/dev/null 2>/dev/null; then
+  compdef _travis travis
+  _travis()          { _travis_complete $((${#words} - 1)) "${words[2]}"; }
+  _travis_commands() { list=(<%= commands.map { |c| "%s:%p" % [c.command_name, c.description] }.join(" ") %>) _describe -t common-commands 'common commands' list; }
+  _travis_setup()    { list=(<%= Travis::CLI::Setup.services.map { |s| "%s:%p" % [s.service_name, s.description] }.join(" ") %>) _describe -t common-commands 'common commands' list; }
+  _travis_init()     { list=(<%= Travis::CLI::Init.languages.map { |l| "#{l}:'initialize #{l} project'" }.join(" ") %>) _describe -t common-commands 'common commands' list; }
+  _travis_option()   {
+    case "${words[2]}" in
+    <% commands.each do |c| %>
+      <%= "#{c.command_name})".ljust(10) %> <%= c.new.parser.compsys(" ", c.command_name).gsub(/\s+\\\s+/, ' ')[/_arguments.*/] %>;;
+    <% end %>
+    esac
+  }
+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=(<%= commands.map(&:command_name).map(&:inspect).join(" ") %>); }
+  _travis_setup()    { reply=(<%= Travis::CLI::Setup.services.map(&:service_name).map(&:inspect).join(" ") %>); }
+  _travis_init()     { reply=(<%= Travis::CLI::Init.languages.map(&:inspect).join(" ") %>); }
+  _travis_option()   {
+    case "${words[2]}" in
+    <% commands.each do |c| %>
+      <%= "#{c.command_name})".ljust(10) %> reply=(<%= c.new.parser.candidate("-").flat_map { |o| [o.sub('[no-]', ''), o.sub('[no-]', 'no-')] }.uniq.map(&:inspect).join(" ") %>);;
+    <% end %>
+    esac
+  }
+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 "<%= commands.map(&:command_name).join(" ") %>" -- "${COMP_WORDS[COMP_CWORD]}") ); }
+  _travis_setup()    { COMPREPLY=( $(compgen -W "<%= Travis::CLI::Setup.services.map(&:service_name).join(" ") %>" -- "${COMP_WORDS[COMP_CWORD]}") ); }
+  _travis_init()     { COMPREPLY=( $(compgen -W "<%= Travis::CLI::Init.languages.join(" ") %>" -- "${COMP_WORDS[COMP_CWORD]}") ); }
+  _travis_option()   {
+    local options
+    case "${COMP_WORDS[1]}" in
+    <% commands.each do |c| %>
+      <%= "#{c.command_name})".ljust(10) %> options="<%= c.new.parser.candidate("-").flat_map { |o| [o.sub('[no-]', ''), o.sub('[no-]', 'no-')] }.uniq.join(" ") %>";;
+    <% end %>
+    esac
+    COMPREPLY=( $(compgen -W "$options" -- "${COMP_WORDS[COMP_CWORD]}") )
+  }
+fi

data/lib/travis/cli.rb

@@ -9,9 +9,6 @@ rescue LoadError => e
   end
 end
 
-require 'gh'
-GH.set(:ssl => Travis::Client::Session::SSL_OPTIONS)
-
 require 'stringio'
 
 module Travis

data/lib/travis/cli/accounts.rb

@@ -11,12 +11,14 @@ module Travis
           color = account.subscribed? ? :green : :info
           say [
             color(account.login, [color, :bold]),
-            color("(#{account.name}):", color),
+            color("(#{account.name || account.login.capitalize}):", color),
             account.subscribed?      ? "subscribed,"  : "not subscribed,",
             account.repos_count == 1 ? "1 repository" : "#{account.repos_count} repositories"
           ].join(" ")
         end
-        say session.config['host'], "To set up a subscription, please visit %s." unless accounts.all?(&:subscribed?)
+        unless accounts.all?(&:subscribed?) or session.config['host'].nil?
+          say session.config['host'], "To set up a subscription, please visit %s."
+        end
       end
     end
   end

data/lib/travis/cli/api_command.rb

@@ -31,7 +31,7 @@ module Travis
       end
 
       def initialize(*)
-        @session = Travis::Client.new
+        @session = Travis::Client.new(:agent_info => "command #{command_name}")
         super
       end
 
@@ -80,6 +80,24 @@ module Travis
 
       private
 
+        def load_gh
+          return if defined? GH
+          require 'gh'
+
+          gh_config       = session.config['github']
+          gh_config     &&= gh_config.inject({}) { |h,(k,v)| h.update(k.to_sym => v) }
+          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.set(gh_config)
+        end
+
+        def github_endpoint
+          load_gh
+          GH.with({}).api_host
+        end
+
         def listen(*args)
           super(*args) do |listener|
             on_signal { listener.disconnect }

data/lib/travis/cli/command.rb

@@ -171,9 +171,9 @@ module Travis
         "Usage: " << color(usage, :command)
       end
 
-      def help
+      def help(info = "")
         parser.banner = usage
-        self.class.description.sub(/./) { |c| c.upcase } + ".\n" + parser.to_s
+        self.class.description.sub(/./) { |c| c.upcase } + ".\n" + info + parser.to_s
       end
 
       def say(data, format = nil, style = nil)
@@ -220,8 +220,8 @@ module Travis
         end
 
         def color(line, style)
-          return line unless interactive?
-          terminal.color(line, Array(style).map(&:to_sym))
+          return line.to_s unless interactive?
+          terminal.color(line || '???', Array(style).map(&:to_sym))
         end
 
         def interactive?(io = output)

data/lib/travis/cli/endpoint.rb

@@ -8,8 +8,16 @@ module Travis
       skip :authenticate
       on '--drop-default', 'delete stored default endpoint'
       on '--set-default', 'store endpoint as global default'
+      on '--github', 'display github endpoint'
 
-      def run
+      def run_github
+        error "--github cannot be combined with --drop-default" if drop_default?
+        error "--github cannot be combined with --set-default" if set_default?
+        load_gh
+        say github_endpoint.to_s, "GitHub endpoint: %s"
+      end
+
+      def run_travis
         if drop_default? and was = config['default_endpoint']
           config.delete('default_endpoint')
           say was, "default API endpoint dropped (was %s)"
@@ -18,6 +26,10 @@ module Travis
           say api_endpoint, "API endpoint: %s#{" (stored as default)" if set_default?}"
         end
       end
+
+      def run
+        github? ? run_github : run_travis
+      end
     end
   end
 end

data/lib/travis/cli/init.rb

@@ -3,6 +3,15 @@ require 'travis/cli'
 module Travis
   module CLI
     class Init < Enable
+      LANGUAGE_MAPPING = {
+        "node"         => "node_js",
+        "node.js"      => "node_js",
+        "javascript"   => "node_js",
+        "coffeescript" => "node_js",
+        "c++"          => "cpp",
+        "obj-c"        => "objective-c"
+      }
+
       description "generates a .travis.yml and enables the project"
 
       on('-f', '--force', 'override .travis.yml if it already exists')
@@ -24,6 +33,15 @@ module Travis
 
       attr_writer :travis_config
 
+      def self.languages
+        pattern = File.expand_path("../init/*.yml", __FILE__)
+        Dir[pattern].map { |f| File.basename(f, '.yml') }.sort
+      end
+
+      def help
+        super("Available languages: #{self.class.languages.join(", ")}\n\n")
+      end
+
       def run(language = nil, file = '.travis.yml')
         error "#{file} already exists, use --force to override" if File.exist?(file) and not force? and not print_conf?
         language ||= ask('Main programming language used: ') { |q| q.default = detect_language }
@@ -45,14 +63,20 @@ module Travis
 
       private
 
+        def template_name(language)
+          File.expand_path("../init/#{language}.yml", __FILE__)
+        end
+
         def template(language)
-          file = File.expand_path("../init/#{language}.yml", __FILE__)
+          language = language.to_s.downcase
+          language = LANGUAGE_MAPPING[language] || language
+          file = template_name(language)
           error "unknown language #{language}" unless File.exist? file
           YAML.load_file(file)
         end
 
         def detect_language
-          'ruby'
+          repository.github_language || "Ruby"
         end
     end
   end

data/lib/travis/cli/login.rb

@@ -6,17 +6,14 @@ 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)'
 
       skip :authenticate
-      attr_accessor :github_login, :github_password, :github_token, :callback
-
-      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)') do |c|
-        c.github_token ||= Travis::Tools::TokenFinder.find(:explode => c.explode?)
-      end
+      attr_accessor :github_login, :github_password, :github_token, :github_otp, :callback
 
       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!")
@@ -27,16 +24,25 @@ module Travis
       private
 
         def generate_github_token
+          load_gh
           ask_info
 
-          gh    = GH.with(:username => github_login, :password => github_password)
+          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 => e
-          raise e if explode?
-          error JSON.parse(e.info[:response_body])["message"]
+        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
         end
 
         def github_scopes
@@ -44,8 +50,9 @@ module Travis
         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 GitHub."
+          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."
@@ -54,6 +61,11 @@ module Travis
           self.github_password = ask("Password: ") { |q| q.echo = "*" }
           empty_line
         end
+
+        def ask_2fa
+          self.github_otp = ask "Two-factor authentication code: "
+          empty_line
+        end
     end
   end
 end

data/lib/travis/cli/monitor.rb

@@ -1,16 +1,22 @@
 require 'travis/cli'
+require 'travis/tools/notification'
 
 module Travis
   module CLI
     class Monitor < ApiCommand
       description "live monitor for what's going on"
-
       on('-m', '--my-repos', 'Only monitor my own repositories')
+
       on('-r', '--repo SLUG', 'monitor given repository (can be used more than once)') do |c, slug|
         c.repos << slug
       end
 
-      attr_reader :repos
+      types = Tools::Notification::DEFAULT.map(&:to_s).join(", ")
+      on('-n', '--[no-]notify [TYPE]', "send out desktop notifications (optional type: #{types})") do |c, type|
+        c.setup_notification(type)
+      end
+
+      attr_reader :repos, :notification
 
       def initialize(*)
         @repos = []
@@ -21,6 +27,22 @@ module Travis
         super
         repos.map! { |r| repo(r) }
         repos.concat(user.repositories) if my_repos?
+        setup_notification(repos.any? || :dummy) unless notification
+      end
+
+      def setup_notification(type = nil)
+        refuse = false
+        case type
+        when false     then @notification = Tools::Notification.new(:dummy)
+        when nil, true then @notification = Tools::Notification.new
+        else
+          refuse        = true
+          @notification = Tools::Notification.new(type)
+        end
+      rescue ArgumentError => e
+        @notification = Tools::Notification.new(:dummy)
+        error(e.message) if refuse
+        warn(e.message)
       end
 
       def description
@@ -42,6 +64,7 @@ module Travis
               color(entity.inspect_info, [entity.color, :bold]),
               color(entity.state, entity.color)
             ].join(" ")
+            notification.notify("Travis CI", "#{entity.inspect_info} #{entity.state}")
           end
         end
       end

data/lib/travis/cli/repo_command.rb

@@ -44,11 +44,10 @@ module Travis
         end
 
         def find_slug
-          git_head = `git name-rev --name-only HEAD 2>&1`.chomp
-          git_remote = `git config --get branch.#{git_head}.remote 2>&1`.chomp
-          # Default to 'origin' if no tracking is set
+          git_head   = `git name-rev --name-only HEAD 2>#{IO::NULL}`.chomp
+          git_remote = `git config --get branch.#{git_head}.remote 2>#{IO::NULL}`.chomp
           git_remote = 'origin' if git_remote.empty?
-          git_info = `git config --get remote.#{git_remote}.url 2>&1`.chomp
+          git_info   = `git config --get remote.#{git_remote}.url 2>#{IO::NULL}`.chomp
           $1 if git_info =~ GIT_REGEX
         end
 
@@ -64,6 +63,7 @@ module Travis
             ENV['TRAVIS_ENDPOINT']
           else
             repo_config['endpoint'] ||= begin
+              load_gh
               GH.head("/repos/#{slug}")
               Travis::Client::ORG_URI
             rescue GH::Error

data/lib/travis/cli/setup.rb

@@ -1,142 +1,47 @@
 require 'travis/cli'
-require 'json'
-require 'yaml'
 
 module Travis
   module CLI
     class Setup < RepoCommand
+      autoload :CloudControl, 'travis/cli/setup/cloud_control'
+      autoload :CloudFoundry, 'travis/cli/setup/cloud_foundry'
+      autoload :EngineYard,   'travis/cli/setup/engine_yard'
+      autoload :Heroku,       'travis/cli/setup/heroku'
+      autoload :Nodejitsu,    'travis/cli/setup/nodejitsu'
+      autoload :OpenShift,    'travis/cli/setup/open_shift'
+      autoload :RubyGems,     'travis/cli/setup/ruby_gems'
+      autoload :SauceConnect, 'travis/cli/setup/sauce_connect'
+      autoload :Service,      'travis/cli/setup/service'
+
       description "sets up an addon or deploy target"
       on('-f', '--force', 'override config section if it already exists')
 
-      def run(service)
-        error "unknown service #{service}" unless respond_to? "setup_#{service}"
-        public_send "setup_#{service}"
-      end
-
-      def setup_heroku
-        configure 'deploy', 'provider' => 'heroku' do |config|
-          config['api_key'] = `heroku auth:token 2>/dev/null`.strip
-          config['api_key'] = ask("Heroku API token: ") { |q| q.echo = "*" }.to_s if config['api_key'].empty?
-          config['app']     = `heroku apps:info 2>/dev/null`.scan(/^=== (.+)$/).flatten.first
-          config['app']     = ask("Heroku application name: ") { |q| q.default = repository.name }.to_s if config['app'].nil?
-          config['on']      = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
-          encrypt(config, 'api_key') if agree("Encrypt API key? ") { |q| q.default = 'yes' }
-        end
-      end
-
-      def setup_engineyard
-        configure 'deploy', 'provider' => 'engineyard' do |config|
-          eyrc                  = File.expand_path(".eyrc", Dir.home)
-          config['api_key']     = YAML.load_file(eyrc)["api_token"] if File.exists?(eyrc)
-          config['api_key']     = ask("API token: ") { |q| q.echo = "*" }.to_s unless config['api_key']
-          env                   = ask("Environment (optional): ").to_s
-          config['environment'] = env unless env.empty?
-          migrate               = agree("Run migrations on deploy? ") { |q| q.default = 'yes' }
-          config['migrate']     = ask("Migration command: ") { |q| q.default = "rake db:migrate" } if migrate
-          config['on']          = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
-          encrypt(config, 'api_key') if agree("Encrypt API key? ") { |q| q.default = 'yes' }
-        end
-      end
-
-      def setup_openshift
-        configure 'deploy', 'provider' => 'openshift' do |config|
-          config['user']     = ask("OpenShift user: ").to_s
-          config['password'] = ask("OpenShift password: ") { |q| q.echo = "*" }.to_s
-          config['app']      = ask("OpenShift application name: ") { |q| q.default = repository.name }.to_s
-          config['domain']   = ask("OpenShift domain: ").to_s
-          config['on']       = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
-          encrypt(config, 'password') if agree("Encrypt password? ") { |q| q.default = 'yes' }
-        end
-      end
-
-      def setup_rubygems
-        configure 'deploy', 'provider' => 'rubygems' do |config|
-          authorization_file  = File.expand_path('.rubygems/authorization', ENV['HOME'])
-          credentials_file    = File.expand_path('.gem/credentials', ENV['HOME'])
-
-          config['api_key'] ||= File.read(authorization_file)                       if File.exist? authorization_file
-          config['api_key'] ||= YAML.load_file(credentials_file)[:rubygems_api_key] if File.exist? credentials_file
-          config['api_key'] ||= ask("RubyGems API token: ") { |q| q.echo = "*" }.to_s
-          config['gem']     ||= ask("Gem name: ") { |q| q.default = repository.name }.to_s
-
-          on("Release only from #{repository.slug}? ", config, 'repo' => repository.slug)
-          on("Release only tagged commits? ",          config, 'tags' => true)
-          encrypt(config, 'api_key') if agree("Encrypt API key? ") { |q| q.default = 'yes' }
-        end
+      def self.service(name)
+        normal_name = Service.normalized_name(name)
+        const_name  = constants(false).detect { |c| Service.normalized_name(c) == normal_name }
+        constant    = const_get(const_name) if const_name
+        constant if constant and constant < Service and constant.known_as? name
       end
 
-      def setup_nodejitsu
-        configure 'deploy', 'provider' => 'nodejitsu' do |config|
-          jitsu_file = File.expand_path('.jitsuconf', ENV['HOME'])
-
-          if File.exist? jitsu_file
-            jitsu_conf        = JSON.parse(File.read(jitsu_file))
-            config['user']    = jitsu_conf['username']
-            config['api_key'] = jitsu_conf['apiToken']
-          end
-
-          config['user']    ||= ask("Nodejitsu user: ").to_s
-          config['api_key'] ||= ask("Nodejitsu API token: ") { |q| q.echo = "*" }.to_s
-          config['on']        = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
-          encrypt(config, 'api_key') if agree("Encrypt API key? ") { |q| q.default = 'yes' }
-        end
+      def self.services
+        constants(false).sort.map { |c| const_get(c) }.select { |c| c < Service }
       end
 
-      def setup_sauce_connect
-        travis_config['addons'] ||= {}
-        configure 'sauce_connect', {}, travis_config['addons'] do |config|
-          config['username']   = ask("Sauce Labs user: ").to_s
-          config['access_key'] = ask("Sauce Labs access key: ") { |q| q.echo = "*" }.to_s
-          encrypt(config, 'access_key') if agree("Encrypt access key? ") { |q| q.default = 'yes' }
-        end
+      def help
+        services = self.class.services.map { |s| "\t" << color(s.service_name.ljust(20), :command) << color(s.description, :info) }.join("\n")
+        super("\nAvailable services:\n\n#{services}\n\n")
       end
 
-      alias setup_sauce_labs setup_sauce_connect
-      alias setup_sauce      setup_sauce_connect
-
-      def setup_cloudcontrol
-        configure 'deploy', 'provider' => 'cloudcontrol' do |config|
-          config['email']      = ask("cloudControl email: ").to_s
-          config['password']   = ask("cloudControl password: ") { |q| q.echo = "*" }.to_s
-          app                  = ask("cloudControl application: ") { |q| q.default = repository.name }.to_s
-          dep                  = ask("cloudControl deployment: ") { |q| q.default = "default" }.to_s
-          config['deployment'] = "#{app}/#{dep}"
-          config['on']         = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
-          encrypt(config, 'password') if agree("Encrypt password? ") { |q| q.default = 'yes' }
-        end
+      def run(service, file = travis_yaml)
+        service(service).run
+        save_travis_config(file)
       end
 
-      def setup_cloudfoundry
-        configure 'deploy', 'provider' => 'cloudfoundry' do |config|
-          config['target']       = ask("Cloud Foundry target: ").to_s
-          config['username']     = ask("Cloud Foundry user name: ").to_s
-          config['password']     = ask("Cloud Foundry password: ") { |q| q.echo = "*" }.to_s
-          config['organization'] = ask("Cloud Foundry organization: ").to_s
-          config['space']        = ask("Cloud Foundry space: ").to_s
-          config['on']           = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
-          encrypt(config, 'password') if agree("Encrypt password? ") { |q| q.default = 'yes' }
-        end
+      def service(name)
+        factory = self.class.service(name)
+        error("unknown service #{name}") unless factory
+        factory.new(self)
       end
-
-      private
-
-        def on(question, config, condition)
-          return unless agree(question) { |q| q.default = 'yes' }
-          config['on'] ||= {}
-          config['on'].merge! condition
-        end
-
-        def encrypt(config, key)
-          encrypted   = repository.encrypt(config.fetch(key))
-          config[key] = { 'secure' => encrypted }
-        end
-
-        def configure(key, value = {}, config = travis_config)
-          error "#{key} section already exists in .travis.yml, run with --force to override" if config.include? key and not force?
-          result = yield(config[key] = value)
-          save_travis_config
-          result
-        end
     end
   end
 end