travis 1.4.0 → 1.5.0

data/lib/travis/cli.rb

@@ -16,6 +16,7 @@ module Travis
   module CLI
     autoload :Token,        'travis/cli/token'
     autoload :ApiCommand,   'travis/cli/api_command'
+    autoload :Accounts,     'travis/cli/accounts'
     autoload :Branches,     'travis/cli/branches'
     autoload :Command,      'travis/cli/command'
     autoload :Console,      'travis/cli/console'
@@ -28,6 +29,7 @@ module Travis
     autoload :Init,         'travis/cli/init'
     autoload :Login,        'travis/cli/login'
     autoload :Logs,         'travis/cli/logs'
+    autoload :Monitor,      'travis/cli/monitor'
     autoload :Open,         'travis/cli/open'
     autoload :Parser,       'travis/cli/parser'
     autoload :Pubkey,       'travis/cli/pubkey'

data/lib/travis/cli/accounts.rb

@@ -0,0 +1,21 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Accounts < ApiCommand
+      def run
+        authenticate
+        accounts.each do |account|
+          color = account.subscribed? ? :green : :info
+          say [
+            color(account.login, [color, :bold]),
+            color("(#{account.name}):", 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?)
+      end
+    end
+  end
+end

data/lib/travis/cli/api_command.rb

@@ -79,6 +79,13 @@ module Travis
 
       private
 
+        def listen(*args)
+          super(*args) do |listener|
+            on_signal { listener.disconnect }
+            yield listener
+          end
+        end
+
         def detected_endpoint
           Travis::Client::ORG_URI
         end

data/lib/travis/cli/command.rb

@@ -58,6 +58,7 @@ module Travis
       attr_reader :input, :output
 
       def initialize(options = {})
+        @on_signal  = []
         @formatter  = Travis::Tools::Formatter.new
         self.output = $stdout
         self.input  = $stdin
@@ -124,6 +125,7 @@ module Travis
       end
 
       def execute
+        setup_trap
         check_ruby
         check_arity(method(:run), *arguments)
         load_config
@@ -173,8 +175,21 @@ module Travis
         end
       end
 
+      def on_signal(&block)
+        @on_signal << block
+      end
+
       private
 
+        def setup_trap
+          [:INT, :TERM].each do |signal|
+            trap signal do
+              @on_signal.each { |c| c.call }
+              exit 1
+            end
+          end
+        end
+
         def format(data, format = nil, style = nil)
           style ||= :important
           data = format % color(data, style) if format and interactive?

data/lib/travis/cli/encrypt.rb

@@ -20,7 +20,7 @@ module Travis
         error "--override without --add makes no sense"  if override? and not add?
         self.override |= !config_key.start_with?('env.') if add?      and not append?
 
-        if args.first =~ %r{\w+/\w+}
+        if args.first =~ %r{\w+/\w+} && !args.first.include?("=")
           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"
@@ -100,4 +100,3 @@ Please add the following to your <[[ color('.travis.yml', :info) ]]> file:
 %s
 
 Pro Tip: You can add it automatically by running with <[[ color('--add', :info) ]]>.
-

data/lib/travis/cli/logs.rb

@@ -1,18 +1,14 @@
 require 'travis/cli'
+require 'travis/tools/safe_string'
 
 module Travis
   module CLI
     class Logs < RepoCommand
+      include Tools::SafeString
       def run(number = last_build.number)
         error "##{number} is not a job, try #{number}.1" unless job = job(number)
-        say log(job)
+        job.log.body { |part| print interactive? ? encoded(part) : clean(part) }
       end
-
-      private
-
-        def log(job)
-          interactive? ? job.log.colorized_body : job.log.clean_body
-        end
     end
   end
 end

data/lib/travis/cli/monitor.rb

@@ -0,0 +1,48 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Monitor < ApiCommand
+      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
+
+      def initialize(*)
+        @repos = []
+        super
+      end
+
+      def setup
+        super
+        repos.map! { |r| repo(r) }
+        repos.concat(user.repositories) if my_repos?
+      end
+
+      def description
+        case repos.size
+        when 0 then session.config['host']
+        when 1 then repos.first.slug
+        else "#{repos.size} repositories"
+        end
+      end
+
+      def run
+        listen(*repos) do |listener|
+          listener.on_connect { say description, 'Monitoring %s:' }
+          listener.on 'build:started', 'job:started', 'build:finished', 'job:finished' do |event|
+            entity = event.job          || event.build
+            time   = entity.finished_at || entity.started_at
+            say [
+              color(formatter.time(time), entity.color),
+              color(entity.inspect_info, [entity.color, :bold]),
+              color(entity.state, entity.color)
+            ].join(" ")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/travis/cli/restart.rb

@@ -4,6 +4,7 @@ module Travis
   module CLI
     class Restart < RepoCommand
       def run(number = last_build.number)
+        authenticate
         entity = job(number) || build(number)
         entity.restart
 

data/lib/travis/cli/setup.rb

@@ -33,6 +33,20 @@ module Travis
         end
       end
 
+      def setup_rubygems
+        configure 'deploy', 'provider' => 'rubygems' do |config|
+          rubygems_file = File.expand_path('.rubygems/authorization', ENV['HOME'])
+
+          if File.exist? rubygems_file
+            config['api_key'] = File.read(rubygems_file)
+          end
+
+          config['api_key'] ||= ask("RubyGems 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
+      end
+
       def setup_nodejitsu
         configure 'deploy', 'provider' => 'nodejitsu' do |config|
           jitsu_file = File.expand_path('.jitsuconf', ENV['HOME'])
@@ -59,8 +73,8 @@ module Travis
         end
       end
 
-      alias setup_sauce_lab setup_sauce_connect
-      alias setup_sauce     setup_sauce_connect
+      alias setup_sauce_labs setup_sauce_connect
+      alias setup_sauce      setup_sauce_connect
 
       private
 

data/lib/travis/cli/token.rb

@@ -4,7 +4,7 @@ module Travis
   module CLI
     class Token < ApiCommand
       def run
-        error "not logged in, please run #{command("login#{endpoint_option}")}" if access_token.nil?
+        authenticate
         say access_token, "Your access token is %s"
       end
     end

data/lib/travis/cli/whatsup.rb

@@ -3,7 +3,7 @@ require 'travis/cli'
 module Travis
   module CLI
     class Whatsup < ApiCommand
-      on('-m', '--my-repos')
+      on('-m', '--my-repos', 'Only display my own repositories')
 
       def run
         recent.each do |repo|

data/lib/travis/client.rb

@@ -13,6 +13,8 @@ require 'travis/client/job'
 require 'travis/client/worker'
 require 'travis/client/namespace'
 require 'travis/client/account'
+require 'travis/client/broadcast'
+require 'travis/client/listener'
 
 module Travis
   module Client

data/lib/travis/client/account.rb

@@ -3,12 +3,16 @@ require 'travis/client'
 module Travis
   module Client
     class Account < Entity
-      attributes :name, :login, :type, :repos_count
+      attributes :name, :login, :type, :repos_count, :subscribed
 
       one :account
       many :accounts
 
       inspect_info :login
+
+      def subscribed
+        attributes.fetch('subscribed') { true }
+      end
     end
   end
 end

data/lib/travis/client/artifact.rb

@@ -1,9 +1,12 @@
 # encoding: utf-8
 require 'travis/client'
+require 'travis/tools/safe_string'
 
 module Travis
   module Client
     class Artifact < Entity
+      CHUNKED = "application/json; chunked=true; version=2, application/json; version=2"
+
       # @!parse attr_reader :job_id, :type, :body
       attributes :job_id, :type, :body
 
@@ -11,16 +14,49 @@ module Travis
       has :job
 
       def encoded_body
-        return body unless body.respond_to? :encode
-        body.encode 'utf-8'
+        Tools::SafeString.encoded(body)
       end
 
       def colorized_body
-        attributes['colorized_body'] ||= encoded_body.gsub(/[^[:print:]\e\n]/, '')
+        attributes['colorized_body'] ||= Tools::SafeString.colorized(body)
       end
 
       def clean_body
-        attributes['clean_body'] ||= colorized_body.gsub(/\e[^m]+m/, '')
+        attributes['clean_body'] ||= Tools::SafeString.clean(body)
+      end
+
+      def body(stream = block_given?)
+        return load_attribute('body') unless block_given? or stream
+        return yield(load_attribute('body')) unless stream and job.pending?
+        number = 0
+
+        session.listen(self) do |listener|
+          listener.on 'job:log' do |event|
+            next unless event.payload['number'] > number
+            number = event.payload['number']
+            yield event.payload['_log']
+            listener.disconnect if event.payload['final']
+          end
+
+          listener.on 'job:finished' do |event|
+            listener.disconnect
+          end
+
+          listener.on_connect do
+            data = session.get_raw("/artifacts/#{id}", nil, "Accept" => CHUNKED)['log']
+            if data['parts']
+              data['parts'].each { |p| yield p['content'] }
+              number = data['parts'].last['number'] if data['parts'].any?
+            else
+              yield data['body']
+              listener.disconnect
+            end
+          end
+        end
+      end
+
+      def pusher_entity
+        job
       end
 
       one :log

data/lib/travis/client/broadcast.rb

@@ -0,0 +1,14 @@
+require 'travis/client'
+
+module Travis
+  module Client
+    class Broadcast < Entity
+      attributes :recipient_id, :recipient_type, :kind, :message, :expired, :created_at, :updated_at
+
+      one :broadcast
+      many :broadcasts
+
+      inspect_info :message
+    end
+  end
+end

data/lib/travis/client/build.rb

@@ -34,6 +34,10 @@ module Travis
         pull_request? ? "Pull Request ##{pr_number}" : commit.branch
       end
 
+      def pusher_channels
+        repository.pusher_channels
+      end
+
       def inspect_info
         "#{repository.slug}##{number}"
       end

data/lib/travis/client/entity.rb

@@ -21,8 +21,8 @@ module Travis
         MAP.fetch(key)
       end
 
-      def self.aka(name)
-        MAP[name.to_s] = self
+      def self.aka(*names)
+        names.each { |n| MAP[n.to_s] = self }
       end
 
       def self.one(key = nil)

data/lib/travis/client/job.rb

@@ -48,6 +48,10 @@ module Travis
         end
       end
 
+      def pusher_channels
+        build.pusher_channels + ["job-#{id}"]
+      end
+
       def inspect_info
         "#{repository.slug}##{number}"
       end

data/lib/travis/client/listener.rb

@@ -0,0 +1,149 @@
+require 'travis/client'
+require 'forwardable'
+require 'json'
+
+if require 'pusher-client'
+  # it's us that has been loading pusher-client
+  # so let's assume we can mess with it - yay for global state
+  PusherClient.logger.level = 2
+end
+
+module Travis
+  module Client
+    class Listener
+      class Socket < PusherClient::Socket
+        attr_accessor :session, :signatures
+        def initialize(application_key, options = {})
+          @session    = options.fetch(:session)
+          @signatures = {}
+          super
+        end
+
+        def subscribe_all
+          # bulk auth on connect
+          fetch_auth(*channels.channels.keys)
+          super
+        end
+
+        def fetch_auth(*channels)
+          channels.select! { |c| signatures[c].nil? if c.start_with? 'private-' }
+          signatures.merge! session.post_raw('/pusher/auth', :channels => channels, :socket_id => socket_id)['channels'] if channels.any?
+        end
+
+        def get_private_auth(channel)
+          fetch_auth(channel.name)
+          signatures[channel.name]
+        end
+      end
+
+      EVENTS = %w[
+        build:created build:started build:finished
+        job:created job:started job:log job:finished
+      ]
+
+      Event = Struct.new(:type, :repository, :build, :job, :payload)
+
+      class EntityListener
+        attr_reader :listener, :entities
+
+        extend Forwardable
+        def_delegators :listener, :disconnect, :on_connect, :subscribe
+
+        def initialize(listener, entities)
+          @listener, @entities = listener, Array(entities)
+        end
+
+        def on(*events)
+          listener.on(*events) { |e| yield(e) if dispatch?(e) }
+        end
+
+        private
+
+          def dispatch?(event)
+            entities.include? event.repository or
+            entities.include? event.build      or
+            entities.include? event.job
+          end
+      end
+
+      attr_reader :session, :socket
+
+      def initialize(session)
+        @session   = session
+        @socket    = Socket.new(pusher_key, :encrypted => true, :session => session)
+        @channels  = []
+        @callbacks = []
+      end
+
+      def subscribe(*entities)
+        entities = entities.map do |entity|
+          entity = entity.pusher_entity while entity.respond_to? :pusher_entity
+          @channels.concat(entity.pusher_channels)
+          entity
+        end
+
+        yield entities.any? ? EntityListener.new(self, entities) : self if block_given?
+      end
+
+      def on(*events, &block)
+        events = events.flat_map { |e| e.respond_to?(:to_str) ? e.to_str : EVENTS.grep(e) }.uniq
+        events.each { |e| @callbacks << [e, block] }
+      end
+
+      def on_connect
+        socket.bind('pusher:connection_established') { yield }
+      end
+
+      def listen
+        @channels = default_channels if @channels.empty?
+        @channels.map! { |c| c.start_with?('private-') ? c : "private-#{c}" } if session.private_channels?
+        @channels.uniq.each { |c| socket.subscribe(c) }
+        @callbacks.each { |e,b| socket.bind(e) { |d| dispatch(e, d, &b) } }
+        socket.connect
+      end
+
+      def disconnect
+        socket.disconnect
+      end
+
+      private
+
+        def dispatch(type, json)
+          payload  = JSON.parse(json)
+          entities = session.load format_payload(type, payload)
+          yield Event.new(type, entities['repository'], entities['build'], entities['job'], payload)
+        end
+
+        def format_payload(type, payload)
+          case type
+          when "job:log" then format_log(payload)
+          when /job:/    then format_job(payload)
+          else payload
+          end
+        end
+
+        def format_job(payload)
+          build           = { "id" => payload["build_id"],      "repository_id" => payload["repository_id"]   }
+          repo            = { "id" => payload["repository_id"], "slug"          => payload["repository_slug"] }
+          build["number"] = payload["number"][/^[^\.]+/] if payload["number"]
+          { "job" => payload, "build" => build, "repository" => repo }
+        end
+
+        def format_log(payload)
+          job = session.job(payload['id'])
+          { "job" => { "id" => job.id }, "build" => { "id" => job.build.id }, "repository" => { "id" => job.repository.id } }
+        end
+
+        def default_channels
+          return ['common'] if session.access_token.nil?
+          session.user.channels
+        end
+
+        def pusher_key
+          session.config.fetch('pusher').fetch('key')
+        rescue IndexError
+          raise Travis::Client::Error, "#{session.api_endpoint} is missing pusher key"
+        end
+    end
+  end
+end