travis 1.11.1 → 1.13.0

data/lib/travis/client/build.rb

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis
   module Client
     class Build < Entity
-      include States, Restartable
+      include Restartable
+      include States
       preloadable
 
       # @!parse attr_reader :repository_id, :commit_id, :number, :pull_request, :pull_request_number, :pull_request_title, :config, :state, :started_at, :finished_at, :duration, :job_ids
-      attributes :repository_id, :commit_id, :number, :pull_request, :pull_request_number, :pull_request_title, :config, :state, :started_at, :finished_at, :duration, :job_ids
+      attributes :repository_id, :commit_id, :number, :pull_request, :pull_request_number, :pull_request_title,
+                 :config, :state, :started_at, :finished_at, :duration, :job_ids
       time :started_at, :finished_at
 
       alias pull_request? pull_request
@@ -27,7 +31,7 @@ module Travis
       end
 
       def push?
-        not pull_request?
+        !pull_request?
       end
 
       def branch_info

data/lib/travis/client/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client/weak_entity'
 
 module Travis
@@ -14,11 +16,11 @@ module Travis
       many :caches
 
       def delete
-        repository.delete_caches(:branch => branch, :match => slug)
+        repository.delete_caches(branch:, match: slug)
       end
 
       def inspect_info
-        [repository.slug, branch, slug].compact.join(" ")
+        [repository.slug, branch, slug].compact.join(' ')
       end
     end
   end

data/lib/travis/client/commit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis
@@ -6,7 +8,8 @@ module Travis
       include NotLoadable
 
       # @!parse attr_reader :sha, :branch, :message, :committed_at, :author_name, :author_email, :committer_name, :committer_email, :compare_url
-      attributes :sha, :branch, :message, :committed_at, :author_name, :author_email, :committer_name, :committer_email, :compare_url
+      attributes :sha, :branch, :message, :committed_at, :author_name, :author_email, :committer_name,
+                 :committer_email, :compare_url
       time :committed_at
 
       one :commit
@@ -21,7 +24,7 @@ module Travis
       end
 
       def inspect_info
-        short_sha + " " + subject.inspect
+        "#{short_sha} #{subject.inspect}"
       end
     end
   end

data/lib/travis/client/entity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'time'
 
@@ -48,7 +50,7 @@ module Travis
 
         list.each do |name|
           name = name.to_s
-          fail "can't call an attribute id" if name == "id"
+          raise "can't call an attribute id" if name == 'id'
 
           @attributes << name
           define_method(name) { load_attribute(name) }
@@ -111,6 +113,7 @@ module Travis
 
       def initialize(session, id)
         raise Travis::Client::Error, '%p is not a valid id' % id unless self.class.id? id
+
         @attributes = {}
         @session    = session
         @id         = self.class.cast_id(id) if id
@@ -155,6 +158,7 @@ module Travis
 
       def missing?(key)
         return false unless include? key
+
         !attributes.include?(key.to_s)
       end
 
@@ -164,7 +168,7 @@ module Travis
 
       def inspect
         klass = self.class
-        klass = curry if curry and curry.name and curry.to_s.size < klass.to_s.size
+        klass = curry if curry&.name && curry.to_s.size < klass.to_s.size
         "#<#{klass}: #{inspect_info}>"
       end
 
@@ -182,57 +186,57 @@ module Travis
 
       private
 
-        def relation(name)
-          name   = name.to_s
-          entity = Entity.subclass_for(name)
-
-          if entity.many == name
-            Array(send("#{entity.one}_ids")).map do |id|
-              session.find_one(entity, id)
-            end
-          else
-            id = send("#{name}_id")
-            session.find_one(entity, id) unless id.nil?
+      def relation(name)
+        name   = name.to_s
+        entity = Entity.subclass_for(name)
+
+        if entity.many == name
+          Array(send("#{entity.one}_ids")).map do |id|
+            session.find_one(entity, id)
           end
+        else
+          id = send("#{name}_id")
+          session.find_one(entity, id) unless id.nil?
         end
+      end
 
-        def inspect_info
-          id
-        end
+      def inspect_info
+        id
+      end
 
-        def set_attribute(name, value)
-          attributes[name.to_s] = value
-        end
+      def set_attribute(name, value)
+        attributes[name.to_s] = value
+      end
 
