dockerfile-rails 1.0.15 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 643e89aa7b925c6eafb7a39646fbc7a3598ed3a0ac1733c94b8baed912e814c9
-  data.tar.gz: 2235072e0a79ecb5011d720287e18641d5e44263498db0b33e2f3dc0e223911f
+  metadata.gz: 05b8a577ac00405dd179ea5b1cde996561ea653975160a946c204191a0fa0a26
+  data.tar.gz: 2ea30cf471f625e997fca7185bcbc89d59731516cd6165d8553a3c8a59ddcfa5
 SHA512:
-  metadata.gz: 244a1ccd3abc9fd668d76726728c600a8edd1ecd30a735f116973da58d021bf2f980780f7b0694f87b217a601259d7c5d96f7b284960f577bd82a3ac5c76b988
-  data.tar.gz: 5f6f2dc75d9014aa7b3d79314a6cb09af2f284ca847300fc57aa056518c95b18a4b421c00c6c490a707fbfba0b60717ba71d2aaa26e216e12cc9d30efadc94b2
+  metadata.gz: 1f6ea1a1dc18afd820a0af903385837688f22cac8b11e625e706b6fa2342b850e03f6a0d05606b7ea1c565560993eead3fd31259b1ca34c611b8c0178acdb38a
+  data.tar.gz: 9b9c27e9c40f6b6edac3aa732d0fae0b2b10a68127b229ade66c980e333ba0601e6f85de78f729efa8acf947f797ef0abf8923990f757c57bcf20c58867074be

data/lib/dockerfile-rails/scanner.rb

@@ -2,21 +2,6 @@ module DockerfileRails
   module Scanner
     def scan_rails_app
 
-      ### database ###
-
-      database = YAML.load_file('config/database.yml', aliases: true).
-        dig('production', 'adapter') rescue nil
-
-      if database == 'sqlite3'
-        @sqlite3 = true
-      elsif database == 'postgresql'
-        @postgresql = true
-      elsif database == 'mysql' or database == 'mysql2'
-        @mysql = true
-      elsif database == 'sqlserver'
-        @sqlserver = true
-      end
-
       ### ruby gems ###
 
       @gemfile = []
@@ -49,6 +34,25 @@ module DockerfileRails
       @puppeteer = @gemfile.include? 'puppeteer'
       @bootsnap = @gemfile.include? 'bootsnap'
 
+      ### database ###
+
+      database = YAML.load_file('config/database.yml', aliases: true).
+        dig('production', 'adapter') rescue nil
+
+      if database == 'sqlite3'
+        @sqlite3 = true
+      elsif database == 'postgresql'
+        @postgresql = true
+      elsif database == 'mysql' or database == 'mysql2'
+        @mysql = true
+      elsif database == 'sqlserver'
+        @sqlserver = true
+      end
+
+      @sqlite3 = true if @gemfile.include? 'sqlite3'
+      @postgresql = true if @gemfile.include? 'pg'
+      @mysql = true if @gemfile.include? 'mysql2'
+
       ### node modules ###
 
       @package_json = []

data/lib/generators/dockerfile_generator.rb

@@ -28,7 +28,7 @@ class DockerfileGenerator < Rails::Generators::Base
 
   # load defaults from config file
   if File.exist? 'config/dockerfile.yml'
-    options = YAML.safe_load_file('config/dockerfile.yml', symbolize_names: true)[:options]
+    options = YAML.safe_load(IO.read('config/dockerfile.yml'), symbolize_names: true)[:options]
 
     if options
       OPTION_DEFAULTS.to_h.each do |option, value|
@@ -403,7 +403,7 @@ private
 
     # optionally, adjust cwd
     if options['bin-cd']
-      binfixups.push %{sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)' /app/bin/*}
+      binfixups.push %{grep -l '#!/usr/bin/env ruby' /rails/bin/* | xargs sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)'}
     end
 
     binfixups

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.17
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails