travis 1.0.3 → 1.1.0

data/Rakefile

@@ -17,6 +17,9 @@ task 'travis.gemspec' do
     :files   => `git ls-files`.split("\n").reject { |f| f =~ /^(\.|Gemfile)/ }
   }
 
+  # :(
+  fields[:email].delete("konstantin.haase@gmail.com")
+
   # insert data
   fields.each do |field, values|
     updated = "  s.#{field} = ["

data/lib/travis/cli/api_command.rb

@@ -12,6 +12,13 @@ module Travis
       on('--org', "short-cut for --api-endpoint '#{Travis::Client::ORG_URI}'") { |c,_| c.api_endpoint = Travis::Client::ORG_URI }
       on('-t', '--token [ACCESS_TOKEN]', 'access token to use') { |c, t| c.access_token = t }
 
+      on('--debug', 'show API requests') do |c,_|
+        c.session.instrument do |info, request|
+          c.debug(info)
+          request.call
+        end
+      end
+
       def initialize(*)
         @session = Travis::Client.new
         super
@@ -44,6 +51,21 @@ module Travis
         error "not logged in, please run #{command("login#{endpoint_option}")}" if access_token.nil?
       end
 
+      def sync(block = true, dot = '.')
+        user.sync
+
+        steps = count = 1
+        while block and user.reload.syncing?
+          count += 1
+          sleep(1)
+
+          if count % steps == 0
+            steps = count/10 + 1
+            output.print dot
+          end
+        end
+      end
+
       private
 
         def detected_endpoint

data/lib/travis/cli/command.rb

@@ -1,4 +1,6 @@
 require 'travis/cli'
+require 'travis/tools/formatter'
+
 require 'highline'
 require 'forwardable'
 require 'delegate'
@@ -11,13 +13,14 @@ module Travis
       extend Forwardable
       def_delegators :terminal, :agree, :ask, :choose
 
-      HighLine.use_color = !CLI.windows?
+      HighLine.use_color = !CLI.windows? && $stdin.tty?
       HighLine.color_scheme = HighLine::ColorScheme.new do |cs|
         cs[:command]   = [ :bold             ]
         cs[:error]     = [ :red              ]
         cs[:important] = [ :bold, :underline ]
         cs[:success]   = [ :green            ]
         cs[:info]      = [ :yellow           ]
+        cs[:debug]     = [ :magenta          ]
       end
 
       on('-h', '--help', 'Display help') do |c, _|
@@ -26,6 +29,7 @@ module Travis
       end
 
       on('-i', '--[no-]interactive', "be interactive and colorful") do |c, v|
+        HighLine.use_color = v unless CLI.windows?
         c.force_interactive = v
       end
 
@@ -48,12 +52,13 @@ module Travis
         define_method(name) {}
       end
 
-      attr_accessor :arguments, :config, :terminal, :force_interactive
+      attr_accessor :arguments, :config, :terminal, :force_interactive, :formatter
 
       def initialize(options = {})
-        @output   = SimpleDelegator.new($stdout)
-        @input    = SimpleDelegator.new($stdin)
-        @terminal = HighLine.new(@input, @output)
+        @formatter = Travis::Tools::Formatter.new
+        @output    = SimpleDelegator.new($stdout)
+        @input     = SimpleDelegator.new($stdin)
+        @terminal  = HighLine.new(@input, @output)
         options.each do |key, value|
           public_send("#{key}=", value) if respond_to? "#{key}="
         end
@@ -109,7 +114,7 @@ module Travis
       end
 
       def usage
-        usage  = "#$0 #{command_name} [options]"
+        usage  = "#$0 #{command_name}"
         method = method(:run)
         if method.respond_to? :parameters
           method.parameters.each do |type, name|
@@ -117,9 +122,10 @@ module Travis
             name = "[#{name}..]" if type == :rest
             usage << " #{name}"
           end
-        else
+        elsif method.arity != 0
           usage << " ..."
         end
+        usage << " [options]"
         "Usage: " << color(usage, :command)
       end
 
@@ -128,20 +134,31 @@ module Travis
         parser.to_s
       end
 
-      def say(data, format = nil)
-        data = format % color(data, :important) if format and interactive?
-        terminal.say data.gsub(/<\[\[/, '<%=').gsub(/\]\]>/, '%>')
+      def say(data, format = nil, style = nil)
+        terminal.say format(data, format, style)
+      end
+
+      def debug(line)
+        write_to($stderr) do
+          say color("** #{line}", :debug)
+        end
       end
 
       private
 
+        def format(data, format = nil, style = nil)
+          style ||= :important
+          data = format % color(data, style) if format and interactive?
+          data = data.gsub(/<\[\[/, '<%=').gsub(/\]\]>/, '%>')
+        end
+
         def template(file)
           File.read(file).split('__END__', 2)[1].strip
         end
 
-        def color(line, *args)
+        def color(line, style)
           return line unless interactive?
-          terminal.color(line, *args)
+          terminal.color(line, Array(style).map(&:to_sym))
         end
 
         def interactive?(io = output)
@@ -153,14 +170,18 @@ module Travis
           say "\n"
         end
 
-        def error(message)
+        def warn(message)
           write_to($stderr) do
             say color(message, :error)
             yield if block_given?
-            exit 1
           end
         end
 
+        def error(message, &block)
+          warn(message, &block)
+          exit 1
+        end
+
         def command(name)
           color("#$0 #{name}", :command)
         end
@@ -197,7 +218,7 @@ module Travis
           return unless method.respond_to? :parameters
           method.parameters.each do |type, name|
             return if type == :rest
-            wrong_args("few") unless args.shift or type == :opt
+            wrong_args("few") unless args.shift or type == :opt or type == :block
           end
           wrong_args("many") if args.any?
         end

data/lib/travis/cli/console.rb

@@ -0,0 +1,13 @@
+require 'travis/cli'
+require 'pry'
+
+module Travis
+  module CLI
+    class Console < ApiCommand
+      def run
+        Object.send(:include, Client::Namespace.new(session))
+        binding.pry(:quiet => true, :prompt => Pry::SIMPLE_PROMPT)
+      end
+    end
+  end
+end

data/lib/travis/cli/disable.rb

@@ -0,0 +1,13 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Disable < RepoCommand
+      def run
+        authenticate
+        repository.enable
+        say "disabled", color("#{slug}: %s :(", :error)
+      end
+    end
+  end
+end

data/lib/travis/cli/enable.rb

@@ -0,0 +1,29 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Enable < RepoCommand
+      on('-s', '--skip-sync', "don't trigger a sync if the repo is unknown")
+
+      def run
+        authenticate
+        repository.enable
+        say "enabled", color("#{slug}: %s :)", :success)
+      end
+
+      private
+
+        def repository
+          repo(slug)
+        rescue Travis::Client::NotFound
+          unless skip_sync?
+            say "repository not known to Travis CI (or no access?)"
+            say "triggering sync: "
+            sync
+            say " done"
+          end
+          super
+        end
+    end
+  end
+end

data/lib/travis/cli/encrypt.rb

@@ -11,7 +11,16 @@ module Travis
         c.config_key = value || 'env.global'
       end
 
+      on('-s', '--[no-]split', 'treat each line as a separate input')
+
       def run(*args)
+        if args.first =~ %r{\w+/\w+}
+          warn "WARNING: The name of the repository is now passed to the command with the -r option:"
+          warn "    #{command("encrypt [...] -r #{args.first}")}"
+          warn "  If you tried to pass the name of the repository as the first argument, you"
+          warn "  probably won't get the results you wanted.\n"
+        end
+
         data = args.join(" ")
 
         if data.empty?
@@ -19,17 +28,21 @@ module Travis
           data = $stdin.read
         end
 
-        encrypted = repository.encrypt(data)
+        data = split? ? data.split("\n") : [data]
+        encrypted = data.map { |data| repository.encrypt(data) }
 
         if config_key
           travis_config = YAML.load_file(travis_yaml)
           keys          = config_key.split('.')
           last_key      = keys.pop
           nested_config = keys.inject(travis_config) { |c,k| c[k] ||= {}}
-          nested_config[last_key] ||= [] << { 'secret' => encrypted }
+          encrypted.each do |encrypted|
+            nested_config[last_key] ||= [] << { 'secure' => encrypted }
+          end
           File.write(travis_yaml, travis_config.to_yaml)
         else
-          say encrypted.inspect, template(__FILE__)
+          list = encrypted.map { |data| format(data.inspect, "  secure: %s") }
+          say(list.join("\n"), template(__FILE__), :none)
         end
       end
 
@@ -51,7 +64,7 @@ end
 __END__
 Please add the following to your <[[ color('.travis.yml', :info) ]]> file:
 
-  secure: %s
+%s
 
 Pro Tip<[[ "™" unless Travis::CLI.windows? ]]>: You can add it automatically by running with <[[ color('--add', :info) ]]>.
 

data/lib/travis/cli/history.rb

@@ -0,0 +1,43 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class History < RepoCommand
+      on('-a', '--after BUILD', 'Only show history after a given build number')
+      on('-p', '--pull-request NUMBER', 'Only show history for the given Pull Request')
+      on('-b', '--branch BRANCH', 'Only show history for the given branch')
+      on('-l', '--limit LIMIT', 'Maximum number of history items')
+      on('--[no-]all', 'Display all history items')
+
+      def run
+        countdown = Integer(limit || 10) unless all?
+        params    = { :after_number => after } if after
+        repository.each_build(params) do |build|
+          next unless display? build
+          display(build)
+
+          if countdown
+            countdown -= 1
+            break if countdown < 1
+          end
+        end
+      end
+
+      private
+
+        def display?(build)
+          return build.pr_number   == pull_request if pull_request
+          return build.branch_info == branch       if branch
+          true
+        end
+
+        def display(build)
+          say [
+            color("##{build.number} #{build.state}:".ljust(14), [build.color, :bold]),
+            color("#{build.branch_info} ", :info),
+            build.commit.subject
+          ].join
+        end
+    end
+  end
+end

data/lib/travis/cli/logs.rb

@@ -0,0 +1,18 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Logs < RepoCommand
+      def run(number = last_build.number)
+        error "##{number} is not a job" unless job = job(number)
+        say log(job)
+      end
+
+      private
+
+        def log(job)
+          interactive? ? job.log.colorized_body : job.log.clean_body
+        end
+    end
+  end
+end

data/lib/travis/cli/open.rb

@@ -0,0 +1,36 @@
+require 'travis/cli'
+require 'launchy'
+
+module Travis
+  module CLI
+    class Open < RepoCommand
+      on('-g', '--github', 'Open the corresponding project, compare view or pull request on GitHub')
+      on('-p', '--print',  'Print out the URL instead of opening it in a browser')
+
+      def run(number = nil)
+        url = url_for(number)
+        if print?
+          say url, "web view: %s"
+        else
+          Launchy.open(url)
+        end
+      end
+
+      private
+
+        def url_for(number)
+          return repo_url unless number
+          entity = job(number) || build(number)
+          github ? entity.commit.compare_url : "#{repo_url}/#{entity.class.many}/#{entity.id}"
+        end
+
+        def repo_url
+          "https://#{host}/#{slug}"
+        end
+
+        def host
+          github ? "github.com" : session.config['host']
+        end
+    end
+  end
+end

data/lib/travis/cli/parser.rb

@@ -18,9 +18,9 @@ module Travis
         block ||= begin
           full_arg = args.detect { |a| a.start_with? '--' }
           name = full_arg.gsub(/^--(\[no-\])?(\S+).*$/, '\2').gsub('-', '_')
-          attr_reader(name) unless method_defined? name
-          attr_writer(name) unless method_defined? "#{name}="
-          alias_method("#{name}?", name) if full_arg.start_with? '--[no-]' and not method_defined? "#{name}?"
+          attr_reader(name)               unless method_defined? name
+          attr_writer(name)               unless method_defined? "#{name}="
+          alias_method("#{name}?", name)  unless method_defined? "#{name}?"
           proc { |instance, value| instance.public_send("#{name}=", value) }
         end
 

data/lib/travis/cli/repo_command.rb

@@ -13,16 +13,31 @@ module Travis
         error "Can't figure out GitHub repo name. Are you in the right directory?" unless self.slug ||= find_slug
         self.api_endpoint = detect_api_endpoint
         super
+        repository.load # makes sure we actually have access to the repo
       end
 
       def repository
         repo(slug)
       rescue Travis::Client::NotFound
-        error "repository not known to travis: #{color(slug, :important)}"
+        error "repository not known to #{api_endpoint}: #{color(slug, :important)}"
       end
 
       private
 
+        def build(number_or_id)
+          return super if number_or_id.is_a? Integer
+          repository.build(number_or_id)
+        end
+
+        def job(number_or_id)
+          return super if number_or_id.is_a? Integer
+          repository.job(number_or_id)
+        end
+
+        def last_build
+          repository.last_build or error("no build yet for #{slug}")
+        end
+
         def detected_endpoint?
           !explicit_api_endpoint?
         end

data/lib/travis/cli/restart.rb

@@ -0,0 +1,14 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Restart < RepoCommand
+      def run(number = last_build.number)
+        entity = job(number) || build(number)
+        entity.restart
+
+        say "restarted", "#{entity.class.one} ##{entity.number} has been %s"
+      end
+    end
+  end
+end

data/lib/travis/cli/show.rb

@@ -0,0 +1,50 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Show < RepoCommand
+      def run(number = last_build.number)
+        entity = job(number) || build(number)
+
+        say template(__FILE__) % [
+          entity.class.one.capitalize,
+          entity.number,
+          entity.commit.subject,
+          entity.state,
+          entity.color,
+          entity.pull_request? ? "pull request" : "push",
+          entity.commit.compare_url,
+          formatter.duration(entity.duration),
+          formatter.time(entity.started_at),
+          formatter.time(entity.finished_at)
+        ]
+
+        if entity.respond_to? :jobs
+          empty_line
+          entity.jobs.each do |job|
+            say [
+              color("##{job.number} #{job.state}:".ljust(16), [job.color, :bold]),
+              formatter.duration(job.duration).ljust(14),
+              formatter.job_config(job.config),
+              (color("(failure allowed)", :info) if job.allow_failures?)
+            ].compact.join(" ").rstrip
+          end
+        else
+          config = formatter.job_config(entity.config)
+          say color("Allow Failure: ", :info) + entity.allow_failures?.inspect
+          say color("Config:        ", :info) + config unless config.empty?
+        end
+      end
+    end
+  end
+end
+
+__END__
+
+<[[ color("%s #%s: %s", :bold) ]]>
+<[[ color("State:         ", :info) ]]><[[ color(%p, :%s) ]]>
+<[[ color("Type:          ", :info) ]]>%s
+<[[ color("Compare URL:   ", :info) ]]>%s
+<[[ color("Duration:      ", :info) ]]>%s
+<[[ color("Started:       ", :info) ]]>%s
+<[[ color("Finished:      ", :info) ]]>%s

data/lib/travis/cli/status.rb

@@ -0,0 +1,17 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Status < RepoCommand
+      on '-x', '--[no-]exit-code',    'sets the exit code to 1 if the build failed'
+      on '-q', '--[no-]quiet',        'does not print anything'
+      on '-p', '--[no-]fail-pending', 'sets the status code to 1 if the build is pending'
+
+      def run
+        say color(last_build.state, last_build.color), "build ##{last_build.number} %s" unless quiet?
+        exit 1 if exit_code?    and last_build.unsuccessful?
+        exit 1 if fail_pending? and last_build.pending?
+      end
+    end
+  end
+end

data/lib/travis/cli/sync.rb

