config-factory 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c44c851822d0e71704e0892c28b76f68cfed5772
-  data.tar.gz: 6b6fc389e2b25d2b3d2344990761ccf768c0fb0a
+  metadata.gz: 71ac5f68f30df9052485393cdcf146484a7acd37
+  data.tar.gz: e5d2743640833b9cbeb9c6ee3614b5ba6b6bfd28
 SHA512:
-  metadata.gz: f94eecfabc84b6e17d0e40538dd65dff3b299c0920acc7a5e07964552c2a521bf15e564c2c23efbf31e805d666defc7e128f8cd06981e7cb04c332e4b12de17c
-  data.tar.gz: 517762975319826c5101bf3ba0ed599735d4ab593b3c4a8bd971a3ec36fbf62886287f3b2f4f18db58e68e7eb11a6a5eede8fb9d71f157a1e840bfac7a64ec9c
+  metadata.gz: f580ce87fbee29317fb3dd0445bd936b996054597309bf90b77bfeae576f76dc0db8f668b8ba649def5879c61f82e3038450694799739457e6dd2bd56e5451c0
+  data.tar.gz: fa49944fb3829497732cee5a131509db8a276264d9005b1c9dc9784e7de0db30d31206881f006b146311b59641c8709cc70f61a73fef00a96fe6bb874a2749d0

data/.gitignore

@@ -1,3 +1,8 @@
+# ignore IntelliJ IDEA project entirely
+
+.idea
+*.iml
+
 # Ruby defaults
 
 /.bundle/
@@ -23,14 +28,6 @@ mkmf.log
 
 /log/
 
-# IntellJ
-
-*.iml
-*.ipr
-*.iws
-*.ids
-.rakeTasks
-
 # Emacs
 
 *~

data/.rubocop.yml

@@ -1,8 +1,3 @@
-# Disable compact style check for example.rb
-Style/ClassAndModuleChildren:
-  Exclude:
-    - 'example.rb'
-
 # Disable line-length check; it's too easy for the cure to be worse than the disease
 Metrics/LineLength:
   Enabled: False
@@ -11,14 +6,23 @@ Metrics/LineLength:
 Style/Documentation:
   Enabled: false
 
-# Allow one line around class body (Style/EmptyLines will still disallow two or more)
-Style/EmptyLinesAroundClassBody:
+# Allow one line around class body (Layout/EmptyLines will still disallow two or more)
+Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
-# Allow one line around module body (Style/EmptyLines will still disallow two or more)
-Style/EmptyLinesAroundModuleBody:
+# Allow one line around module body (Layout/EmptyLines will still disallow two or more)
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
-# Allow one line around block body (Style/EmptyLines will still disallow two or more)
-Style/EmptyLinesAroundBlockBody:
+# Allow one line around block body (Layout/EmptyLines will still disallow two or more)
+Layout/EmptyLinesAroundBlockBody:
   Enabled: false
+
+# Disable some style checks for sample code
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'example.rb'
+
+Style/MixinUsage:
+  Exclude:
+    - 'example.rb'

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.4.1

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.1.10 (2 January 2018)
+
+- Update to Ruby 2.4.1
+- Update to RuboCop 0.52
+
 ## 0.0.9 (9 August 2016)
 
 - Add `AbstractFactory#env_name` and inject the environment name, if available, on construction,

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 The Regents of the University of California
+Copyright (c) 2018 The Regents of the University of California
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ------------------------------------------------------------
 # RSpec
 
@@ -8,7 +10,7 @@ namespace :spec do
 
   desc 'Run all unit tests'
   RSpec::Core::RakeTask.new(:unit) do |task|
-    task.rspec_opts = %w(--color --format documentation --order default)
+    task.rspec_opts = %w[--color --format documentation --order default]
     task.pattern = 'unit/**/*_spec.rb'
   end
 
@@ -38,7 +40,7 @@ RuboCop::RakeTask.new
 
 desc 'List TODOs (from spec/todo.rb)'
 RSpec::Core::RakeTask.new(:todo) do |task|
-  task.rspec_opts = %w(--color --format documentation --order default)
+  task.rspec_opts = %w[--color --format documentation --order default]
   task.pattern = 'todo.rb'
 end
 
@@ -46,4 +48,4 @@ end
 # Defaults
 
 desc 'Run unit tests, check test coverage, run acceptance tests, check code style'
-task default: [:coverage, :rubocop]
+task default: %i[coverage rubocop]

data/config-factory.gemspec

@@ -1,4 +1,6 @@
-# coding: utf-8
+
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -15,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   origin = `git config --get remote.origin.url`.chomp
-  origin_uri = origin.start_with?('http') ? URI(origin) : URI(origin.sub('git@github.com:', 'https://github.com/'))
+  origin_uri = origin.start_with?('http') ? URI(origin) : URI(origin.gsub(%r{git@([^:]+)(.com|.org)[^\/]+}, 'http://\1\2'))
   spec.homepage = URI::HTTP.build(host: origin_uri.host, path: origin_uri.path.chomp('.git')).to_s
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -27,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.4'
   spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'rubocop', '~> 0.52'
   spec.add_development_dependency 'simplecov', '~> 0.9.2'
   spec.add_development_dependency 'simplecov-console', '~> 0.2.0'
-  spec.add_development_dependency 'rubocop', '~> 0.35.1'
 end

data/example.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'config/factory'
 include Config::Factory

data/lib/config/factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Config
   module Factory
     Dir.glob(File.expand_path('../factory/*.rb', __FILE__)).sort.each(&method(:require))

data/lib/config/factory/abstract_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'config/factory/environments'
 
 module Config
@@ -32,7 +34,7 @@ module Config
 
       def for_environment(env, config_name)
         arg_hash = env.args_for(config_name)
-        fail ArgumentError, "no #{self} arguments found for config #{config_name} in environment #{env}" unless arg_hash
+        raise ArgumentError, "no #{self} arguments found for config #{config_name} in environment #{env}" unless arg_hash
         build_from(arg_hash, nil, env.name)
       end
 
@@ -42,13 +44,13 @@ module Config
       end
 
       def build_from(arg_hash, section_name = nil, env_name = nil)
-        fail ArgumentError, "nil argument hash passed to #{self}.build_from" unless arg_hash
+        raise ArgumentError, "nil argument hash passed to #{self}.build_from" unless arg_hash
         args = deep_symbolize_keys(arg_hash)
         args = args[section_name] if section_name
         impl_class = find_impl_class(args)
         begin
           return create_impl(impl_class, args, env_name)
-        rescue => e
+        rescue StandardError => e
           raise ArgumentError, "Error instantiating #{impl_class} with arguments #{args}: #{e}"
         end
       end
@@ -65,10 +67,10 @@ module Config
       end
 
       def impl_for_key(key_sym, args)
-        fail ArgumentError, "implementation key #{key_sym} not found in argument hash #{args || 'nil'}" unless args && args.key?(key_sym)
+        raise ArgumentError, "implementation key #{key_sym} not found in argument hash #{args || 'nil'}" unless args&.key?(key_sym)
         key_value = args.delete(key_sym)
         impl_class = impls_by_key[key_value]
-        fail ArgumentError, "No #{name} implementation found for #{key_sym}: #{key_value}" unless impl_class
+        raise ArgumentError, "No #{name} implementation found for #{key_sym}: #{key_value}" unless impl_class
         impl_class
       end
 

data/lib/config/factory/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Config
   module Factory
     class Environment
@@ -17,7 +19,7 @@ module Config
 
       def self.load_file(path)
         hash = YAML.load_file(path)
-        fail IOError, "Unable to load YAML file #{path}" unless hash && hash.is_a?(Hash)
+        raise IOError, "Unable to load YAML file #{path}" unless hash && hash.is_a?(Hash)
         load_hash(hash)
       end
 
@@ -32,12 +34,12 @@ module Config
       private
 
       def name=(v)
-        fail ArgumentError, "Environment name #{v} must be a symbol" unless v && v.is_a?(Symbol)
+        raise ArgumentError, "Environment name #{v} must be a symbol" unless v && v.is_a?(Symbol)
         @name = v
       end
 
       def configs=(v)
-        fail ArgumentError, "Environment configs #{v} must be a hash" unless v && v.is_a?(Hash)
+        raise ArgumentError, "Environment configs #{v} must be a hash" unless v && v.is_a?(Hash)
         @configs = v
       end
 

data/lib/config/factory/environments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'config/factory/environment'
 
@@ -5,12 +7,12 @@ module Config
   module Factory
     module Environments
       DEFAULT_ENVIRONMENT = :production
-      STANDARD_ENVIRONMENTS = [:defaults, :development, :test, :stage, :staging, :production].freeze
+      STANDARD_ENVIRONMENTS = %i[defaults development test stage staging production].freeze
       STANDARD_ENVIRONMENTS_NOT_FOUND = "No standard environment tags (#{STANDARD_ENVIRONMENTS.join(', ')}) found; is this really a multiple-environment configuration?"
 
       def self.load_file(path)
         hash = YAML.load_file(path)
