satorix-rails 1.1.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b9d6f9e7b878b946c92879ecdca57539e17b726
-  data.tar.gz: 51f759acfe38d749d2d629f9c0c2d0aaba1c4a2a
+SHA256:
+  metadata.gz: 435a13aeb52a37926e1c05131e9ade2acef2a753076fd973cdcec8fc42a1dbbc
+  data.tar.gz: 5809274213b07e1bcdc4f573efabd0f2f0c3d67105f6f25e5eff09f6e80c077b
 SHA512:
-  metadata.gz: 3061312baa499d9421499caf785bb7239c6199e1d8811f6b6fb996a1e31c65cafe5485fcef62b81a6d9e785313c1428bb8dc6fb363260bc00b6cfdd4cc4ecc79
-  data.tar.gz: 98dc15e19de99dc0e7f160aa5a265b9fee5525b87a6c3f4cc7d215990dd8dad9d14f4db91fb27690c8dbc5f5d2e5b50bd2e3542031ab10223a5f96f51fd38255
+  metadata.gz: cc01af9987e38d189dee15d4b4d5ee89c9ef0a443beed6f23d6b2a869b381273563355dd378754615ad784f30c3574cb7e8c4b04dcd7739a3918388fb77577fd
+  data.tar.gz: 46fa05b77b27a9e5c8892aa23c8d87f052adcac05004886966d769c05c35a6152280e0b766056318c11a89ce23cdd98fd411c9e19592d5b9b3dd60d83322b804

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.gitlab-ci.yml

@@ -3,7 +3,6 @@ image: 'satorix/rails'
 
 .satorix: &satorix
   script:
-    - bundle # This generates a Gemfile.lock, to make the buildpacks happy
     - gem install satorix --source https://gems.iexposure.com --no-document
     - satorix
 
@@ -15,17 +14,17 @@ cache:
 
 
 rspec:
-  before_script:
-    - sed -i -e 's/add_development_dependency/add_dependency/g' satorix-rails.gemspec # To avoid an application dependency, but still be available for CI
   <<: *satorix
 
 
-# This is a custom job, defined at satorix/CI/deploy/ie_gem_server.rb
+# This is a custom job, defined at satorix/CI/deploy/rubygems.rb
 deploy_to_rubygems:
   environment:
     name: $CI_COMMIT_REF_NAME
-    url: 'http://gems.iexposure.com/gems/satorix-rails'
+    url: 'https://rubygems.org/gems/satorix-rails'
   stage: deploy
   only:
-    - master
+    - tags
+  except:
+    - schedules
   <<: *satorix

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.5
+ruby-2.6.6

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    satorix-rails (1.3.0)
+      passenger
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    passenger (6.0.4)
+      rack
+      rake (>= 0.8.1)
+    rack (2.2.2)
+    rake (13.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  satorix-rails!
+
+RUBY VERSION
+   ruby 2.6.6p146
+
+BUNDLED WITH
+   1.17.3

data/Rakefile

@@ -1,6 +1,10 @@
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+begin
+  require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+  RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+  task :default => :spec
+rescue LoadError
+  # no rspec available
+end

data/lib/rails/generators/templates/custom_ci_job/satorix/CI/deploy/mock_deploy.rb

@@ -3,10 +3,8 @@ module Satorix
     module Deploy
       module MockDeploy
 
-
         include Satorix::Shared::Console
 
-
         extend self
 
 
@@ -17,19 +15,18 @@ module Satorix
         end
 
 
-        private ########################################################################################################
+        private
 
 
-        def turbines_to_speed
-          batnap
-          puts 'Roger. Ready to move out.'
-        end
+          def turbines_to_speed
+            batnap
+            puts 'Roger. Ready to move out.'
+          end
 
 
-        def batnap
-          sleep(rand(6))
-        end
-
+          def batnap
+            sleep(rand(6))
+          end
 
       end
     end

data/lib/rails/generators/templates/custom_ci_job/satorix/CI/test/bare_bones.rb

@@ -5,21 +5,16 @@ module Satorix
       # This is the simplest possible implementation of a custom job.
       module BareBones
 
-
         extend self
 
         # go() is the method that will be called during the CI run.
         # You can add your own logic to do whatever you want.
         def go
-          # Uncomment the line below if you want to execute in the context of the app's buildpack.
-          # Satorix::CI::Test::Shared::BuildpackManager.go
           puts "\n\nRunning BareBones#go..."
         end
 
-
       end
 
-
     end
   end
 end

data/lib/rails/generators/templates/custom_ci_job/satorix/CI/test/info.rb

@@ -3,17 +3,13 @@ module Satorix
     module Test
       module Info
 
-
         include Satorix::Shared::Console
 
-
         extend self
 
         # go() is the method that will be called during the CI run.
         # You can add your own logic to do whatever you want.
         def go
-          # Uncomment the line below if you want to execute in the context of the app's buildpack.
-          # Satorix::CI::Test::Shared::BuildpackManager.go
 
           log_bench('Describing logging...') do
             describe_log
@@ -22,7 +18,7 @@ module Satorix
           end
 
           log_bench('Describing console commands...') do
-            describe_run_command_string
+            describe_unsafe_run_command_string
             describe_run_command_array
             describe_run_command_filtered
             describe_run_command_quiet
@@ -33,62 +29,67 @@ module Satorix
         end
 
 
-        private ########################################################################################################
+        private
 
 
-        def describe_environment_variables
-          puts "Remember, #{ ENV['GITLAB_USER_EMAIL'] }, that you have access to all of the environment variables ",
-               ' described at https://docs.gitlab.com/ce/ci/variables/#predefined-variables-environment-variables'
-        end
+          def describe_environment_variables
+            puts "Remember, #{ ENV['GITLAB_USER_EMAIL'] }, that you have access to all of the environment variables ",
+                 ' described at https://docs.gitlab.com/ce/ci/variables/#predefined-variables-environment-variables'
+          end
 
 
-        def describe_log
-          log 'The log() method writes a message to the log'
-          colors.keys.each { |color| log "You can provide an optional color, like :#{ color }", color }
-        end
+          def describe_log
+            log 'The log() method writes a message to the log'
+            colors.keys.each { |color| log "You can provide an optional color, like :#{ color }", color }
+          end
 
 
-        def describe_log_error
-          log_error 'The log_error() method writes an error to the log'
-        end
+          def describe_log_error
+            log_error 'The log_error() method writes an error to the log'
+          end
 
 
-        def describe_log_error_and_abort
-          log_error 'The log_error_and_abort() method writes an error to the log and aborts the job'
-        rescue SystemExit => e
-          puts 'Rescuing from the error, to continue the tutorial.',
-               e.inspect
-        end
+          def describe_log_error_and_abort
+            log_error 'The log_error_and_abort() method writes an error to the log and aborts the job'
+          rescue SystemExit => e
+            puts 'Rescuing from the error, to continue the tutorial.',
+                 e.inspect
+          end
 
 
-        def describe_run_command_string
-          run_command "echo 'We can safely run string console commands with the run_command() method'"
-        end
-
+          def describe_unsafe_run_command_string
+            # It is possible to use a string command that is assumed to be already escaped and will not be escaped further.
+            # See below for safer alternate options.
+            # Please see the run_command documentation in the satorix gem for more information and examples.
+            run_command "echo 'We can run string console commands that have already been properly escaped with the run_command() method and the `string_verified_safe: true` option. This is best avoided!'",
+                        string_verified_safe: true
+          end
 
-        def describe_run_command_array
-          run_command ['echo', "'We can safely run array console commands with the run_command() method'"]
-        end
 
+          def describe_run_command_array
+            # It is preferred to use an array command, especially for anything containing dynamic input. Escaping will be taken care of for you.
+            # Please see the run_command documentation in the satorix gem for more information and examples.
+            run_command ['echo', 'We can safely run unescaped array console commands with the run_command() method. This is ideal!']
+          end
 
-        def describe_run_command_quiet
-          run_command "echo 'This will not be displayed'", quiet: true
-        end
 
+          def describe_run_command_quiet
+            run_command ['echo', 'This will not be displayed (but will return the output).'], quiet: true
+          end
 
-        def describe_run_command_filtered
-          run_command "echo 'You can filter secrets, like 1234 and 5678 (unless you explicitly display them)'", filtered_text: %w(1234 5678)
-        end
 
+          def describe_run_command_filtered
+            run_command ['echo', 'You can filter sensitive text from the logs, like 1234 and 5678 (the original output will be returned).'], filtered_text: %w(1234 5678)
+          end
 
-        def describe_run_command_with_error
-          run_command 'false'
-        rescue SystemExit
-          puts 'Commands that exit with a non-zero return code abort operation, unless rescued.',
-               'Rescuing from the error, to continue the tutorial.',
-               e.inspect
-        end
 
+          def describe_run_command_with_error
+            run_command %w[false]
+          rescue SystemExit
+            puts 'Commands that exit with a non-zero return code abort operation, unless rescued.',
+                 'Rescuing from the error, to continue the tutorial.',
+                 e.inspect
+          end
 
       end
     end

data/lib/rails/generators/templates/install/.gitlab-ci.yml

@@ -1,4 +1,5 @@
-# We are using the Satorix Rails CI image from https://hub.docker.com/r/satorix/rails/
+# We are using the base Satorix Rails CI image from https://hub.docker.com/r/satorix/rails/
+# Additional versions with expanded features can be found at https://hub.docker.com/u/satorix
 image: 'satorix/rails'
 
 
@@ -9,12 +10,6 @@ cache:
     - 'tmp/satorix/cache' # To cache buildpack gems between runs.
 
 
-.satorix: &satorix
-  script:
-    - gem install satorix --source https://gems.iexposure.com --no-document
-    - satorix
-
-
 ###############################################################################
 #
 # Below are resources that will be available as part of the CI pipeline.
@@ -61,6 +56,13 @@ cache:
 #    MYSQL_ROOT_PASSWORD: password # The default user is: root
 
 
+.satorix: &satorix
+  <<: *use_postgres
+  script:
+    - gem install satorix --source https://gems.iexposure.com --no-document
+    - satorix
+
+
 ###############################################################################
 #
 # Below are jobs that will run as part of the CI pipeline.
@@ -74,8 +76,6 @@ cache:
 ## Static analysis security scanner for Ruby on Rails
 ## http://brakemanscanner.org/
 #brakeman:
-#  variables:
-#    SKIP_BUILDPACK: 'true'
 #  <<: *satorix
 
 
@@ -83,8 +83,6 @@ cache:
 ## Patch-level verification for Bundler
 ## https://github.com/rubysec/bundler-audit
 #bundler_audit:
-#  variables:
-#    SKIP_BUILDPACK: 'true'
 #  <<: *satorix
 
 
@@ -92,7 +90,6 @@ cache:
 ## Executes executable specifications written in plain language
 ## https://github.com/cucumber/cucumber
 #cucumber:
-#  <<: *use_postgres
 #  <<: *satorix
 
 
@@ -100,7 +97,6 @@ cache:
 ## Built-in mechanisms in Rails for testing your application
 ## http://guides.rubyonrails.org/testing.html
 #rails_test:
-#  <<: *use_postgres
 #  <<: *satorix
 
 
@@ -108,7 +104,6 @@ cache:
 ## Behaviour Driven Development for Ruby
 ## http://rspec.info/
 #rspec:
-#  <<: *use_postgres
 #  <<: *satorix
 
 
@@ -116,8 +111,6 @@ cache:
 ## A Ruby static code analyzer, based on the community Ruby style guide.
 ## https://github.com/bbatsov/rubocop
 #rubocop:
-#  variables:
-#    SKIP_BUILDPACK: 'true'
 #  <<: *satorix
 
 
@@ -129,4 +122,6 @@ deploy_with_flynn:
   only:
     - staging
     - production
+  except:
+    - schedules
   <<: *satorix

data/lib/satorix/rails/version.rb

@@ -1,7 +1,7 @@
 module Satorix
   module Rails
     module Version
-      VERSION = '1.1.8'
+      VERSION = '1.3.0'
     end
   end
 end

data/satorix-rails.gemspec

@@ -6,7 +6,7 @@ require 'satorix/rails/version'
 Gem::Specification.new do |spec|
   spec.name          = 'satorix-rails'
   spec.version       = Satorix::Rails::Version::VERSION
-  spec.authors       = ['Internet Exposure']
+  spec.authors       = ['Satorix']
   spec.email         = ['info@satorix.com']
 
   spec.summary       = 'Satorix in Rails'
@@ -30,7 +30,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'passenger'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/satorix/CI/deploy/rubygems.rb

@@ -3,13 +3,10 @@ module Satorix
     module Deploy
       module Rubygems
 
-
         require 'fileutils'
 
-
         include Satorix::Shared::Console
 
-
         extend self
 
 
@@ -21,111 +18,111 @@ module Satorix
         end
 
 
-        private ########################################################################################################
+        private
 
 
-        def build_gem
-          run_command 'rake build'
-        end
+          def build_gem
+            Dir.chdir(Satorix.app_dir) do
+              run_command(%w[bundle exec rake build])
+            end
+          end
 
 
-        def built_gems
-          Dir.glob(File.join(gem_build_directory, '*.gem')).select { |e| File.file? e }
-        end
+          def built_gems
+            Dir.glob(File.join(gem_build_directory, '*.gem')).select { |e| File.file? e }
+          end
 
 
-        def gem_build_directory
-          File.join Satorix.app_root, 'pkg'
-        end
-
+          def gem_build_directory
+            File.join Satorix.app_dir, 'pkg'
+          end
 
-        def generate_rubygems_configuration_file
-          path = File.join(Dir.home, '.gem')
-          FileUtils.mkdir_p(path) unless File.exist?(path)
-
-          file = File.join(path, 'credentials')
-          File.open(file, 'w') { |f| f.write rubygems_configuration_file_contents }
-          FileUtils.chmod 0600, file
-        end
 
+          def generate_rubygems_configuration_file
+            path = File.join(Dir.home, '.gem')
+            FileUtils.mkdir_p(path) unless File.exist?(path)
 
-        def prepare_gem_build_directory
-          run_command "rm -rf #{ gem_build_directory }"
-          FileUtils.mkdir_p gem_build_directory
-        end
+            file = File.join(path, 'credentials')
+            File.open(file, 'w') { |f| f.write rubygems_configuration_file_contents }
+            FileUtils.chmod 0600, file
+          end
 
 
-        def publish_gem(gem)
-          run_command "gem push #{ gem } --config-file #{ File.join(Dir.home, '.gem', 'credentials') }"
-        rescue RuntimeError
-          # To prevent the display of an ugly stacktrace.
-          abort "\nGem was not published!"
-        end
+          def prepare_gem_build_directory
+            run_command(['rm', '-rf', gem_build_directory])
+            FileUtils.mkdir_p gem_build_directory
+          end
 
 
-        def rubygems_api_key
-          ENV['SATORIX_CI_RUBYGEMS_API_KEY']
-        end
+          def publish_gem(gem)
+            run_command ['gem', 'push', gem, '--config-file', File.join(Dir.home, '.gem', 'credentials')]
+          rescue RuntimeError
+            # To prevent the display of an ugly stacktrace.
+            abort "\nGem was not published!"
+          end
 
 
-        def rubygems_configuration_file_contents
-          "---\n:rubygems_api_key: #{ rubygems_api_key }"
-        end
+          def rubygems_api_key
+            ENV['SATORIX_CI_RUBYGEMS_API_KEY']
+          end
 
 
-        # To be used for rake release - START
+          def rubygems_configuration_file_contents
+            "---\n:rubygems_api_key: #{ rubygems_api_key }"
+          end
 
 
-        def configure_git
-          run_command 'git config user.name Satorix'
-          run_command 'git config user.email satorix@iexposure.com'
-          run_command 'git config push.default simple'
-        end
+          # To be used for rake release - START
 
+          def configure_git
+            run_command(%w[git config user.name Satorix])
+            run_command(%w[git config user.email satorix@iexposure.com])
+            run_command(%w[git config push.default simple])
+          end
 
-        def configure_ssh
-          run_command 'whoami'
-          run_command 'printenv'
 
-          path = File.join(Dir.home, '.ssh')
-          FileUtils.mkdir_p(path) unless File.exist?(path)
+          def configure_ssh
+            run_command(%w[whoami])
+            run_command(%w[printenv])
 
-          public_key_file = File.join(path, 'id_rsa.pub')
-          File.open(public_key_file, 'w') { |f| f.write ssh_public_key }
-          FileUtils.chmod 0600, public_key_file
-          run_command "cat #{ public_key_file }"
+            path = File.join(Dir.home, '.ssh')
+            FileUtils.mkdir_p(path) unless File.exist?(path)
 
-          private_key_file = File.join(path, 'id_rsa')
-          File.open(private_key_file, 'w') { |f| f.write ssh_private_key }
-          FileUtils.chmod 0600, private_key_file
+            public_key_file = File.join(path, 'id_rsa.pub')
+            File.open(public_key_file, 'w') { |f| f.write ssh_public_key }
+            FileUtils.chmod 0600, public_key_file
+            run_command(['cat', public_key_file])
 
-          config_file = File.join(path, 'config')
-          File.open(config_file, 'w') { |f| f.write "IdentityFile #{ private_key_file }" }
-          FileUtils.chmod 0600, config_file
-          run_command "cat #{ config_file }"
+            private_key_file = File.join(path, 'id_rsa')
+            File.open(private_key_file, 'w') { |f| f.write ssh_private_key }
+            FileUtils.chmod 0600, private_key_file
 
-          system 'eval `ssh-agent -s`'
-          run_command "ssh-add #{ private_key_file }"
-        end
+            config_file = File.join(path, 'config')
+            File.open(config_file, 'w') { |f| f.write "IdentityFile #{ private_key_file }" }
+            FileUtils.chmod 0600, config_file
+            run_command(['cat', config_file])
 
+            system 'eval `ssh-agent -s`'
+            run_command(['ssh-add', private_key_file])
+          end
 
-        def rake_release
-          run_command 'bundle exec rake release'
-        end
 
+          def rake_release
+            run_command(%w[bundle exec rake release])
+          end
 
-        def ssh_private_key
-          ENV['SATORIX_CI_SSH_PRIVATE_KEY']
-        end
 
+          def ssh_private_key
+            ENV['SATORIX_CI_SSH_PRIVATE_KEY']
+          end
 
-        def ssh_public_key
-          ENV['SATORIX_CI_SSH_PUBLIC_KEY']
-        end
 
+          def ssh_public_key
+            ENV['SATORIX_CI_SSH_PUBLIC_KEY']
+          end
 
-        # To be used for rake release - END
 
+          # To be used for rake release - END
 
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satorix-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.3.0
 platform: ruby
 authors:
-- Internet Exposure
+- Satorix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: passenger
@@ -24,48 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: The satorix-rails gem provides a streamlined mechanism for a Rails application
   to interact with the Satorix ecosystem.
 email:
@@ -79,6 +37,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - Procfile
 - README.md
 - Rakefile
@@ -120,8 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Satorix in Rails