redis-copy 1.0.0.rc.0 → 1.0.0.rc.1

data/.travis.yml

@@ -4,9 +4,6 @@ script: "bundle exec rake run"
 rvm:
   - 1.9.3
   - 2.0.0
-gemfile:
-  - .travis/Gemfile.redis-gem-3.0
-  - .travis/Gemfile.redis-gem-master
 env:
   global:
     - TIMEOUT=1

data/README.md

@@ -26,18 +26,18 @@ Usage: redis-copy [options] <source> <destination>
     like [redis://][<username>:<password>@]<hostname>[:<port>][/<db>]
 
 Specific options:
-        --pattern PATTERN            Only transfer matching keys (default *)
+    -p, --pattern PATTERN            Only transfer matching keys (default *)
                                      See http://redis.io/commands/keys for more info.
-        --[no-]pipeline              Use redis pipeline where available (default true)
+    -v, --[no-]verify [PERCENT]      Verify percentage of transfers -- VERY SLOW (default 0)
+    -n, --[no-]allow-nonempty        Allow non-empty destination (default false)
+    -f, --[no-]fail-fast             Abort on first failure (default false)
+        --[no-]pipeline              Pipeline redis commands where available (default true)
     -r, --require FILENAME           Require a script; useful for loading third-party
                                      implementations of key-emitter or copy strategies.
                                      Relative paths *must* begin with `../' or `./'.
     -d, --[no-]debug                 Write debug output (default false)
     -t, --[no-]trace                 Enable backtrace on failure (default false)
-    -f, --[no-]fail-fast             Abort on first failure (default false)
-        --[no-]verify [PERCENT]      Verify percentage of transfers -- VERY SLOW (default 0)
         --[no-]prompt                Prompt for confirmation (default true)
-        --[no-]allow-nonempty        Allow non-empty destination (default false)
         --[no-]dry-run               Output configuration and exit
 ```
 

data/lib/redis-copy/cli.rb

@@ -36,15 +36,36 @@ module RedisCopy
         opts.separator ''
         opts.separator "Specific options:"
 
-        opts.on('--pattern PATTERN', indent_desc[
+        opts.on('-p', '--pattern PATTERN', indent_desc[
           "Only transfer matching keys (default #{DEFAULTS[:pattern]})\n" +
           "See http://redis.io/commands/keys for more info."
         ]) do |pattern|
           options[:pattern] = pattern
         end
 
+        opts.on('-v', '--[no-]verify [PERCENT]',
+          "Verify percentage of transfers -- VERY SLOW (default #{DEFAULTS[:verify]})"
+        ) do |verify|
+          options[:verify] = case verify
+                             when /\A1?[0-9]{2}\z/
+                               verify.to_i
+                             when false, 'false', 'none'
+                               0
+                             else
+                               100
+                             end
+        end
+
+        opts.on('-n', '--[no-]allow-nonempty', "Allow non-empty destination (default #{DEFAULTS[:allow_nonempty]})") do |allow_nonempty|
+          options[:allow_nonempty] = allow_nonempty
+        end
+
+        opts.on('-f', '--[no-]fail-fast', "Abort on first failure (default #{DEFAULTS[:fail_fast]})") do |ff|
+          options[:fail_fast] = ff
+        end
+
         opts.on('--[no-]pipeline',
-          "Use redis pipeline where available (default #{DEFAULTS[:pipeline]})"
+          "Pipeline redis commands where available (default #{DEFAULTS[:pipeline]})"
         ) do |pipeline|
           options[:pipeline] = pipeline
         end
@@ -71,31 +92,10 @@ module RedisCopy
           options[:trace] = trace
         end
 
-        opts.on('-f', '--[no-]fail-fast', "Abort on first failure (default #{DEFAULTS[:fail_fast]})") do |ff|
-          options[:fail_fast] = ff
-        end
-
-        opts.on('--[no-]verify [PERCENT]',
-          "Verify percentage of transfers -- VERY SLOW (default #{DEFAULTS[:verify]})"
-        ) do |verify|
-          options[:verify] = case verify
-                             when /\A1?[0-9]{2}\z/
-                               verify.to_i
-                             when false, 'false', 'none'
-                               0
-                             else
-                               100
-                             end
-        end
-
         opts.on('--[no-]prompt', "Prompt for confirmation (default #{DEFAULTS[:prompt]})") do |prompt|
           options[:prompt] = prompt
         end
 
-        opts.on('--[no-]allow-nonempty', "Allow non-empty destination (default #{DEFAULTS[:allow_nonempty]})") do |allow_nonempty|
-          options[:allow_nonempty] = allow_nonempty
-        end
-
         opts.on('--[no-]dry-run', 'Output configuration and exit') do |d|
           options[:dry_run] = true
         end

data/lib/redis-copy/strategy.rb

@@ -27,41 +27,58 @@ module RedisCopy
     def verify?(key)
       @ui.debug("VERIFY: #{key.dump}")
       type = @src.type(key)
-      proc = case type
-             when 'string' then proc { |r| r.get key }
-             when 'hash'   then proc { |r| r.hgetall key }
-             when 'zset'   then proc { |r| r.zrange(key, 0, -1, :with_scores => true) }
-             when 'set'    then proc { |r| r.smembers(key).sort }
-             when 'list'   then proc { |r| r.lrange(key, 0, -1) }
-             else
-               @ui.debug("BORK: #{key.dump} has unknown type #{type.dump}!")
-               return false
-             end
 
-      return false unless same_response?(&proc)
-      return false unless same_response? { |r| r.ttl key }
+      template = { args: [key],
+                   proc: ->(x){ x },
+                   test: ->(a, b) { a == b } }
+
+      export_command = case type
+                       when 'string'
+                         { command: :get }
+                       when 'hash'
+                         { command: :hgetall }
+                       when 'zset'
+                         { command: :zrange,
+                           args: [key, 0, -1, {with_scores: true}] }
+                       when 'set'
+                         { command: :smembers,
+                           proc: ->(x){ x.to_set} }
+                       when 'list'
+                         { command: :lrange,
+                           args: [key, 0, -1] }
+                       else
+                         @ui.debug("BORK: #{key.dump} has unknown type #{type.dump}!")
+                         return false
+                       end
+
+      # account for drift, ensure within 1 of each other.
+      ttl_command = {command: :ttl, test: ->(a,b){ (a - b).abs <= 1 } }
+
+      return false unless same_response?(template.merge export_command)
+      return false unless same_response?(template.merge ttl_command)
 
       true
     end
 
     private
 
-    def same_response?(&blk)
+    def same_response?(hsh)
       responses = {
-        source:      capture_result(@src, &blk),
-        destination: capture_result(@dst, &blk)
+        source:      capture_result(@src, hsh),
+        destination: capture_result(@dst, hsh)
       }
-      if (responses[:source] == responses[:destination])
+      if (hsh[:test].call(responses[:source], responses[:destination]))
         return true
       else
-        @ui.debug("MISMATCH: #{keys.dump} #{responses.inspect}")
+        @ui.debug("MISMATCH: #{hsh.inspect} => #{responses.inspect}")
         return false
       end
     end
 
-    def capture_result(redis, &block)
-      return [:returned, block.call(redis)]
-      rescue Object => exception
+    def capture_result(redis, hsh)
+      result = redis.send(hsh[:command], *hsh[:args])
+      return hsh[:proc].call(result)
+    rescue Object => exception
       return [:raised, exception]
     end
   end

data/lib/redis-copy/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module RedisCopy
-  VERSION = '1.0.0.rc.0'
+  VERSION = '1.0.0.rc.1'
 end

data/redis-copy.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec',   '~> 2.14'
 
-  spec.add_runtime_dependency     'redis'
+  spec.add_runtime_dependency     'redis', '~> 3.0', '>= 3.0.6'
   spec.add_runtime_dependency     'activesupport'
   spec.add_runtime_dependency     'implements', '~> 0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-copy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.0
+  version: 1.0.0.rc.1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,17 +65,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -120,8 +126,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- .travis/Gemfile.redis-gem-3.0
-- .travis/Gemfile.redis-gem-master
 - Gemfile
 - LICENSE.txt
 - README.md

data/.travis/Gemfile.redis-gem-3.0

@@ -1,6 +0,0 @@
-# encoding: utf-8
-source 'https://rubygems.org'
-
-gem 'redis', '~> 3.0'
-
-gemspec :path => '../'

data/.travis/Gemfile.redis-gem-master

@@ -1,6 +0,0 @@
-# encoding: utf-8
-source 'https://rubygems.org'
-
-gem 'redis', :git => 'https://github.com/redis/redis-rb.git'
-
-gemspec :path => '../'