on_container 0.0.14 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9375ce2312b71fcf2711319eb18e58c1e08bfef053edd28bc05e22c9dfeba543
-  data.tar.gz: '078fa6d17b8586ebdccdfd033983969a6818df32aedfb22d8a0c4d40dd6e274f'
+  metadata.gz: eed50e20955f44cedd05bbe573a86af912f532c709b947c08830f7accb9fec87
+  data.tar.gz: 736ca61c1c66875fa3873432fa8e5c9d452a15f9ae3ce4deef051914a4b838e0
 SHA512:
-  metadata.gz: 6d76eb51ac0bfbfd78518c711cd627ee9c24b69b44995f4e2728268d12d414422bdbde4881bd95b0962b640d4a1d635cd141632cfa0d2130be3f5b47de57eb88
-  data.tar.gz: f7b57e656c49b8435e4434156fee713cbc2af2fdc508371aa290276dd8e1511f50eefe077727a0648092e9f03e5e1fb63fbc2f1abb030bc7192e017d7c948ad9
+  metadata.gz: 24bb727cfe9cd0c052befbda70a4979c2f2d38e26268480eb62c12638b7911e76a98e11873d3479551098705ee369493123869aa31d2cd8b69c4f53852f89182
+  data.tar.gz: c7b5fcb41cf3415183c237ab68a155e4f4dcf3f5c75dc2276f536a31cb7c64cb90520666ba630b212295e5b02bd842a46d6065a52220593e19ecdfcfa2aa36b7

data/lib/on_container/dev/active_record_ops.rb

@@ -13,7 +13,8 @@ module OnContainer
         require 'yaml'
 
         database_yaml = Pathname.new File.expand_path('config/database.yml')
-        loaded_yaml = YAML.load(ERB.new(database_yaml.read).result) || {}
+        database_config = ERB.new(database_yaml.read).result
+        loaded_yaml = YAML.safe_load(database_config, aliases: true) || {}
         shared = loaded_yaml.delete('shared')
       
         loaded_yaml.each { |_k, values| values.reverse_merge!(shared) } if shared

data/lib/on_container/dev/setup_ops.rb

@@ -4,25 +4,37 @@ module OnContainer
   module Dev
     module SetupOps
       APP_PATH = File.expand_path '.'
-  
-      def app_temp_path; "#{APP_PATH}/tmp"; end
-      def app_setup_wait; ENV.fetch('APP_SETUP_WAIT', '5').to_i; end
-      def app_setup_lock_path; "#{app_temp_path}/setup.lock"; end
-  
+      TRUEISH_VALUES = %w[true True TRUE yes Yes YES].freeze
+      SKIP_SETUP_ENV_VAR = 'ON_CONTAINER_SKIP_SETUP_LOCK'.freeze
+
+      def app_temp_path
+        "#{APP_PATH}/tmp"
+      end
+
+      def app_setup_wait
+        ENV.fetch('APP_SETUP_WAIT', '5').to_i
+      end
+
+      def app_setup_lock_path
+        "#{app_temp_path}/setup.lock"
+      end
+
       def lock_setup
         system "mkdir -p #{app_temp_path} && touch #{app_setup_lock_path};"
       end
-      
+
       def unlock_setup
         system "rm -rf #{app_setup_lock_path}"
       end
-      
+
       def wait_setup
         puts 'Waiting for app setup to finish...'
         sleep app_setup_wait
       end
 
       def on_setup_lock_acquired
+        return yield if TRUEISH_VALUES.include? ENV[SKIP_SETUP_ENV_VAR]
+
         wait_setup while File.exist?(app_setup_lock_path)
 
         lock_setup
@@ -32,7 +44,6 @@ module OnContainer
         end
 
         yield
-
       ensure
         unlock_setup
       end
@@ -42,7 +53,7 @@ module OnContainer
           rails rspec sidekiq hutch puma rake webpack webpack-dev-server
         ].include?(ARGV[0])
       end
-      
+
       def command_might_require_database?
         %w[
           rails rspec sidekiq hutch puma rake

data/lib/on_container/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnContainer
-  VERSION = '0.0.14'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: on_container
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.17
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport