satorix-rails 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b9d6f9e7b878b946c92879ecdca57539e17b726
-  data.tar.gz: 51f759acfe38d749d2d629f9c0c2d0aaba1c4a2a
+  metadata.gz: 540f373fd884bc1e15f5332fdd9e3199585a18c7
+  data.tar.gz: c1531bb5ea3fa2a8cf9506a9fbe34c07ad2ee4ec
 SHA512:
-  metadata.gz: 3061312baa499d9421499caf785bb7239c6199e1d8811f6b6fb996a1e31c65cafe5485fcef62b81a6d9e785313c1428bb8dc6fb363260bc00b6cfdd4cc4ecc79
-  data.tar.gz: 98dc15e19de99dc0e7f160aa5a265b9fee5525b87a6c3f4cc7d215990dd8dad9d14f4db91fb27690c8dbc5f5d2e5b50bd2e3542031ab10223a5f96f51fd38255
+  metadata.gz: 881552851cfabbd7162f8a6081a1ab671b76228b6c7c21abc0f3bac6d4fae84c6c0c53e5a1f51d6261736bcf29aed86935f45b739eca1fcb38460118beb4240c
+  data.tar.gz: 358ad0ca21b9bc58032d105324ba88ecf7b506d29fc39880c002e7f13c4459238ed136cdd19c84d05cacb840e0f4f9c62c4bc74320459abc48dc13a0e3001dce

data/.gitlab-ci.yml

@@ -22,10 +22,14 @@ rspec:
 
 # This is a custom job, defined at satorix/CI/deploy/ie_gem_server.rb
 deploy_to_rubygems:
+  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
   environment:
     name: $CI_COMMIT_REF_NAME
     url: 'http://gems.iexposure.com/gems/satorix-rails'
   stage: deploy
   only:
     - master
+  except:
+    - schedules
   <<: *satorix

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.1.9'
     end
   end
 end

data/satorix-rails.gemspec

@@ -30,7 +30,7 @@ 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'
+  spec.add_dependency 'bundler', '~> 1.13'
+  spec.add_dependency 'rake', '~> 10.0'
+  spec.add_dependency 'rspec', '~> 3.0'
 end

data/satorix/CI/deploy/rubygems.rb

@@ -25,7 +25,9 @@ module Satorix
 
 
         def build_gem
-          run_command 'rake build'
+          Dir.chdir(Satorix.app_dir) do
+            run_command 'bundle exec rake build'
+          end
         end
 
 
@@ -35,7 +37,7 @@ module Satorix
 
 
         def gem_build_directory
-          File.join Satorix.app_root, 'pkg'
+          File.join Satorix.app_dir, 'pkg'
         end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satorix-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Internet Exposure
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: passenger
@@ -31,7 +31,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +45,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Satorix in Rails