-        def load_attribute(name)
-          session.reload(self) if missing? name
-          attributes[name.to_s]
-        end
+      def load_attribute(name)
+        session.reload(self) if missing? name
+        attributes[name.to_s]
+      end
 
-        # shamelessly stolen from sinatra
-        def time(value)
-          if value.respond_to? :to_time
-            value.to_time
-          elsif value.is_a? Time
-            value
-          elsif value.respond_to? :new_offset
-            d = value.new_offset 0
-            t = Time.utc d.year, d.mon, d.mday, d.hour, d.min, d.sec + d.sec_fraction
-            t.getlocal
-          elsif value.respond_to? :mday
-            Time.local(value.year, value.mon, value.mday)
-          elsif value.is_a? Numeric
-            Time.at value
-          elsif value.nil? or value.empty?
-            nil
-          else
-            Time.parse value.to_s
-          end
-        rescue ArgumentError => boom
-          raise boom
-        rescue Exception
-          raise ArgumentError, "unable to convert #{value.inspect} to a Time object"
+      # shamelessly stolen from sinatra
+      def time(value)
+        if value.respond_to? :to_time
+          value.to_time
+        elsif value.is_a? Time
+          value
+        elsif value.respond_to? :new_offset
+          d = value.new_offset 0
+          t = Time.utc d.year, d.mon, d.mday, d.hour, d.min, d.sec + d.sec_fraction
+          t.getlocal
+        elsif value.respond_to? :mday
+          Time.local(value.year, value.mon, value.mday)
+        elsif value.is_a? Numeric
+          Time.at value
+        elsif value.nil? || value.empty?
+          nil
+        else
+          Time.parse value.to_s
         end
+      rescue ArgumentError => e
+        raise e
+      rescue Exception
+        raise ArgumentError, "unable to convert #{value.inspect} to a Time object"
+      end
     end
   end
 end

data/lib/travis/client/env_var.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'delegate'
 
@@ -35,7 +37,7 @@ module Travis
         end
 
         def add(name, value, options = {})
-          body       = JSON.dump(:env_var => options.merge(:name => name, :value => value))
+          body       = JSON.dump(env_var: options.merge(name:, value:))
           result     = session.post(EnvVar.path(self), body)
           self.list += [result['env_var']]
         end
@@ -43,8 +45,8 @@ module Travis
         def upsert(name, value, options = {})
           entries = select { |e| e.name == name }
           if entries.any?
-            entries.first.update(options.merge(:value => value))
-            entries[1..-1].each { |e| e.delete }
+            entries.first.update(options.merge(value:))
+            entries[1..].each { |e| e.delete }
           else
             add(name, value, options)
           end
@@ -53,11 +55,13 @@ module Travis
 
         def [](key)
           return super if key.is_a? Integer
+
           detect { |e| e.name == key.to_s }
         end
 
         def []=(key, value)
           return super if key.is_a? Integer
+
           upsert(key.to_s, value)
         end
 
@@ -65,8 +69,9 @@ module Travis
       end
 
       def self.path(object)
-        repository_id = Repository === object ? object.id : object.repository_id
-        raise "repository unknown" unless repository_id
+        repository_id = object.is_a?(Repository) ? object.id : object.repository_id
+        raise 'repository unknown' unless repository_id
+
         "/settings/env_vars/#{object.id if object.is_a? EnvVar}?repository_id=#{repository_id}"
       end
 
@@ -82,8 +87,8 @@ module Travis
       has :repository
 
       def update(options)
-        options = { :value => options } unless options.is_a? Hash
-        result  = session.patch(EnvVar.path(self), JSON.dump(:env_var => options))
+        options = { value: options } unless options.is_a? Hash
+        result  = session.patch(EnvVar.path(self), JSON.dump(env_var: options))
         attributes.replace(result['env_var'].attributes)
         self
       end
@@ -95,7 +100,7 @@ module Travis
       end
 
       def inspect_info
-        "#{name}=#{value ? value.inspect : "[secure]"}"
+        "#{name}=#{value ? value.inspect : '[secure]'}"
       end
     end
   end

data/lib/travis/client/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis
@@ -25,7 +27,7 @@ module Travis
 
     class AssetNotFound < Error
       def initialize(file, *args)
-        if md = file.match(%r[init/(?<lang>[^\.]+)\.yml$])
+        if (md = file.match(%r{init/(?<lang>[^.]+)\.yml$}))
           super "unknown language #{md[:lang]}", *args
         else
           super file, *args
@@ -42,9 +44,9 @@ module Travis
       end
 
       def parse_message(message)
-        response   = JSON.load(message)
+        response   = JSON.parse(message)
         message    = response['message'].to_s
-        if @errors = response['errors'] and @errors.any?
+        if (@errors = response['errors']) && @errors.any?
           readable = @errors.map { |e| "#{e['field']}: #{e['code'].gsub('_', ' ')}" }
           message += " (#{readable.join(', ')})"
         end

data/lib/travis/client/has_uuid.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Travis
   module Client
     module HasUuid
       def id?(object)
-         object =~ /\A(?:\w+-){4}\w+\Z/ if object.is_a? String
+        object =~ /\A(?:\w+-){4}\w+\Z/ if object.is_a? String
       end
 
       def cast_id(object)

data/lib/travis/client/job.rb

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis
   module Client
     class Job < Entity
-      include States, Restartable
+      include Restartable
+      include States
       preloadable
 
       # @!parse attr_reader :repository_id, :build_id, :commit_id, :log_id, :number, :config, :state, :started_at, :finished_at, :queue, :allow_failure, :tags
-      attributes :repository_id, :build_id, :commit_id, :log_id, :number, :config, :state, :started_at, :finished_at, :queue, :allow_failure, :tags
+      attributes :repository_id, :build_id, :commit_id, :log_id, :number, :config, :state, :started_at, :finished_at,
+                 :queue, :allow_failure, :tags
       time :started_at, :finished_at
 
       alias allow_failure? allow_failure
@@ -31,7 +35,8 @@ module Travis
       end
 
       def allow_failures?
-        return false unless config.include? 'matrix' and config['matrix'].include? 'allow_failures'
+        return false unless config.include?('matrix') && config['matrix'].include?('allow_failures')
+
         config['matrix']['allow_failures'].any? do |allow|
           allow.all? { |key, value| config[key] == value }
         end

data/lib/travis/client/lint_result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Travis
   module Client
     class LintResult

data/lib/travis/client/listener.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'forwardable'
 require 'json'
@@ -13,6 +15,7 @@ module Travis
     class Listener
       class Socket < PusherClient::Socket
         attr_accessor :session, :signatures
+
         def initialize(application_key, options = {})
           @session    = options.fetch(:session)
           @signatures = {}
@@ -31,7 +34,10 @@ module Travis
 
         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?
+          return unless channels.any?
+
+          signatures.merge! session.post_raw('/pusher/auth', channels:,
+                                                             socket_id:)['channels']
         end
 
         def get_private_auth(channel)
@@ -40,19 +46,22 @@ module Travis
         end
 
         def handle_error(data)
-          code, message = data["code"], data["message"] if data.is_a? Hash
+          if data.is_a? Hash
+            code = data['code']
+            message = data['message']
+          end
           message ||= data.inspect
 
           case code
           when 4100             then reconnect(1)
           when 4200, 4201, 4202 then reconnect
-          else raise Travis::Client::Error, "Pusher error: %s (code: %p)" % [message, code]
+          else raise Travis::Client::Error, format('Pusher error: %s (code: %p)', message, code)
           end
         end
 
         def reconnect(delay = nil)
           disconnect if connected
-          sleep delay if delay and delay > 0
+          sleep delay if delay&.positive?
           connect
         end
       end
@@ -60,7 +69,7 @@ module Travis
       EVENTS = %w[
         build:created build:started build:finished
         job:created job:started job:log job:finished
-      ]
+      ].freeze
 
       Event = Struct.new(:type, :repository, :build, :job, :payload)
 
@@ -71,7 +80,8 @@ module Travis
         def_delegators :listener, :disconnect, :on_connect, :subscribe
 
         def initialize(listener, entities)
-          @listener, @entities = listener, Array(entities)
+          @listener = listener
+          @entities = Array(entities)
         end
 
         def on(*events)
@@ -80,11 +90,11 @@ module Travis
 
         private
 
-          def dispatch?(event)
-            entities.include? event.repository or
-            entities.include? event.build      or
+        def dispatch?(event)
+          entities.include? event.repository or
+            entities.include? event.build or
             entities.include? event.job
-          end
+        end
       end
 
       attr_reader :session, :socket
@@ -111,15 +121,15 @@ module Travis
         events.each { |e| @callbacks << [e, block] }
       end
 
