travis 1.11.1 → 1.13.0

data/lib/travis/cli/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
@@ -5,49 +7,52 @@ module Travis
     class Settings < RepoCommand
       attr_accessor :setting
 
-      description "access repository settings"
+      description 'access repository settings'
       on('--keys', 'always use setting key instead of description')
-      on('-t', '--enable',  'enable boolean setting(s)')  { |c  | c.setting = true  }
-      on('-f', '--disable', 'disable boolean setting(s)') { |c  | c.setting = false }
-      on('-s', '--set VALUE', 'set to given value')       { |c,v| c.setting = v     }
+      on('-t', '--enable',  'enable boolean setting(s)')  { |c| c.setting = true  }
+      on('-f', '--disable', 'disable boolean setting(s)') { |c| c.setting = false }
+      on('-s', '--set VALUE', 'set to given value')       { |c, v| c.setting = v }
       on('-c', '--configure', 'change settings interactively')
 
       DESCRIPTIONS = {
-        :builds_only_with_travis_yml => "Only run builds with a .travis.yml",
-        :build_pushes                => "Build pushes",
-        :build_pull_requests         => "Build pull requests",
-        :maximum_number_of_builds    => "Maximum number of concurrent builds",
-        :auto_cancel_pushes          => "Cancel older push builds that are not yet running",
-        :auto_cancel_pull_requests   => "Cancel older pull request builds that are not yet running"
-      }
+        builds_only_with_travis_yml: 'Only run builds with a .travis.yml',
+        build_pushes: 'Build pushes',
+        build_pull_requests: 'Build pull requests',
+        maximum_number_of_builds: 'Maximum number of concurrent builds',
+        auto_cancel_pushes: 'Cancel older push builds that are not yet running',
+        auto_cancel_pull_requests: 'Cancel older pull request builds that are not yet running'
+      }.freeze
 
       def run(*keys)
-        exit 1 if interactive? and keys.empty? and !setting.nil? and !all_settings? and !configure?
+        exit 1 if interactive? && keys.empty? && !setting.nil? && !all_settings? && !configure?
         authenticate
-        say repository.slug, "Settings for %s:"
+        say repository.slug, 'Settings for %s:'
         repository.settings.to_h.each do |key, value|
-          next unless keys.empty? or keys.include? key
+          next unless keys.empty? || keys.include?(key)
+
           if configure?
-            if boolean? key
-              repository.settings[key] = agree("#{describe(key, "enable #{key}")}? ") do |q|
-                default   = setting.nil? ? value : setting
-                q.default = default ? "yes" : "no"
-              end
-            else
-              repository.settings[key] = ask("#{describe(key,  "Value for #{key}")}: ", Integer) do |q|
-                default   = setting.to_i if setting and setting.respond_to? :to_i
-                default ||= value
-                default ||= 0
-                q.default = default
-              end
-            end
+            repository.settings[key] = if boolean? key
+                                         agree("#{describe(key, "enable #{key}")}? ") do |q|
+                                           default   = setting.nil? ? value : setting
+                                           q.default = default ? 'yes' : 'no'
+                                         end
+                                       else
+                                         ask("#{describe(key, "Value for #{key}")}: ", Integer) do |q|
+                                           default   = setting.to_i if setting && setting.respond_to?(:to_i)
+                                           default ||= value
+                                           default ||= 0
+                                           q.default = default
+                                         end
+                                       end
           else
             value  = repository.settings[key] = setting unless setting.nil?
-            descr  = color(describe(key, color(key, :info)) { |s| key.ljust(30) + " " + color(s, [:reset, :bold]) }, :info)
-            say format_value(value) << " " << descr
+            descr  = color(describe(key, color(key, :info)) do |s|
+                             "#{key.ljust(30)} #{color(s, %i[reset bold])}"
+                           end, :info)
+            say format_value(value) << ' ' << descr
           end
         end
-        repository.settings.save if configure? or !setting.nil?
+        repository.settings.save if configure? || !setting.nil?
       end
 
       def boolean?(key)
@@ -56,20 +61,21 @@ module Travis
 
       def format_value(value)
         case value
-        when false, nil then color("[-]", [ :bold, :red   ])
-        when true       then color("[+]", [ :bold, :green ])
-        else color(value.to_s.rjust(3),    [ :bold, :blue  ])
+        when false, nil then color('[-]', %i[bold red])
+        when true       then color('[+]', %i[bold green])
+        else color(value.to_s.rjust(3), %i[bold blue])
         end
       end
 
       def all_settings?
-        agree("Really #{setting ? "enable" : "disable"} all settings? ") do |q|
-          q.default = "no"
+        agree("Really #{setting ? 'enable' : 'disable'} all settings? ") do |q|
+          q.default = 'no'
         end
       end
 
       def describe(key, description = key)
         return description if keys?
+
         desc = DESCRIPTIONS[key.to_sym]
         desc &&= yield(desc) if block_given?
         desc || description

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

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Anynines < Service
-        description "automatic deployment to anynines"
+        description 'automatic deployment to anynines'
 
         def run
           deploy 'anynines' do |config|
-            config['username']     ||= ask("anynines username: ").to_s
-            config['password']     ||= ask("anynines password: ") { |q| q.echo = "*" }.to_s
-            config['organization'] ||= ask("anynines organization: ").to_s
-            config['space']        ||= ask("anynines space: ").to_s
+            config['username']     ||= ask('anynines username: ').to_s
+            config['password']     ||= ask('anynines password: ') { |q| q.echo = '*' }.to_s
+            config['organization'] ||= ask('anynines organization: ').to_s
+            config['space']        ||= ask('anynines space: ').to_s
           end
         end
-
       end
     end
   end

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

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Appfog < Service
-        description "automatic deployment to Appfog"
+        description 'automatic deployment to Appfog'
 
         def run
           deploy 'appfog' do |config|
-            config['email'] = ask("Email address: ").to_s
-            config['password'] = ask("Password: ") { |q| q.echo = "*" }.to_s
-            config['app'] = ask("App name: ") { |q| q.default = repository.name }.to_s
+            config['email'] = ask('Email address: ').to_s
+            config['password'] = ask('Password: ') { |q| q.echo = '*' }.to_s
+            config['app'] = ask('App name: ') { |q| q.default = repository.name }.to_s
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
@@ -10,11 +12,11 @@ module Travis
         def run
           travis_config['addons'] ||= {}
           configure 'artifacts', {}, travis_config['addons'] do |config|
-            config['key'] = ask("Access key ID: ").to_s
-            config['secret'] = ask("Secret access key: ") { |q| q.echo = "*" }.to_s
-            config['bucket'] = ask("Bucket: ").to_s
-            encrypt(config, 'key') if agree("Encrypt access key ID? ") { |q| q.default = 'yes' }
-            encrypt(config, 'secret') if agree("Encrypt secret access key? ") { |q| q.default = 'yes' }
+            config['key'] = ask('Access key ID: ').to_s
+            config['secret'] = ask('Secret access key: ') { |q| q.echo = '*' }.to_s
+            config['bucket'] = ask('Bucket: ').to_s
+            encrypt(config, 'key') if agree('Encrypt access key ID? ') { |q| q.default = 'yes' }
+            encrypt(config, 'secret') if agree('Encrypt secret access key? ') { |q| q.default = 'yes' }
           end
         end
       end

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

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Biicode < Service
-        description "automatic publish to biicode"
+        description 'automatic publish to biicode'
 
         def run
           deploy 'biicode', 'release' do |config|
-            config['user'] ||= ask("biicode username: ") { |q| q }.to_s
-            config['password'] ||= ask("biicode password: ") { |q| q.echo = "*" }.to_s
-            on("publish only tagged commits? ", config, 'tags' => true)
+            config['user'] ||= ask('biicode username: ') { |q| q }.to_s
+            config['password'] ||= ask('biicode password: ') { |q| q.echo = '*' }.to_s
+            on('publish only tagged commits? ', config, 'tags' => true)
           end
         end
       end

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

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Cloud_66 < Service
-        description "Automatic deployment to Cloud 66"
+        description 'Automatic deployment to Cloud 66'
         service_name 'cloud66'
 
         def run
           deploy 'cloud66', 'release' do |config|
-            config['redeployment_hook'] ||= ask("Cloud 66 Redeployment Hook Url: ") { |q| q.echo = "*" }.to_s
+            config['redeployment_hook'] ||= ask('Cloud 66 Redeployment Hook Url: ') { |q| q.echo = '*' }.to_s
 
-            encrypt(config, 'redeployment_hook') if agree("Encrypt Redeployment Hook?") { |q| q.default = 'yes' }
+            encrypt(config, 'redeployment_hook') if agree('Encrypt Redeployment Hook?') { |q| q.default = 'yes' }
           end
         end
       end
     end
   end
-end
+end

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

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class CloudControl < Service
-        description "automatic deployment to cloudControl"
+        description 'automatic deployment to cloudControl'
 
         def run
           deploy 'cloudcontrol' do |config|
-            config['email']      = ask("cloudControl email: ").to_s
-            config['password']   = ask("cloudControl password: ") { |q| q.echo = "*" }.to_s
-            app                  = ask("cloudControl application: ") { |q| q.default = repository.name }.to_s
-            dep                  = ask("cloudControl deployment: ") { |q| q.default = "default" }.to_s
+            config['email']      = ask('cloudControl email: ').to_s
+            config['password']   = ask('cloudControl password: ') { |q| q.echo = '*' }.to_s
+            app                  = ask('cloudControl application: ') { |q| q.default = repository.name }.to_s
+            dep                  = ask('cloudControl deployment: ') { |q| q.default = 'default' }.to_s
             config['deployment'] = "#{app}/#{dep}"
           end
         end
       end
     end
   end
-end
+end

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

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class CloudFiles < Service
-        description "automatic pushing to Rackspace Cloud Files"
+        description 'automatic pushing to Rackspace Cloud Files'
 
         def run
           deploy 'cloudfiles' do |config|
-            config['username'] = ask("Rackspace Username: ").to_s
-            config['api_key'] = ask("Rackspace Api Key: ") { |q| q.echo = "*" }.to_s
-            config['region'] = ask("Cloud Files Region: ").to_s
-            config['container'] = ask("Container: ").to_s
+            config['username'] = ask('Rackspace Username: ').to_s
+            config['api_key'] = ask('Rackspace Api Key: ') { |q| q.echo = '*' }.to_s
+            config['region'] = ask('Cloud Files Region: ').to_s
+            config['container'] = ask('Container: ').to_s
           end
         end
       end

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

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class CloudFoundry < Service
-        description "automatic deployment to Cloud Foundry"
+        description 'automatic deployment to Cloud Foundry'
 
         def run
           deploy 'cloudfoundry' do |config|
             target_file = File.expand_path('.cf/config.json', Dir.home)
-            config['api']       ||= JSON.parse(File.read(target_file))["Target"] if File.exist? target_file
-            config['api']       ||= ask("Cloud Foundry api: ").to_s
-            config['username']     ||= ask("Cloud Foundry username: ").to_s
-            config['password']     ||= ask("Cloud Foundry password: ") { |q| q.echo = "*" }.to_s
-            config['organization'] ||= ask("Cloud Foundry organization: ").to_s
-            config['space']        ||= ask("Cloud Foundry space: ").to_s
+            config['api']       ||= JSON.parse(File.read(target_file))['Target'] if File.exist? target_file
+            config['api']       ||= ask('Cloud Foundry api: ').to_s
+            config['username']     ||= ask('Cloud Foundry username: ').to_s
+            config['password']     ||= ask('Cloud Foundry password: ') { |q| q.echo = '*' }.to_s
+            config['organization'] ||= ask('Cloud Foundry organization: ').to_s
+            config['space']        ||= ask('Cloud Foundry space: ').to_s
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 require 'shellwords'
 
@@ -5,7 +7,7 @@ module Travis
   module CLI
     class Setup
       class CodeDeploy < Service
-        description "triggering a new deployment on Amazon CodeDeploy"
+        description 'triggering a new deployment on Amazon CodeDeploy'
         AWS_CONFIG = File.expand_path('.aws/config', ENV['HOME'])
 
         def run
@@ -16,38 +18,40 @@ module Travis
           end
 
           deploy 'codedeploy' do |config|
-            config['access_key_id']     = ask("Access key ID: ") { |q| q.default = access_key if access_key }.to_s
+            config['access_key_id']     = ask('Access key ID: ') { |q| q.default = access_key if access_key }.to_s
             secret_access_key           = nil unless access_key == config['access_key_id']
-            config['secret_access_key'] = secret_access_key || ask("Secret access key: ") { |q| q.echo = "*" }.to_s
-            config['bucket']            = ask("S3 Bucket: ").to_s
-            config['key']               = ask("S3 Key: ").to_s
-            config['bundle_type']       = ask("Bundle Type: ") { |q| q.default = config['key'][/\.(zip|tar|tgz)$/, 1] }.to_s
-            config['application']       = ask("Application Name: ") { |q| q.default = repository.name }.to_s
-            config['deployment_group']  = ask("Deployment Group Name: ").to_s
-            encrypt(config, 'secret_access_key') if agree("Encrypt secret access key? ") { |q| q.default = 'yes' }
+            config['secret_access_key'] = secret_access_key || ask('Secret access key: ') { |q| q.echo = '*' }.to_s
+            config['bucket']            = ask('S3 Bucket: ').to_s
+            config['key']               = ask('S3 Key: ').to_s
+            config['bundle_type']       = ask('Bundle Type: ') do |q|
+              q.default = config['key'][/\.(zip|tar|tgz)$/, 1]
+            end.to_s
+            config['application']       = ask('Application Name: ') { |q| q.default = repository.name }.to_s
+            config['deployment_group']  = ask('Deployment Group Name: ').to_s
+            encrypt(config, 'secret_access_key') if agree('Encrypt secret access key? ') { |q| q.default = 'yes' }
           end
 
-          if agree("Also push bundle to S3? ")
-            cd = travis_config['deploy']
-            s3 = {
-              'provider'          => 's3',
-              'access_key_id'     => cd['access_key_id'],
-              'secret_access_key' => cd['secret_access_key'],
-              'local_dir'         => 'dpl_cd_upload',
-              'skip_cleanup'      => true,
-              'on'                => cd['on'],
-              'bucket'            => cd['bucket']
-            }
+          return unless agree('Also push bundle to S3? ')
 
-            s3['upload_dir']               = File.dirname(cd['key']) if cd['key'].include? '/'
-            travis_config['deploy']        = [ s3, cd ]
-            upload_file_name               = File.basename(cd['key'])
-            source_file                    = ask("Source File: ") { |q| q.default = upload_file_name }
-            travis_config['before_deploy'] = [
-              "mkdir -p dpl_cd_upload",
-              "mv #{Shellwords.escape(source_file)} dpl_cd_upload/#{Shellwords.escape(upload_file_name)}"
-            ]
-          end
+          cd = travis_config['deploy']
+          s3 = {
+            'provider' => 's3',
+            'access_key_id' => cd['access_key_id'],
+            'secret_access_key' => cd['secret_access_key'],
+            'local_dir' => 'dpl_cd_upload',
+            'skip_cleanup' => true,
+            'on' => cd['on'],
+            'bucket' => cd['bucket']
+          }
+
+          s3['upload_dir']               = File.dirname(cd['key']) if cd['key'].include? '/'
+          travis_config['deploy']        = [s3, cd]
+          upload_file_name               = File.basename(cd['key'])
+          source_file                    = ask('Source File: ') { |q| q.default = upload_file_name }
+          travis_config['before_deploy'] = [
+            'mkdir -p dpl_cd_upload',
+            "mv #{Shellwords.escape(source_file)} dpl_cd_upload/#{Shellwords.escape(upload_file_name)}"
+          ]
         end
       end
     end

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

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Deis < Service
-        description "automatic deployment to a deis app"
+        description 'automatic deployment to a deis app'
 
         def run
           deploy 'deis' do |config|
-            config['controller'] ||= ask("Deis Controller: ").to_s
-            config['app']        ||= ask("Deis App: ").to_s
-            config['username']   ||= ask("Deis Username: ").to_s
-            config['password']   ||= ask("Deis Password: ") { |q| q.echo = "*" }.to_s
+            config['controller'] ||= ask('Deis Controller: ').to_s
+            config['app']        ||= ask('Deis App: ').to_s
+            config['username']   ||= ask('Deis Username: ').to_s
+            config['password']   ||= ask('Deis Password: ') { |q| q.echo = '*' }.to_s
           end
         end
       end
     end
   end
-end
+end

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

@@ -1,18 +1,20 @@
-require 'travis/cli/setup'
-
-module Travis
-  module CLI
-    class Setup
-      class Divshot < Service
-        description "deployment to Divshot.io"
-
-        def run
-          deploy 'divshot' do |config|
-            config['api_key'] = ask("Divshot Api Key: ") { |q| q.echo = "*" }.to_s
-            config['environment'] = ask("Divshot Environment: ").to_s
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'travis/cli/setup'
+
+module Travis
+  module CLI
+    class Setup
+      class Divshot < Service
+        description 'deployment to Divshot.io'
+
+        def run
+          deploy 'divshot' do |config|
+            config['api_key'] = ask('Divshot Api Key: ') { |q| q.echo = '*' }.to_s
+            config['environment'] = ask('Divshot Environment: ').to_s
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class ElasticBeanstalk < Service
-        description "deployment to AWS Elastic Beanstalk"
+        description 'deployment to AWS Elastic Beanstalk'
 
         def run
           deploy 'elasticbeanstalk' 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['region'] = ask("Elastic Beanstalk region: ") {|q| q.default = 'us-east-1'}.to_s
-            config['app'] = ask("Elastic Beanstalk application name: ").to_s
-            config['env'] = ask("Elastic Beanstalk environment to update: ").to_s
-            config['bucket_name'] = ask("Bucket name to upload app to: ").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['region'] = ask('Elastic Beanstalk region: ') { |q| q.default = 'us-east-1' }.to_s
+            config['app'] = ask('Elastic Beanstalk application name: ').to_s
+            config['env'] = ask('Elastic Beanstalk environment to update: ').to_s
+            config['bucket_name'] = ask('Bucket name to upload app to: ').to_s
 
-            encrypt(config, 'secret_access_key') if agree("Encrypt secret access key? ") { |q| q.default = 'yes' }
+            encrypt(config, 'secret_access_key') if agree('Encrypt secret access key? ') { |q| q.default = 'yes' }
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 require 'yaml'
 
@@ -5,17 +7,17 @@ module Travis
   module CLI
     class Setup
       class EngineYard < Service
-        description "automatic deployment to Engine Yard"
+        description 'automatic deployment to Engine Yard'
 
         def run
           deploy 'engineyard' do |config|
-            eyrc                  = File.expand_path(".eyrc", Dir.home)
-            config['api_key']     = YAML.load_file(eyrc)["api_token"] if File.exists?(eyrc)
-            config['api_key']     = ask("API token: ") { |q| q.echo = "*" }.to_s unless config['api_key']
-            env                   = ask("Environment (optional): ").to_s
+            eyrc                  = File.expand_path('.eyrc', Dir.home)
+            config['api_key']     = YAML.load_file(eyrc)['api_token'] if File.exist?(eyrc)
+            config['api_key']     = ask('API token: ') { |q| q.echo = '*' }.to_s unless config['api_key']
+            env                   = ask('Environment (optional): ').to_s
             config['environment'] = env unless env.empty?
-            migrate               = agree("Run migrations on deploy? ") { |q| q.default = 'yes' }
-            config['migrate']     = ask("Migration command: ") { |q| q.default = "rake db:migrate" } if migrate
+            migrate               = agree('Run migrations on deploy? ') { |q| q.default = 'yes' }
+            config['migrate']     = ask('Migration command: ') { |q| q.default = 'rake db:migrate' } if migrate
           end
         end
       end

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

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class GCS < Service
-        description "automatic pushing to Google Cloud Storage"
+        description 'automatic pushing to Google Cloud Storage'
 
         def run
           deploy 'gcs' 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?
-            encrypt(config, 'secret_access_key') if agree("Encrypt secret access key? ") { |q| q.default = 'yes' }
+            encrypt(config, 'secret_access_key') if agree('Encrypt secret access key? ') { |q| q.default = 'yes' }
           end
         end
       end
     end
   end
-end
+end

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

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class Hackage < Service
-        description "automatic deployment of hackage packages"
+        description 'automatic deployment of hackage packages'
 
         def run
           deploy 'hackage' do |config|
-            config['username'] ||= ask("Hackage Username: ").to_s
-            config['password'] ||= ask("Hackage Password: ") { |q| q.echo = "*" }.to_s
+            config['username'] ||= ask('Hackage Username: ').to_s
+            config['password'] ||= ask('Hackage Password: ') { |q| q.echo = '*' }.to_s
           end
         end
       end
     end
   end
-end
+end