redis-copy 0.0.2 → 0.0.3

data/lib/redis-copy/cli.rb

@@ -10,8 +10,10 @@ module RedisCopy
       ui:             :command_line,
       key_emitter:    :default,
       strategy:       :auto,
+      pipeline:       :true,
       fail_fast:      false,
-      yes:            false,
+      prompt:         true,
+      trace:          false,
       allow_nonempty: false,
     }.freeze unless defined?(DEFAULTS)
 
@@ -44,30 +46,36 @@ module RedisCopy
           options[:strategy] = strategy
         end
 
-        opts.on('--[no-]dry-run', 'Output configuration and exit') do |d|
-          options[:dry_run] = true
+        opts.on('--[no-]pipeline',
+          "Use redis pipeline where available (default #{DEFAULTS[:pipeline]})"
+        ) do |pipeline|
+          options[:pipeline] = pipeline
         end
 
-        opts.on('-d', '--[no-]debug', 'Write debug output') do |debug|
+        opts.on('-d', '--[no-]debug', "Write debug output (default #{DEFAULTS[:debug]})") do |debug|
           options[:debug] = debug
         end
 
-        opts.on('-t', '--[no-]trace', 'Enable backtrace on failure') do |trace|
+        opts.on('-t', '--[no-]trace', "Enable backtrace on failure (default #{DEFAULTS[:trace]})") do |trace|
           options[:trace] = trace
         end
 
-        opts.on('-f', '--[no-]fail-fast', 'Abort on first failure') do |ff|
+        opts.on('-f', '--[no-]fail-fast', "Abort on first failure (default #{DEFAULTS[:fail_fast]})") do |ff|
           options[:fail_fast] = ff
         end
 
-        opts.on('-y', '--yes', 'Automatically accept any prompts') do
-          options[:yes] = true
+        opts.on('--[no-]prompt', "Prompt for confirmation (default #{DEFAULTS[:prompt]})") do
+          options[:prompt] = true
         end
 
-        opts.on('--[no-]allow-nonempty', 'Allow non-empty destination') do |allow_nonempty|
+        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
+
         opts.parse!(argv)
         unless argv.size == 2
           opts.abort "Source and Destination must be specified\n\n" +

data/lib/redis-copy/strategy/classic.rb

@@ -17,22 +17,30 @@ module RedisCopy
           list = @src.lrange(key, 0, -1)
           if list.length == 0
             # Empty list special case
-            @dst.lpush(key, '')
-            @dst.lpop(key)
+            maybe_pipeline(@dst) do |dst|
+              dst.lpush(key, '')
+              dst.lpop(key)
+            end
           else
-            list.each do |ele|
-              @dst.rpush(key, ele)
+            maybe_pipeline(@dst) do |dst|
+              list.each do |ele|
+                dst.rpush(key, ele)
+              end
             end
           end
         when "set"
           set = @src.smembers(key)
           if set.length == 0
             # Empty set special case
-            @dst.sadd(key, '')
-            @dst.srem(key, '')
+            maybe_pipeline(@dst) do |dst|
+              dst.sadd(key, '')
+              dst.srem(key, '')
+            end
           else
-            set.each do |ele|
-              @dst.sadd(key,ele)
+            maybe_pipeline(@dst) do |dst|
+              set.each do |ele|
+                dst.sadd(key,ele)
+              end
             end
           end
         when 'hash'
@@ -50,6 +58,18 @@ module RedisCopy
 
         return true
       end
+
+      def maybe_pipeline(redis, &block)
+        if pipeline_enabled? && redis.respond_to?(:pipelined)
+          redis.pipelined(&block)
+        else
+          yield(redis)
+        end
+      end
+
+      def pipeline_enabled?
+        @pipeline_enabled ||= (false | @opt[:pipeline])
+      end
     end
   end
 end

data/lib/redis-copy/ui/command_line.rb

@@ -7,7 +7,7 @@ module RedisCopy
 
       def confirm?(prompt)
         $stderr.puts(prompt)
-        return true if @options[:yes]
+        return true unless @options[:prompt]
         $stderr.puts("Continue? [yN]")
         abort unless $stdin.gets.chomp =~ /y/i
         true

data/lib/redis-copy/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module RedisCopy
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/redis-copy/strategy_spec.rb

@@ -32,11 +32,6 @@ class RedisMultiplex < Struct.new(:source, :destination)
 end
 
 shared_examples_for(RedisCopy::Strategy) do
-  let(:ui) { double.as_null_object }
-  let(:strategy) { strategy_class.new(source, destination, ui)}
-  let(:source) { Redis.new(db: 14) }
-  let(:destination) { Redis.new(db: 15) }
-  let(:multiplex) { RedisMultiplex.new(source, destination) }
   let(:key) { rand(16**128).to_s(16) }
   after(:each) { multiplex.both { |redis| redis.del(key) } }
 
@@ -332,6 +327,13 @@ shared_examples_for(RedisCopy::Strategy) do
 end
 
 describe RedisCopy::Strategy do
+  let(:options) { Hash.new } # append using before(:each) { options.update(foo: true) }
+  let(:ui) { double.as_null_object }
+  let(:strategy) { strategy_class.new(source, destination, ui, options)}
+  let(:multiplex) { RedisMultiplex.new(source, destination) }
+  let(:source) { Redis.new(db: 14) }
+  let(:destination) { Redis.new(db: 15) }
+
   describe :New do
     let(:strategy_class) { RedisCopy::Strategy::New }
     it_should_behave_like RedisCopy::Strategy
@@ -339,5 +341,22 @@ describe RedisCopy::Strategy do
   describe :Classic do
     let(:strategy_class) { RedisCopy::Strategy::Classic }
     it_should_behave_like RedisCopy::Strategy
+    context '#maybe_pipeline' do
+      it 'should not pipeline' do
+        source.should_not_receive(:pipelined)
+        strategy.maybe_pipeline(source) { }
+      end
+    end
+
+    context 'with pipeline enabled' do
+      before(:each) { options.update pipeline: true }
+      it_should_behave_like RedisCopy::Strategy
+      context '#maybe_pipeline' do
+        it 'should pipeline' do
+          source.should_receive(:pipelined)
+          strategy.maybe_pipeline(source) { }
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-copy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: