diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4fe184..7946786 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,24 +40,3 @@ dependency_scanning: artifacts: paths: - gl-dependency-scanning-report.json - -sast: - stage: security - dependencies: - - build - image: docker:stable - variables: - DOCKER_DRIVER: overlay2 - allow_failure: true - services: - - docker:stable-dind - script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}" - --volume "$PWD:/code" - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code - artifacts: - paths: - - gl-sast-report.json diff --git a/.rubocop.yml b/.rubocop.yml index c33d73d..87bd208 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,3 +1,9 @@ +AllCops: + TargetRubyVersion: 2.3 + Naming/FileName: Exclude: - 'lib/capistrano-rails-console.rb' + +Metrics/LineLength: + Max: 120 diff --git a/Gemfile b/Gemfile index b64e06d..998a52d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source 'https://rubygems.org' # Specify your gem's dependencies in capistrano-rails-console.gemspec diff --git a/Rakefile b/Rakefile index c702cfc..7398a90 100644 --- a/Rakefile +++ b/Rakefile @@ -1 +1,3 @@ +# frozen_string_literal: true + require 'bundler/gem_tasks' diff --git a/capistrano-rails-console.gemspec b/capistrano-rails-console.gemspec index c1363b3..4704ac7 100644 --- a/capistrano-rails-console.gemspec +++ b/capistrano-rails-console.gemspec @@ -1,3 +1,5 @@ +# frozen_string_literal: true + lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'capistrano/rails/console/version' diff --git a/lib/capistrano-rails-console.rb b/lib/capistrano-rails-console.rb index e69de29..8e9b8f9 100644 --- a/lib/capistrano-rails-console.rb +++ b/lib/capistrano-rails-console.rb @@ -0,0 +1 @@ +# frozen_string_literal: true diff --git a/lib/capistrano/rails/console.rb b/lib/capistrano/rails/console.rb index fc319fc..2dbb52d 100644 --- a/lib/capistrano/rails/console.rb +++ b/lib/capistrano/rails/console.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'sshkit/interactive' require 'capistrano/rails/console/version' diff --git a/lib/capistrano/rails/console/tasks.cap b/lib/capistrano/rails/console/tasks.cap index 329205d..84299cb 100644 --- a/lib/capistrano/rails/console/tasks.cap +++ b/lib/capistrano/rails/console/tasks.cap @@ -1,9 +1,11 @@ +# frozen_string_literal: true + namespace :load do task :defaults do # Add rails to RVM, Rbenv and Chruby bins - %i{rvm_map_bins rbenv_map_bins chruby_map_bins}.each do |bins_var| - bins = fetch(bins_var, []) - set bins_var, bins.push('rails') unless bins.include?('rails') + %i[rvm_map_bins rbenv_map_bins chruby_map_bins].each do |bins_var| + bins = fetch(bins_var, []) + set bins_var, bins.push('rails') unless bins.include?('rails') end # Default values @@ -17,7 +19,7 @@ end namespace :rails do desc 'Interact with a remote rails console' task :console do - args = [] + args = [] args << '--sandbox' if ENV.key?('sandbox') || ENV.key?('s') run_interactively primary(fetch(:console_role)), shell: fetch(:console_shell) do diff --git a/lib/capistrano/rails/console/version.rb b/lib/capistrano/rails/console/version.rb index 71ef6d5..54515f9 100644 --- a/lib/capistrano/rails/console/version.rb +++ b/lib/capistrano/rails/console/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Capistrano module Capistrano # Rails @@ -5,7 +7,7 @@ module Capistrano # Console module Console # Gem version - VERSION = '2.3.0'.freeze + VERSION = '2.3.0' end end end