travis 1.11.0 → 1.12.0

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

data/lib/travis/client/states.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis
   module Client
     module States
-      STATES  = %w[created queued received started passed failed errored canceled ready]
+      STATES = %w[created queued received started passed failed errored canceled ready].freeze
 
       def ready?
         state == 'ready'
@@ -11,7 +13,7 @@ module Travis
 
       def pending?
         check_state
-        %w[created started queued received ].include? state
+        %w[created started queued received].include? state
       end
 
       def started?
@@ -30,7 +32,7 @@ module Travis
       end
 
       def finished?
-        not pending?
+        !pending?
       end
 
       def passed?
@@ -90,9 +92,9 @@ module Travis
 
       private
 
-        def check_state
-          raise Error, "unknown state %p for %p" % [state, self] unless STATES.include? state
-        end
+      def check_state
+        raise Error, format('unknown state %p for %p', state, self) unless STATES.include? state
+      end
     end
   end
 end

data/lib/travis/client/user.rb

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

data/lib/travis/client/weak_entity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis
@@ -10,7 +12,7 @@ module Travis
       end
 
       def self.id_field
-        raise "weak entities do not have id fields"
+        raise 'weak entities do not have id fields'
       end
 
       def self.id?(object)
@@ -19,8 +21,9 @@ module Travis
 
       def self.cast_id(object)
         return object if id? object
-        raise "weak entities do not have id fields"
+
+        raise 'weak entities do not have id fields'
       end
     end
   end
-end
+end

data/lib/travis/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client/error'
 require 'travis/client/states'
 require 'travis/client/restartable'
@@ -26,11 +28,12 @@ require 'travis/client/lint_result'
 
 module Travis
   module Client
+
     ORG_URI = 'https://api.travis-ci.org/'
     COM_URI = 'https://api.travis-ci.com/'
 
     def self.new(options = {})
-      options[:uri] ||= ORG_URI if options.is_a? Hash and not options['uri']
+      options[:uri] ||= COM_URI if options.is_a?(Hash) && !(options['uri'])
       Session.new(options)
     end
   end

data/lib/travis/pro/auto_login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/pro'
 require 'travis/client/auto_login'
 Travis::Client::AutoLogin.new(Travis::Pro).authenticate

data/lib/travis/pro.rb

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

data/lib/travis/tools/assets.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 require 'pathname'
 module Travis
   module Tools
     module Assets
-      BASE = File.expand_path('../../../../assets', __FILE__)
-      extend self
+      BASE = File.expand_path('../../../assets', __dir__)
+
+      module_function
 
       def asset_path(file)
         Pathname.glob(File.expand_path(file, BASE)).tap do |x|
-          raise Travis::Client::AssetNotFound.new(file) if x.empty?
+          raise Travis::Client::AssetNotFound, file if x.empty?
         end.first.to_s
       end
 

data/lib/travis/tools/completion.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/tools/assets'
 require 'travis/cli'
 require 'fileutils'
@@ -8,7 +10,8 @@ module Travis
     module Completion
       RCS = ['.zshrc', '.bashrc'].map { |f| File.expand_path(f, ENV['HOME']) }
       include FileUtils
-      extend self
+
+      module_function
 
       def config_path
         ENV.fetch('TRAVIS_CONFIG_PATH') { File.expand_path('.travis', ENV['HOME']) }
@@ -20,12 +23,13 @@ module Travis
 
       def install_completion
         update_completion
-        source = "source " << cmp_file
+        source = 'source ' << cmp_file
 
         RCS.each do |file|
-          next unless File.exist? file and File.writable? file
+          next unless File.exist?(file) && File.writable?(file)
           next if File.read(file).include? source
-          File.open(file, "a") { |f| f.puts("", "# added by travis gem", "[ ! -s #{cmp_file} ] || #{source}") }
+
+          File.open(file, 'a') { |f| f.puts('', '# added by travis gem', "[ ! -s #{cmp_file} ] || #{source}") }
         end
       end
 
@@ -35,9 +39,9 @@ module Travis
       end
 
       def completion_installed?
-        source = "source " << config_path
+        source = 'source ' << config_path
         RCS.each do |file|
-          next unless File.exist? file and File.writable? file
+          next unless File.exist?(file) && File.writable?(file)
           return false unless File.read(file).include? source
         end
         true

data/lib/travis/tools/formatter.rb

@@ -1,30 +1,35 @@
+# frozen_string_literal: true
+
 require 'time'
 
 module Travis
   module Tools
     class Formatter
       DAY         = 24 * 60 * 60
-      TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
-      CONFIG_KEYS = ['rvm', 'gemfile', 'env', 'jdk', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala', 'compiler', 'os']
+      TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+      CONFIG_KEYS = %w[rvm gemfile env jdk otp_release php node_js perl python scala
+                       compiler os].freeze
 
       def duration(seconds, suffix = nil)
-        return "none" if seconds.nil?
+        return 'none' if seconds.nil?
+
         seconds          = (Time.now - seconds).to_i if seconds.is_a? Time
         output           = []
         minutes, seconds = seconds.divmod(60)
         hours, minutes   = minutes.divmod(60)
-        output << "#{hours  } hrs" if hours > 0
-        output << "#{minutes} min" if minutes > 0
-        output << "#{seconds} sec" if seconds > 0 or output.empty?
+        output << "#{hours} hrs" if hours.positive?
+        output << "#{minutes} min" if minutes.positive?
+        output << "#{seconds} sec" if seconds.positive? || output.empty?
         output << suffix           if suffix
-        output.join(" ")
+        output.join(' ')
       end
 
-      def file_size(input, human = true)
+      def file_size(input, human: true)
         return "#{input} B" unless human
-        format = "B"
+
+        format = 'B'
         iec    = %w[KiB MiB GiB TiB PiB EiB ZiB YiB]
-        while human and input > 512 and iec.any?
+        while human && (input > 512) && iec.any?
           input /= 1024.0
           format = iec.shift
         end
@@ -33,8 +38,9 @@ module Travis
       end
 
       def time(time)
-        return "not yet" if time.nil? # or time > Time.now
-        #return duration(time, "ago") if Time.now - time < DAY
+        return 'not yet' if time.nil? # or time > Time.now
+
+        # return duration(time, "ago") if Time.now - time < DAY
         time.localtime.strftime(TIME_FORMAT)
       end
 
@@ -43,8 +49,8 @@ module Travis
         config.each_pair do |key, value|
           output << "#{key}: #{value}" if CONFIG_KEYS.include? key
         end
-        output.join(", ")
+        output.join(', ')
       end
     end
   end
-end
+end