dice_bag 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad1fdaa143ede5c607a8ea0c451252da996e6d783a895ed742ee6c6b82b1001
-  data.tar.gz: 52802ac8af7acc21bcddcb86b246860bb05e9274be8bef54c9ccedffadfe670d
+  metadata.gz: 0aeb57da5b1f84e4929fa3e5d84a5fdfc6df0a90ff14d3007ca92d2a61082448
+  data.tar.gz: e974c236127bdb24655128d2ab7c19a8cbda6824f15d1c0aa25181261a2fba7d
 SHA512:
-  metadata.gz: 91dd8e76e891b52d9bb836f6b0da7a453f4f0aa182d63a0f2082e09260f6dd495d799ba62700f259d225233f676d2b6a8677981bf2de7653b8554b4fb911f030
-  data.tar.gz: d1947a678fef6d5f1c3855cead618c181593ac0a87f54fd6932609ba914ee904357d7acd450dd9b7fcea3c98ecc3351b43b426df890e6017357f54d1a1e2d601
+  metadata.gz: 4ddc53b4204485be8747048633ecb73248719ef72a24548c5873846fea9f7db56531d917121e82a8288a3cdbf967281b7c2c57c85f657e602913ff3e970cd306
+  data.tar.gz: e1ab8a58dc1055cad2c39fec29d768c77840f1c74b2a399763ea813b0dc5e18bae66d83e9f3783885c2242896bd8305263ccef3a93ddc282037a106f8f10a7b5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.6.0
+* Drop support for Ruby 2.3 and 2.4.
+
 # 1.5.0
 * Add ability to generate and verify x509 certificates.
 

data/README.md

@@ -1,6 +1,6 @@
 # DiceBag
 
-[![Build Status](https://travis-ci.org/mdsol/dice_bag.svg?branch=develop)](https://travis-ci.org/mdsol/dice_bag)
+[![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

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
@@ -35,8 +37,8 @@ module DiceBag
 
     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
@@ -36,7 +38,7 @@ module DiceBag
       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::SHA256.new)
+      cert.sign(root_key, OpenSSL::Digest.new("SHA256"))
       cert
     end
 
@@ -67,7 +69,7 @@ module DiceBag
       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::SHA256.new)
+      root_ca.sign(root_key, OpenSSL::Digest.new("SHA256"))
     end
   end
 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,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiceBag
-  VERSION = "1.5.0"
+  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.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 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
@@ -40,33 +54,33 @@ dependencies:
       - !ruby/object:Gem::Version
         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
@@ -145,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -159,6 +173,6 @@ 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/configuration_spec.rb
-- spec/spec_helper.rb
 - spec/command_spec.rb
+- spec/spec_helper.rb
+- spec/configuration_spec.rb