jets 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c68122c5a2a85bb9081c2c20f383014bfce1109efe241a0db1762958064ad4a
-  data.tar.gz: 6de016056f47eb36e5156017f3fd218b1a3a57ce3b890617fb7d07997c38b794
+  metadata.gz: ddb22c9d9b8de3f074f3365fb40ce6f0a5aa5e745ae51ae7d295c5b21929b3c2
+  data.tar.gz: 0d990945082be50bbce002a6c0b0232560f2ea17553b5b642dd96eb17264832e
 SHA512:
-  metadata.gz: 1a1386fbe1a7e225f27116dcb23b9e272aeaf84992383b1e08f90d3fc1d2e72c69f487c7f5c223b178362eb772695ac6f6426b1f2d4c4248a9e6dcdc5342ae49
-  data.tar.gz: b316f857d5277fb166e0e45e8674fedf8803e6b280b8212600f24967abcf01b6110ccd9fb330295c057aed95a722100f29f6288dc8756000cfcb844eb61cd210
+  metadata.gz: 8d4340fe4a89c7f482a37e6f22161a49edc2cbd6e9c1d3b02279b2a01bd3e4ee44137f2eee93a868623351655a0fb6c7683808a21816bf196b91e9de26f589ec
+  data.tar.gz: ee828e0a8f06ff7122fc273f854719fe9256150a18d9c418620d4d009b54871fa2f1040bdae3c083022cd80470dce1ae5057b41c4f0e12a4eb4f1122c343faab

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.0.4]
+- import:rails reconfigure database.yml pull request #56 from tongueroo/database-yml
+
 ## [1.0.3]
 - Allow control to prewarming of rack endpoint more
 - add config.prewarm.rack_ratio setting pull request #55 from tongueroo/prewarm-rack-more

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.0.3)
+    jets (1.0.4)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -114,7 +114,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     memoist (0.16.0)
-    method_source (0.9.0)
+    method_source (0.9.1)
     mimemagic (0.3.2)
     mini_portile2 (2.3.0)
     minitest (5.11.3)

data/lib/jets/commands/import/rail.rb

@@ -28,11 +28,25 @@ CODE
       end
     end
 
-    def copy_database_yaml
-      src = "#{Jets.root}config/database.yml"
-      dest = "#{Jets.root}rack/config/database.yml"
-      puts "Copying #{src} to #{dest}"
-      FileUtils.cp(src, dest)
+    def reconfigure_database_yml
+      current_yaml = "#{Jets.root}rack/config/database.yml"
+      return unless File.exist?(current_yaml)
+
+      vars = {}
+      data = YAML.load_file(current_yaml)
+      # Grab values from current database.yml
+      %w[development test production].each do |env|
+        vars["database_#{env}"] = data[env]['database']
+      end
+      vars['adapter'] = data['development']['adapter']
+
+      path = File.expand_path("templates/config/database.yml", File.dirname(__FILE__))
+      content = Jets::Erb.result(path, vars)
+      IO.write(current_yaml, content)
+      puts "Reconfigured #{current_yaml}"
+    rescue Exception
+      # If unable to copy the database.yml settings just slightly fail.
+      # Do this because really unsure what is in the current database.yml
     end
 
     def finish_message
@@ -48,12 +62,14 @@ CODE
 
         The catchall route passes any route not handled by the Jets app as a request onto the Rails app.  You can modified the route to selectively route what you want.
 
+        Please double check that rack/config/database.yml is appropriately configured, it likely needs to be updated.
+
         Test the application locally. Test that the Rails app in the rack subfolder works independently.  You can start the application up with:
 
             cd rack # cd into the imported Rails project
             bundle exec rackup
 
-        The rack server starts up on http://localhost:9292  You might have to make sure that the database is configured.
+        The rack server starts up on http://localhost:9292
 
         Once tested, stop that server with CTRL-C.
 

data/lib/jets/commands/import/templates/config/database.yml

@@ -0,0 +1,26 @@
+default: &default
+  adapter:  <%= @adapter %>
+  encoding: utf8
+  pool: <%%= ENV["DB_POOL"] || 5  %>
+  database: <%%= ENV['DB_NAME'] || '<%= @database_development %>' %>
+<% if @adapter == 'mysql' -%>
+  username: <%%= ENV['DB_USER'] || 'root' %>
+<% else -%>
+  username: <%%= ENV['DB_USER'] || ENV['USER'] %>
+<% end -%>
+  password: <%%= ENV['DB_PASS'] %>
+  host: <%%= ENV["DB_HOST"] %>
+  url: <%%= ENV['DATABASE_URL'] %> # takes higher precedence than other settings
+
+development:
+  <<: *default
+  database: <%%= ENV['DB_NAME'] || '<%= @database_development %>' %>
+
+test:
+  <<: *default
+  database: <%= @database_test %>
+
+production:
+  <<: *default
+  database: <%= @database_production %>
+  url: <%%= ENV['DATABASE_URL'] %>

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -525,6 +525,7 @@ files:
 - lib/jets/commands/import/rack.rb
 - lib/jets/commands/import/rail.rb
 - lib/jets/commands/import/sequence.rb
+- lib/jets/commands/import/templates/config/database.yml
 - lib/jets/commands/import/templates/submodules-cheatsheet.md
 - lib/jets/commands/main.rb
 - lib/jets/commands/markdown.rb