travis 1.11.1 → 1.13.0

data/lib/travis/client/namespace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis
@@ -7,7 +9,8 @@ module Travis
         attr_accessor :namespace, :type
 
         def initialize(namespace, type)
-          @namespace, @type = namespace, type
+          @namespace = namespace
+          @type = type
         end
 
         def find_one(id = nil)
@@ -41,9 +44,9 @@ module Travis
 
         private
 
-          def session
-            namespace.session
-          end
+        def session
+          namespace.session
+        end
       end
 
       include Methods
@@ -66,20 +69,21 @@ module Travis
 
       private
 
-        def fix_names(klass)
-          constants.each do |name|
-            const = klass.const_get(name)
-            klass.const_set(name, const) if const == const_get(name)
-          end
+      def fix_names(klass)
+        constants.each do |name|
+          const = klass.const_get(name)
+          klass.const_set(name, const) if const == const_get(name)
         end
+      end
 
-        def delegate_session(klass)
-          return if klass == Object or klass == Kernel
-          klass.extend(Methods)
-          namespace = self
-          klass.define_singleton_method(:session)  { namespace.session }
-          klass.define_singleton_method(:session=) { |value| namespace.session = value }
-        end
+      def delegate_session(klass)
+        return if [Object, Kernel].include?(klass)
+
+        klass.extend(Methods)
+        namespace = self
+        klass.define_singleton_method(:session)  { namespace.session }
+        klass.define_singleton_method(:session=) { |value| namespace.session = value }
+      end
     end
   end
 end

data/lib/travis/client/not_loadable.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Travis
   module Client
     module NotLoadable
-      def missing?(attribute)
+      def missing?(_attribute)
         false
       end
 

data/lib/travis/client/repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'travis/tools/ssl_key'
 
@@ -14,7 +16,7 @@ module Travis
 
         def encrypt(value)
           encrypted = to_rsa.public_encrypt(value)
-          Base64.encode64(encrypted).gsub(/\s+/, "")
+          Base64.encode64(encrypted).gsub(/\s+/, '')
         end
 
         def to_rsa
@@ -34,7 +36,8 @@ module Travis
       preloadable
 
       # @!parse attr_reader :slug, :description
-      attributes :slug, :active, :private, :admin, :description, :last_build_id, :last_build_number, :last_build_state, :last_build_duration, :last_build_started_at, :last_build_finished_at, :github_language
+      attributes :slug, :active, :private, :admin, :description, :last_build_id, :last_build_number, :last_build_state,
+                 :last_build_duration, :last_build_started_at, :last_build_finished_at, :github_language
       inspect_info :slug
 
       time :last_build_finished_at, :last_build_started_at
@@ -51,14 +54,14 @@ module Travis
       end
 
       def public_key
-        attributes["public_key"] ||= begin
+        attributes['public_key'] ||= begin
           payload = session.get_raw("/repos/#{id}/key")
           Key.new(payload.fetch('key'), payload['fingerprint'])
         end
       end
 
       def name
-        slug[/[^\/]+$/]
+        slug[%r{[^/]+$}]
       end
 
       def public_key=(key)
@@ -75,6 +78,7 @@ module Travis
       # @!parse attr_reader :last_build
       def last_build
         return unless last_build_id
+
         attributes['last_build'] ||= begin
           last_build               = session.find_one(Build, last_build_id)
           last_build.number        = last_build_number
@@ -89,11 +93,12 @@ module Travis
 
       def builds(params = nil)
         return each_build unless params
-        session.find_many(Build, params.merge(:repository_id => id))
+
+        session.find_many(Build, params.merge(repository_id: id))
       end
 
       def build(number)
-        builds(:number => number.to_s).first
+        builds(number: number.to_s).first
       end
 
       def recent_builds
@@ -102,7 +107,8 @@ module Travis
 
       def last_on_branch(name = nil)
         return branch(name) if name
-        attributes['last_on_branch'] ||= session.get('branches', :repository_id => id)['branches']
+
+        attributes['last_on_branch'] ||= session.get('branches', repository_id: id)['branches']
       end
 
       def branches
@@ -112,19 +118,24 @@ module Travis
       def branch(name)
         attributes['branches']       ||= {}
         attributes['branches'][name] ||= begin
-          build = attributes['last_on_branch'].detect { |b| b.commit.branch == name.to_s } if attributes['last_on_branch']
+          if attributes['last_on_branch']
+            build = attributes['last_on_branch'].detect do |b|
+              b.commit.branch == name.to_s
+            end
+          end
           build || session.get("/repos/#{id}/branches/#{name}")['branch']
         end
       end
 
       def each_build(params = nil, &block)
         return enum_for(__method__, params) unless block_given?
+
         params ||= {}
         chunk = builds(params)
         until chunk.empty?
           chunk.each(&block)
           number = chunk.last.number
-          chunk  = number == '1' ? [] : builds(params.merge(:after_number => number))
+          chunk  = number == '1' ? [] : builds(params.merge(after_number: number))
         end
         self
       end
@@ -133,12 +144,12 @@ module Travis
         build_number = number.to_s[/^\d+/] or return nil
         build        = build(build_number) or return nil
         job          = build.jobs.detect { |j| j.number == number } if number != build_number
-        job        ||= build.jobs.first if build and build.jobs.size == 1
+        job        ||= build.jobs.first if build && (build.jobs.size == 1)
         job
       end
 
       def set_hook(flag)
-        result = session.put_raw('/hooks/', :hook => { :id => id, :active => flag })
+        result = session.put_raw('/hooks/', hook: { id:, active: flag })
         result['result']
       end
 
@@ -152,10 +163,10 @@ module Travis
 
       def pusher_channels
         attributes['pusher_channels'] ||= if session.private_channels?
-          ["user-#{session.user.id}", "repo-#{id}"]
-        else
-          ["common"]
-        end
+                                            ["user-#{session.user.id}", "repo-#{id}"]
+                                          else
+                                            ['common']
+                                          end
       end
 
       def member?
@@ -163,7 +174,7 @@ module Travis
       end
 
       def owner_name
-        slug[/^[^\/]+/]
+        slug[%r{^[^/]+}]
       end
 
       def owner
@@ -171,7 +182,7 @@ module Travis
       end
 
       def requests
-        attributes['requests'] ||= session.find_many(Request, :repository_id => id)
+        attributes['requests'] ||= session.find_many(Request, repository_id: id)
       end
 
       def settings
@@ -181,7 +192,7 @@ module Travis
           settings
         end
       rescue Travis::Client::NotFound
-        raise Travis::Client::Error, "not allowed to access settings"
+        raise Travis::Client::Error, 'not allowed to access settings'
       end
 
       def caches(params = {})
@@ -193,8 +204,9 @@ module Travis
       end
 
       def active?
-        # TODO remove once active is properly synced and exposed by api
+        # TODO: remove once active is properly synced and exposed by api
         return active unless active.nil?
+
         last_build_id?
       end
 
@@ -216,9 +228,9 @@ module Travis
 
       private
 
-        def state
-          last_build_state
-        end
+      def state
+        last_build_state
+      end
     end
   end
 end

data/lib/travis/client/request.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 require 'travis/client/weak_entity'
 
 module Travis
   module Client
     class Request < WeakEntity
       # @!parse attr_reader :commit_id, :repository_id, :created_at, :owner_id, :owner_type, :event_type, :base_commit, :head_commit, :result, :message, :pull_request, :pull_request_number, :pull_request_title, :branch, :tag
-      attributes :commit_id, :repository_id, :created_at, :owner_id, :owner_type, :event_type, :base_commit, :head_commit, :result, :message, :pull_request, :pull_request_number, :pull_request_title, :branch, :tag
+      attributes :commit_id, :repository_id, :created_at, :owner_id, :owner_type, :event_type, :base_commit,
+                 :head_commit, :result, :message, :pull_request, :pull_request_number, :pull_request_title, :branch, :tag
       time :created_at
 
       # @!parse attr_reader :repository
@@ -29,7 +32,7 @@ module Travis
         [
           repository && repository.slug,
           event_type, branch || pull_request_number, result
-        ].compact.join(" ")
+        ].compact.join(' ')
       end
     end
   end

data/lib/travis/client/restartable.rb

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

data/lib/travis/client/session.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'travis/version'
 
 require 'faraday'
-require 'faraday_middleware'
 require 'travis/tools/system'
 require 'travis/tools/assets'
+require 'faraday/rack'
 
 begin
-  require 'typhoeus/adapters/faraday' unless Travis::Tools::System.windows?
+  require 'faraday/typhoeus' unless Travis::Tools::System.windows?
 rescue LoadError
 end
 
@@ -16,14 +18,14 @@ require 'json'
 module Travis
   module Client
     class Session
-      PRIMITIVE   = [nil, false, true]
-      SSL_OPTIONS = { :ca_file => Tools::Assets['cacert.pem'] }
+      PRIMITIVE   = [nil, false, true].freeze
+      SSL_OPTIONS = { ca_file: Tools::Assets['cacert.pem'] }
 
       include Methods
       attr_reader :connection, :headers, :access_token, :instruments, :faraday_adapter, :agent_info, :ssl
       attr_accessor :debug_http
 
-      def initialize(options = Travis::Client::ORG_URI)
+      def initialize(options = Travis::Client::COM_URI)
         @headers         = {}
         @cache           = {}
         @instruments     = []
@@ -32,10 +34,11 @@ module Travis
         @faraday_adapter = defined?(Typhoeus) ? :typhoeus : :net_http
         @ssl             = SSL_OPTIONS
 
-        options = { :uri => options } unless options.respond_to? :each_pair
+        options = { uri: options } unless options.respond_to? :each_pair
         options.each_pair { |key, value| public_send("#{key}=", value) }
 
-        raise ArgumentError, "neither :uri nor :connection specified" unless connection
+        raise ArgumentError, 'neither :uri nor :connection specified' unless connection
+
         headers['Accept'] = 'application/vnd.travis-ci.2+json'
         set_user_agent
         check_ssl
@@ -57,7 +60,7 @@ module Travis
 
       def uri=(uri)
         clear_cache!
-        self.connection = Faraday.new(:url => uri, :ssl => ssl) do |faraday|
+        self.connection = Faraday.new(url: uri, ssl:) do |faraday|
           faraday.request :url_encoded
           faraday.request :retry
           faraday.response :logger if debug_http
@@ -93,21 +96,27 @@ module Travis
       end
 
       def find_one(entity, id = nil)
-        raise Travis::Client::Error, "cannot fetch #{entity}" unless entity.respond_to?(:many) and entity.many
+        raise Travis::Client::Error, "cannot fetch #{entity}" unless entity.respond_to?(:many) && entity.many
         return create_entity(entity, entity.id_field => id) if entity.id? id
+
         cached(entity, :by, id) { fetch_one(entity, id) }
       end
 
       def find_many(entity, args = {})
-        raise Travis::Client::Error, "cannot fetch #{entity}" unless entity.respond_to?(:many) and entity.many
+        raise Travis::Client::Error, "cannot fetch #{entity}" unless entity.respond_to?(:many) && entity.many
+
         cached(entity, :many, args) { fetch_many(entity, args) }
       end
 
       def find_one_or_many(entity, args = nil)
-        raise Travis::Client::Error, "cannot fetch #{entity}" unless entity.respond_to?(:many) and entity.many
+        raise Travis::Client::Error, "cannot fetch #{entity}" unless entity.respond_to?(:many) && entity.many
+
         cached(entity, :one_or_many, args) do
-          path       = "/#{entity.many}"
-          path, args = "#{path}/#{args}", {} unless args.is_a? Hash
+          path = "/#{entity.many}"
+          unless args.is_a? Hash
+            path = "#{path}/#{args}"
+            args = {}
+          end
           result     = get(path, args)
           one        = result[entity.one]
 
@@ -157,8 +166,9 @@ module Travis
       def preload(list)
         list.group_by(&:class).each do |type, instances|
           next unless type.preloadable?
+
           ids = instances.map { |e| e.id unless e.complete? }.compact
-          find_many(type, :ids => ids) if ids.any?
+          find_many(type, ids:) if ids.any?
         end
         list
       end
@@ -204,32 +214,40 @@ module Travis
       end
 
       def raw(verb, url, *args)
-        url     = url.sub(/^\//, '')
+        url     = url.sub(%r{^/}, '')
         result  = instrumented(verb.to_s.upcase, url, *args) do
-          if url !~ /^https?:/ or url.start_with? api_endpoint
+          if url !~ (/^https?:/) || url.start_with?(api_endpoint)
             connection.public_send(verb, url, *args)
           else
-            Faraday.public_send(verb, url, *args) { |r| r.headers.delete("Authorization") }
+            Faraday.public_send(verb, url, *args) { |r| r.headers.delete('Authorization') }
           end
         end
 
         case result.status
         when 0             then raise Travis::Client::SSLError, 'SSL error: could not verify peer'
-        when 200..299      then JSON.parse(result.body) rescue result.body
+        when 200..299      then begin
+          JSON.parse(result.body)
+        rescue StandardError
+          result.body
+        end
         when 301, 303      then raw(:get, result.headers['Location'])
         when 302, 307, 308 then raw(verb, result.headers['Location'])
-        when 401           then raise Travis::Client::NotLoggedIn,      'not logged in'
-        when 403           then
-          body = JSON.parse(result.body) rescue {}
-          if body["error_type"] == "migrated_repository"
-            raise Travis::Client::RepositoryMigrated, body["error_message"]
-          else
-            raise Travis::Client::NotLoggedIn,      'invalid access token'
+        when 401           then raise Travis::Client::NotLoggedIn, 'not logged in'
+        when 403
+          body = begin
+            JSON.parse(result.body)
+          rescue StandardError
+            {}
           end
+          raise Travis::Client::RepositoryMigrated, body['error_message'] if body['error_type'] == 'migrated_repository'
+
+          raise Travis::Client::NotLoggedIn, 'invalid access token'
+
         when 404           then raise Travis::Client::NotFound,         result.body
         when 422           then raise Travis::Client::ValidationFailed, result.body
-        when 400..499      then raise Travis::Client::Error,            "%s: %p" % [result.status, result.body]
-        when 500..599      then raise Travis::Client::Error,            "server error (%s: %p)" % [result.status, result.body]
+        when 400..499      then raise Travis::Client::Error,            format('%s: %p', result.status, result.body)
+        when 500..599      then raise Travis::Client::Error,
+                                      format('server error (%s: %p)', result.status, result.body)
         else raise Travis::Client::Error, "unhandled status code #{result.status}"
         end
       end
@@ -264,83 +282,95 @@ module Travis
 
       private
 
-        def set_user_agent
-          adapter = Array === faraday_adapter ? faraday_adapter.first : faraday_adapter
-          adapter = adapter.to_s.capitalize.gsub(/_http_(.)/) { "::HTTP::#{$1.upcase}" }.gsub(/_http/, '::HTTP')
-          headers['User-Agent'] = "Travis/#{Travis::VERSION} (#{Travis::Tools::System.description(agent_info)}) Faraday/#{Faraday::VERSION} #{adapter}/#{adapter_version(adapter)}"
-        end
+      def set_user_agent
+        adapter = faraday_adapter.is_a?(Array) ? faraday_adapter.first : faraday_adapter
+        adapter = adapter.to_s.capitalize.gsub(/_http_(.)/) do
+          "::HTTP::#{::Regexp.last_match(1).upcase}"
+        end.gsub(/_http/, '::HTTP')
+        headers['User-Agent'] =
+          "Travis/#{Travis::VERSION} (#{Travis::Tools::System.description(agent_info)}) Faraday/#{Faraday::VERSION} #{adapter}/#{adapter_version(adapter)}"
+      end
 
-        def adapter_version(adapter)
-          version = Object.const_get(adapter).const_get("VERSION")
-          [*version].join('.')
-        rescue Exception
-          "unknown"
-        end
+      def adapter_version(adapter)
+        version = Object.const_get(adapter).const_get('VERSION')
+        [*version].join('.')
+      rescue Exception
+        'unknown'
+      end
 
-        def instrumented(name, *args)
-          name   = [name, *args.map(&:inspect)].join(" ") if args.any?
-          result = nil
-          chain  = instruments + [proc { |n,l| result = yield }]
-          lift   = proc { chain.shift.call(name, lift) }
-          lift.call
-          result
-        end
+      def instrumented(name, *args)
+        name   = [name, *args.map(&:inspect)].join(' ') if args.any?
+        result = nil
+        chain  = instruments + [proc { |_n, _l| result = yield }]
+        lift   = proc { chain.shift.call(name, lift) }
+        lift.call
+        result
+      end
 
-        def create_entity(type, data)
-          return data if primitive?(data)
-          data   = { type.id_field => data } if type.id? data
-          id     = type.cast_id(data.fetch(type.id_field)) unless type.weak?
-          entity = id ? cached(type, :id, id) { type.new(self, id) } : type.new(self, nil)
-          entity.update_attributes(data)
-          entity
-        end
+      def create_entity(type, data)
+        return data if primitive?(data)
 
-        def primitive?(data)
-          PRIMITIVE.include? data
-        end
+        data   = { type.id_field => data } if type.id? data
+        id     = type.cast_id(data.fetch(type.id_field)) unless type.weak?
+        entity = id ? cached(type, :id, id) { type.new(self, id) } : type.new(self, nil)
+        entity.update_attributes(data)
+        entity
+      end
 
-        def error_message(e)
-          message = e.response[:body].to_str rescue e.message
-          JSON.parse(message).fetch('error').fetch('message') rescue message
-        end
+      def primitive?(data)
+        PRIMITIVE.include? data
+      end
 
-        def reset_entities
-          subcaches do |subcache|
-            subcache[:id].each_value { |e| e.attributes.clear } if subcache.include? :id
-          end
+      def error_message(e)
+        message = begin
+          e.response[:body].to_str
+        rescue StandardError
+          e.message
         end
-
-        def clear_find_cache
-          subcaches do |subcache|
-            subcache.delete_if { |k, v| k != :id }
-          end
+        begin
+          JSON.parse(message).fetch('error').fetch('message')
+        rescue StandardError
+          message
         end
+      end
 
-        def subcaches
-          @cache.each_value do |subcache|
-            yield subcache if subcache.is_a? Hash
-          end
+      def reset_entities
+        subcaches do |subcache|
+          subcache[:id].each_value { |e| e.attributes.clear } if subcache.include? :id
         end
+      end
 
-        def fetch_one(entity, id = nil)
-          get("/#{entity.base_path}/#{id}")[entity.one]
+      def clear_find_cache
+        subcaches do |subcache|
+          subcache.delete_if { |k, _v| k != :id }
         end
+      end
 
-        def fetch_many(entity, params = {})
-          get("/#{entity.base_path}/", params)[entity.many]
+      def subcaches
+        @cache.each_value do |subcache|
+          yield subcache if subcache.is_a? Hash
         end
+      end
 
-        def cached(*keys)
-          last  = keys.pop
-          cache = keys.inject(@cache) { |store, key| store[key] ||= {} }
-          cache[last] ||= yield
-        end
+      def fetch_one(entity, id = nil)
+        get("/#{entity.base_path}/#{id}")[entity.one]
+      end
 
-        def check_ssl
-          raw(:head, '/') if ssl == SSL_OPTIONS
-        rescue Exception => error
-          self.ssl = {} if error.class == Travis::Client::SSLError
-        end
+      def fetch_many(entity, params = {})
+        get("/#{entity.base_path}/", params)[entity.many]
+      end
+
+      def cached(*keys)
+        last  = keys.pop
+        cache = keys.inject(@cache) { |store, key| store[key] ||= {} }
+        cache[last] ||= yield
+      end
+
+      def check_ssl
+        raw(:head, '/') if ssl == SSL_OPTIONS
+      rescue Exception => e
+        self.ssl = {} if e.instance_of?(Travis::Client::SSLError)
+      end
     end
   end
 end

data/lib/travis/client/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client/weak_entity'
 require 'json'
 
@@ -5,14 +7,17 @@ module Travis
   module Client
     class Settings < WeakEntity
       attr_accessor :repository
+
       # @!parse attr_reader :builds_only_with_travis_yml, :build_pushes, :build_pull_requests, :maximum_number_of_builds, :auto_cancel_pushes, :auto_cancel_pull_requests
-      attributes :builds_only_with_travis_yml, :build_pushes, :build_pull_requests, :maximum_number_of_builds, :auto_cancel_pushes, :auto_cancel_pull_requests
+      attributes :builds_only_with_travis_yml, :build_pushes, :build_pull_requests, :maximum_number_of_builds,
+                 :auto_cancel_pushes, :auto_cancel_pull_requests
       one :settings
       many :settings
 
       def save
-        raise "repository unknown" unless repository
-        result = session.patch("/repos/#{repository.id}/settings", JSON.dump("settings" => attributes))
+        raise 'repository unknown' unless repository
+
+        result = session.patch("/repos/#{repository.id}/settings", JSON.dump('settings' => attributes))
         attributes.replace(result['settings'].attributes)
         self
       end

data/lib/travis/client/singleton_setting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Travis

data/lib/travis/client/ssh_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Travis