terra_boi 1.0.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f586f964ace1990c78dd488bec9045c589493bb6a8d3bb76bd1184535d19927
-  data.tar.gz: 2d04e5da26bee200183935911f7b5a60820099750bd79ff17326378a52f05212
+  metadata.gz: e98fe63cdd49324f4d3133aeb410938321e2d7bf78b80b637e037333cadbb796
+  data.tar.gz: aa4f14f8fe184394d1346cced24d85cc5cf8dfce0c3b9c340e73e0042426a2c0
 SHA512:
-  metadata.gz: dd77679206ecc88ff7f9816494da339d7bdc5b6bf09a9ea3597f67fac2d1550723c5a857ead2b6c3a8265ce582e6cd716619e55c539d43a7f041aa9a1818f315
-  data.tar.gz: 283ca1f89860f934937a2f85c1389904936fd5512c11fa26a5dc0b17794227d4f7419e952423d7e5c01af3658be55197801808997e87bca116f22dc93f94836a
+  metadata.gz: 5dcf8122933b214068a2ec6395a5c401c8c775e279f9542ccd3c1d103b1a2dcec78bd392b0b824cbc0b8cb45d9b496d796321d63ee946a23843ae215ee9ec9df
+  data.tar.gz: ac6913546297e5ccbc95c71a2135e8928de8603feb20d1b7e39c81f873c37f6fcb7b3c0ecd4095df49ed006ec8ff1b2e652f1820eb6876554de4a966945c109c

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/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

@@ -22,15 +22,15 @@ namespace :terra_boi do
 		ENVS = get_envs(args)
 
 		create_boilerplate_files
-		# apply_terraform_state
-		# apply_terraform_cert
-		# apply_ecr
-		# apply_data
-		# push_container_to_ecr
-		# apply_web_app_and_worker
-		# puts_urls_for_alb
-		# puts_how_to_connect_domain_and_load_balancer
-		# puts_twitter_plug
+		apply_terraform_state
+		apply_terraform_cert
+		apply_ecr
+		apply_data
+		push_container_to_ecr
+		apply_web_app_and_worker
+		puts_urls_for_alb
+		puts_how_to_connect_domain_and_load_balancer
+		puts_twitter_plug
 	end
 
 	desc """

data/lib/terra_boi/version.rb

@@ -1,3 +1,3 @@
 module TerraBoi
-	VERSION = '1.0.2'
+	VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terra_boi
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.2
 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,34 @@ 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'
+- !ruby/object:Gem::Dependency
+  name: whenever
+  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 +152,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