et_full_system 1.0.11.pre.rc1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c17961e003c050d0d42d509c9acdefe37b70aebbb9cd5e7d402a9c03ba8f9ec2
-  data.tar.gz: db9973d99aba50b91802236dde282744c5b5d1fb871e8bdc83a050d3a2ca426e
+  metadata.gz: 350455266930288a5bc63303704423b8642144ca7e45fa8cfc09d1f5eb27a467
+  data.tar.gz: 45e90d6f4318592e076d218501a3625d0032aa80626f9e0a18067df0a17a0cf7
 SHA512:
-  metadata.gz: '09c3a4e90219dbee03953cd3f295213fd2220cdc83eb5e931c5bb51520e6ae27d4d01d0b26e81f91804eba9051fc565b300ef4a9c23b842e91bf3f6d0fe6b512'
-  data.tar.gz: 998eaf34834d3e875b0114e7944ba7f14c612ba0962909b010a416824bb3ed074818969d459e45c3a261615efbd4125ed685c14abaf286c097d49e7fcc9307a0
+  metadata.gz: 3d19574850f6836ee394857b47808b2c45c6596ecdfaf0ac2f16bbd47a21cd50fb882195118539921f75b28003b98077faecdf5180d9eb013d330b2343e2cb6f
+  data.tar.gz: ce1423cf4e70982ea6aa81d1cd8c6fd07ee0392d084a7306dc92922b6137b006d358b9b034a79d7c4e4f5a2382dd0cb1eb6c28e1adf47166d1a390277b2f4835

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.11.pre.rc1)
+    et_full_system (2.0.1)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -13,9 +13,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activesupport (6.1.1)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -23,21 +23,21 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.416.0)
-    aws-sdk-core (3.111.0)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.434.0)
+    aws-sdk-core (3.113.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.87.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.92.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-core (0.1.15)
       faraday (~> 0.9)
@@ -48,7 +48,7 @@ GEM
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6, >= 1.6.8)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     dotenv (2.7.6)
     et_fake_acas_server (0.1.10)
       activesupport (>= 5.2)
@@ -57,38 +57,38 @@ GEM
       ruby-mcrypt (~> 0.2)
       sinatra (~> 2.0, >= 2.0.3)
       sinatra-contrib (~> 2.0)
-    et_fake_ccd (1.1.1)
+    et_fake_ccd (1.1.3)
       activemodel (>= 5.2.3)
       iodine (~> 0.7)
       json-schema (~> 2.5)
       roda (~> 3.21)
-      rotp (~> 5.1)
+      rotp (~> 6.2)
       thor (~> 1.0)
       tilt (~> 2.0, >= 2.0.9)
-    faraday (0.17.3)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.7)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    iodine (0.7.43)
+    iodine (0.7.44)
     jmespath (1.4.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.0225)
     mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.11.1)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     public_suffix (4.0.6)
@@ -97,12 +97,11 @@ GEM
     rack-protection (2.1.0)
       rack
     rake (13.0.1)
-    roda (3.39.0)
+    roda (3.42.0)
       rack
-    rotp (5.1.0)
-      addressable (~> 2.5)
+    rotp (6.2.0)
     ruby-mcrypt (0.2.0)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
@@ -114,7 +113,7 @@ GEM
       rack-protection (= 2.1.0)
       sinatra (= 2.1.0)
       tilt (~> 2.0)
-    thor (1.0.1)
+    thor (1.1.0)
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)

data/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM phusion/passenger-customizable:0.9.34
+FROM phusion/passenger-customizable:1.0.12
 # Set correct environment variables.
 ENV HOME /root
 ARG GEM_VERSION=>0
@@ -17,25 +17,22 @@ CMD ["/sbin/my_init"]
 #
 #   Ruby support
 
-# The following 2 lines are temporary - see https://github.com/phusion/passenger-docker/issues/234
-# Try to remove and build from scratch maybe after january 2019
-RUN curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
-RUN curl -sSL https://rvm.io/mpapis.asc -o /pd_build/ruby_support/mpapis-pubkey.asc
+
 #RUN /pd_build/ruby-2.0.*.sh
 #RUN /pd_build/ruby-2.1.*.sh
 #RUN /pd_build/ruby-2.2.*.sh
 #RUN /pd_build/ruby-2.3.*.sh
 #RUN /pd_build/ruby-2.4.*.sh
-RUN /pd_build/ruby-2.5.*.sh
+RUN /pd_build/ruby-2.7.*.sh
 #RUN /pd_build/jruby-9.1.*.sh
 #   Python support.
 #RUN /pd_build/python.sh
 #   Node.js and Meteor standalone support.
 #   (not needed if you already have the above Ruby support)
-#RUN /pd_build/nodejs.sh
+RUN /pd_build/nodejs.sh
 
 # Get latest rubygems
-RUN bash --login -c "rvm --default use 2.5.1"
+RUN bash --login -c "rvm --default use 2.7.2"
 RUN gem update --system
 
 # ...put your own build instructions here...
@@ -66,8 +63,6 @@ COPY docker/pdftk /usr/local/bin
 RUN chmod 0755 /usr/local/bin/pdftk
 
 
-RUN /pd_build/nodejs.sh
-
 # Enable the Redis service.
 RUN rm -f /etc/service/redis/down
 
@@ -107,7 +102,7 @@ WORKDIR /home/app/full_system
 RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
 USER app
 
-RUN bash --login -c "rvm --default use 2.5.1"
+RUN bash --login -c "rvm --default use 2.7.2"
 RUN bash --login -c "gem install bundler --version 1.17.3"
 
 # Install gems required outside of any bundle.

data/lib/et_full_system/cli/local.rb

@@ -342,7 +342,7 @@ module EtFullSystem
 
     def setup_et1_service
       puts "------------------------------------------------ SETTING UP ET1 SERVICE ---------------------------------------------------"
-      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et1.env\" bundle install --with=#{options[:rails_env]}\""
+      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et1.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'et1 setup'
 
@@ -357,7 +357,7 @@ module EtFullSystem
 
     def setup_et3_service
       puts "------------------------------------------------ SETTING UP ET3 SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et3 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et3.env\" bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et3 && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et3.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'et3 setup'
 
@@ -368,7 +368,7 @@ module EtFullSystem
 
     def setup_admin_service
       puts "------------------------------------------------ SETTING UP ADMIN SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/admin && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_admin.env\" bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/admin && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_admin.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'admin setup'
 
@@ -380,7 +380,7 @@ module EtFullSystem
 
     def setup_api_service
       puts "------------------------------------------------ SETTING UP API SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/api && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/api && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'api setup'
 
@@ -392,14 +392,14 @@ module EtFullSystem
 
     def setup_atos_service
       puts "------------------------------------------------ SETTING UP ATOS SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/atos && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_atos.env\" bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/atos && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_atos.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'atos setup'
     end
     
     def setup_ccd_service
       puts "------------------------------------------------ SETTING UP CCD EXPORT SERVICE ---------------------------------------------------"
-      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et_ccd_export && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" bundle install --with=#{options[:rails_env]}\""
+      cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et_ccd_export && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
       puts cmd
       external_command cmd, 'ccd setup'
     end

data/lib/et_full_system/cli/local/file_storage.rb

@@ -55,7 +55,7 @@ module EtFullSystem
 
         def setup_azure_storage
           unbundled do
-            puts `bash --login -c "cd systems/api && rvm use && dotenv -f \"#{GEM_PATH}/foreman/.env\" dotenv -f \"#{GEM_PATH}/foreman/et_api.env\"  bundle exec bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`
+            puts `bash --login -c "export RAILS_ENV=production && cd systems/api && rvm use && dotenv -f \"#{GEM_PATH}/foreman/.env\" dotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`
 
           end
         end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.11-rc1"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.11.pre.rc1
+  version: 2.0.1
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -195,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6