travis 1.11.1 → 1.13.0

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

data/lib/travis/tools/github.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'travis/tools/system'
 require 'yaml'
 require 'json'
@@ -11,21 +14,21 @@ module Travis
       GITHUB_HOST = 'github.com'
 
       attr_accessor :api_url, :scopes, :github_token, :drop_token, :callback, :explode, :after_tokens,
-        :login_header, :auto_token, :note,
-        :hub_path, :oauth_paths, :composer_path, :git_config_keys, :debug, :no_token, :check_token
+                    :login_header, :auto_token, :note,
+                    :hub_path, :oauth_paths, :composer_path, :git_config_keys, :debug, :no_token, :check_token
 
       def initialize(options = nil)
         @check_token     = true
-        @ask_login       = proc { raise "ask_login callback not set" }
-        @after_tokens    = proc { }
+        @ask_login       = proc { raise 'ask_login callback not set' }
+        @after_tokens    = proc {}
         @debug           = proc { |_| }
         @hub_path        = ENV['HUB_CONFIG'] || '~/.config/hub'
         @oauth_paths     = ['~/.github-oauth-token']
-        @composer_path   = "~/.composer/config.json"
+        @composer_path   = '~/.composer/config.json'
         @note            = 'temporary token'
         @git_config_keys = %w[github.token github.oauth-token]
         @scopes          = ['user', 'user:email', 'repo'] # overridden by value from /config
-        options.each_pair { |k,v| send("#{k}=", v) if respond_to? "#{k}=" } if options
+        options&.each_pair { |k, v| send("#{k}=", v) if respond_to? "#{k}=" }
         yield self if block_given?
       end
 
@@ -37,12 +40,13 @@ module Travis
         require 'gh' unless defined? GH
         possible_tokens { |t| yield(t) if acceptable?(t) }
       ensure
-        callback, self.callback = self.callback, nil
-        callback.call if callback
+        callback = self.callback
+        self.callback = nil
+        callback&.call
       end
 
-      def with_session(&block)
-        with_token { |t| GH.with(:token => t) { yield(t) } }
+      def with_session
+        with_token { |t| GH.with(token: t) { yield(t) } }
       end
 
       def possible_tokens(&block)
@@ -66,6 +70,7 @@ module Travis
 
       def git_tokens
         return unless System.has? 'git'
+
         git_config_keys.each do |key|
           `git config --get-all #{key}`.each_line do |line|
             token = line.strip
@@ -83,11 +88,11 @@ module Travis
 
       def hub_tokens
         hub.fetch(host, []).each do |entry|
-          yield entry["oauth_token"] if entry["oauth_token"]
+          yield entry['oauth_token'] if entry['oauth_token']
         end
       end
 
-      def oauth_file_tokens(&block)
+      def oauth_file_tokens
         oauth_paths.each do |path|
           file(path) do |content|
             token = content.strip
@@ -103,12 +108,12 @@ module Travis
       end
 
       def issuepost_token(&block)
-        security(:generic, :w, "-l issuepost.github.access_token",  "issuepost token", &block) if host == 'github.com'
+        security(:generic, :w, '-l issuepost.github.access_token', 'issuepost token', &block) if host == 'github.com'
       end
 
       def github_for_mac_token(&block)
         command = '-s "github.com/mac"'
-        security(:internet, :w, command, "GitHub for Mac token", &block) if host == 'github.com'
+        security(:internet, :w, command, 'GitHub for Mac token', &block) if host == 'github.com'
       end
 
       def host
@@ -117,57 +122,62 @@ module Travis
 
       def api_host
         return GITHUB_API unless api_url
+
         api_url[%r{^(?:https?://)?([^/]+)}, 1]
       end
 
       def acceptable?(token)
         return true unless check_token
-        gh   = GH.with(:token => token)
-        user = gh['user']
+
+        gh = GH.with(token:)
+        gh['user']
 
         true
-      rescue GH::Error => error
-        debug "token is not acceptable: #{gh_error(error)}"
+      rescue GH::Error => e
+        debug "token is not acceptable: #{gh_error(e)}"
         false
       end
 
       private
 
-        def gh_error(error)
-          raise error if explode
-          if error.info.key? :response_body
-            JSON.parse(error.info[:response_body])["message"].to_s
-          else
-            "Unknown error"
-          end
-        end
+      def gh_error(error)
+        raise error if explode
 
-        def debug(line)
-          return unless @debug
-          @debug.call "Tools::Github: #{line}"
+        if error.info.key? :response_body
+          JSON.parse(error.info[:response_body])['message'].to_s
+        else
+          'Unknown error'
         end
+      end
 
-        def security(type, key, arg, name)
-          return false unless System.has? 'security'
-          return false unless system "security find-#{type}-password #{arg} 2>/dev/null >/dev/null"
-          debug "requesting to load #{name} from keychain"
-          result = %x[security find-#{type}-password #{arg} -#{key} 2>&1].chomp
-          $?.success? ? yield(result) : debug("request denied")
-        rescue => e
-          raise e if explode
-        end
+      def debug(line)
+        return unless @debug
 
-        def file(path, default = nil)
-          path        &&= File.expand_path(path)
-          @file       ||= {}
-          @file[path] ||= if path and File.readable?(path)
-            debug "reading #{path}"
-            yield File.read(path)
-          end
-          @file[path] || default
-        rescue => e
-          raise e if explode
-        end
+        @debug.call "Tools::Github: #{line}"
+      end
+
+      def security(type, key, arg, name)
+        return false unless System.has? 'security'
+        return false unless system "security find-#{type}-password #{arg} 2>/dev/null >/dev/null"
+
+        debug "requesting to load #{name} from keychain"
+        result = `security find-#{type}-password #{arg} -#{key} 2>&1`.chomp
+        $CHILD_STATUS.success? ? yield(result) : debug('request denied')
+      rescue StandardError => e
+        raise e if explode
+      end
+
+      def file(path, default = nil)
+        path        &&= File.expand_path(path)
+        @file       ||= {}
+        @file[path] ||= if path && File.readable?(path)
+                          debug "reading #{path}"
+                          yield File.read(path)
+                        end
+        @file[path] || default
+      rescue StandardError => e
+        raise e if explode
+      end
     end
   end
 end

data/lib/travis/tools/notification.rb

@@ -1,31 +1,35 @@
-require "travis"
-require "travis/tools/system"
-require "travis/tools/assets"
-require "cgi"
+# frozen_string_literal: true
+
+require 'travis'
+require 'travis/tools/system'
+require 'travis/tools/assets'
+require 'cgi'
 
 module Travis
   module Tools
     module Notification
-      extend self
-      DEFAULT = [:osx, :growl, :libnotify]
+      module_function
+
+      DEFAULT = %i[osx growl libnotify].freeze
       ICON    = Assets['notifications/icon.png']
 
       def new(*list)
         list.concat(DEFAULT) if list.empty?
         notification = list.map { |n| get(n) }.detect { |n| n.available? }
-        raise ArgumentError, "no notification system found (looked for #{list.join(", ")})" unless notification
+        raise ArgumentError, "no notification system found (looked for #{list.join(', ')})" unless notification
+
         notification
       end
 
       def get(name)
         const = constants.detect { |c| c.to_s[/[^:]+$/].downcase == name.to_s }
-        raise ArgumentError, "unknown notifications type %p" % name unless const
+        raise ArgumentError, 'unknown notifications type %p' % name unless const
+
         const_get(const).new
       end
 
       class Dummy
-        def notify(title, body)
-        end
+        def notify(title, body); end
 
         def available?
           true
@@ -33,14 +37,15 @@ module Travis
       end
 
       class OSX
-        BIN_PATH = Assets["notifications/Travis CI.app/Contents/MacOS/Travis CI"]
+        BIN_PATH = Assets['notifications/Travis CI.app/Contents/MacOS/Travis CI']
 
         def notify(title, body)
           system BIN_PATH, '-message', body.to_s, '-title', title.to_s, '-sender', 'org.travis-ci.Travis-CI'
         end
 
         def available?
-          System.mac? and System.recent_version?(System.os_version.to_s, '10.8') and System.running? "NotificationCenter"
+          System.mac? and System.recent_version?(System.os_version.to_s,
+                                                 '10.8') and System.running? 'NotificationCenter'
         end
       end
 
@@ -50,7 +55,7 @@ module Travis
         end
 
         def available?
-          System.has? 'growlnotify' and System.running? "Growl"
+          System.has? 'growlnotify' and System.running? 'Growl'
         end
       end
 

data/lib/travis/tools/safe_string.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 module Travis
   module Tools
     module SafeString
-      extend self
+      module_function
 
       def encoded(string)
         return string unless string.respond_to? :encode
+
         string.encode 'utf-8'
       rescue Encoding::UndefinedConversionError
         string.force_encoding 'utf-8'

data/lib/travis/tools/ssl_key.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'base64'
 
 module Travis
   module Tools
     module SSLKey
-      extend self
+      module_function
 
       def generate_rsa(size = 2048)
         OpenSSL::PKey::RSA.generate(size)
@@ -40,7 +42,8 @@ module Travis
       end
 
       def to_byte_array(num, *significant)
-        return significant if num.between?(-1, 0) and significant[0][7] == num[7]
+        return significant if num.between?(-1, 0) && (significant[0][7] == num[7])
+
         to_byte_array(*num.divmod(256)) + significant
       end
     end

data/lib/travis/tools/system.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Travis
   module Tools
     module System
-      extend self
+      module_function
 
       def recent_version?(version, minimum)
         version = version.split('.').map { |s| s.to_i }
@@ -10,7 +12,7 @@ module Travis
       end
 
       def windows?
-        File::ALT_SEPARATOR == "\\"
+        File::ALT_SEPARATOR == '\\'
       end
 
       def mac?
@@ -22,7 +24,7 @@ module Travis
       end
 
       def unix?
-        not windows?
+        !windows?
       end
 
       def os
@@ -52,7 +54,7 @@ module Travis
       end
 
       def ruby_version
-        "%s-p%s" % [RUBY_VERSION, RUBY_PATCHLEVEL]
+        format('%s-p%s', RUBY_VERSION, RUBY_PATCHLEVEL)
       end
 
       def ruby
@@ -65,22 +67,25 @@ module Travis
       end
 
       def rubygems
-        return "no RubyGems" unless defined? Gem
+        return 'no RubyGems' unless defined? Gem
+
         "RubyGems #{Gem::VERSION}"
       end
 
       def description(*args)
-        [ full_os, ruby, rubygems, *args.flatten].compact.uniq.join("; ")
+        [full_os, ruby, rubygems, *args.flatten].compact.uniq.join('; ')
       end
 
       def has?(command)
         return false unless unix?
+
         @has ||= {}
         @has.fetch(command) { @has[command] = system "command -v #{command} 2>/dev/null >/dev/null" }
       end
 
       def running?(app)
         return false unless unix?
+
         system "/usr/bin/pgrep -u $(whoami) #{app} >/dev/null"
       end
     end

data/lib/travis/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Travis
-  VERSION = '1.11.1'
+  VERSION = '1.13.0'
 end

data/lib/travis.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Travis
   autoload :Client,   'travis/client'
   autoload :CLI,      'travis/cli'
   autoload :Pro,      'travis/pro'
   autoload :Version,  'travis/version'
 
-  include Client::Namespace.new(Client::ORG_URI)
+  include Client::Namespace.new(Client::COM_URI)
 end