travis 1.11.0 → 1.12.0

data/lib/travis/client/artifact.rb

@@ -1,12 +1,13 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 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"
-      TEXT    = "#{CHUNKED}, text/plain"
+      CHUNKED = 'application/json; chunked=true; version=2, application/json; version=2'
+      TEXT    = "#{CHUNKED}, text/plain".freeze
 
       # @!parse attr_reader :job_id, :type, :body
       attributes :job_id, :type, :body
@@ -15,11 +16,12 @@ module Travis
       has :job
 
       def delete_body(reason = {})
-        reason = { :reason => reason } unless reason.is_a? Hash
+        reason = { reason: } unless reason.is_a? Hash
         session.patch_raw("jobs/#{job_id}/log", reason)
         reload
-      rescue Travis::Client::Error => error
-        raise unless error.message == '409'
+      rescue Travis::Client::Error => e
+        raise unless e.message == '409'
+
         self
       end
 
@@ -39,32 +41,34 @@ module Travis
         attributes['current_body'] ||= begin
           body = load_attribute('body')
           if body.to_s.empty?
-            log  = session.get_raw("jobs/#{job_id}/log", nil, "Accept" => TEXT)
-            body = String === log ? log : log['log']['body']
+            log  = session.get_raw("jobs/#{job_id}/log", nil, 'Accept' => TEXT)
+            body = log.is_a?(String) ? log : log['log']['body']
           end
           body
         end
       end
 
       def body(stream = block_given?)
-        return current_body unless block_given? or stream
-        return yield(current_body) unless stream and job.pending?
+        return current_body unless block_given? || stream
+        return yield(current_body) unless stream && 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.on 'job:finished' do |_event|
             listener.disconnect
           end
 
           listener.on_connect do
-            data = session.get_raw("/logs/#{id}", nil, "Accept" => CHUNKED)['log']
+            data = session.get_raw("/logs/#{id}", nil, 'Accept' => CHUNKED)['log']
             if data['parts']
               data['parts'].each { |p| yield p['content'] }
               number = data['parts'].last['number'] if data['parts'].any?

data/lib/travis/client/auto_login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'travis/tools/github'
 require 'yaml'
@@ -12,12 +14,13 @@ module Travis
         @session     = session.session
         config_path  = ENV.fetch('TRAVIS_CONFIG_PATH') { File.expand_path('.travis', Dir.home) }
         @config_file = options.fetch(:config_file) { File.expand_path('config.yml', config_path) }
-        @auto_token  = options.fetch(:auto_token) { true }
-        @raise       = options.fetch(:raise) { true }
+        @auto_token  = options.fetch(:auto_token, true)
+        @raise       = options.fetch(:raise, true)
       end
 
       def authenticate
-        return if session.access_token = cli_token
+        return if (session.access_token = cli_token)
+
         github.with_token { |t| session.github_auth(t) }
       end
 
@@ -25,7 +28,7 @@ module Travis
         @github         ||= Tools::Github.new(session.config['github']) do |g|
           g.explode       = true
           g.auto_token    = @auto_token
-          g.after_tokens  = proc { raise NoTokenError, "no suitable github token found" } if @raise
+          g.after_tokens  = proc { raise NoTokenError, 'no suitable github token found' } if @raise
         end
       end
 

data/lib/travis/client/broadcast.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis

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