dice_bag 1.3.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5904157b01abe47270b498bcfc8774f0e957f1684f4a41801fb7cd37b8d8a0c1
-  data.tar.gz: 7cfa5ac9041c69b21fd3129e841a3d6f6b1fb41aa33bacf47629dae5f2d296a5
+  metadata.gz: 0aeb57da5b1f84e4929fa3e5d84a5fdfc6df0a90ff14d3007ca92d2a61082448
+  data.tar.gz: e974c236127bdb24655128d2ab7c19a8cbda6824f15d1c0aa25181261a2fba7d
 SHA512:
-  metadata.gz: 0d88e2ff2d7cbc111140e34062854dde082b6c6dd0f21ebf19b04656a5e129e57f65910a62178fd862f77430340d5081c2141cdeb30f4b43081c0b6a2755f151
-  data.tar.gz: 1fe7033f94c1d15294582f90586ade1c67edd936becd5c67bca58ecc6ac7254a28f528d7b846053d806ab91737ad8ce65fa4c2e0471bc31e9a13ceee535dca9c
+  metadata.gz: 4ddc53b4204485be8747048633ecb73248719ef72a24548c5873846fea9f7db56531d917121e82a8288a3cdbf967281b7c2c57c85f657e602913ff3e970cd306
+  data.tar.gz: e1ab8a58dc1055cad2c39fec29d768c77840f1c74b2a399763ea813b0dc5e18bae66d83e9f3783885c2242896bd8305263ccef3a93ddc282037a106f8f10a7b5

data/CHANGELOG.md

@@ -0,0 +1,84 @@
+# 1.6.0
+* Drop support for Ruby 2.3 and 2.4.
+
+# 1.5.0
+* Add ability to generate and verify x509 certificates.
+
+# 1.4.1
+* Bundle extra files in the gem (MIT-LICENSE etc.).
+
+# 1.4.0
+* Allow thor 0.x and 1.x.
+
+# 1.3.4
+* Remove extra spaces from the database templates.
+
+# 1.3.3
+* Address a deprecation warning when using Rails 6.0.
+
+# 1.3.2
+* Gem specifies MIT license.
+
+# 1.3.1
+* Fix adapter name in the database.yml.dice template for PostgreSQL.
+
+# 1.3.0
+* Detect pg gem and generate database.yml.dice for PostgreSQL.
+
+# 1.2.3
+* Fix: Add missing newline after ruby warning message.
+
+# 1.2.2
+* Remove trailing space from the message generated by `<%= warning.as_yaml_comment %>`.
+
+# 1.2.1
+* Replaces `starts_with?` with `start_with?` to remove Rails dependency.
+
+# 1.2.0
+* Adds a `config:generate_from_gems` task to generate the templates from the specified gems only
+
+# 1.1.1
+* Updates the database.yml.dice file to not provide settings for test and development when
+ building in production.
+
+# 1.1.0
+* Removed the template for Newrelic.
+
+# 1.0.0
+* `config:generate_all` task allows user to choose an appropriate action when source and local templates are different.
+* `config:generate_all:force` allows user to generate templates in 'force mode' (replacing local templates with the source).
+
+# 0.9.0
+* Feature: Adding a bang (!) at the end of method names, will raise when the variable
+ is not found in production.
+* New relic template to use SSL by default
+
+# 0.8.0
+* Fix Template generation fails if the target directory is missing
+* Document that configuration files must not be loaded in Rails config/application.rb
+* Don't overwrite config files if user responds 'No' instead of just 'N'.
+* Omit .dice files in Bundler path or in dot-prefixed directories
+
+# 0.7.1
+* The ensure_is_private_key method now additionally supports RSA keys without spaces.
+
+# 0.7.0
+* New ensure_is_private_key helper method to process RSA private keys.
+* New config:deploy rake task to use for deployments, which overwrites config files without prompting.
+
+# 0.6.0
+* **Breaking change:** Only templates with the '.dice' extension are processed.
+* **Breaking change:** Local override via the '.local' extension has been removed.
+* Templates are processed in all directories.
+
+# 0.5.0
+* Generated templates should be committed to source control.
+* New '.dice' extension for templates.
+* Better testing infrastructure.
+* Plugins and rake task can specify custom location for templates.
+
+# 0.4.1
+* Fix: Templates are generated in 'config' directory for Rails projects.
+
+# 0.4.0
+* Initial open source release.

data/MIT-LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2012-2020 Medidata Solutions Worldwide
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,174 @@
+# DiceBag
+
+[![Build Status](https://travis-ci.com/mdsol/dice_bag.svg?branch=develop)](https://travis-ci.com/mdsol/dice_bag)
+[![Code Climate](https://codeclimate.com/github/mdsol/dice_bag.png)](https://codeclimate.com/github/mdsol/dice_bag)
+
+DiceBag is a library of rake tasks for configuring web apps in the style of [The
+Twelve-Factor App][1]. Configuration values are picked up from the environment
+and used to populate configuration files from templates. Pre-packaged templates
+for common configuration files are provided.
+
+Although Rails already supports ERB syntax for its YML configuration files, DiceBag will generate a final
+static file that will work without keeping your deployment environment variables in sync with your
+production environment variables. For security reasons, these environments may sometimes differ.
+
+Also DiceBag will work with any kind of text files, not only YML files. It can be very useful for
+ruby initializer files for instance.
+
+[1]: http://www.12factor.net/
+
+## Installation
+
+Add the following to your `Gemfile`:
+
+```ruby
+gem 'dice_bag'
+```
+
+If you are using these tasks outside of a Rails project, add the following to
+your `Rakefile` or wherever your local rake tasks are defined:
+
+```ruby
+require 'dice_bag/tasks'
+```
+
+Run the following command to see the new tasks:
+
+```
+[bundle exec] rake -T | grep "rake config"
+```
+
+## Create configuration files from templates
+
+When the rake "config" task is run, configuration files are populated for all
+ERB template files in the project that have a ".dice" extension. Configuration
+values from the environment are made available to the templates through the
+`configured` object.
+
+For example, take a "database.yml.dice" file containing this template:
+
+```erb
+development:
+  database: development
+  username: <%= configured.database_username || 'root' %>
+  password: <%= configured.database_password %>
+```
+
+Then running the following command:
+
+```
+DATABASE_USERNAME=alice DATABASE_PASSWORD=xyzzy [bundle exec] rake config
+```
+
+will generate a "database.yml" file with the following contents:
+
+```yaml
+development:
+  database: development
+  username: alice
+  password: xyzzy
+```
+
+See the [feature documentation][features] for further examples and
+functionality.
+
+[features]: https://www.relishapp.com/mdsol/dice-bag/docs
+
+As discussed in [The Twelve-Factor App section on configuration][2], do not
+commit your generated configuration files to source control. Instead, commit the
+templates to source control and then regenerate the configuration files at
+deployment time by running the rake `config:deploy` task.
+
+[2]: http://www.12factor.net/config
+
+
+### Ensuring variables are set in production
+
+It is a common pattern to use default information for development but to not
+ allow defaults in production, instead we want to always set up the environment variables
+in production.
+
+It is very easy to discover what variables have not been set in production using a bang after
+the variable name, for instance:
+```
+secret_key: <%= configured.secret_key_base! || 'any text is ok' %>
+```
+Will raise an explanatory error if we are using Rails, we are in production and the
+ variable SECRET_KEY_BASE is not set. In other environments will not care about it
+not being set and will use the default.
+
+
+### Generating the templates of given gems only
+
+`config:generate_all` will generate all the templates it can find. Since sometimes this behavior
+is not desirable you can use the `config:generate_from_gems` task to specify gem names:
+
+```
+[bundle exec] rake config:generate_from_gems gem1 gem2 gemN
+```
+
+will generate only the templates provided by `gem1`, `gem2` and `gemN`.
+
+To force-generate set the `DICEBAG_FORCE` environment variable to any value when running the task.
+
+
+## Generating the pre-packaged templates
+
+If the corresponding gems are installed, the following pre-packaged templates are provided:
+
+* mysql2 or pg: `database.yml.dice` for [Rails](https://github.com/rails/rails/)
+* aws-sdk: `aws.yml.dice`
+* dalli: `dalli.yml.dice`
+
+Run the following command to generate them:
+
+```
+[bundle exec] rake config:generate_all
+```
+
+This command provides options to compare changes between source and local templates, so new additions to the source templates can be safely added while preserving any project specific customization to local templates.
+
+Alternatively, to force generate templates (replacing existing local templates with the source), run the following:
+
+```
+[bundle exec] rake config:generate_all:force
+```
+
+
+As with your own templates, you should commit these pre-packaged templates to
+source control.
+
+You can customize these pre-packaged template to your needs but if the change is
+a generic fix or extension, please consider contributing it back to this project
+so that everyone benefits.
+
+### Defining your own pre-packaged templates
+
+If you want DiceBag to generate your own pre-packaged templates when you run the
+rake "config:generate_all" task, you can create a plug-in. Read the
+[templates.md](./templates.md) file to learn how to do this.
+
+## Troubleshooting
+
+### rake config fails in Rails project with file not found
+
+Due to rake running ``` config/application.rb ``` before kicking off a task,
+if ``` config/application.rb ``` loads any configuration files that dice_bag
+ must generate a 'file not found' error may occur.  Makes sense that a file
+  ``` rake config:generate_all ``` needs to create, does not exist before it has ran.
+
+Solution: Move any config loading that depends on files generated by dice_bag out of `application.rb` and into `config/initializers/*`.  Since the commands
+`rails server` or `rails console` etc. always run the initializers, moving the logic
+ here should be a safe bet.
+
+## Contributors
+
+* [Andrew Smith](https://github.com/asmith-mdsol)
+* [Jordi Carres](https://github.com/jcarres-mdsol)
+* [Dan Hoizner](https://github.com/dhoizner-mdsol)
+* [Aaron Weiner](https://github.com/HonoreDB)
+* [Luke Greene](https://github.com/lgreene-mdsol)
+* [Johnny Lo](https://github.com/jlo188)
+* [Connor Ross](https://github.com/cross311)
+* [Mathieu Jobin](https://github.com/mjobin-mdsol)
+

data/lib/dice_bag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "dice_bag/available_templates"
 module DiceBag
   require "dice_bag/railtie" if defined?(Rails)

data/lib/dice_bag/available_templates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubygems"
 require "dice_bag/default_template_file"
 

data/lib/dice_bag/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "dice_bag/available_templates"
 require "dice_bag/project"
 require "dice_bag/config_file"

data/lib/dice_bag/config_file.rb

@@ -1,4 +1,6 @@
-require "dice_bag/dice_bag_file.rb"
+# frozen_string_literal: true
+
+require "dice_bag/dice_bag_file"
 require "dice_bag/project"
 
 # this class encapsulate a configuration file of the project

data/lib/dice_bag/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiceBag
   # This class abstracts access to configuration values, to be used within ERB
   # templates. Currently, the values are read from the environment, as per the
@@ -29,6 +31,7 @@ module DiceBag
       if in_production? && value.nil?
         raise "Environment variable #{variable_name} required in production but it was not provided"
       end
+
       value
     end
 

data/lib/dice_bag/default_template_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "dice_bag/dice_bag_file"
 require "dice_bag/project"
 
@@ -11,9 +13,7 @@ module DiceBag
 
     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
+      name = AvailableTemplates.template_filename_for(name) if File.dirname(name) == "."
       @filename = File.basename(save_as || name)
       @file = name
       @template_location = location

data/lib/dice_bag/dice_bag_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "dice_bag/version"
 
 # This module contains common methods for all the type of files Dicebag knows about:
@@ -5,12 +7,11 @@ require "dice_bag/version"
 module DiceBag
   module DiceBagFile
     attr_reader :file, :filename, :destination
+
     @@overwrite_all = false
 
     def assert_existence
-      unless File.exists?(@file)
-        raise "File #{@file} not found. Configuration file not created"
-      end
+      raise "File #{@file} not found. Configuration file not created" unless File.exist?(@file)
     end
 
     def write(contents)
@@ -20,10 +21,11 @@ module DiceBag
     end
 
     def should_write?(new_contents)
-      return true if @@overwrite_all || !File.exists?(file)
+      return true if @@overwrite_all || !File.exist?(file)
       return false if diff(file, new_contents).empty?
 
-      while true
+      # rubocop:disable Metrics/BlockLength
+      loop do
         puts "Overwrite #{file} ?    Recommended: Yes. "
         puts " [Y]es, [n]o, [a]ll files, [q]uit, [d]show diff"
         answer = $stdin.gets
@@ -43,6 +45,7 @@ module DiceBag
           return true
         end
       end
+      # rubocop:enable Metrics/BlockLength
     end
 
     private

data/lib/dice_bag/private_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiceBag
   class PrivateKey
     attr_accessor :private_key
@@ -10,7 +12,7 @@ module DiceBag
       require "openssl"
 
       begin
-        OpenSSL::PKey::RSA.new @private_key
+        rsa_object
         true
       rescue => e
         puts "#{e.message}\n#{e.backtrace}"
@@ -25,10 +27,18 @@ module DiceBag
       @private_key = [HEADER, body, FOOTER].flatten.join("\n")
     end
 
+    def public_key
+      rsa_object.public_key
+    end
+
+    def rsa_object
+      @rsa_object ||= OpenSSL::PKey::RSA.new(@private_key)
+    end
+
     private
 
-    HEADER = "-----BEGIN RSA PRIVATE KEY-----".freeze
-    FOOTER = "-----END RSA PRIVATE KEY-----".freeze
+    HEADER = "-----BEGIN RSA PRIVATE KEY-----"
+    FOOTER = "-----END RSA PRIVATE KEY-----"
 
     def strip_down_key
       @private_key.gsub!(HEADER, "")

data/lib/dice_bag/project.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This class encapsulate data about the project dice_bag got in
 module DiceBag
   class Project

data/lib/dice_bag/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiceBag
   class Railtie < Rails::Railtie
     rake_tasks do

data/lib/dice_bag/tasks.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 load "dice_bag/tasks/config.rake"

data/lib/dice_bag/tasks/config.rake

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "erb"
 require "dice_bag/command"
 
-FORCE_ENV_VAR = "DICEBAG_FORCE".freeze
+FORCE_ENV_VAR = "DICEBAG_FORCE"
 
 desc "Populate all templates using values from the environment to create configuration files"
-task :config => ["config:all"]
+task config: ["config:all"]
 
 namespace :config do
   # Deprecated, present only for backward compatibility.
@@ -14,17 +16,19 @@ namespace :config do
 
   desc "As per the config task but automatically overwrites pre-existing configuration files"
   task :deploy do
-    DiceBag::Command.new.write_all(:deploy => true)
+    DiceBag::Command.new.write_all(deploy: true)
   end
 
   desc "Populate just the specified template to create the associated configuration file"
-  task :file, :filename do |t, args|
+  task :file, :filename do |_t, args|
     filename = args[:filename]
     raise "A filename needs to be provided" if filename.nil?
+
     DiceBag::Command.new.write(filename)
   end
 
-  desc "Generate all configuration file templates with interactive commands (use config:generate_all:force to replace all without asking for input)"
+  desc "Generate all configuration file templates with interactive commands " \
+       "(use config:generate_all:force to replace all without asking for input)"
   task :generate_all do
     DiceBag::Command.new.generate_all_templates(false)
   end
@@ -36,18 +40,21 @@ namespace :config do
   end
 
   desc "Generate specified template, optionally in the specified location with options to control file actions"
-  task :generate, :filename, :location do |t, args|
+  task :generate, :filename, :location do |_t, args|
     filename = args[:filename]
     location = args[:location]
     raise "A filename needs to be provided" if filename.nil?
+
     DiceBag::Command.new.generate_template(DiceBag::DefaultTemplateFile.new(filename, location), false)
   end
 
-  desc "Generate the templates from the specified gems only ('config:generate_from_gems gem1 gem2 gemN', set the env variable '#{FORCE_ENV_VAR}' to overwrite the templates without asking for confirmation)"
-  task :generate_from_gems, :names do |t, args|
-    ARGV.each { |a| task a.to_sym do ; end }
+  desc "Generate the templates from the specified gems only ('config:generate_from_gems gem1 gem2 gemN'," \
+       " set the env variable '#{FORCE_ENV_VAR}' to overwrite the templates without asking for confirmation)"
+  task :generate_from_gems, :names do |_t, _args|
+    ARGV.each { |a| task a.to_sym do; end }
     names = ARGV[1..-1]
     raise "One or more gem names need to be provided" if names.empty?
+
     DiceBag::Command.new.generate_gems_templates(names, !ENV[FORCE_ENV_VAR].nil?)
   end
 end

data/lib/dice_bag/template_file.rb

@@ -1,4 +1,6 @@
-require "dice_bag/dice_bag_file.rb"
+# frozen_string_literal: true
+
+require "dice_bag/dice_bag_file"
 require "dice_bag/template_helpers"
 require "dice_bag/configuration"
 require "dice_bag/warning"

data/lib/dice_bag/template_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "dice_bag/private_key"
 
 module DiceBag
@@ -17,5 +19,57 @@ module DiceBag
         raise "The private key provided is invalid"
       end
     end
+
+    # Generates https://en.wikipedia.org/wiki/X.509 certificate, commonly used in authentication services
+    def generate_509_certificate(private_key, root_ca: nil, root_key: nil)
+      root_key ||= OpenSSL::PKey::RSA.new(2048) # the CA's public/private key
+      root_ca ||= default_root_ca(root_key)
+
+      cert = OpenSSL::X509::Certificate.new
+      cert.version = 2
+      cert.serial = 2
+      cert.subject = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Ruby certificate")
+      cert.issuer = root_ca.subject # root CA is the issuer
+      cert.public_key = PrivateKey.new(private_key.dup).public_key
+      cert.not_before = Time.now
+      cert.not_after = cert.not_before + 1 * 365 * 24 * 60 * 60 # 1 years validity
+      ef = OpenSSL::X509::ExtensionFactory.new
+      ef.subject_certificate = cert
+      ef.issuer_certificate = root_ca
+      cert.add_extension(ef.create_extension("keyUsage", "digitalSignature", true))
+      cert.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false))
+      cert.sign(root_key, OpenSSL::Digest.new("SHA256"))
+      cert
+    end
+
+    # raw_cert: DER or PEM encoded certificate
+    def ensure_is_509_certificate(raw_cert)
+      certificate = OpenSSL::X509::Certificate.new(raw_cert)
+    rescue OpenSSL::X509::CertificateError
+      false
+    end
+
+    def default_root_ca(root_key)
+      @default_root_ca ||= generate_root_ca(root_key)
+    end
+
+    def generate_root_ca(root_key)
+      root_ca = OpenSSL::X509::Certificate.new
+      root_ca.version = 2 # cf. RFC 5280 - to make it a "v3" certificate
+      root_ca.serial = 1 # considered a security flaw for real certificates
+      root_ca.subject = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Ruby CA")
+      root_ca.issuer = root_ca.subject # root CA's are "self-signed"
+      root_ca.public_key = root_key.public_key
+      root_ca.not_before = Time.now
+      root_ca.not_after = root_ca.not_before + 2 * 365 * 24 * 60 * 60 # 2 years validity
+      ef = OpenSSL::X509::ExtensionFactory.new
+      ef.subject_certificate = root_ca
+      ef.issuer_certificate = root_ca
+      root_ca.add_extension(ef.create_extension("basicConstraints", "CA:TRUE", true))
+      root_ca.add_extension(ef.create_extension("keyUsage", "keyCertSign, cRLSign", true))
+      root_ca.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false))
+      root_ca.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false))
+      root_ca.sign(root_key, OpenSSL::Digest.new("SHA256"))
+    end
   end
 end

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

@@ -12,8 +12,8 @@
   port: <%= configured[env].database_port || 3306 %>
   pool: <%= configured[env].database_pool || 5 %>
   timeout: <%= configured[env].database_timeout || 5000 %>
-  encoding:  <%= configured[env].database_encoding || 'utf8' %>
-  reconnect:  <%= configured[env].database_reconnect || false %>
+  encoding: <%= configured[env].database_encoding || 'utf8' %>
+  reconnect: <%= configured[env].database_reconnect || false %>
   <% db_cert = configured[env].database_ssl_cert %>
   <%= db_cert ? "sslca: #{db_cert}" : '' %>
 <% end %>

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

@@ -12,8 +12,8 @@
   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 %>
+  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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This module has the logic that decides what templates will be
 # generated for this project.
 # this file lives in the same directory than all the templates it
@@ -10,9 +12,7 @@ module DiceBag
       @needed_templates = []
       configured = Configuration.new
 
-      if defined?(Dalli)
-        add_template("dalli.yml.dice")
-      end
+      add_template("dalli.yml.dice") if defined?(Dalli)
 
       if defined?(Mysql2)
         add_template("databases/mysql.yml.dice", save_as: "database.yml.dice")
@@ -20,13 +20,9 @@ module DiceBag
         add_template("databases/postgres.yml.dice", save_as: "database.yml.dice")
       end
 
-      if defined?(AWS)
-        add_template("aws.yml.dice")
-      end
+      add_template("aws.yml.dice") if defined?(AWS)
 
-      if configured.google_analytics_id
-        add_template("google_analytics.yml.dice")
-      end
+      add_template("google_analytics.yml.dice") if configured.google_analytics_id
 
       @needed_templates
     end

data/lib/dice_bag/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiceBag
-  VERSION = "1.3.3"
+  VERSION = "1.6.0"
 end

data/lib/dice_bag/warning.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiceBag
   class Warning
     def initialize(template_filename)
@@ -8,7 +10,7 @@ module DiceBag
       lines.map { |line| "# #{line}".rstrip }.join("\n") + "\n"
     end
 
-    alias :as_yaml_comment :as_ruby_comment
+    alias as_yaml_comment as_ruby_comment
 
     def as_xml_comment
       ["<!--", lines, "-->"].flatten.join("\n")
@@ -19,7 +21,7 @@ module DiceBag
     def lines
       [
         "WARNING! Do not modify this file directly. It was generated from the",
-        "'#@template_filename' template file.",
+        "'#{@template_filename}' template file.",
         "",
         "Use the rake config task to reconfigure. See the template file for",
         "further guidance."

data/spec/command_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "dice_bag/project"
 

data/spec/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "dice_bag/configuration"
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Require this file using `require "spec_helper"` to ensure that it is only
 # loaded once.
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_bag
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -29,44 +43,44 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: diff-lcs
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: 0.6.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,19 +96,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 description: 
 email:
 - asmith@mdsol.com
@@ -103,6 +117,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- MIT-LICENSE
+- README.md
 - lib/dice_bag.rb
 - lib/dice_bag/available_templates.rb
 - lib/dice_bag/command.rb
@@ -142,14 +159,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Dice Bag is a library of rake tasks for configuring web apps in the style