terra_boi 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f5413354a66c625ee26c8778773011b1119e1ca8c7907d5c35d3848f376c9a
-  data.tar.gz: 73ffe12bcc566b1ba30077ae5cc228edc03a922d235ab3c785bd9fa9c94d1d26
+  metadata.gz: d35fd6f8f0c06796d8da9aaa2c0f7465f7727e5a1ea8e4d304f43d6d7b173a59
+  data.tar.gz: ab8e91ccee4625755ee0ecb2d90bc3eae26afc72cf949bebe193218fb9157c2f
 SHA512:
-  metadata.gz: e9aeb3d92446bcc652784cc3f4c0cad93bf42bc2e23564844b24eaff946c23815bee419f0cbe19a3d355c606129d4f40f2c116d89d1ec15ca931df09b4497e0d
-  data.tar.gz: 33d3a88b5034b673eeaca0a377fc19445188b2436f00f634cfa2c4780538c144c0e581294cbba8df0d2e34273649d8ab1aa75b7868c3d7e7fe9bd42db7b932be
+  metadata.gz: 2ccaf8b0d5421b09d6306126544f10789b0be2c91778cfd20217f0e2cc4b421296d1eefa7536174017231dbd639a1f28b2d728e420817d837e435fad2a763fae
+  data.tar.gz: 4c294c4d415b7625c5a5eeca12a0c10ac6b4658213e63f05ef06d335be32b55e4e5220f9d40edead4686068407c79b3caaf5470e073ff6fd9242e87ef55c33bc

data/lib/generators/extensions.rb

@@ -1,29 +1,34 @@
 module TerraBoi
 	module GeneratorHelpers
 		# https://api.rubyonrails.org/classes/Rails/Generators/NamedBase.html#method-i-application_name
-		def generate_application_name
+		def generate_application_name(separators: false)
 			if defined?(Rails) && Rails.application
-				Rails.application.class.name.split("::").first.underscore
-			else
-				"application"
-			end
-		end
+        app_name = Rails.application.class.name.split("::").first.underscore
+        unless separators
+          app_name = app_name.gsub('_', '') 
+        end
 
-		def generate_terraform_files(args)
-			args[:env].each do |env|
-				template(args[:template], 
-					"terraform_v2/#{env}/#{args[:file_path]}",
-					{
-						env: env,
-						domain_name: (class_options && class_options[:domain_name]) || generate_application_name + '.com'
-					}
-				)
-			end
-		end
-	end
+        app_name
+      else
+        "application"
+      end
+    end
+
+    def generate_terraform_files(args)
+      args[:env].each do |env|
+        template(args[:template], 
+          "terraform_v2/#{env}/#{args[:file_path]}",
+          {
+            env: env,
+            domain_name: (class_options && class_options[:domain_name]) || generate_application_name + '.com'
+          }
+        )
+      end
+    end
+  end
 end
 
 class Rails::Generators::Base
-	include TerraBoi::GeneratorHelpers
+  include TerraBoi::GeneratorHelpers
 end
-	
+  

data/lib/generators/terra_boi/db_config_generator.rb

@@ -15,11 +15,11 @@ module TerraBoi
 
 	  def init
 	  	# defined in lib/generators/extensions
-	  	self.application_name = generate_application_name
+	  	self.application_name = generate_application_name separators: false
 	  end
 
 	  def create_db_config_file
 	  	template "db_config.erb", "config/database.yml"
 	  end
 	end
-end
+end

data/lib/generators/terra_boi/templates/db_config.erb

@@ -27,4 +27,4 @@ production:
   username: <%%= ENV["DB_USERNAME"] %>
   password: <%%= ENV["DB_PASSWORD"] %>
   host: <%%= ENV["DB_HOST"] %>
-  pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

data/lib/generators/terra_boi/templates/env/data/main.tf.erb

@@ -20,7 +20,7 @@ variable "db_username" {}
 variable "db_password" {}
 
 module "db_and_s3" {
-  source = "github.com/charliereese/terraform_modules//data?ref=v0.0.27"
+  source = "github.com/charliereese/terraform_modules//data?ref=v0.0.28"
 
   env               = "<%= config[:env] %>"
   app_name          = "<%= application_name %>"
@@ -28,4 +28,4 @@ module "db_and_s3" {
   db_encrypted      = <%= config[:env] == 'prod' ? true : false %>
   db_username       = var.db_username
   db_password       = var.db_password
-}
+}

data/lib/generators/terra_boi/templates/lib/scripts/push_to_ecr.sh.erb

@@ -12,7 +12,11 @@ aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --
 
 # Build your Docker image using the following command
 DOCKERFILE_PATH="$SCRIPT_DIR/../../../."
-docker build -t $AWS_ECR_REPO_NAME $DOCKERFILE_PATH
+if ! docker build -t $AWS_ECR_REPO_NAME $DOCKERFILE_PATH; then 
+	echo "TERRA_BOI | Command failed. Pruning Docker memory then retrying!"
+	echo "TERRA_BOI | Pruning may take a couple minutes..."
+	docker system prune -a && docker build -t $AWS_ECR_REPO_NAME $DOCKERFILE_PATH
+fi
 
 # After the build completes, tag your image so you can push the image to this repository:
 docker tag $AWS_ECR_REPO_NAME:latest $AWS_ECR_REPO_URL:latest

data/lib/generators/terra_boi/templates/state_main.erb

@@ -3,8 +3,8 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 module "remote_state_locking" {
-  source = "github.com/charliereese/terraform_modules//state?ref=v0.0.25"
+	source = "github.com/charliereese/terraform_modules//state?ref=v0.0.28"
 
-  app_name = "<%= application_name %>"
-  region   = "us-east-2"
+	app_name = "<%= application_name %>"
+	region   = "us-east-2"
 }

data/lib/generators/terra_boi/tf_env_generator.rb

@@ -35,7 +35,7 @@ module TerraBoi
 
 		def init
 			# defined in lib/generators/extensions
-			self.application_name = generate_application_name
+			self.application_name = generate_application_name separators: false
 			self.class_options = options
 		end
 
@@ -51,4 +51,4 @@ module TerraBoi
 			end
 		end
 	end
-end
+end

data/lib/generators/terra_boi/tf_state_generator.rb

@@ -14,11 +14,11 @@ module TerraBoi
 		)
 
 		def init
-			self.application_name = generate_application_name
+			self.application_name = generate_application_name separators: false
 		end
 
 		def create_main_terraform_file
 			template "state_main.erb", "terraform/state/main.tf"
 		end
 	end
-end
+end

data/lib/tasks/terra_boi_tasks.rake

@@ -155,13 +155,7 @@ end
 
 def push_container_to_ecr
 	puts "\nTERRA_BOI | Building application docker container then pushing to ECR...\n".cyan.bold
-	sh "./terraform/lib/scripts/push_to_ecr.sh" do |ok, res|
-		if !ok
-			puts "\nTERRA_BOI | Docker container build and push failed (status = #{res.exitstatus})".cyan.bold
-			puts "\nTERRA_BOI | Pruning docker (to create more memory) and retrying...\n".cyan.bold
-			sh "docker system prune -a && ./terraform/lib/scripts/push_to_ecr.sh"
-		end
-	end
+	sh "./terraform/lib/scripts/push_to_ecr.sh"
 end
 
 def apply_web_app_and_worker

data/lib/terra_boi/version.rb

@@ -1,3 +1,3 @@
 module TerraBoi
-	VERSION = '1.0.1'
+	VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terra_boi
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Charlie Reese
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Deploy your rails application to AWS with `rake deploy`.
 
@@ -124,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Deploy your rails application to AWS with `rake deploy`. terra_boi generates