dice_bag 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874c8d8cd121a6aa6c77dabeca7bc3f14f1942c02c74fa17698eab6dcf487e25
-  data.tar.gz: 2ec917b4582c85a62855c1c9c259014d75e3c9ed2275b250ef2dd3964a32d32c
+  metadata.gz: e0b21d4256744e2c288eae48cd2949029e7e3a4eee8307a03f4aad5998232ef6
+  data.tar.gz: 56aa419d74d9b581b380b9f70ab5a45c518e69adc82e740a571b13a6d9ba944a
 SHA512:
-  metadata.gz: a07f5df7c3b2d577539b89557c968be3449dc61df0c1399e73d881b4de17017d3ef197c86877537e647eed8aa910bfa7ce1c9d66c521960d0d46642759c17907
-  data.tar.gz: 8d25d866a4db9e3dd049a00c7cdb2c86a4f5e127995c9eda6c68e741b285788c17d6044e558e4d721976b079470201d826be84c4d0604e95f4337514eaea1a46
+  metadata.gz: cd63073daf8e395e12ef4af05818bcf32bfd009815ee2037fc2c9a208a93927d43a9d1c54b7966ee884dfe8cd9c7baf40f2da31bdec8a21f38cbf4825682de35
+  data.tar.gz: 006a8f5ae690be23ab34d1e62ac302285b3b135450c3a67089311134bf8a4445f05e1e2d529fa63774038304245cc5e04425a948c1e064ab62e381869d38a3e8

data/lib/dice_bag/available_templates.rb

@@ -48,8 +48,8 @@ module DiceBag
           checker = template_checker.new
           next if !gem_names.empty? && !checker_within_given_gems?(checker, gem_names)
           location = checker.templates_location
-          checker.templates.each do |template|
-            available_templates.push( DefaultTemplateFile.new(template, location) )
+          checker.templates.each do |template, save_as|
+            available_templates.push( DefaultTemplateFile.new(template, location, save_as) )
           end
         end
         available_templates

data/lib/dice_bag/default_template_file.rb

@@ -10,12 +10,12 @@ module DiceBag
   class DefaultTemplateFile
     include DiceBagFile
 
-    def initialize(name, location=nil)
+    def initialize(name, location=nil, save_as=nil)
       #if called from command line with only a name we search in all our templates for the file
       if (File.dirname(name) == '.')
         name = AvailableTemplates.template_filename_for(name)
       end
-      @filename = File.basename(name)
+      @filename = File.basename(save_as || name)
       @file = name
       @template_location = location
       @destination = File.join(Project.root, @template_location, @filename)

data/lib/dice_bag/templates/databases/postgres.yml.dice

@@ -0,0 +1,19 @@
+<%= warning.as_yaml_comment %>
+
+<% environments = Rails.env.production? ? [:production] : [:development, :test] %>
+
+<% environments.each do |env| %>
+<%= env %>:
+  adapter: <%= configured[env].database_driver || 'postgres' %>
+  database: <%= configured[env].database_name! || "PROJECT_NAME_#{env}" %><%= ('<'+'%=ENV["TEST_ENV_NUMBER"] %'+'>') if (env == :test) %>
+  username: <%= configured[env].database_username! || 'postgres' %>
+  password: <%= configured[env].database_password! %>
+  host: <%= configured[env].database_host! || 'localhost' %>
+  port: <%= configured[env].database_port || 5432 %>
+  pool: <%= configured[env].database_pool || 5 %>
+  timeout: <%= configured[env].database_timeout || 5000 %>
+  encoding:  <%= configured[env].database_encoding || 'unicode' %>
+  reconnect:  <%= configured[env].database_reconnect || false %>
+  <% db_cert = configured[env].database_ssl_cert %>
+  <%= db_cert ? "sslca: #{db_cert}" : '' %>
+<% end %>

data/lib/dice_bag/templates/gems_checker.rb

@@ -16,7 +16,9 @@ module DiceBag
       end
 
       if defined?(Mysql2)
-        add_template('database.yml.dice')
+        add_template('databases/mysql.yml.dice', save_as: 'database.yml.dice')
+      elsif defined?(PG)
+        add_template('databases/postgres.yml.dice', save_as: 'database.yml.dice')
       end
 
       if defined?(AWS)
@@ -30,9 +32,9 @@ module DiceBag
       @needed_templates
     end
 
-    def add_template(file)
+    def add_template(file, save_as: nil)
       pwd = File.dirname(__FILE__)
-      @needed_templates.push(File.join(pwd, file))
+      @needed_templates.push([File.join(pwd, file), save_as])
     end
 
   end

data/lib/dice_bag/version.rb

@@ -1,3 +1,3 @@
 module DiceBag
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_bag
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -119,7 +119,8 @@ files:
 - lib/dice_bag/template_helpers.rb
 - lib/dice_bag/templates/aws.yml.dice
 - lib/dice_bag/templates/dalli.yml.dice
-- lib/dice_bag/templates/database.yml.dice
+- lib/dice_bag/templates/databases/mysql.yml.dice
+- lib/dice_bag/templates/databases/postgres.yml.dice
 - lib/dice_bag/templates/gems_checker.rb
 - lib/dice_bag/templates/google_analytics.yml.dice
 - lib/dice_bag/version.rb