dockrails 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adbe324970fc15fb50b9b9ad644592992c9f1241
-  data.tar.gz: 0776a2436119808d5471b06910d3535c16889847
+  metadata.gz: 8096b68de7a31963de73702571cdc07950838d6e
+  data.tar.gz: ff8d5475e2de304a1654229c38ea49961acef3d2
 SHA512:
-  metadata.gz: da05bbe63ab3882df34d3b5663268e4c72a907c16c2ecd82bffa4c06167ccb50410bcb420dc7b4a1410291cfae11b178243e671c00fd26bdef999060a04121ff
-  data.tar.gz: 75d4f9effa54dd0010f5743dad3ccb700198d9227f6b216d338f44c4373932a84be887e84e359567811d4a4962aaa9e4e1d2928312c784d0e2fe37c6d54c2f7e
+  metadata.gz: 38232ab9d1ed8fdc66278c64700754117d39a5f71945d2fc8144afd0ab6fdab70fecfbf7fd7fa08d2844606b8d1bf8c33a869bef10832b8ba19c3c57fac463de
+  data.tar.gz: c802e14c7650ec7a4f92b9ce8aa3aa7f75ffc188c0b9e9d7f0f7328cbf2a6e0c0437e62fdd2d3d824e8325932614d1abe91623a5cc72e7dc7d06e1c1aab47b25

data/bin/dockrails

@@ -7,6 +7,7 @@ require 'dockrails'
 program :name, 'dockrails'
 program :version, Dockrails::VERSION
 program :description, 'CLI to Generate and Run a Rails environment with Docker'
+program :help_formatter, Commander::HelpFormatter::TerminalCompact
 
 command :init do |c|
   c.syntax = 'dockrails init'
@@ -17,15 +18,15 @@ command :init do |c|
 
     existing_files = ["Dockerfile", "docker-compose.yml", "docker-sync.yml"].map { |file| File.exist?(file) }
     if existing_files.include?(true)
-      say "We detected an existing Docker install in this folder"
-      answer = agree "Do you want to continue and override it? (yes|no)"
+      say "<%= color 'We detected an existing Docker install in this folder', YELLOW %>"
+      answer = agree "<%= color 'Do you want to continue and override it? (yes|no)', BOLD %>"
       exit if !answer
     end
 
-    rails_app = ask "\nType the name of your Rails App folder"
+    rails_app = ask "\n<%= color 'Type the name of your Rails App folder', BOLD %>"
     if !system("find #{rails_app} > /dev/null")
-      say "\nUnable to find your Rails application folder in the current path, please try again"
-      say "If you want to create a new Rails app: rails new my_app -B -d postgresql"
+      say "\n<%= color 'Unable to find your Rails application folder in the current path, please try again', RED %>"
+      say "<%= color 'If you want to create a new Rails app: rails new my_app -B -d postgresql', UNDERLINE %>"
       exit
     end
 
@@ -33,7 +34,7 @@ command :init do |c|
 
     (generate.check_system_requirements).each do |k,v|
       if v == false
-        say "please install \"#{k}\" in order to continue\n"
+        say "\n<%= color 'Please install #{k} in order to continue', RED%>"
         exit
       end
     end
@@ -45,11 +46,11 @@ command :init do |c|
     generate.create_docker_compose
     generate.create_docker_sync
 
-    say "\nSuccessful dockerization!
+    say "\n<%= color 'Successful dockerization!
 Please take a look at the different files generated:
 - Dockerfile
 - docker-compose.yml
-- docker-sync.yml"
+- docker-sync.yml', GREEN%>"
 
     say "\nStart your dockerized Rails Environement: dockrails start"
     say "Familiarize yourself with the different commands: dockrails --help"
@@ -83,7 +84,7 @@ command :run do |c|
   c.example 'description', 'dockrails run [web|job|db|redis] bundle install'
   c.action do |args, options|
     if args.size < 2
-      say "\n Please specify a container and command to run, ex: dockrails run app bundle install"
+      say "\n<%= color 'Please specify a container and command to run, ex: dockrails run app bundle install', RED%>"
     else
       system("docker-compose run #{args.join(" ")}")
     end
@@ -93,12 +94,23 @@ end
 command :attach do |c|
   c.syntax = 'dockrails attach [container]'
   c.summary = 'Attach TTY to a specific container (usefull for ByeBug or Pry)'
-  c.description = 'toto'
+  c.description = ''
+  c.example 'description', 'dockrails attach web'
   c.action do |args, options|
     if args.size < 1
-      say "\n Please specify a container, ex: dockrails attach app"
+      say "\n<%= color 'Please specify a container, ex: dockrails attach web', RED%>"
     else
       system("docker attach $(docker-compose ps -q #{args[0]})")
     end
   end
 end
+
+command :update do |c|
+  c.syntax = 'dockrails update'
+  c.summary = 'Update to latest Dockrails version'
+  c.description = ''
+  c.example 'description', 'dockrails update'
+  c.action do |args, options|
+    system("gem update dockrails")
+  end
+end

data/lib/dockrails/generate.rb

@@ -21,23 +21,24 @@ module Dockrails
     end
 
     def configure
-      @config[:"ruby-version"] = choose("\nChoose a ruby version?", "latest", "2.4", "2.3", "2.2")
-      @config[:db] = choose("\nChoose a DB Engine", :pgsql, :mysql)
-      @config[:db_name] = ask "\nChoose a database name"
-      @config[:db_user] = ask "\nChoose a database username"
-      @config[:db_password] = ask "\nChoose a database password"
-      @config[:redis] = agree("\nDo you need a Redis DB? (yes|no)")
-      @config[:sidekiq] = agree("\nDo you need a SideKiq Container? (yes|no)") if @config[:redis]
-
-      user_agree = agree "\nSummary:
-    - Ruby version: #{@config[:"ruby-version"]}
+      @config[:ruby] = choose("\n<%= color 'Choose a ruby version?', BOLD%>", "latest", "2.4", "2.3", "2.2")
+      @config[:db] = choose("\n<%= color 'Choose a DB Engine', BOLD%>", :pgsql, :mysql)
+      @config[:db_name] = ask "\n<%= color 'Choose a database name', BOLD%>"
+      @config[:db_user] = ask "\n<%= color 'Choose a database username', BOLD%>"
+      @config[:db_password] = ask "\n<%= color 'Choose a database password', BOLD%>"
+      @config[:redis] = agree("\n<%= color 'Do you need a Redis DB? (yes|no)', BOLD%>")
+      @config[:sidekiq] = agree("\n<%= color 'Do you need a SideKiq Container? (yes|no)', BOLD%>") if @config[:redis]
+
+      say "\nSummary:
+    - Ruby version: #{@config[:ruby]}
     - DB Engine: #{@config[:db]}
     - DB Name: #{@config[:db_name]}
     - DB Username: #{@config[:db_user]}
     - DB Password: #{@config[:db_password]}
     - Redis? #{@config[:redis]}
-    - Job Container? #{@config[:sidekiq] ||= false}\n
-  Is this correct? (yes|no)"
+    - Job Container? #{@config[:sidekiq] ||= false}"
+
+      user_agree = agree("\n<%= color 'Is this correct? (yes|no)', BOLD%>")
 
       unless user_agree
         configure
@@ -54,7 +55,7 @@ module Dockrails
 
     def create_dockerfile
       File.open("Dockerfile", 'w') do |f|
-        f.write("FROM ruby:#{@config[:"ruby-version"]}
+        f.write("FROM ruby:#{@config[:ruby]}
   RUN apt-get update && apt-get install -y \
   build-essential \
   wget \

data/lib/dockrails/version.rb

@@ -1,3 +1,3 @@
 module Dockrails
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/generate_spec.rb

@@ -56,7 +56,7 @@ describe Dockrails::Generate do
       @app_path = "rails_app"
 
       @config_with_redis = {
-        "ruby-version": "latest",
+        ruby: "latest",
         db: :pgsql,
         db_name: "rails",
         db_user: "rails",
@@ -66,7 +66,7 @@ describe Dockrails::Generate do
       }
 
       @config_without_redis = {
-        "ruby-version": "latest",
+        ruby: "latest",
         db: :pgsql,
         db_name: "rails",
         db_user: "rails",
@@ -76,7 +76,7 @@ describe Dockrails::Generate do
       }
 
       @config_with_mysql = {
-        "ruby-version": "latest",
+        ruby: "latest",
         db: :mysql,
         db_name: "rails",
         db_user: "rails",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockrails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Guillaume Montard