-      def on_connect
-        socket.bind('pusher:connection_established') { yield }
+      def on_connect(&block)
+        socket.bind('pusher:connection_established', &block)
       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) } }
+        @callbacks.each { |e, b| socket.bind(e) { |d| dispatch(e, d, &b) } }
         socket.connect
       end
 
@@ -129,55 +139,60 @@ module Travis
 
       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 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
+      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_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 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 default_channels
+        return ['common'] if session.access_token.nil?
 
-        def pusher_options
-          pusher_options       = session.config['pusher'] || {}
-          encrypted            = pusher_options['scheme'] != 'http'
-          options              = { :encrypted => encrypted, :session => session }
-          options[:ws_host]    = pusher_options['host'] if pusher_options['host']
-          options[:wss_port]   = pusher_options['port'] if encrypted  and pusher_options['port']
-          options[:ws_port]    = pusher_options['port'] if !encrypted and pusher_options['port']
-          options[:ws_path]    = pusher_options['path'] if pusher_options['path']
-          options[:ws_path]    = '/' << options[:ws_path] unless options[:ws_path].nil? or options[:ws_path].start_with? '/'
-          options[:ssl_verify] = session.ssl.fetch(:verify, true)
-          options
-        end
+        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
+      def pusher_options
+        pusher_options       = session.config['pusher'] || {}
+        encrypted            = pusher_options['scheme'] != 'http'
+        options              = { encrypted:, session: }
+        options[:ws_host]    = pusher_options['host'] if pusher_options['host']
+        options[:wss_port]   = pusher_options['port'] if encrypted  && pusher_options['port']
+        options[:ws_port]    = pusher_options['port'] if !encrypted && pusher_options['port']
+        options[:ws_path]    = pusher_options['path'] if pusher_options['path']
+        unless options[:ws_path].nil? || options[:ws_path].start_with?('/')
+          options[:ws_path] =
+            '/' << options[:ws_path]
+        end
+        options[:ssl_verify] = session.ssl.fetch(:verify, true)
+        options
+      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

data/lib/travis/client/methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'yaml'
 
@@ -17,12 +19,13 @@ module Travis
       end
 
       def github_auth(github_token)
-        reply = session.post_raw("/auth/github", :github_token => github_token)
-        unless reply.respond_to?(:key?) && reply.key?("access_token")
-          raise InvalidTokenError, 'token is invalid, or does not have sufficient scope; see https://docs.travis-ci.com/user/github-oauth-scopes/ for more information on scope'
+        reply = session.post_raw('/auth/github', github_token:)
+        unless reply.respond_to?(:key?) && reply.key?('access_token')
+          raise InvalidTokenError,
+                'token is invalid, or does not have sufficient scope; see https://docs.travis-ci.com/user/github-oauth-scopes/ for more information on scope'
         end
 
-        session.access_token = reply["access_token"]
+        session.access_token = reply['access_token']
       end
 
       def explicit_api_endpoint?
@@ -67,7 +70,7 @@ module Travis
       end
 
       def accounts
-        session.find_many(Account, :all => true)
+        session.find_many(Account, all: true)
       end
 
       def broadcasts
@@ -78,12 +81,14 @@ module Travis
         # btw, internally we call this reset, not restart, as it resets the state machine
         # but we thought that would be too confusing
         raise Error, "cannot restart a #{entity.class.one}" unless entity.restartable?
+
         session.post_raw("/#{entity.class.many}/#{entity.id}/restart")
         entity.reload
       end
 
       def cancel(entity)
         raise Error, "cannot cancel a #{entity.class.one}" unless entity.cancelable?
+
         session.post_raw("/#{entity.class.many}/#{entity.id}/cancel")
         entity.reload
       end
@@ -92,6 +97,22 @@ module Travis
         session.get_raw('/logout')
       end
 
+      def regenerate_token
+        session.headers['Travis-Api-Version'] = '3'
+        token = session.patch_raw('/access_token')
+        session.headers.delete('Travis-Api-Version')
+
+        token
+      end
+
+      def remove_token
+        session.headers['Travis-Api-Version'] = '3'
+        resp = session.delete_raw('/access_token')
+        session.headers.delete('Travis-Api-Version')
+
+        resp
+      end
+
       def listen(*entities, &block)
         listener = Listener.new(session)
         listener.subscribe(*entities, &block)