handsome_fencer-circle_c_i 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df83db91e5bd2dc538032cb8dde3f4b58631133401a6406a893e0e6d1e3d8b0f
-  data.tar.gz: 96bde906b6e2654a5df99b22876ed6e09657d6c4c92dce03f2eaf652e2735ecb
+  metadata.gz: 6c2d157627c52291111579687d10bc3278cd9ba89e64c9eda1e119fda18a6dd2
+  data.tar.gz: ebbf1880c8d04be0bcdc471d79b0792c5ec79e76d5cf64bd09bd29670cf7d248
 SHA512:
-  metadata.gz: e35e3dde3d7e2720546d90e6d69854041bd388557f35f365b6b2264bf434081f1b2981f9d3cd4a16084c9289f0b0a68ed9e1c7ee1440e85219b03d2264d28687
-  data.tar.gz: e1f9df99333c30829973700e843d110a57a5d54959708ac426c7f4f2632a0ca20f0cf2a4e083dfe2c47349e1d70fea32cf5b3541a4fe1409e63e1a3c3e404561
+  metadata.gz: d354527aec03f7925a0ebbdf7780519e951e1165b632f5fbddcdafe9648472acca525c9faafe4b5112920ee9d0de499303519dcaadd21b040c5b40f7d1fb9d69
+  data.tar.gz: 9f17cf1473d3063db1758046ae390eac41c4a8e1cec8712648ab7e112b24df4eb476278b9986ef5c8984adc3b4246aad57dd80fc71c1f0edca5624474681cb9d

data/README.md

@@ -57,10 +57,12 @@ $ cd sooperdooperapp
 $ handsome_fencer-circle_c_i dockerize
 ```
 
-3) Ask Docker to use Rails to generate our dockerized Rails app in our current directory:
+You will be prompted to over-write a number of files. Please do so.
+
+3) Ask Docker to use Rails to generate our dockerized Rails app in our current directory. Do NOT write over the :
 
 ```bash
-$ docker-compose run app rails new .
+$ docker-compose run app rails new . --skip
 ```
 
 3a) If you're on a linux machine, you may need to chown the newly created files:
@@ -69,18 +71,18 @@ $ docker-compose run app rails new .
 $ sudo chown <username><user group> -R .
 ```
 
-3b) If that doesn't work, Docker's [documentation](https://docs.docker.com/install/linux/linux-postinstall/#manage-docker-as-a-non-root-user) should get you pointed in the right direction.
+If that doesn't work, Docker's [documentation](https://docs.docker.com/install/linux/linux-postinstall/#manage-docker-as-a-non-root-user) should get you pointed in the right direction.
 
 4) Ask Docker to build the necessary images for our app and spool up containers using them:
 
 ```bash
-$ docker-compose up --build
+$ docker-compose build
  ```
 
-4) Ask Docker to set up our database bye executing the following commands within the container for our Rails app:
+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:
 
  ```bash
- $ docker-compose exec app bin/rails db:create db:migrate
+ $ docker-compose run app bin/rails db:create db:migrate
   ```
 
 You should now be able to see the Rails welcome screen upon clicking [http://localhost:3000/](http://localhost:3000/).

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

@@ -20,6 +20,15 @@ module HandsomeFencer
         append_to_file ".gitignore", "\ndocker/**/*.env"
         append_to_file ".gitignore", "\ndocker/**/*.key"
 
+        default_values = {
+          "APP_NAME" => "greenfield",
+          "SERVER_HOST" => "ip-address-of-your-server",
+          "DOCKERHUB_EMAIL" => "your-docker-hub-emaill",
+          "DOCKERHUB_USER" => "your-docker-hub-user-name",
+          "POSTGRES_USER" => "your-postgres-username",
+          "POSTGRES_PASSWORD" => "your-postgres-password",
+          "DOCKERHUB_PASS" => "your-docker-hub-password"
+        }
         prompts = {
           "APP_NAME" => "the name of your app",
           "SERVER_HOST" => "the ip address of your server",
@@ -31,15 +40,17 @@ module HandsomeFencer
         }
 
         prompts.map do |key, prompt|
-          prompts[key] = ask("Please provide #{prompt}:")
+          prompts[key] = ask("Please provide #{prompt}:") || default_values[key]
         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])
-        if account_type == "org"
+        case account_type
+        when "org"
           prompts['DOCKERHUB_ORG_NAME']= ask("Organization name:")
-        else
+        when "user"
+          prompts['DOCKERHUB_ORG_NAME']= "${DOCKERHUB_USER}"
+        when nil
           prompts['DOCKERHUB_ORG_NAME']= "${DOCKERHUB_USER}"
-        end
 
         prompts.map do |key, value|
           append_to_file 'docker/env_files/circleci.env', "\nexport #{key}=#{value}"

data/lib/handsome_fencer/circle_c_i/templates/docker/containers/database/development.env

@@ -1,3 +1 @@
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=some-long-secure-password
-POSTGRES_DB=handsomefencer_development
+

data/lib/handsome_fencer/circle_c_i/templates/docker/containers/database/production.env

@@ -1,5 +0,0 @@
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=some-long-secure-password
-POSTGRES_DB=bacchanal_production
-
-POSTGRES_DB=handsomefencer_production

data/lib/handsome_fencer/circle_c_i/version.rb

@@ -1,5 +1,5 @@
 module HandsomeFencer
   module CircleCI
-    VERSION = '0.1.39'
+    VERSION = '0.1.40'
   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.39
+  version: 0.1.40
 platform: ruby
 authors:
 - schadenfred