travis 1.11.1 → 1.12.0

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

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