@@ -0,0 +1,28 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Sync < ApiCommand
+      on '-c', '--check',      'only check the sync status'
+      on '-b', '--background', 'will trigger sync but not block until sync is done'
+      on '-f', '--force',      'will force sync, even if one is already running'
+
+      def run
+        authenticate
+
+        if check?
+          say "#{"not " unless user.syncing?}syncing", "#{user.login} is currently %s"
+        elsif user.syncing? and not force?
+          error "user is already syncing"
+        elsif background?
+          say "starting synchronization"
+          sync(false)
+        else
+          say "synchronizing: "
+          sync
+          say color(" done", :success)
+        end
+      end
+    end
+  end
+end

data/lib/travis/cli/whatsup.rb

@@ -0,0 +1,16 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Whatsup < ApiCommand
+      def run
+        repos.each do |repo|
+          say [
+            color(repo.slug, [:bold, repo.color]),
+            color("#{repo.last_build.state}: ##{repo.last_build.number}", repo.color)
+          ].join(" ")
+        end
+      end
+    end
+  end
+end

data/lib/travis/cli.rb

@@ -16,14 +16,25 @@ module Travis
   module CLI
     autoload :ApiCommand,   'travis/cli/api_command'
     autoload :Command,      'travis/cli/command'
+    autoload :Console,      'travis/cli/console'
+    autoload :Disable,      'travis/cli/disable'
+    autoload :Enable,       'travis/cli/enable'
     autoload :Encrypt,      'travis/cli/encrypt'
     autoload :Endpoint,     'travis/cli/endpoint'
     autoload :Help,         'travis/cli/help'
+    autoload :History,      'travis/cli/history'
     autoload :Login,        'travis/cli/login'
+    autoload :Logs,         'travis/cli/logs'
+    autoload :Open,         'travis/cli/open'
     autoload :Parser,       'travis/cli/parser'
     autoload :Raw,          'travis/cli/raw'
     autoload :RepoCommand,  'travis/cli/repo_command'
+    autoload :Restart,      'travis/cli/restart'
+    autoload :Show,         'travis/cli/show'
+    autoload :Status,       'travis/cli/status'
+    autoload :Sync,         'travis/cli/sync'
     autoload :Version,      'travis/cli/version'
+    autoload :Whatsup,      'travis/cli/whatsup'
     autoload :Whoami,       'travis/cli/whoami'
 
     extend self

data/lib/travis/client/artifact.rb

@@ -0,0 +1,25 @@
+require 'travis/client'
+
+module Travis
+  module Client
+    class Artifact < Entity
+      # @!parse attr_reader :job_id, :type, :body
+      attributes :job_id, :type, :body
+
+      # @!parse attr_reader :job
+      has :job
+
+      def colorized_body
+        attributes['colorized_body'] ||= body.gsub(/[^[:print:]\e\n]/, '')
+      end
+
+      def clean_body
+        attributes['clean_body'] ||= colorized_body.gsub(/\e[^m]+m/, '')
+      end
+
+      one :artifact
+      many :artifacts
+      aka :log
+    end
+  end
+end

data/lib/travis/client/build.rb

@@ -0,0 +1,41 @@
+require 'travis/client'
+
+module Travis
+  module Client
+    class Build < Entity
+      include States
+
+      # @!parse attr_reader :repository_id, :commit_id, :number, :pull_request, :config, :state, :started_at, :finished_at, :duration, :job_ids
+      attributes :repository_id, :commit_id, :number, :pull_request, :config, :state, :started_at, :finished_at, :duration, :job_ids
+      time :started_at, :finished_at
+
+      alias pull_request? pull_request
+
+      # @!parse attr_reader :repository, :commit, :jobs
+      has :repository, :commit, :jobs
+
+      one :build
+      many :builds
+
+      def restart
+        session.restart(self)
+      end
+
+      def push?
+        not pull_request?
+      end
+
+      def pr_number
+        commit.compare_url[/\d+$/] if pull_request?
+      end
+
+      def branch_info
+        pull_request? ? "Pull Request ##{pr_number}" : commit.branch
+      end
+
+      def inspect_info
+        "#{repository.slug}##{number}"
+      end
+    end
+  end
+end