dice_bag 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aeb57da5b1f84e4929fa3e5d84a5fdfc6df0a90ff14d3007ca92d2a61082448
-  data.tar.gz: e974c236127bdb24655128d2ab7c19a8cbda6824f15d1c0aa25181261a2fba7d
+  metadata.gz: e5bb488ea8f0b38b938b9fd4ac13a69a1f60a8df544d546c123478bb31bb25ae
+  data.tar.gz: 7a351f59b04eaa6703e00608c2e9f90a3c53199529536ffe0ce3eb01f49d698e
 SHA512:
-  metadata.gz: 4ddc53b4204485be8747048633ecb73248719ef72a24548c5873846fea9f7db56531d917121e82a8288a3cdbf967281b7c2c57c85f657e602913ff3e970cd306
-  data.tar.gz: e1ab8a58dc1055cad2c39fec29d768c77840f1c74b2a399763ea813b0dc5e18bae66d83e9f3783885c2242896bd8305263ccef3a93ddc282037a106f8f10a7b5
+  metadata.gz: c4b40020b59067e98abe32f5bdceb5fc93a1dd4d543674423e6c8740f749e1d42563b7d7fcedd06afb99c4869c654c75dcb4e8d1963d41aee1c350a337a70653
+  data.tar.gz: a2470807821c5a6247f1cc8c7581a82b6a0d8195d5a2f3c391b3f74c4af9b31ac39145a766e63cc27b66503b3c461d88482e018ded8500c9de461852ae6f7e47

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.6.1
+* Use keyword argument for ERB.new to suppress deprecated warnings.
+* Use default bundle path (`vendor/bundle`) when `Bundler.settings[:path]` returns nil.
+
 # 1.6.0
 * Drop support for Ruby 2.3 and 2.4.
 

data/lib/dice_bag/available_templates.rb

@@ -16,11 +16,10 @@ module DiceBag
 
     class << self
       def gem_specs
-        @gem_specs ||= begin
+        @gem_specs ||=
           Gem::Specification.sort.each_with_object({}) do |spec, hsh|
             hsh[spec.name] = spec.full_gem_path
           end
-        end
       end
 
       def checker_within_given_gems?(checker, gem_names)

data/lib/dice_bag/project.rb

@@ -4,6 +4,7 @@
 module DiceBag
   class Project
     DEFAULT_NAME = "project"
+    DEFAULT_BUNDLE_PATH = "vendor/bundle"
 
     # TODO: how to find the name of the project in non Rails apps?
     def self.name
@@ -22,8 +23,9 @@ module DiceBag
     end
 
     def self.templates_to_generate
+      bundle_path = (defined?(Bundler) && Bundler.settings[:path]) || DEFAULT_BUNDLE_PATH
       FileList.new("**/*.dice") do |fl|
-        fl.exclude(File.join(Bundler.settings[:path], "/**/*")) if defined?(Bundler) && Bundler.settings[:path]
+        fl.exclude(File.join(bundle_path, "/**/*"))
       end
     end
   end

data/lib/dice_bag/tasks/config.rake

@@ -9,7 +9,6 @@ desc "Populate all templates using values from the environment to create configu
 task config: ["config:all"]
 
 namespace :config do
-  # Deprecated, present only for backward compatibility.
   task :all do
     DiceBag::Command.new.write_all
   end

data/lib/dice_bag/template_file.rb

@@ -19,11 +19,6 @@ module DiceBag
     end
 
     def create_file(config_file, params)
-      # By passing "<>" we're trimming trailing newlines on lines that are
-      # nothing but ERB blocks (see documentation). This is useful for files
-      # like mauth_key where we want to control newlines carefully.
-      template = ERB.new(File.read(@file), nil, "<>")
-
       # templates expect a configured object
       configured = Configuration.new
       warning = Warning.new(@filename)
@@ -34,5 +29,18 @@ module DiceBag
       config_file.write(contents)
       puts "File '#{config_file.file}' created"
     end
+
+    private
+
+    def template
+      # By passing "<>" we're trimming trailing newlines on lines that are
+      # nothing but ERB blocks (see documentation). This is useful for files
+      # like mauth_key where we want to control newlines carefully.
+      if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+        ERB.new(File.read(@file), trim_mode: "<>")
+      else
+        ERB.new(File.read(@file), nil, "<>")
+      end
+    end
   end
 end

data/lib/dice_bag/template_helpers.rb

@@ -32,7 +32,7 @@ module DiceBag
       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
+      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
@@ -61,7 +61,7 @@ module DiceBag
       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
+      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

data/lib/dice_bag/version.rb

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

data/spec/support/config/database.yml.dice

@@ -0,0 +1,4 @@
+development:
+  database: development
+  username: <%= configured.database_username || 'root' %>
+  password: <%= configured.database_password %>

data/spec/template_file_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "dice_bag/project"
+require "dice_bag/template_file"
+
+RSpec.describe DiceBag::TemplateFile do
+  let(:file_name) { "config/database.yml" }
+  let(:template_name) { "#{file_name}.dice" }
+  let(:template_file) { DiceBag::TemplateFile.new(template_name) }
+  let(:config_file) { double(file: file_name) }
+  let(:params) { { deploy: true } }
+
+  before do
+    allow(ENV).to receive(:[]).with("DATABASE_USERNAME").and_return("alice")
+    allow(ENV).to receive(:[]).with("DATABASE_PASSWORD").and_return("xyzzy")
+    allow(DiceBag::Project).to receive(:root).and_return(File.join(__dir__, "support"))
+  end
+
+  it "writes to configuration file" do
+    expect(config_file)
+      .to receive(:write).with("development:\n  database: development\n  username: alice\n  password: xyzzy\n")
+    template_file.create_file(config_file, params)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_bag
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -145,6 +145,8 @@ files:
 - spec/command_spec.rb
 - spec/configuration_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/database.yml.dice
+- spec/template_file_spec.rb
 homepage: 
 licenses:
 - MIT
@@ -173,6 +175,8 @@ summary: Dice Bag is a library of rake tasks for configuring web apps in the sty
   of The Twelve-Factor App. It also provides continuous integration tasks that rely
   on the configuration tasks.
 test_files:
-- spec/command_spec.rb
-- spec/spec_helper.rb
 - spec/configuration_spec.rb
+- spec/spec_helper.rb
+- spec/support/config/database.yml.dice
+- spec/command_spec.rb
+- spec/template_file_spec.rb