-        fail IOError, "Unable to load YAML file #{path}" unless hash && hash.is_a?(Hash)
+        raise IOError, "Unable to load YAML file #{path}" unless hash && hash.is_a?(Hash)
         load_hash(hash)
       end
 

data/lib/config/factory/log.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module Config
@@ -20,8 +22,6 @@ module Config
       @log = new_logger(logdev: value)
     end
 
-    private
-
     def self.new_logger(logdev:, level: Logger::DEBUG, shift_age: 10, shift_size: 1024 * 1024)
       logger = Logger.new(logdev, shift_age, shift_size)
       logger.level = level
@@ -30,6 +30,7 @@ module Config
       end
       logger
     end
+    private_class_method :new_logger
 
   end
 end

data/lib/config/factory/module_info.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Config
   module Factory
     # The name of this gem
     NAME = 'config-factory'
 
     # The version of this gem
-    VERSION = '0.0.9'
+    VERSION = '0.1.0'
 
     # The copyright notice for this gem
-    COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'
+    COPYRIGHT = 'Copyright (c) 2018 The Regents of the University of California'
   end
 end

data/spec/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: ../.rubocop.yml
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/MethodLength:
   Enabled: false
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ------------------------------------------------------------
 # SimpleCov setup
 

data/spec/unit/config/factory/abstract_factory_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require_relative 'fixtures'
 

data/spec/unit/config/factory/environment_spec.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
+require 'tmpdir'
 require_relative 'fixtures'
 
 module Config
@@ -18,7 +21,7 @@ module Config
         it 'registers the configurations' do
           yaml_hash = YAML.load_file('spec/data/single-environment.yml')
           env = Environment.new(name: :test, configs: yaml_hash)
-          %w(db source index).each do |key|
+          %w[db source index].each do |key|
             expect(env.args_for(key)).to eq(yaml_hash[key])
           end
         end

data/spec/unit/config/factory/environments_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require_relative 'fixtures'
 
@@ -8,7 +10,7 @@ module Config
         it 'loads a multi-environment config file' do
           envs = Environments.load_file('spec/data/multiple-environments.yml')
           expect(envs).to be_a(Hash)
-          expected = [:defaults, :development, :test, :production]
+          expected = %i[defaults development test production]
           expect(envs.size).to eq(expected.size)
           expected.each do |env_name|
             env = envs[env_name]
@@ -67,7 +69,7 @@ module Config
         it 'reads a standard ActiveRecord DB config' do
           envs = Environments.load_file('spec/data/db-config.yml')
           expect(envs).to be_a(Hash)
-          expected = [:development, :test, :production]
+          expected = %i[development test production]
           expect(envs.size).to eq(expected.size)
           expected.each do |env_name|
             env = envs[env_name]

data/spec/unit/config/factory/fixtures.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'config/factory'
 require 'uri'
 
@@ -61,7 +63,7 @@ class XMLConfig < PersistenceConfig
   attr_reader :connection_info
 
   can_build_if do |config|
-    config[:path] && config[:path].end_with?('.xml')
+    config[:path]&.end_with?('.xml')
   end
 
   def initialize(connection_info)

data/spec/unit/config/factory/log_spec.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
+require 'time'
 
 module Config
   module Factory
@@ -12,7 +15,7 @@ module Config
           logged = out.string
           expect(logged).to include(msg)
           timestamp_str = logged.split[0]
-          timestamp = DateTime.parse(timestamp_str)
+          timestamp = Time.parse(timestamp_str)
           expect(timestamp.to_date).to eq(Time.now.utc.to_date)
         ensure
           Factory.log_device = $stdout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config-factory
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.52'
 - !ruby/object:Gem::Dependency
-  name: simplecov-console
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.2.0
 description: A gem for creating configuration classes using the Abstract Factory pattern,
   with run-time configuration provided by hashes or YAML files.
 email:
@@ -130,7 +130,7 @@ files:
 - spec/unit/config/factory/environments_spec.rb
 - spec/unit/config/factory/fixtures.rb
 - spec/unit/config/factory/log_spec.rb
-homepage: http://github.com/dmolesUC3/config-factory
+homepage: http://github.com/config-factory
 licenses:
 - MIT
 metadata: {}
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A gem for creating configuration classes using the Abstract Factory pattern.
@@ -166,4 +166,3 @@ test_files:
 - spec/unit/config/factory/environments_spec.rb
 - spec/unit/config/factory/fixtures.rb
 - spec/unit/config/factory/log_spec.rb
-has_rdoc: