handsome_fencer-circle_c_i 0.1.42 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d807797d37bb6c31b3ae1871caaa1f1d993acebc5be72a2dfc8c5292c2fc51
-  data.tar.gz: e527d3d976744702cd7f295d8a6531323ba11f06d7267e4df9c70abdc725ff22
+  metadata.gz: b18dee52b2f957362a3ecd283c67945d8468f9c9d5ca98c2497d60a3c3a90dc5
+  data.tar.gz: ea22ffa16ab6472a6d112f48a5f886f42e324f64cd1c606468db4df864ff075d
 SHA512:
-  metadata.gz: bc8b437b8daabf1766e50d715a02348004585fffffea75b0ddcbea3d1a0d1b88cd97025256bc7112aebc6be0f9ea11fdde145b9e9a94be6ca805b97a316177bb
-  data.tar.gz: 9be8a2c5e12f907e480ef407669cb0ffb2e4d365e8ddc5eb0d9e726e961fe44f6f381aefe1cf3c90fab0857b5471286831d760455de383d439ae41edb28b96bb
+  metadata.gz: 0024e6219058607c9bebf03f3129c2787033b0bddf491f0fa323a341145afb3c05915f87c4d9f0866ea5f715b80fe76c96243e1fd3eef747044b15e8e3c13c8e
+  data.tar.gz: 764c6ffb1fd91ed41466c1c3b14ec20c23247aa611a31ec23ce178e174f0bad9826bc6550f9635819a0825d395c01e078bf780a0d755475f85591fc130b0e96c

data/README.md

@@ -46,8 +46,8 @@ docker-compose version 1.21.0, build 5920eb0
 1) Create a directory named after your new, greenfield app and change into that directory:
 
 ```bash
-$ mkdir -p sooperdooperapp
-$ cd sooperdooperapp
+$ mkdir -p sooperdooper
+$ cd sooperdooper
 
 ```
 
@@ -57,12 +57,12 @@ $ cd sooperdooperapp
 $ handsome_fencer-circle_c_i dockerize
 ```
 
-You will be prompted to over-write a number of files. Please do so.
+You will be prompted with a number of questions. For demonstration purposes and to accept the defaults, hit enter at each prompt without answering, and again hit enter when asked if you'd like to over-write files.
 
-3) Ask Docker to use Rails to generate our dockerized Rails app in our current directory. Do NOT write over the :
+3) Ask Docker to 'run' the 'rails new' command inside our 'app' container to generate a rails app in '.' (our current directory), with a flag specifying our 'database' as 'postgresql' and another flag so it will 'skip' over-writing our previously generated files:
 
 ```bash
-$ docker-compose run app rails new . --skip
+$ docker-compose run app rails new . --database=postgresql --skip
 ```
 
 3a) If you're on a linux machine, you may need to chown the newly created files:
@@ -79,7 +79,7 @@ If that doesn't work, Docker's [documentation](https://docs.docker.com/install/l
 $ docker-compose build
  ```
 
-4) Now we need to ask Docker to execute a command on the container started in the previous step. Issue the following command in a new terminal:
+4) Now we need to ask Docker to execute a command on the container we asked Docker to run in the previous step. Issue the following command in a new terminal:
 
  ```bash
  $ docker-compose run app bin/rails db:create db:migrate
@@ -92,7 +92,7 @@ You should now be able to see the Rails welcome screen upon clicking [http://loc
 1) Execute the install command:
 
 ```bash
-$ handsome_fencer-circle_c_i install
+$ handsome_fencer-circle_c_i dockerize
 ```
 
 2) You'll be asked which files to write over. Keep your Gemfile and let it write over everything else, including your .gitignore, any existing docker-compose.yml, .circleci/config.yml, and Gemfile.lock files.

data/lib/handsome_fencer/circle_c_i/cli/dockerize.rb

@@ -25,33 +25,40 @@ module HandsomeFencer
           "SERVER_HOST" => "ip-address-of-your-server",
           "DOCKERHUB_EMAIL" => "your-docker-hub-emaill",
           "DOCKERHUB_USER" => "your-docker-hub-user-name",
+          "DOCKERHUB_ORG" => "your-docker-hub-org-name",
+          "DOCKERHUB_PASS" => "your-docker-hub-password",
           "POSTGRES_USER" => "your-postgres-username",
-          "POSTGRES_PASSWORD" => "your-postgres-password",
-          "DOCKERHUB_PASS" => "your-docker-hub-password"
+          "POSTGRES_PASSWORD" => "your-postgres-password"
         }
+
         prompts = {
           "APP_NAME" => "the name of your app",
           "SERVER_HOST" => "the ip address of your server",
           "DOCKERHUB_EMAIL" => "your Docker Hub email",
           "DOCKERHUB_USER" => "your Docker Hub username",
+          "DOCKERHUB_ORG" => "your Docker Hub organization name",
+          "DOCKERHUB_PASS" => "your Docker Hub password",
           "POSTGRES_USER" => "your Postgres username",
-          "POSTGRES_PASSWORD" => "your Postgres password",
-          "DOCKERHUB_PASS" => "your Docker Hub password"
+          "POSTGRES_PASSWORD" => "your Postgres password"
         }
 
         prompts.map do |key, prompt|
-          prompts[key] = ask("Please provide #{prompt}:") || default_values[key]
+          prompts[key] = ask("Please provide #{prompt}:")
+          if prompts[key].size == 0
+            prompts[key] = default_values[key]
+          end
         end
 
-        account_type = ask("Will you be pushing images to Docker Hub under your user name or under your organization name instead?", :limited_to => %w[org user])
-        case account_type
-        when "org"
-          prompts['DOCKERHUB_ORG_NAME']= ask("Organization name:")
-        when "user"
-          prompts['DOCKERHUB_ORG_NAME']= "${DOCKERHUB_USER}"
-        when nil
-          prompts['DOCKERHUB_ORG_NAME']= "${DOCKERHUB_USER}"
-        end
+        # account_type = ask("Will you be pushing images to Docker Hub under your user name or under your organization name instead?", :limited_to => ["org", "user", "skip"])
+        # case account_type
+        #
+        # when "o"
+        #   prompts['DOCKERHUB_ORG_NAME']= ask("Organization name:")
+        # when "u"
+        #   prompts['DOCKERHUB_ORG_NAME']= "${DOCKERHUB_USER}"
+        # when "s"
+        #   prompts['DOCKERHUB_ORG_NAME']= "${DOCKERHUB_USER}"
+        # end
         prompts.map do |key, value|
           append_to_file 'docker/env_files/circleci.env', "\nexport #{key}=#{value}"
         end

data/lib/handsome_fencer/circle_c_i/version.rb

@@ -1,5 +1,5 @@
 module HandsomeFencer
   module CircleCI
-    VERSION = '0.1.42'
+    VERSION = '0.1.43'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handsome_fencer-circle_c_i
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.43
 platform: ruby
 authors:
 - schadenfred