stockpile-redis 1.1 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c921c5dea37bc0ab0c8f2b5ebb77bb3db14071a3
-  data.tar.gz: 75fa3e0437603717c027d83270d36f93eb814852
+  metadata.gz: d40f8011b02ab91d739a865686931cee23ea4ba0
+  data.tar.gz: 201d2ae7aba6ec7df5f58153824978bf5267c4ee
 SHA512:
-  metadata.gz: bc72992d8cf5eaf4d146d0f3ae643659ea6b1c14d97a24bdaae96fa17b6fc2d74234dab6d79b39b3549d7ad16abae044784a2eff8e67717ddd8ff5917105116a
-  data.tar.gz: 061fe3aabb239931475bd1ba656b5d48e0d187c1f40777861844c9afa7e98be17a1b040256204193dc718a0bdde69d1e2fe13ba9780e9ef962c8f2c4d83204ca
+  metadata.gz: 98c37e4a71cd967669e837918d24bff07fafcc6aa57018306cddce2e85dd3617e0724d21a885d4a60161d6d828749d59591a7d31207cfcca9dce3e559fdf02d5
+  data.tar.gz: ad1bd1b18becc30212432f2b0c29e085fb94e469fa32bbf60f8e8ad53b91225ab11ffbe367124725777bb67e559a530555406ee7708044fdc4be139f93b243e7

data/.autotest

@@ -1,27 +1,8 @@
+# frozen_string_literal: true
 # -*- ruby -*-
 
-require "autotest/restart"
+require 'autotest/restart'
 
 Autotest.add_hook :initialize do |at|
-  # .minitest.rb ensures that the gem version of minitest is used.
   at.testlib = ".minitest.rb"
-  # at.testlib = "minitest/unit"
-  #
-  # at.extra_files << "../some/external/dependency.rb"
-  #
-  # at.libs << ":../some/external"
-  #
-  # at.add_exception "vendor"
-  #
-  # at.add_mapping(/dependency.rb/) do |f, _|
-  #   at.files_matching(/test_.*rb$/)
-  # end
-  #
-  # %w(TestA TestB).each do |klass|
-  #   at.extra_class_map[klass] = "test/test_misc.rb"
-  # end
 end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end

data/.minitest.rb

@@ -1,2 +1,3 @@
-gem "minitest"
-require "minitest/autorun"
+# frozen_string_literal: true
+gem 'minitest'
+require 'minitest/autorun'

data/.rubocop.yml

@@ -0,0 +1,209 @@
+---
+# inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Include:
+    - '**/Rakefile'
+    - '**/config.rb'
+  Exclude:
+    - 'bin/**/*'
+    - 'config/**/*'
+    - 'script/**/*'
+    - 'tmp/**/*'
+  DisplayCopNames: true
+  TargetRubyVersion: 2.3
+
+Style/AlignHash:
+  EnforcedHashRocketStyle: key
+  EnforcedColonStyle: key
+  EnforcedLastArgumentHashStyle: always_ignore
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/BarePercentLiterals:
+  EnforcedStyle: percent_q
+
+Style/BracesAroundHashParameters:
+  EnforcedStyle: context_dependent
+
+Style/Documentation:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+# This replaces the old Style/Blocks. The default for this is still stupid
+# (multiline blocks are do/end and single-line blocks are {/}), but it now
+# performs a semantic analysis, allowing for the more nuanced version proposed
+# by Jim Weirich around 2004. If a block is used as part of an assignment or
+# method chaining, prefer {/} delimiters; if not, prefer do/end delimiters. It
+# isn't *quite* that simple in all circumstances, but we can add them to one of
+# three groups: ProceduralMethods (prefer do/end), FunctionalMethods ({/}), and
+# ignored (because it does not matter).
+Style/BlockDelimiters:
+  Enabled: false
+  EnforcedStyle: semantic
+  ProceduralMethods:
+    # Methods that are known to be procedural in nature but look functional from
+    # their usage, e.g.
+    #
+    #   time = Benchmark.realtime do
+    #     foo.bar
+    #   end
+    #
+    # Here, the return value of the block is discarded but the return value of
+    # `Benchmark.realtime` is used.
+    - benchmark
+    - bm
+    - bmbm
+    - create
+    - each_with_object
+    - measure
+    - new
+    - realtime
+    - tap
+    - with_object
+    - assert_raises
+    - solr_search
+    - solr_paginated
+    - all_of
+    - any_of
+  FunctionalMethods:
+    # Methods that are known to be functional in nature but look procedural from
+    # their usage, e.g.
+    #
+    #   let(:foo) { Foo.new }
+    #
+    # Here, the return value of `Foo.new` is used to define a `foo` helper but
+    # doesn't appear to be used from the return value of `let`.
+    - let
+    - let!
+    - subject
+    - watch
+  IgnoredMethods:
+    # Methods that can be either procedural or functional and cannot be
+    # categorised from their usage alone, e.g.
+    #
+    #   foo = lambda do |x|
+    #     puts "Hello, #{x}"
+    #   end
+    #
+    #   foo = lambda do |x|
+    #     x * 100
+    #   end
+    #
+    # Here, it is impossible to tell from the return value of `lambda` whether
+    # the inner block's return value is significant.
+    - lambda
+    - proc
+    - it
+Performance/FixedSize:
+  Enabled: false
+
+Style/FormatString:
+  Enabled: false
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/SpaceInsideBrackets:
+  Enabled: false
+
+Style/CommentAnnotation:
+  Enabled: false
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/ClassCheck:
+  EnforcedStyle: kind_of?
+
+Style/RegexpLiteral:
+  EnforcedStyle: mixed
+
+Style/CommandLiteral:
+  EnforcedStyle: percent_x
+
+Style/UnneededPercentQ:
+  Enabled: false
+
+Style/IndentAssignment:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 90
+  Exclude:
+    - test/**/*
+    - Gemfile
+
+Style/MethodDefParentheses:
+  Exclude:
+    - test/**/*
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/FileName:
+  Exclude:
+    - Gemfile
+    - .autotest
+    - .simplecov-prelude.rb
+
+Style/RedundantSelf:
+  Exclude:
+    - test/test_helper.rb
+
+Style/SignalException:
+  EnforcedStyle: semantic
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Performance/RedundantBlockCall:
+  Enabled: false
+
+Style/LambdaCall:
+  Enabled: false

data/.simplecov-prelude.rb

@@ -0,0 +1,9 @@
+require 'simplecov'
+
+SimpleCov.start do
+  command_name 'Minitest'
+  add_filter '/lib/cartage/backport.rb'
+  add_filter '/test/'
+end
+
+gem 'minitest'

data/.travis.yml

@@ -1,18 +1,17 @@
 ---
+sudo: false
 language: ruby
 rvm:
-  - "2.2"
-  - "2.1"
-  - 2.0.0
-  - 1.9.3
+  - 2.3.0
+  - 2.2
+  - 2.1
+  - 2.0
   - ruby-head
-  - jruby-19mode
-  - jruby-head
+  - jruby-9.0
   - rbx-2
 matrix:
   allow_failures:
     - rvm: rbx-2
-    - rvm: jruby-head
     - rvm: ruby-head
 gemfile:
   - Gemfile
@@ -33,5 +32,3 @@ notifications:
       - halostatue@gmail.com
     on_success: change
     on_failure: always
-sudo:
-  false

data/.workenv

@@ -0,0 +1,5 @@
+#! zsh
+
+--workenv-tab --first
+--workenv-tab --desc autotest autotest
+--workenv-tab --desc documents "fswatch -o *.rdoc lib/**/*.rb| xargs -n1 -I{} rake docs"

data/Gemfile

@@ -3,7 +3,9 @@
 # NOTE: This file is present to keep Travis CI happy. Edits to it will not
 # be accepted.
 
-source "https://rubygems.org/"
+source 'https://rubygems.org/'
 gemspec
 
+gem 'stockpile', path: ENV['LOCAL_STOCKPILE'] if ENV['LOCAL_STOCKPILE']
+
 # vim: syntax=ruby

data/History.md

@@ -0,0 +1,40 @@
+### 2.0 / 2016-04-04
+
+*   1 major change
+
+    *   Dropped support for Ruby 1.9
+
+*   1 minor change
+
+    *   Changed Rails environment support from looking for Rails.env to
+        RAILS_ENV.
+
+*   1 bugfix
+
+    *   Fix [issue #1][]. OpenStruct is now supported for Stockpile options.
+
+*   1 governance change:
+
+    *   Stockpile::Redis is under the Contributer Covenant Code of Conduct.
+
+*   Miscellaneous
+
+    *   Added Rubocop.
+
+### 1.1 / 2015-02-10
+
+* 2 minor enhancements
+
+  * Modified Stockpile::Redis to be implemented based on the new
+    Stockpile::Base class provided in stockpile 1.1.
+
+  * Implemented the +namespace+ option for client connections to add additional
+    namespace support to individual child connections.
+
+### 1.0 / 2015-01-21
+
+* 1 major enhancement
+
+  * Birthday!
+
+[issue #1]: https://github.com/halostatue/stockpile-redis/issues/1

data/Licence.rdoc

@@ -2,7 +2,7 @@
 
 This software is available under an MIT-style licence.
 
-* Copyright 2015 Austin Ziegler
+* Copyright 2015–2016 Austin Ziegler
 
 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

data/Manifest.txt

@@ -1,10 +1,13 @@
 .autotest
 .gemtest
 .minitest.rb
+.rubocop.yml
+.simplecov-prelude.rb
 .travis.yml
+.workenv
 Contributing.rdoc
 Gemfile
-History.rdoc
+History.md
 Licence.rdoc
 Manifest.txt
 README.rdoc

data/README.rdoc

@@ -2,7 +2,7 @@
 
 code :: https://github.com/halostatue/stockpile-redis/
 bugs :: https://github.com/halostatue/stockpile-redis/issues
-continuous integration :: {<img src="https://travis-ci.org/halostatue/stockpile-redis.png" />}[https://travis-ci.org/halostatue/stockpile-redis]
+continuous integration :: {<img src="https://travis-ci.org/halostatue/stockpile-redis.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/halostatue/stockpile-redis]
 
 == Description
 
@@ -18,8 +18,8 @@ Redis.new)</tt>).
 stockpile-redis provides special-case handling for connections for Resque when
 the name of the client is +:resque+.
 
-Release 1.1 adds a minor enhancement to allow for namespaces for named clients
-using Stockpile::Redis#connection_for.
+Release 2.0 fixes an issue with initialization using OpenStruct for options.
+Ruby 1.9 is no longer supported.
 
 == Synopsis
 
@@ -105,7 +105,7 @@ using Stockpile::Redis#connection_for.
 
 Put stockpile-redis in your Gemfile:
 
-  gem 'stockpile-redis', '~> 1.1'
+  gem 'stockpile-redis', '~> 2.0'
 
 Or manually install:
 

data/Rakefile

@@ -2,55 +2,63 @@
 
 require 'rubygems'
 require 'hoe'
+require 'rake/clean'
 
 Hoe.plugin :doofus
+Hoe.plugin :email unless ENV['CI'] || ENV['TRAVIS']
 Hoe.plugin :gemspec2
 Hoe.plugin :git
 Hoe.plugin :minitest
 Hoe.plugin :travis
-Hoe.plugin :email unless ENV['CI'] or ENV['TRAVIS']
 
 spec = Hoe.spec 'stockpile-redis' do
   developer('Austin Ziegler', 'halostatue@gmail.com')
 
-  self.history_file = 'History.rdoc'
+  self.history_file = 'History.md'
   self.readme_file = 'README.rdoc'
-  self.extra_rdoc_files = FileList["*.rdoc"].to_a
-
-  license "MIT"
-
-  self.need_tar = true
-  self.require_ruby_version '>= 1.9.2'
-
-  self.extra_deps << ['stockpile', '~> 1.1']
-  self.extra_deps << ['redis', '~> 3.0']
-  self.extra_deps << ['redis-namespace', '~> 1.0']
-  self.extra_dev_deps << ['fakeredis', '~> 0.5']
-  self.extra_dev_deps << ['hoe-doofus', '~> 1.0']
-  self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
-  self.extra_dev_deps << ['hoe-git', '~> 1.5']
-  self.extra_dev_deps << ['hoe-travis', '~> 1.2']
-  self.extra_dev_deps << ['minitest', '~> 5.4']
-  self.extra_dev_deps << ['minitest-around', '~> 0.3']
-  self.extra_dev_deps << ['minitest-autotest', '~> 1.0']
-  self.extra_dev_deps << ['minitest-bisect', '~> 1.2']
-  self.extra_dev_deps << ['minitest-focus', '~> 1.1']
-  self.extra_dev_deps << ['minitest-moar', '~> 0.0']
-  self.extra_dev_deps << ['minitest-pretty_diff', '~> 0.1']
-  self.extra_dev_deps << ['rake', '>= 10.0']
-  self.extra_dev_deps << ['redis-namespace', '~> 1.5']
-  self.extra_dev_deps << ['simplecov', '~> 0.7']
+
+  license 'MIT'
+
+  require_ruby_version '>= 2.0'
+
+  extra_deps << ['stockpile', '~> 2.0']
+  extra_deps << ['redis', '~> 3.0']
+  extra_deps << ['redis-namespace', '~> 1.0']
+  extra_dev_deps << ['fakeredis', '~> 0.5']
+  extra_dev_deps << ['hoe-doofus', '~> 1.0']
+  extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
+  extra_dev_deps << ['hoe-git', '~> 1.5']
+  extra_dev_deps << ['hoe-travis', '~> 1.2']
+  extra_dev_deps << ['minitest', '~> 5.4']
+  extra_dev_deps << ['minitest-autotest', '~> 1.0']
+  extra_dev_deps << ['minitest-bisect', '~> 1.2']
+  extra_dev_deps << ['minitest-bonus-assertions', '~> 2.0']
+  extra_dev_deps << ['minitest-focus', '~> 1.1']
+  extra_dev_deps << ['minitest-moar', '~> 0.0']
+  extra_dev_deps << ['minitest-pretty_diff', '~> 0.1']
+  extra_dev_deps << ['rake', '>= 10.0']
+  extra_dev_deps << ['redis-namespace', '~> 1.5']
+  extra_dev_deps << ['simplecov', '~> 0.7']
+end
+
+module Hoe::Publish
+  alias_method :original_make_rdoc_cmd, :make_rdoc_cmd
+
+  def make_rdoc_cmd(*extra_args) # :nodoc:
+    spec.extra_rdoc_files.reject! { |f| f == 'Manifest.txt' }
+    original_make_rdoc_cmd(*extra_args)
+  end
 end
 
 namespace :test do
   task :coverage do
-    spec.test_prelude = [
-      'require "simplecov"',
-      'SimpleCov.start("test_frameworks") { command_name "Minitest" }',
-      'gem "minitest"'
-    ].join('; ')
+    spec.test_prelude = %q(load ".simplecov-prelude.rb")
     Rake::Task['test'].execute
   end
+
+  CLOBBER << 'coverage'
 end
 
+CLOBBER << 'tmp'
+
 # vim: syntax=ruby

data/lib/stockpile-redis.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'stockpile/redis'

data/lib/stockpile/redis.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 require 'redis'
@@ -7,7 +8,7 @@ require 'stockpile/base'
 class Stockpile
   # A connection manager for Redis.
   class Redis < Stockpile::Base
-    VERSION = '1.1' # :nodoc:
+    VERSION = '2.0' # :nodoc:
 
     # Create a new Redis connection manager with the provided options.
     #
@@ -28,11 +29,10 @@ class Stockpile
       super
 
       @redis_options = (@options.delete(:redis) || {}).dup
+      @redis_options = @redis_options.to_h unless @redis_options.kind_of?(Hash)
       @namespace     = @options.fetch(:namespace) {
         @redis_options.fetch(:namespace) {
-          ENV['REDIS_NAMESPACE'] ||
-          (defined?(::Rails) && ::Rails.env) ||
-          ENV['RACK_ENV']
+          ENV['REDIS_NAMESPACE'] || ENV['RAILS_ENV'] || ENV['RACK_ENV']
         }
       }
 
@@ -142,6 +142,7 @@ class Stockpile
     # :method: disconnect
 
     private
+
     def client_connect(name = nil, options = {})
       options = { namespace: options[:namespace] }
 
@@ -153,11 +154,11 @@ class Stockpile
       end
     end
 
-    def client_reconnect(redis = connection())
+    def client_reconnect(redis = connection)
       redis.client.reconnect if redis
     end
 
-    def client_disconnect(redis = connection())
+    def client_disconnect(redis = connection)
       redis.quit if redis
     end
 
@@ -187,7 +188,7 @@ class Stockpile
       if r.instance_of?(::Redis::Namespace) && r.namespace.to_s !~ /:resque\z/
         r = ::Redis::Namespace.new(:"#{r.namespace}:resque", redis: r.redis)
       elsif r.instance_of?(::Redis)
-        r = ::Redis::Namespace.new("resque", redis: r)
+        r = ::Redis::Namespace.new('resque', redis: r)
       end
 
       r

data/test/minitest_config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # -*- ruby encoding: utf-8 -*-
 
 gem 'minitest'
@@ -22,11 +23,7 @@ module Minitest::ENVStub
   def stub_env env, options = {}, *block_args, &block
     mock = lambda { |key|
       env.fetch(key) { |k|
-        if options[:passthrough]
-          ENV.send(:"__minitest_stub__[]", k)
-        else
-          nil
-        end
+        ENV.send(:"__minitest_stub__[]", k) if options[:passthrough]
       }
     }
 

data/test/test_stockpile_adapter_redis.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require 'minitest_config'
 require 'stockpile/redis'
 require 'time'
 
 describe Stockpile do
-  describe ".inject!" do
+  describe '.inject!' do
     let(:mod) { Module.new }
     let(:lrt) {
       Module.new do
@@ -18,25 +19,25 @@ describe Stockpile do
       end
     }
 
-    describe "Mod.cache_adapter" do
+    describe 'Mod.cache_adapter' do
       let(:now) { Time.now }
       before { ::Stockpile.inject_redis!(mod, adaptable: true) }
 
-      it "adapts the cache with last_run_time" do
+      it 'adapts the cache with last_run_time' do
         mod.cache_adapter(lrt)
         assert_nil mod.cache.last_run_time('foo')
         assert_equal true, mod.cache.last_run_time('foo', now)
         assert_equal now.to_i, mod.cache.last_run_time('foo').to_i
       end
 
-      it "adapts the module with last_run_time" do
+      it 'adapts the module with last_run_time' do
         mod.cache_adapter(lrt, mod)
         assert_nil mod.last_run_time('foo')
         assert_equal true, mod.last_run_time('foo', now)
         assert_equal now.to_i, mod.last_run_time('foo').to_i
       end
 
-      it "adapts the lrt module with last_run_time" do
+      it 'adapts the lrt module with last_run_time' do
         mod.cache_adapter!(lrt)
         assert_nil lrt.last_run_time('foo')
         assert_equal true, lrt.last_run_time('foo', now)

data/test/test_stockpile_redis.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'minitest_config'
 require 'stockpile/redis'
 
@@ -13,19 +14,17 @@ describe Stockpile::Redis do
   let(:rcm_narrow) { stub_env({}) { Stockpile::Redis.new(narrow: true) } }
 
   describe 'constructor' do
-    it "uses the default connection width by default" do
+    it 'uses the default connection width by default' do
       stub ::Stockpile, :narrow?, lambda { false } do
-        refute Stockpile::Redis.new.narrow?,
-          "should be narrow, but is not"
+        refute Stockpile::Redis.new.narrow?, 'should be narrow, but is not'
       end
 
       stub ::Stockpile, :narrow?, lambda { true } do
-        assert Stockpile::Redis.new.narrow?,
-          "is not narrow, but should be"
+        assert Stockpile::Redis.new.narrow?, 'is not narrow, but should be'
       end
     end
 
-    it "can be told which connection width to use explicitly" do
+    it 'can be told which connection width to use explicitly' do
       stub ::Stockpile, :narrow?, lambda { false } do
         assert rcm_narrow.narrow?
       end
@@ -35,7 +34,7 @@ describe Stockpile::Redis do
       end
     end
 
-    it "passes settings through to Redis" do
+    it 'passes settings through to Redis' do
       options = {
         redis: {
           url: 'redis://xyz/'
@@ -45,98 +44,103 @@ describe Stockpile::Redis do
       assert_equal 'xyz', rcm.connect.client.options[:host]
     end
 
-    it "has no clients by default" do
+    it 'passes settings through to Redis with an OpenStruct' do
+      require 'ostruct'
+      options = OpenStruct.new(redis: { url: 'redis://xyz/' })
+      rcm = ::Stockpile::Redis.new(options)
+      assert_equal 'xyz', rcm.connect.client.options[:host]
+    end
+
+    it 'passes settings through to Redis with a nested OpenStruct' do
+      require 'ostruct'
+      redis_options = OpenStruct.new(url: 'redis://xyz/')
+      options = OpenStruct.new(redis: redis_options)
+      rcm = ::Stockpile::Redis.new(options)
+      assert_equal 'xyz', rcm.connect.client.options[:host]
+    end
+
+    it 'has no clients by default' do
       assert_clients [], ::Stockpile::Redis.new
     end
 
-    describe "namespace support" do
+    describe 'namespace support' do
       def assert_namespace(client)
         assert_equal 'stockpile', client.instance_variable_get(:@namespace)
       end
 
-      it "will set namespace from ENV['REDIS_NAMESPACE']" do
-        stub_env({ 'REDIS_NAMESPACE' => 'stockpile' }) do
+      it %q(will set namespace from ENV['REDIS_NAMESPACE']) do
+        stub_env('REDIS_NAMESPACE' => 'stockpile') do
           assert_namespace ::Stockpile::Redis.new
         end
       end
 
-      it "will set namespace from Rails.env" do
-        begin
-          ::Rails = Class.new do
-            def self.env
-              'stockpile'
-            end
-          end
-
-          stub_env({}) do
-            assert_namespace ::Stockpile::Redis.new
-          end
-        ensure
-          Object.send(:remove_const, :Rails)
+      it 'will set namespace from RAILS_ENV' do
+        stub_env('RAILS_ENV' => 'stockpile') do
+          assert_namespace ::Stockpile::Redis.new
         end
       end
 
-      it "will set namespace from ENV['RACK_ENV']" do
-        stub_env({ 'RACK_ENV' => 'stockpile' }) do
+      it %q(will set namespace from ENV['RACK_ENV']) do
+        stub_env('RACK_ENV' => 'stockpile') do
           assert_namespace ::Stockpile::Redis.new
         end
       end
 
-      it "will set namespace from parameters" do
-        stub_env({ 'RACK_ENV' => 'test' }) do
+      it 'will set namespace from parameters' do
+        stub_env('RACK_ENV' => 'test') do
           assert_namespace ::Stockpile::Redis.new(namespace: 'stockpile')
         end
       end
     end
   end
 
-  describe "#connect" do
-    it "creates a connection to Redis" do
+  describe '#connect' do
+    it 'creates a connection to Redis' do
       assert_nil rcm.connection
       refute_nil rcm.connect
       assert_kind_of ::Redis, rcm.connection
     end
 
-    it "creates a namespaced connection to Redis" do
+    it 'creates a namespaced connection to Redis' do
       assert_nil rcm_namespace.connection
       refute_nil rcm_namespace.connect
       assert_kind_of ::Redis::Namespace, rcm_namespace.connection
     end
 
-    describe "with a wide connection width" do
+    describe 'with a wide connection width' do
       before do
         rcm_wide.connect(:redis, rollout: { namespace: 'rollout' })
       end
 
-      it "connects multiple clients" do
+      it 'connects multiple clients' do
         assert_clients [ :redis, :rollout ], rcm_wide
       end
 
-      it "creates a Redis::Namespace for rollout" do
+      it 'creates a Redis::Namespace for rollout' do
         assert_kind_of Redis::Namespace, rcm_wide.connection_for(:rollout)
       end
 
-      it "connects *different* clients" do
+      it 'connects *different* clients' do
         refute_same rcm_wide.connection, rcm_wide.connection_for(:redis)
         refute_same rcm_wide.connection, rcm_wide.connection_for(:rollout)
         refute_same rcm_wide.connection_for(:redis), rcm_wide.connection_for(:rollout)
       end
     end
 
-    describe "with a narrow connection width" do
+    describe 'with a narrow connection width' do
       before do
         rcm_narrow.connect(:redis, rollout: { namespace: 'rollout' })
       end
 
-      it "appears to connect multiple clients" do
+      it 'appears to connect multiple clients' do
         assert_clients [ :redis, :rollout ], rcm_narrow
       end
 
-      it "creates a Redis::Namespace for rollout" do
+      it 'creates a Redis::Namespace for rollout' do
         assert_kind_of Redis::Namespace, rcm_narrow.connection_for(:rollout)
       end
 
-      it "returns identical clients" do
+      it 'returns identical clients' do
         assert_same rcm_narrow.connection, rcm_narrow.connection_for(:redis)
         refute_same rcm_narrow.connection, rcm_narrow.connection_for(:rollout)
         assert_same rcm_narrow.connection,
@@ -148,28 +152,28 @@ describe Stockpile::Redis do
     end
   end
 
-  describe "#connection_for" do
-    describe "with a wide connection width" do
-      it "connects the main client" do
+  describe '#connection_for' do
+    describe 'with a wide connection width' do
+      it 'connects the main client' do
         rcm_wide.connection_for(:global)
         assert rcm_wide.connection
         refute_same rcm_wide.connection, rcm_wide.connection_for(:global)
       end
 
-      it "wraps a :resque client in Redis::Namespace" do
+      it 'wraps a :resque client in Redis::Namespace' do
         assert_kind_of Redis::Namespace, rcm_wide.connection_for(:resque)
-        assert_equal "resque", rcm_wide.connection_for(:resque).namespace
+        assert_equal 'resque', rcm_wide.connection_for(:resque).namespace
       end
     end
 
-    describe "with a narrow connection width" do
-      it "connects the main client" do
+    describe 'with a narrow connection width' do
+      it 'connects the main client' do
         rcm_narrow.connection_for(:global)
         assert rcm_narrow.connection
         assert_same rcm_narrow.connection, rcm_narrow.connection_for(:global)
       end
 
-      it "wraps a :resque client in Redis::Namespace" do
+      it 'wraps a :resque client in Redis::Namespace' do
         assert_kind_of Redis::Namespace, rcm_narrow.connection_for(:resque)
       end
     end
@@ -177,8 +181,8 @@ describe Stockpile::Redis do
 
   # #disconnect cannot be tested with FakeRedis because the FakeRedis
   # #connected? method always returns true.
-  describe "#disconnect" do
-    describe "with a wide connection width" do
+  describe '#disconnect' do
+    describe 'with a wide connection width' do
       let(:global) { rcm_wide.connection }
       let(:redis) { rcm_wide.connection_for(:redis) }
 
@@ -188,7 +192,7 @@ describe Stockpile::Redis do
         redis.client.connect
       end
 
-      it "disconnects the global client" do
+      it 'disconnects the global client' do
         instance_stub Redis, :quit do
           force_connection
           rcm_wide.disconnect
@@ -196,7 +200,7 @@ describe Stockpile::Redis do
         assert_instance_called Redis, :quit, 1
       end
 
-      it "disconnects the redis and global clients" do
+      it 'disconnects the redis and global clients' do
         instance_stub Redis, :quit do
           force_connection
           rcm_wide.disconnect(:redis)
@@ -205,7 +209,7 @@ describe Stockpile::Redis do
       end
     end
 
-    describe "with a narrow connection width" do
+    describe 'with a narrow connection width' do
       let(:global) { rcm_narrow.connection }
       let(:redis) { rcm_narrow.connection_for(:redis) }
 
@@ -215,7 +219,7 @@ describe Stockpile::Redis do
         redis.client.connect
       end
 
-      it "disconnects the global client" do
+      it 'disconnects the global client' do
         instance_stub Redis, :quit do
           force_connection
           rcm_narrow.disconnect
@@ -223,7 +227,7 @@ describe Stockpile::Redis do
         assert_instance_called Redis, :quit, 1
       end
 
-      it "disconnects the redis and global clients" do
+      it 'disconnects the redis and global clients' do
         instance_stub Redis, :quit do
           force_connection
           rcm_narrow.disconnect(:redis)
@@ -235,8 +239,8 @@ describe Stockpile::Redis do
 
   # #reconnect cannot be tested with FakeRedis because the FakeRedis
   # #connected? method always returns true.
-  describe "#reconnect" do
-    describe "with a wide connection width" do
+  describe '#reconnect' do
+    describe 'with a wide connection width' do
       let(:global) { rcm_wide.connection }
       let(:redis) { rcm_wide.connection_for(:redis) }
 
@@ -246,7 +250,7 @@ describe Stockpile::Redis do
         redis.client.connect
       end
 
-      it "reconnects the global client" do
+      it 'reconnects the global client' do
         instance_stub Redis::Client, :reconnect do
           force_connection
           rcm_wide.reconnect
@@ -254,7 +258,7 @@ describe Stockpile::Redis do
         assert_instance_called Redis::Client, :reconnect, 1
       end
 
-      it "reconnects the redis and global clients" do
+      it 'reconnects the redis and global clients' do
         instance_stub Redis::Client, :reconnect do
           force_connection
           rcm_wide.reconnect(:redis)
@@ -263,7 +267,7 @@ describe Stockpile::Redis do
       end
     end
 
-    describe "with a narrow connection width" do
+    describe 'with a narrow connection width' do
       let(:global) { rcm_narrow.connection }
       let(:redis) { rcm_narrow.connection_for(:redis) }
 
@@ -273,7 +277,7 @@ describe Stockpile::Redis do
         redis.client.connect
       end
 
-      it "reconnects the global client" do
+      it 'reconnects the global client' do
         instance_stub Redis::Client, :reconnect do
           force_connection
           rcm_narrow.reconnect
@@ -281,7 +285,7 @@ describe Stockpile::Redis do
         assert_instance_called Redis::Client, :reconnect, 1
       end
 
-      it "reconnects the redis and global clients" do
+      it 'reconnects the redis and global clients' do
         instance_stub Redis::Client, :reconnect do
           force_connection
           rcm_narrow.reconnect(:redis)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockpile-redis
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '2.0'
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stockpile
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -151,47 +151,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: minitest-around
+  name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: minitest-autotest
+  name: minitest-bisect
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: minitest-bisect
+  name: minitest-bonus-assertions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
 description: |-
   stockpile-redis is a connection manager for Redis to be used with
   {Stockpile}[https://github.com/halostatue/stockpile].
@@ -285,7 +285,7 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - Contributing.rdoc
-- History.rdoc
+- History.md
 - Licence.rdoc
 - Manifest.txt
 - README.rdoc
@@ -293,10 +293,13 @@ files:
 - ".autotest"
 - ".gemtest"
 - ".minitest.rb"
+- ".rubocop.yml"
+- ".simplecov-prelude.rb"
 - ".travis.yml"
+- ".workenv"
 - Contributing.rdoc
 - Gemfile
-- History.rdoc
+- History.md
 - Licence.rdoc
 - Manifest.txt
 - README.rdoc
@@ -320,7 +323,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -328,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: stockpile-redis is a connection manager for Redis to be used with {Stockpile}[https://github.com/halostatue/stockpile].

data/History.rdoc

@@ -1,15 +0,0 @@
-=== 1.1 / 2015-02-10
-
-* 2 minor enhancements
-
-  * Modified Stockpile::Redis to be implmented based on the new Stockpile::Base
-    class provided in stockpile 1.1.
-
-  * Implemented the +namespace+ option for client connections to add additional
-    namespace support to individual child connections.
-
-=== 1.0 / 2015-01-21
-
-* 1 major enhancement
-
-  * Birthday!