terra_boi 1.0.3 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb679b4c8cdd86155d384ae140855418f08dfa4be915012e8793c760d45492a3
-  data.tar.gz: '00908e67753df845806abcff37d2d77356e21ee140bd740868d91d133460ef44'
+  metadata.gz: 7c8b8a00f0a510df857ec245094274f164b0f4c99146d32612507dfb12b5de42
+  data.tar.gz: f4682351027c398f643d278e21844d8acdab0c2a638768f23d80290bf5bb640e
 SHA512:
-  metadata.gz: c13891a90eced82df61fc806153ab37f4dcda8bc1c6eb6868deabba38b560fb10ddd28c384eb682bce0e39f91a0e9f206537504a0c1e0b5c3982897f4c4b7c0d
-  data.tar.gz: fc865f442eafd954b0a13bdb36a54ce9aab26bcc375b958c251506bdcb7efa14f60a4c59d81f868e4914b1f93f2fc54458f14dada1be076073e6444e6caca11d
+  metadata.gz: 0a2b04b216bf689a4fe72c05d63bedb09fca2a62b9928488fc806c79332f8d3ede3676cd764cb63b7520f41de4e1ddc63cdab66ac9cba54c72f75de9675a7342
+  data.tar.gz: 604fe4ee618898ca7a2cd377597b35fb81c1efbac1b631457a33a05ac89d6a85b9eeee382200b0e2c78e58f5207bf0fb0ef46341be9d272fba55e0b821e1d55f

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

@@ -26,7 +26,8 @@ namespace :terra_boi do
 		apply_terraform_cert
 		apply_ecr
 		apply_data
-		push_container_to_ecr
+	  run_wheneverize	
+    push_container_to_ecr
 		apply_web_app_and_worker
 		puts_urls_for_alb
 		puts_how_to_connect_domain_and_load_balancer
@@ -106,6 +107,10 @@ def get_envs(args)
 	end
 end
 
+def run_wheneverize
+  sh "bundle exec wheneverize ."
+end
+
 def create_boilerplate_files
 	config = {}
 
@@ -271,4 +276,4 @@ def get_domain_name
 
 	puts "\nRad! Setting #{domain_name} as your domain_name.".bold
 	return domain_name
-end
+end

data/lib/terra_boi/version.rb

@@ -1,3 +1,3 @@
 module TerraBoi
-	VERSION = '1.0.3'
+	VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terra_boi
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.3
 platform: ruby
 authors:
 - Charlie Reese
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 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