mock_redis 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51d5bc5ef12c98487d1fc31d420608e1265eb6b7
-  data.tar.gz: 7fcf609fe19c71439098a4f4e588c50e588c91f3
+  metadata.gz: 01d1bfd5cf966db9fd2883757cb12f2c59f09d57
+  data.tar.gz: 80260a25e033a419eac875729b5e04be332b819f
 SHA512:
-  metadata.gz: 7f51ea5086ba013622a7bf782607757c78d9eb9b54f146079e50d37ba7c7486446fe4face94d208395f0aa70b61d5ee4aed7240659682421e4e1461ba52b8546
-  data.tar.gz: c55ead056d294255f2cef773c0e8c4e9960974bda6a64887d60445b6e9211e6d7f82adfda74222294691cc659e035f4d88fea40887a3bd41f6992416f42e1085
+  metadata.gz: 33c9fde7412bf24e0180010c048fb80265e98b620d445765377f590286240063b5fd018cc6398d989f74084eccfaebe5c4333ad8f51db8af4c2dab9eb7d04136
+  data.tar.gz: 25739a7c7e6ec24ccc0079966116c9e2c6bf85011da0b17e4a308407ce1d44332416a41258affeb86855239637175c1d593d949120b4b620d0cb14e576539c10

data/.gitignore

@@ -1,3 +1,4 @@
+coverage/
 pkg/*
 .bundle
 Gemfile.lock

data/.overcommit.yml

@@ -5,7 +5,7 @@ PreCommit:
   HardTabs:
     enabled: true
 
-  Rubocop:
+  RuboCop:
     enabled: true
     command: ['bundle', 'exec', 'rubocop']
 

data/.rubocop.yml

@@ -0,0 +1,91 @@
+Lint/AssignmentInCondition:
+  Enabled: false
+
+# We use this a lot in specs where it's perfectly valid
+Lint/Void:
+  Exclude:
+    - spec/**/*
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/AlignParameters:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/DotPosition:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/HashSyntax:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/MultilineBlockChain:
+  Enabled: false
+
+# Prefer curly braces except for %i/%w/%W, since those return arrays.
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%': '{}'
+    '%i': '[]'
+    '%q': '{}'
+    '%Q': '{}'
+    '%r': '{}'
+    '%s': '()'
+    '%w': '[]'
+    '%W': '[]'
+    '%x': '{}'
+
+Style/PerlBackrefs:
+  Enabled: false
+
+# This hides the has-a versus is-a relationship indicated by the method name
+Style/PredicateName:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+# End last item of a muli-line list with a comma for better diffs in future
+Style/TrailingComma:
+  EnforcedStyleForMultiline: comma
+
+Style/WhenThen:
+  Enabled: false

data/.simplecov

@@ -0,0 +1,4 @@
+SimpleCov.start do
+  add_filter '/bin/'
+  add_filter '/spec/'
+end

data/.travis.yml

@@ -1,14 +1,26 @@
 language: ruby
+
+sudo: false
+
+cache: bundler
+
 services:
   - redis-server
+
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby-19mode
 
+before_script:
+  - git config --local user.email "travis@travis.ci"
+  - git config --local user.name "Travis CI"
+
 script:
   - bundle exec rspec
+  - bundle exec overcommit --run
 
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # MockRedis Changelog
 
+### 0.15.0
+
+* Add support for the `time` method
+
 ### 0.14.1
 
 * Upgrade `redis` gem dependency to 3.2.x series

data/Gemfile

@@ -4,8 +4,10 @@ source 'http://rubygems.org'
 gemspec
 
 # Run all pre-commit hooks via Overcommit during CI runs
-gem 'overcommit', '0.24.0'
+gem 'overcommit', '0.26.0'
 
 # Pin tool versions (which are executed by Overcommit) for Travis builds
-gem 'rubocop', '0.30.0'
+gem 'rubocop', '0.32.1'
 gem 'travis', '~> 1.7'
+
+gem 'coveralls', require: false

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/mock_redis.svg)](http://badge.fury.io/rb/mock_redis)
 [![Build Status](https://travis-ci.org/brigade/mock_redis.svg)](https://travis-ci.org/brigade/mock_redis)
+[![Coverage Status](https://coveralls.io/repos/brigade/mock_redis/badge.svg)](https://coveralls.io/r/brigade/mock_redis)
 [![Dependency Status](https://gemnasium.com/brigade/mock_redis.svg)](https://gemnasium.com/brigade/mock_redis)
 
 MockRedis provides the same interface as `redis-rb`, but it stores its

data/Rakefile

@@ -3,8 +3,8 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w(-fs --color)
-  t.pattern = "spec/**/*_spec.rb"
+  t.rspec_opts = %w[-fs --color]
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 task :default => :spec

data/lib/mock_redis.rb

@@ -15,14 +15,14 @@ class MockRedis
   attr_reader :options
 
   DEFAULTS = {
-     :scheme => "redis",
-     :host => "127.0.0.1",
-     :port => 6379,
-     :path => nil,
-     :timeout => 5.0,
-     :password => nil,
-     :db => 0,
-     :time_class => Time,
+    :scheme => 'redis',
+    :host => '127.0.0.1',
+    :port => 6379,
+    :path => nil,
+    :timeout => 5.0,
+    :password => nil,
+    :db => 0,
+    :time_class => Time,
   }
 
   def self.connect(*args)
@@ -36,36 +36,37 @@ class MockRedis
       TransactionWrapper.new(
         ExpireWrapper.new(
           MultiDbWrapper.new(
-              Database.new(self, *args)))))
+            Database.new(self, *args)))))
   end
 
   def id
-    "redis://#{self.host}:#{self.port}/#{self.db}"
+    "redis://#{host}:#{port}/#{db}"
   end
-  alias :location :id
+  alias_method :location, :id
 
-  def call(command, &block)
-     self.send(*command)
+  def call(command, &_block)
+    send(*command)
   end
 
   def host
-    self.options[:host]
+    options[:host]
   end
 
   def port
-    self.options[:port]
+    options[:port]
   end
 
   def db
-    self.options[:db]
+    options[:db]
   end
 
   def now
-    self.options[:time_class].now
+    options[:time_class].now
   end
+  alias_method :time, :now
 
   def time_at(timestamp)
-    self.options[:time_class].at(timestamp)
+    options[:time_class].at(timestamp)
   end
 
   def client
@@ -80,7 +81,7 @@ class MockRedis
     self
   end
 
-  def respond_to?(method, include_private=false)
+  def respond_to?(method, include_private = false)
     super || @db.respond_to?(method, include_private)
   end
 
@@ -93,7 +94,6 @@ class MockRedis
     @db = @db.clone
   end
 
-
   protected
 
   def _parse_options(options)
@@ -101,19 +101,19 @@ class MockRedis
 
     defaults = DEFAULTS.dup
 
-    url = options[:url] || ENV["REDIS_URL"]
+    url = options[:url] || ENV['REDIS_URL']
 
     # Override defaults from URL if given
     if url
-      require "uri"
+      require 'uri'
 
       uri = URI(url)
 
-      if uri.scheme == "unix"
+      if uri.scheme == 'unix'
         defaults[:path]   = uri.path
       else
         # Require the URL to have at least a host
-        raise ArgumentError, "invalid url" unless uri.host
+        raise ArgumentError, 'invalid url' unless uri.host
 
         defaults[:scheme]   = uri.scheme
         defaults[:host]     = uri.host
@@ -126,7 +126,7 @@ class MockRedis
     options = defaults.merge(options)
 
     if options[:path]
-      options[:scheme] = "unix"
+      options[:scheme] = 'unix'
       options.delete(:host)
       options.delete(:port)
     else
@@ -139,5 +139,4 @@ class MockRedis
 
     options
   end
-
 end

data/lib/mock_redis/assertions.rb

@@ -8,6 +8,5 @@ class MockRedis
         "ERR wrong number of arguments for '#{command}' command"
       end
     end
-
   end
 end

data/lib/mock_redis/database.rb

@@ -21,25 +21,31 @@ class MockRedis
 
     attr_reader :data, :expire_times
 
-    def initialize(base, *args)
+    def initialize(base, *_args)
       @base = base
       @data = MockRedis::IndifferentHash.new
       @expire_times = []
     end
 
-    def initialize_copy(source)
+    def initialize_copy(_source)
       @data = @data.clone
-      @data.keys.each {|k| @data[k] = @data[k].clone}
-      @expire_times = @expire_times.map{|x| x.clone}
+      @data.keys.each { |k| @data[k] = @data[k].clone }
+      @expire_times = @expire_times.map(&:clone)
     end
 
     # Redis commands go below this line and above 'private'
 
-    def auth(_) 'OK' end
+    def auth(_)
+      'OK'
+    end
 
-    def bgrewriteaof() "Background append only file rewriting started" end
+    def bgrewriteaof
+      'Background append only file rewriting started'
+    end
 
-    def bgsave() "Background saving started" end
+    def bgsave
+      'Background saving started'
+    end
 
     def disconnect
       nil
@@ -58,9 +64,9 @@ class MockRedis
       assert_has_args(keys, 'del')
 
       keys.
-        find_all{|key| data[key]}.
-        each {|k| persist(k)}.
-        each {|k| data.delete(k)}.
+        find_all { |key| data[key] }.
+        each { |k| persist(k) }.
+        each { |k| data.delete(k) }.
         length
     end
 
@@ -79,7 +85,7 @@ class MockRedis
 
     def expireat(key, timestamp)
       unless looks_like_integer?(timestamp.to_s)
-        raise Redis::CommandError, "ERR value is not an integer or out of range"
+        raise Redis::CommandError, 'ERR value is not an integer or out of range'
       end
 
       pexpireat(key, timestamp.to_i * 1000)
@@ -87,7 +93,7 @@ class MockRedis
 
     def pexpireat(key, timestamp_ms)
       unless looks_like_integer?(timestamp_ms.to_s)
-        raise Redis::CommandError, "ERR value is not an integer or out of range"
+        raise Redis::CommandError, 'ERR value is not an integer or out of range'
       end
 
       if exists(key)
@@ -100,11 +106,11 @@ class MockRedis
     end
 
     def exists(key)
-      data.has_key?(key)
+      data.key?(key)
     end
 
     def flushdb
-      data.keys.each {|k| del(k)}
+      data.keys.each { |k| del(k) }
       'OK'
     end
 
@@ -150,9 +156,9 @@ class MockRedis
 
     def rename(key, newkey)
       if !data.include?(key)
-        raise Redis::CommandError, "ERR no such key"
+        raise Redis::CommandError, 'ERR no such key'
       elsif key == newkey
-        raise Redis::CommandError, "ERR source and destination objects are the same"
+        raise Redis::CommandError, 'ERR source and destination objects are the same'
       end
       data[newkey] = data.delete(key)
       if has_expiration?(key)
@@ -164,9 +170,9 @@ class MockRedis
 
     def renamenx(key, newkey)
       if !data.include?(key)
-        raise Redis::CommandError, "ERR no such key"
+        raise Redis::CommandError, 'ERR no such key'
       elsif key == newkey
-        raise Redis::CommandError, "ERR source and destination objects are the same"
+        raise Redis::CommandError, 'ERR source and destination objects are the same'
       end
       if exists(newkey)
         false
@@ -222,9 +228,9 @@ class MockRedis
 
     def assert_valid_timeout(timeout)
       if !looks_like_integer?(timeout.to_s)
-        raise Redis::CommandError, "ERR timeout is not an integer or out of range"
+        raise Redis::CommandError, 'ERR timeout is not an integer or out of range'
       elsif timeout < 0
-        raise Redis::CommandError, "ERR timeout is negative"
+        raise Redis::CommandError, 'ERR timeout is negative'
       end
       timeout
     end
@@ -242,7 +248,7 @@ class MockRedis
       if options.is_a?(Hash) && options[:timeout]
         timeout = assert_valid_timeout(options[:timeout])
         [arglist[0..-2], timeout]
-      elsif options.kind_of?(Integer)
+      elsif options.is_a?(Integer)
         timeout = assert_valid_timeout(options)
         [arglist[0..-2], timeout]
       else
@@ -251,11 +257,11 @@ class MockRedis
     end
 
     def expiration(key)
-      expire_times.find {|(_,k)| k == key.to_s}.first
+      expire_times.find { |(_, k)| k == key.to_s }.first
     end
 
     def has_expiration?(key)
-      expire_times.any? {|(_,k)| k == key.to_s}
+      expire_times.any? { |(_, k)| k == key.to_s }
     end
 
     def looks_like_integer?(str)
@@ -270,12 +276,12 @@ class MockRedis
       Regexp.new(
         "^#{pattern}$".
         gsub(/([+|()])/, '\\\\\1').
-        gsub(/([^\\])\?/, "\\1.").
-        gsub(/([^\\])\*/, "\\1.*"))
+        gsub(/([^\\])\?/, '\\1.').
+        gsub(/([^\\])\*/, '\\1.*'))
     end
 
     def remove_expiration(key)
-      expire_times.delete_if do |(t, k)|
+      expire_times.delete_if do |(_t, k)|
         key.to_s == k
       end
     end
@@ -295,16 +301,17 @@ class MockRedis
     end
 
     public
+
     # This method isn't private, but it also isn't a Redis command, so
     # it doesn't belong up above with all the Redis commands.
     def expire_keys
       now = @base.now
 
-      to_delete = expire_times.take_while do |(time, key)|
+      to_delete = expire_times.take_while do |(time, _key)|
         (time.to_r * 1_000).to_i <= (now.to_r * 1_000).to_i
       end
 
-      to_delete.each do |(time, key)|
+      to_delete.each do |(_time, key)|
         del(key)
       end
     end