railsdock 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d95c3a6ff130d75b8398776086adc4de79151972cce4083c24377c6d806624
-  data.tar.gz: f568107b19593fa360d42b96a89f191ca1e688db35425c43c17cb4ccd74cf114
+  metadata.gz: 1927b87f309de68f89107bf239d8ce5a44f50674f8596e7d806545ae557579bd
+  data.tar.gz: cffa8d9e1a54ea1f53bc8d5f9f599f3b208bdd6de7f4c9c4dccc436f10692376
 SHA512:
-  metadata.gz: 20c4692e9455c24b7d5b6db41acb7e4f3d1478a0a6b9131b6e7faa67f141ce60b6dc5af62288e050691fec41983a9422bd9c296407e1d3dc0b173d64edba0c9e
-  data.tar.gz: ee91002e6525c635de98411bd3d5f7f63f6ca42e79ee10b7897f8fe6c3dadb706a861bf91b43d5ca0494b324bd6d1b6e5ed30094548c19b687388f99a9266149
+  metadata.gz: 7287a0e7bded459fd739b499fd7d04da601606833abff3a87fae46db5b978091448814fbdfd5f57752bc118db36126c0e96c8a0efa1587f409a12d93e9346946
+  data.tar.gz: ab53a1a71395a2c86eb167e349655a6d3e63bbacdfa070b77acd6a985555bd00493d1e9cb0ff9ac1fa712f7615ea2604ea023af09703fd20756e7473dad7fe33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    railsdock (0.1.3)
+    railsdock (0.1.4)
       bundler (~> 2.0)
       pastel (~> 0.7.2)
       railties (>= 4.2, < 6.1)
@@ -14,20 +14,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.2)
-      actionview (= 6.0.2)
-      activesupport (= 6.0.2)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2)
-      activesupport (= 6.0.2)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.2)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -39,23 +39,23 @@ GEM
       thor (>= 0.14.0)
     builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     diff-lcs (1.3)
     equatable (0.6.1)
     erubi (1.9.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.0)
     necromancer (0.5.1)
-    nokogiri (1.10.7)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    pastel (0.7.3)
+    pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
     pry (0.12.2)
@@ -63,7 +63,7 @@ GEM
       method_source (~> 0.9.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    rack (2.0.7)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -71,9 +71,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2)
-      actionpack (= 6.0.2)
-      activesupport (= 6.0.2)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -95,10 +95,10 @@ GEM
     rspec-support (3.9.0)
     thor (1.0.0)
     thread_safe (0.3.6)
-    tty-color (0.5.0)
+    tty-color (0.5.1)
     tty-command (0.8.2)
       pastel (~> 0.7.0)
-    tty-cursor (0.7.0)
+    tty-cursor (0.7.1)
     tty-file (0.7.1)
       diff-lcs (~> 1.3)
       pastel (~> 0.7.2)
@@ -112,8 +112,8 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
-    tzinfo (1.2.5)
+    tty-screen (0.7.1)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     wisper (2.0.1)
     zeitwerk (2.2.2)
@@ -130,4 +130,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/lib/railsdock/commands/install.rb

@@ -11,7 +11,11 @@ module Railsdock
       OPTIONS_HASH = {
         database: {
           name: 'Database',
-          options: %i[postgres mysql]
+          options: %i[postgres mysql],
+          default_port: {
+            postgres: 5432,
+            mysql: 3306
+          }
         },
         mem_store: {
           name: 'In-Memory Store',
@@ -49,8 +53,12 @@ module Railsdock
           append_erb_to_compose_file(service)
           file.inject_into_file('./docker-compose.yml', "\n  #{service}:", after: "\nvolumes:")
           append_service_config_to_env(service)
-          copy_db_yml("#{BASE_TEMPLATE_DIR}/#{service}/database.yml.erb") if type == :database
+          if type == :database
+            copy_db_yml("#{BASE_TEMPLATE_DIR}/#{service}/database.yml.erb")
+            inject_db_script_into_entrypoint(service)
+          end
         end
+        cmd.run('chmod +x ./dev-entrypoint')
         output.puts POST_INSTALL_MESSAGE
       end
 
@@ -64,6 +72,16 @@ module Railsdock
         file.copy_file(erb_file, './config/database.yml', context: @variables)
       end
 
+      def inject_db_script_into_entrypoint(service)
+        file.inject_into_file('./dev-entrypoint', after: "echo \"DB is not ready, sleeping...\"\n") do
+          <<~BASH
+            until nc -vz #{service} #{OPTIONS_HASH[:database][:default_port][service]}; do
+              sleep 1
+            done
+          BASH
+        end
+      end
+
       def collect_service_selections
         prompt.collect do
           OPTIONS_HASH.each do |key, value|
@@ -74,9 +92,9 @@ module Railsdock
 
       def inject_driver_config(service)
         file.inject_into_file('./docker-compose.yml', after: "  node_modules:\n    driver: ${VOLUMES_DRIVER}\n") do
-          <<-YAML
-  #{service}:
-    driver: ${VOLUMES_DRIVER}
+          <<~YAML
+            #{service}:
+              driver: ${VOLUMES_DRIVER}
           YAML
         end
       end
@@ -102,6 +120,7 @@ module Railsdock
         file.safe_append_to_file('./docker-compose.yml') do
           generate_erb("#{BASE_TEMPLATE_DIR}/#{service}/docker-compose.yml.erb")
         end
+        file.inject_into_file('./docker-compose.yml', "    - #{service}\n", after: "depends_on:\n")
       end
 
       def append_service_config_to_env(service)

data/lib/railsdock/templates/install/default/default.env.erb

@@ -41,4 +41,4 @@ RAILS_SERVER_HOST_PORT=3000
 RUBY_UID=<%= uid %>
 RUBY_GID=<%= uid %>
 # Select a Node Version for the Ruby container. Accepted values: 8-11
-NODE_VERSION=11
+RAILSDOCK_NODE_VERSION=11

data/lib/railsdock/templates/install/default/dev-entrypoint

@@ -19,9 +19,6 @@ trap unlock_setup HUP INT QUIT KILL TERM EXIT
 
 # 3: Wait for postgres to come up
 echo "DB is not ready, sleeping..."
-until nc -vz postgres 5432; do
-  sleep 1
-done
 echo "DB is ready, starting Rails."
 
 # 4: Specify a default command, in case it wasn't issued:

data/lib/railsdock/templates/install/default/docker-compose.yml.erb

@@ -20,8 +20,6 @@ x-ruby: &ruby-base
   tty: true
   stdin_open: true
   depends_on:
-    - postgres
-    - redis
 
 volumes:
   gems:

data/lib/railsdock/version.rb

@@ -1,3 +1,3 @@
 module Railsdock
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsdock
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kyle Boe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties