travis 1.11.1 → 1.13.0

data/lib/travis/cli/setup/heroku.rb

@@ -1,20 +1,26 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Heroku < Service
-        description "automatic deployment to Heroku"
+        description 'automatic deployment to Heroku'
 
         def run
           deploy 'heroku' do |config|
             config['api_key'] = `heroku auth:token 2>/dev/null`.strip
-            config['api_key'] = ask("Heroku API token: ") { |q| q.echo = "*" }.to_s if config['api_key'].empty?
+            config['api_key'] = ask('Heroku API token: ') { |q| q.echo = '*' }.to_s if config['api_key'].empty?
             config['app']     = `heroku apps:info 2>/dev/null`.scan(/^=== (.+)$/).flatten.first
-            config['app']     = ask("Heroku application name: ") { |q| q.default = repository.name }.to_s if config['app'].nil?
+            if config['app'].nil?
+              config['app'] = ask('Heroku application name: ') do |q|
+                q.default = repository.name
+              end.to_s
+            end
           end
         end
       end
     end
   end
-end
+end

data/lib/travis/cli/setup/modulus.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Modulus < Service
-        description "deployment to Modulus"
+        description 'deployment to Modulus'
 
         def run
           deploy 'modulus' do |config|
-            config['api_key'] = ask("Modulus Api Key: ") { |q| q.echo = "*" }.to_s
-            config['project_name'] = ask("Modulus Project Name: ").to_s
+            config['api_key'] = ask('Modulus Api Key: ') { |q| q.echo = '*' }.to_s
+            config['project_name'] = ask('Modulus Project Name: ').to_s
           end
         end
       end

data/lib/travis/cli/setup/ninefold.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Ninefold < Service
-        description "Automatic deployment to Ninefold"
+        description 'Automatic deployment to Ninefold'
 
         def run
           deploy 'ninefold', 'release' do |config|
-            config['app_id']     ||= ask("Ninefold App ID: ").to_s
-            config['auth_token'] ||= ask("Ninefold Auth Token: ") { |q| q.echo = "*" }.to_s
+            config['app_id']     ||= ask('Ninefold App ID: ').to_s
+            config['auth_token'] ||= ask('Ninefold Auth Token: ') { |q| q.echo = '*' }.to_s
 
-            encrypt(config, 'auth_token') if agree("Encrypt Auth Token? ") { |q| q.default = 'yes' }
+            encrypt(config, 'auth_token') if agree('Encrypt Auth Token? ') { |q| q.default = 'yes' }
           end
         end
       end
     end
   end
-end
+end

data/lib/travis/cli/setup/nodejitsu.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 require 'json'
 
@@ -5,7 +7,7 @@ module Travis
   module CLI
     class Setup
       class Nodejitsu < Service
-        description "automatic deployment to Nodejitsu"
+        description 'automatic deployment to Nodejitsu'
 
         def run
           deploy 'nodejitsu' do |config|
@@ -17,11 +19,11 @@ module Travis
               config['api_key'] = jitsu_conf['apiToken']
             end
 
-            config['user']    ||= ask("Nodejitsu user: ").to_s
-            config['api_key'] ||= ask("Nodejitsu API token: ") { |q| q.echo = "*" }.to_s
+            config['user']    ||= ask('Nodejitsu user: ').to_s
+            config['api_key'] ||= ask('Nodejitsu API token: ') { |q| q.echo = '*' }.to_s
           end
         end
       end
     end
   end
-end
+end

data/lib/travis/cli/setup/npm.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class NPM < Service
-        description "automatic release to npm"
+        description 'automatic release to npm'
 
         def run
           deploy 'npm', 'release' do |config|
-            config['email'] ||= ask("npm email address: ") { |q| q }.to_s
-            config['api_key'] ||= ask("npm api key: ") { |q| q.echo = "*" }.to_s
+            config['email'] ||= ask('npm email address: ') { |q| q }.to_s
+            config['api_key'] ||= ask('npm api key: ') { |q| q.echo = '*' }.to_s
 
-            on("release only tagged commits? ", config, 'tags' => true)
+            on('release only tagged commits? ', config, 'tags' => true)
           end
         end
       end

data/lib/travis/cli/setup/open_shift.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class OpenShift < Service
-        description "automatic deployment to OpenShfit"
+        description 'automatic deployment to OpenShfit'
 
         def run
           deploy 'openshift' do |config|
-            config['user']     = ask("OpenShift user: ").to_s
-            config['password'] = ask("OpenShift password: ") { |q| q.echo = "*" }.to_s
-            config['app']      = ask("OpenShift application name: ") { |q| q.default = repository.name }.to_s
-            config['domain']   = ask("OpenShift domain: ").to_s
+            config['user']     = ask('OpenShift user: ').to_s
+            config['password'] = ask('OpenShift password: ') { |q| q.echo = '*' }.to_s
+            config['app']      = ask('OpenShift application name: ') { |q| q.default = repository.name }.to_s
+            config['domain']   = ask('OpenShift domain: ').to_s
           end
         end
       end
     end
   end
-end
+end

data/lib/travis/cli/setup/opsworks.rb

@@ -1,22 +1,24 @@
-require 'travis/cli/setup'
-
-module Travis
-  module CLI
-    class Setup
-      class OpsWorks < Service
-        description "deployment to OpsWorks"
-
-        def run
-          deploy 'opsworks' do |config|
-            config['access_key_id'] = ask("Access key ID: ").to_s
-            config['secret_access_key'] = ask("Secret access key: ") { |q| q.echo = "*" }.to_s
-            config['app-id'] = ask("App ID: ").to_s
-            config['migrate'] = true if agree("Migrate the Database? ") { |q| q.default = 'no' }
-
-            encrypt(config, 'secret_access_key') if agree("Encrypt secret access key? ") { |q| q.default = 'yes' }
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'travis/cli/setup'
+
+module Travis
+  module CLI
+    class Setup
+      class OpsWorks < Service
+        description 'deployment to OpsWorks'
+
+        def run
+          deploy 'opsworks' do |config|
+            config['access_key_id'] = ask('Access key ID: ').to_s
+            config['secret_access_key'] = ask('Secret access key: ') { |q| q.echo = '*' }.to_s
+            config['app-id'] = ask('App ID: ').to_s
+            config['migrate'] = true if agree('Migrate the Database? ') { |q| q.default = 'no' }
+
+            encrypt(config, 'secret_access_key') if agree('Encrypt secret access key? ') { |q| q.default = 'yes' }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/travis/cli/setup/pypi.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class PyPI < Service
-        description "automatic deployment to PyPI"
+        description 'automatic deployment to PyPI'
 
         def run
           deploy 'pypi', 'release' do |config|
-            config['user']     ||= ask("Username: ").to_s
-            config['password'] ||= ask("Password: ") { |q| q.echo = "*" }.to_s
+            config['user']     ||= ask('Username: ').to_s
+            config['password'] ||= ask('Password: ') { |q| q.echo = '*' }.to_s
 
-            on("release only tagged commits? ", config, 'tags' => true)
+            on('release only tagged commits? ', config, 'tags' => true)
             # the default of pypi `setup.py build` is the `sdist`
-            on("deploy as wheel file too? ", config, 'distributions' => 'sdist bdist_wheel')
+            on('deploy as wheel file too? ', config, 'distributions' => 'sdist bdist_wheel')
           end
         end
       end

data/lib/travis/cli/setup/releases.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 require 'travis/tools/github'
 
@@ -5,16 +7,14 @@ module Travis
   module CLI
     class Setup
       class Releases < Service
-        description "Upload Assets to GitHub Releases"
+        description 'Upload Assets to GitHub Releases'
 
         def run
           deploy 'releases' do |config|
             github.with_token { |t| config['api_key'] = t }
-            if config['api_key'].nil?
-              raise Travis::Client::GitHubLoginFailed, 'all GitHub tokens given were invalid'
-            end
+            raise Travis::Client::GitHubLoginFailed, 'all GitHub tokens given were invalid' if config['api_key'].nil?
 
-            config['file'] = ask("File to Upload: ").to_s
+            config['file'] = ask('File to Upload: ').to_s
           end
         end
 
@@ -25,7 +25,7 @@ module Travis
               g.drop_token    = false
               g.github_token  = github_token
               g.debug         = proc { |log| debug(log) }
-              g.after_tokens  = proc { g.explode = true and error("no suitable github token found") }
+              g.after_tokens  = proc { g.explode = true and error('no suitable github token found') }
               g.scopes        = org? ? ['public_repo'] : ['repo']
               g.note          = "automatic releases for #{repository.slug}"
             end

data/lib/travis/cli/setup/ruby_gems.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class RubyGems < Service
-        description "automatic release to RubyGems"
+        description 'automatic release to RubyGems'
 
         def run
           deploy 'rubygems', 'release' do |config|
@@ -13,13 +15,13 @@ module Travis
 
             config['api_key'] ||= File.read(authorization_file)                       if File.exist? authorization_file
             config['api_key'] ||= YAML.load_file(credentials_file)[:rubygems_api_key] if File.exist? credentials_file
-            config['api_key'] ||= ask("RubyGems API token: ") { |q| q.echo = "*" }.to_s
-            config['gem']     ||= ask("Gem name: ") { |q| q.default = repository.name }.to_s
+            config['api_key'] ||= ask('RubyGems API token: ') { |q| q.echo = '*' }.to_s
+            config['gem']     ||= ask('Gem name: ') { |q| q.default = repository.name }.to_s
 
-            on("Release only tagged commits? ", config, 'tags' => true)
+            on('Release only tagged commits? ', config, 'tags' => true)
           end
         end
       end
     end
   end
-end
+end

data/lib/travis/cli/setup/s3.rb

@@ -1,22 +1,26 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class S3 < Service
-        description "automatic pushing to S3"
+        description 'automatic pushing to S3'
 
         def run
           deploy 's3', 'push' do |config|
-            config['access_key_id'] = ask("Access key ID: ").to_s
-            config['secret_access_key'] = ask("Secret access key: ") { |q| q.echo = "*" }.to_s
-            config['bucket'] = ask("Bucket: ").to_s
-            local_dir = ask("Local project directory to upload (Optional): ").to_s
+            config['access_key_id'] = ask('Access key ID: ').to_s
+            config['secret_access_key'] = ask('Secret access key: ') { |q| q.echo = '*' }.to_s
+            config['bucket'] = ask('Bucket: ').to_s
+            local_dir = ask('Local project directory to upload (Optional): ').to_s
             config['local-dir'] = local_dir unless local_dir.empty?
-            upload_dir = ask("S3 upload directory (Optional): ").to_s
+            upload_dir = ask('S3 upload directory (Optional): ').to_s
             config['upload-dir'] = upload_dir unless upload_dir.empty?
-            config['acl'] = ask("S3 ACL Settings (private, public_read, public_read_write, authenticated_read, bucket_owner_read, bucket_owner_full_control): ").to_s { |q| q.default = 'private'}
-            encrypt(config, 'secret_access_key') if agree("Encrypt secret access key? ") { |q| q.default = 'yes' }
+            config['acl'] = ask('S3 ACL Settings (private, public_read, public_read_write, authenticated_read, bucket_owner_read, bucket_owner_full_control): ').to_s do |q|
+              q.default = 'private'
+            end
+            encrypt(config, 'secret_access_key') if agree('Encrypt secret access key? ') { |q| q.default = 'yes' }
           end
         end
       end

data/lib/travis/cli/setup/sauce_connect.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class SauceConnect < Service
-        description "Sauce Connet addon for Sauce Labs integration"
-        service_name "sauce_connect"
+        description 'Sauce Connet addon for Sauce Labs integration'
+        service_name 'sauce_connect'
 
         def run
           travis_config['addons'] ||= {}
           configure 'sauce_connect', {}, travis_config['addons'] do |config|
-            config['username']   = ask("Sauce Labs user: ").to_s
-            config['access_key'] = ask("Sauce Labs access key: ") { |q| q.echo = "*" }.to_s
-            encrypt(config, 'access_key') if agree("Encrypt access key? ") { |q| q.default = 'yes' }
+            config['username']   = ask('Sauce Labs user: ').to_s
+            config['access_key'] = ask('Sauce Labs access key: ') { |q| q.echo = '*' }.to_s
+            encrypt(config, 'access_key') if agree('Encrypt access key? ') { |q| q.default = 'yes' }
           end
         end
       end

data/lib/travis/cli/setup/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
@@ -9,7 +11,7 @@ module Travis
         end
 
         def self.description(description = nil)
-          @description ||= ""
+          @description ||= ''
           @description = description if description
           @description
         end
@@ -36,39 +38,48 @@ module Travis
 
         private
 
-          def on(question, config, condition)
-            return unless agree(question) { |q| q.default = 'yes' }
-            config['on'] ||= {}
-            config['on'].merge! condition
-          end
+        def on(question, config, condition)
+          return unless agree(question) { |q| q.default = 'yes' }
 
-          def encrypt(config, key)
-            encrypted   = repository.encrypt(config.fetch(key))
-            config[key] = { 'secure' => encrypted }
-          end
+          config['on'] ||= {}
+          config['on'].merge! condition
+        end
 
-          def configure(key, value = {}, config = travis_config)
-            error "#{key} section already exists in .travis.yml, run with --force to override" if config.include? key and not force?
-            yield(config[key] = value)
-          end
+        def encrypt(config, key)
+          encrypted   = repository.encrypt(config.fetch(key))
+          config[key] = { 'secure' => encrypted }
+        end
 
-          def branch
-            @branch ||= `git rev-parse --symbolic-full-name --abbrev-ref HEAD`.chomp
+        def configure(key, value = {}, config = travis_config)
+          if config.include?(key) && !force?
+            error "#{key} section already exists in .travis.yml, run with --force to override"
           end
+          yield(config[key] = value)
+        end
 
-          def deploy(provider, verb = "deploy")
-            configure('deploy', 'provider' => provider) do |config|
-              yield config
-
-              on("#{verb.capitalize} only from #{repository.slug}? ", config, 'repo' => repository.slug)
-              on("#{verb.capitalize} from #{branch} branch? ", config, 'branch' => branch) if branch != 'master' and branch != 'HEAD'
+        def branch
+          @branch ||= `git rev-parse --symbolic-full-name --abbrev-ref HEAD`.chomp
+        end
 
-              config['skip_cleanup'] = 'true' if not ( config.has_key?('skip_cleanup') or config.fetch('edge', 'false') != 'false' )
+        def deploy(provider, verb = 'deploy')
+          configure('deploy', 'provider' => provider) do |config|
+            yield config
 
-              encrypt(config, 'password') if config['password'] and agree("Encrypt Password? ") { |q| q.default = 'yes' }
-              encrypt(config, 'api_key')  if config['api_key']  and agree("Encrypt API key? ") { |q| q.default = 'yes' }
+            on("#{verb.capitalize} only from #{repository.slug}? ", config, 'repo' => repository.slug)
+            if (branch != 'master') && (branch != 'HEAD')
+              on("#{verb.capitalize} from #{branch} branch? ", config,
+                 'branch' => branch)
             end
+
+            config['skip_cleanup'] = 'true' unless config.key?('skip_cleanup') || (config.fetch('edge',
+                                                                                                'false') != 'false')
+
+            encrypt(config, 'password') if config['password'] && agree('Encrypt Password? ') do |q|
+                                             q.default = 'yes'
+                                           end
+            encrypt(config, 'api_key')  if config['api_key']  && agree('Encrypt API key? ') { |q| q.default = 'yes' }
           end
+        end
       end
     end
   end

data/lib/travis/cli/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
@@ -32,14 +34,14 @@ module Travis
       autoload :Deis,             'travis/cli/setup/deis'
       autoload :Service,          'travis/cli/setup/service'
 
-      description "sets up an addon or deploy target"
+      description 'sets up an addon or deploy target'
       on('-f', '--force', 'override config section if it already exists')
 
       def self.service(name)
         normal_name = Service.normalized_name(name)
         const_name  = constants(false).detect { |c| Service.normalized_name(c) == normal_name }
         constant    = const_get(const_name) if const_name
-        constant if constant and constant < Service and constant.known_as? name
+        constant if constant && (constant < Service) && constant.known_as?(name)
       end
 
       def self.services
@@ -47,7 +49,9 @@ module Travis
       end
 
       def help
-        services = self.class.services.map { |s| "\t" << color(s.service_name.ljust(20), :command) << color(s.description, :info) }.join("\n")
+        services = self.class.services.map do |s|
+          "\t" << color(s.service_name.ljust(20), :command) << color(s.description, :info)
+        end.join("\n")
         super("\nAvailable services:\n\n#{services}\n\n")
       end
 

data/lib/travis/cli/show.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Show < RepoCommand
-      description "displays a build or job"
+      description 'displays a build or job'
 
       def run(number = last_build.number)
-        number = repository.branch(number).number if number !~ /^\d+(\.\d+)?$/ and repository.branch(number)
+        number = repository.branch(number).number if number !~ /^\d+(\.\d+)?$/ && repository.branch(number)
         entity = job(number) || build(number)
 
         error "could not find job or build #{repository.slug}##{number}" unless entity
@@ -17,7 +19,7 @@ module Travis
           entity.commit.subject,
           entity.state,
           entity.color,
-          entity.pull_request? ? "pull request" : "push",
+          entity.pull_request? ? 'pull request' : 'push',
           entity.branch_info,
           entity.commit.short_sha,
           entity.commit.compare_url,
@@ -33,13 +35,13 @@ module Travis
               color("##{job.number} #{job.state}:".ljust(16), [job.color, :bold]),
               formatter.duration(job.duration).ljust(14),
               formatter.job_config(job.config),
-              (color("(failure allowed)", :info) if job.allow_failures?)
-            ].compact.join(" ").rstrip
+              (color('(failure allowed)', :info) if job.allow_failures?)
+            ].compact.join(' ').rstrip
           end
         else
           config = formatter.job_config(entity.config)
-          say color("Allow Failure: ", :info) + entity.allow_failures?.inspect
-          say color("Config:        ", :info) + config unless config.empty?
+          say color('Allow Failure: ', :info) + entity.allow_failures?.inspect
+          say color('Config:        ', :info) + config unless config.empty?
         end
       end
     end
@@ -56,4 +58,4 @@ __END__
 <[[ color("Compare URL:   ", :info) ]]>%s
 <[[ color("Duration:      ", :info) ]]>%s
 <[[ color("Started:       ", :info) ]]>%s
-<[[ color("Finished:      ", :info) ]]>%s
+<[[ color("Finished:      ", :info) ]]>%s