redis-copy 0.0.6 → 1.0.0.rc.0

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

@@ -3,7 +3,7 @@
 module RedisCopy
   module UI
     class AutoRun
-      include UI
+      implements UI
 
       def confirm?(prompt)
         $stderr.puts(prompt)

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

@@ -3,7 +3,9 @@
 module RedisCopy
   module UI
     class CommandLine
-      include UI
+      implements UI do |options|
+        options[:ui].to_s.underscore.dasherize == 'command-line'
+      end
 
       def confirm?(prompt)
         $stderr.puts(prompt)

data/lib/redis-copy/version.rb

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

data/redis-copy.gemspec

@@ -27,10 +27,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 1.9.3'
+
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec',   '~> 2.14'
 
   spec.add_runtime_dependency     'redis'
   spec.add_runtime_dependency     'activesupport'
+  spec.add_runtime_dependency     'implements', '~> 0.0.2'
 end

data/spec/redis-copy/{key-emitter_spec.rb → key-emitter/keys_spec.rb}

@@ -1,35 +1,8 @@
 # encoding: utf-8
-require 'redis-copy'
-require_relative '../spec_helper.rb'
-
-shared_examples_for RedisCopy::KeyEmitter do
-  let(:emitter_klass) { described_class }
-  let(:redis) { Redis.new(REDIS_OPTIONS) }
-  let(:ui) { double.as_null_object }
-  let(:instance) { emitter_klass.new(redis, ui)}
-  let(:key_count) { 1 }
-  let(:keys) { key_count.times.map{|i| i.to_s(16) } }
-
-  before(:each) do
-    unless emitter_klass.compatible?(redis)
-      pending "#{emitter_klass} not supported in your environment"
-    end
-    key_count.times.each_slice(50) do |keys|
-      kv = keys.map{|x| x.to_s(16)}.zip(keys)
-      redis.mset(*kv.flatten)
-    end
-    ui.stub(:debug).with(anything)
-  end
-  after(:each) { redis.flushdb }
+require_relative '../../spec_helper.rb'
 
-  context '#keys' do
-    let(:key_count) { 64 }
-    context 'the result' do
-      subject { instance.keys }
-      its(:to_a) { should =~ keys }
-    end
-  end
-end
+require 'redis-copy'
+require 'redis-copy/key-emitter/interface.spec'
 
 describe RedisCopy::KeyEmitter::Keys do
   it_should_behave_like RedisCopy::KeyEmitter do
@@ -61,7 +34,3 @@ describe RedisCopy::KeyEmitter::Keys do
     end
   end
 end
-
-describe RedisCopy::KeyEmitter::Scan do
-  it_should_behave_like RedisCopy::KeyEmitter
-end

data/spec/redis-copy/key-emitter/scan_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+require_relative '../../spec_helper.rb'
+
+require 'redis-copy'
+require 'redis-copy/key-emitter/interface.spec'
+
+describe RedisCopy::KeyEmitter::Scan do
+  it_should_behave_like RedisCopy::KeyEmitter
+end

data/spec/redis-copy/strategy/classic_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require_relative '../../spec_helper'
+
+require 'redis-copy'
+require 'redis-copy/strategy/interface.spec'
+
+describe RedisCopy::Strategy::Classic do
+  it_should_behave_like RedisCopy::Strategy do
+    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
+      let(:options) { Hash.new(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

data/spec/redis-copy/strategy/dump-restore_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+require_relative '../../spec_helper'
+
+require 'redis-copy'
+require 'redis-copy/strategy/interface.spec'
+
+describe RedisCopy::Strategy::DumpRestore do
+  it_should_behave_like RedisCopy::Strategy
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 REDIS_PORT    = 6381
 REDIS_OPTIONS = { 
   :port     => REDIS_PORT, 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: redis-copy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 1.0.0.rc.0
+  prerelease: 6
 platform: ruby
 authors:
 - Ryan Biesemeyer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,6 +92,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: implements
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: A command-line utility built for copying the contents of one redis db
   to another over a network. Supports all data types, persists ttls, and attempts
   to be as efficient as possible.
@@ -105,9 +121,7 @@ files:
 - .gitignore
 - .travis.yml
 - .travis/Gemfile.redis-gem-3.0
-- .travis/Gemfile.redis-gem-3.0.lock
 - .travis/Gemfile.redis-gem-master
-- .travis/Gemfile.redis-gem-master.lock
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -117,9 +131,13 @@ files:
 - lib/redis-copy/cli.rb
 - lib/redis-copy/core_ext.rb
 - lib/redis-copy/key-emitter.rb
+- lib/redis-copy/key-emitter/interface.spec.rb
+- lib/redis-copy/key-emitter/keys.rb
+- lib/redis-copy/key-emitter/scan.rb
 - lib/redis-copy/strategy.rb
 - lib/redis-copy/strategy/classic.rb
-- lib/redis-copy/strategy/new.rb
+- lib/redis-copy/strategy/dump-restore.rb
+- lib/redis-copy/strategy/interface.spec.rb
 - lib/redis-copy/ui.rb
 - lib/redis-copy/ui/auto_run.rb
 - lib/redis-copy/ui/command_line.rb
@@ -127,8 +145,10 @@ files:
 - redis-copy.gemspec
 - redis-copy_spec.rb
 - spec/db/.gitkeep
-- spec/redis-copy/key-emitter_spec.rb
-- spec/redis-copy/strategy_spec.rb
+- spec/redis-copy/key-emitter/keys_spec.rb
+- spec/redis-copy/key-emitter/scan_spec.rb
+- spec/redis-copy/strategy/classic_spec.rb
+- spec/redis-copy/strategy/dump-restore_spec.rb
 - spec/redis.spec.conf
 - spec/spec_helper.rb
 homepage: https://github.com/yaauie/redis-copy
@@ -143,19 +163,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2506344141455451823
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2506344141455451823
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -164,7 +178,10 @@ specification_version: 3
 summary: Copy the contents of one redis db to another
 test_files:
 - spec/db/.gitkeep
-- spec/redis-copy/key-emitter_spec.rb
-- spec/redis-copy/strategy_spec.rb
+- spec/redis-copy/key-emitter/keys_spec.rb
+- spec/redis-copy/key-emitter/scan_spec.rb
+- spec/redis-copy/strategy/classic_spec.rb
+- spec/redis-copy/strategy/dump-restore_spec.rb
 - spec/redis.spec.conf
 - spec/spec_helper.rb
+has_rdoc: 

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

@@ -1,44 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    redis-copy (0.0.5)
-      activesupport
-      redis
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    diff-lcs (1.2.5)
-    i18n (0.6.5)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    rake (10.1.0)
-    redis (3.0.5)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  rake
-  redis (~> 3.0)
-  redis-copy!
-  rspec (~> 2.14)

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

@@ -1,49 +0,0 @@
-GIT
-  remote: https://github.com/redis/redis-rb.git
-  revision: 9bb4156dcd43105b68e24e5efc579dddb12cf260
-  specs:
-    redis (3.0.6)
-
-PATH
-  remote: ../
-  specs:
-    redis-copy (0.0.5)
-      activesupport
-      redis
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    diff-lcs (1.2.5)
-    i18n (0.6.5)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  rake
-  redis!
-  redis-copy!
-  rspec (~> 2.14)

data/spec/redis-copy/strategy_spec.rb

@@ -1,314 +0,0 @@
-# encoding: utf-8
-require_relative '../spec_helper'
-
-shared_examples_for(:no_ttl) do
-  # key, redis,
-  subject { redis.ttl(key) }
-  it { should be < 0 }
-end
-
-shared_examples_for(:ttl_set) do
-  # key, redis, ttl
-  subject { redis.ttl(key) }
-  it { should eq ttl }
-end
-
-shared_examples_for '#verify?' do
-  before(:each) do
-    ui.stub(:debug).and_call_original
-    ui.stub(:notify) do |message|
-      puts message
-    end
-  end
-  it 'should verify successfully' do
-    strategy.verify?(key).should be_true
-  end
-end
-
-shared_examples_for(RedisCopy::Strategy) do
-  let(:strategy_class) { described_class }
-  let(:options) { Hash.new } # append using before(:each) { options.update(foo: true) }
-  # let(:ui) { double.as_null_object }
-  let(:ui) { RedisCopy::UI::CommandLine.new(options) }
-  let(:strategy) { strategy_class.new(source, destination, ui, options)}
-  let(:multiplex) { RedisMultiplex.new(source, destination) }
-  let(:source) { Redis.new(REDIS_OPTIONS.merge(db: 14)) }
-  let(:destination) { Redis.new(REDIS_OPTIONS.merge(db: 15)) }
-
-  let(:key) { rand(16**128).to_s(16) }
-  after(:each) { multiplex.both { |redis| redis.del(key) } }
-  let(:ttl) { 100 }
-
-  before(:each) do
-    unless [source, destination].all?{|redis| strategy_class.compatible?(redis) }
-      pending "#{strategy_class} not supported in your environment"
-    end
-  end
-
-  context '#copy' do
-    before(:each) { populate.call }
-    context 'string' do
-      let(:source_string) { rand(16**256).to_s(16) }
-      let(:populate) { proc {source.set(key, source_string)} }
-      [true,false].each do |with_expiry|
-        context "with_expiry(#{with_expiry})" do
-          before(:each) { source.expire(key, ttl) } if with_expiry
-          context 'before' do
-            context 'source' do
-              let(:redis) { source }
-              subject { source.get(key) }
-              it { should_not be_nil }
-              it { should eq source_string }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.get(key) }
-              it { should be_nil }
-              it_should_behave_like :no_ttl
-            end
-          end
-
-          context 'after' do
-            before(:each) { strategy.copy(key) }
-            context 'source' do
-              let(:redis) { source }
-              subject { source.get(key) }
-              it { should_not be_nil }
-              it { should eq source_string }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.get(key) }
-              it { should_not be_nil }
-              it { should eq source_string }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            it_should_behave_like '#verify?'
-          end
-        end
-      end
-    end
-
-    context 'list' do
-      let(:source_list) do
-        %w(foo bar baz buz bingo jango)
-      end
-      let(:populate) { proc { source_list.each{|x| source.rpush(key, x)} } }
-      [true,false].each do |with_expiry|
-        context "with_expiry(#{with_expiry})" do
-          before(:each) { source.expire(key, 100) } if with_expiry
-          context 'before' do
-            context 'source' do
-              let(:redis) { source }
-              subject { source.lrange(key, 0, -1) }
-              it { should_not be_empty }
-              it { should eq source_list }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.lrange(key, 0, -1) }
-              it { should be_empty }
-              it_should_behave_like :no_ttl
-            end
-          end
-
-          context 'after' do
-            before(:each) { strategy.copy(key) }
-            context 'source' do
-              let(:redis) { source }
-              subject { source.lrange(key, 0, -1) }
-              it { should_not be_empty }
-              it { should eq source_list }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.lrange(key, 0, -1) }
-              it { should_not be_empty }
-              it { should eq source_list }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            it_should_behave_like '#verify?'
-          end
-        end
-      end
-    end
-
-    context 'set' do
-      let(:source_list) do
-        %w(foo bar baz buz bingo jango)
-      end
-      let(:populate) { proc { source_list.each{|x| source.sadd(key, x)} } }
-      [true,false].each do |with_expiry|
-        context "with_expiry(#{with_expiry})" do
-          before(:each) { source.expire(key, 100) } if with_expiry
-          context 'before' do
-            context 'source' do
-              let(:redis) { source }
-              subject { source.smembers(key) }
-              it { should_not be_empty }
-              it { should =~ source_list }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.smembers(key) }
-              it { should be_empty }
-              it_should_behave_like :no_ttl
-            end
-          end
-
-          context 'after' do
-            before(:each) { strategy.copy(key) }
-            context 'source' do
-              let(:redis) { source }
-              subject { source.smembers(key) }
-              it { should_not be_empty }
-              it { should =~ source_list }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.smembers(key) }
-              it { should_not be_empty }
-              it { should =~ source_list }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-          end
-        end
-      end
-    end
-
-    context 'hash' do
-      let(:source_hash) do
-        {
-          'foo' => 'bar',
-          'baz' => 'buz'
-        }
-      end
-      let(:populate) { proc { source.mapped_hmset(key, source_hash) } }
-      [true,false].each do |with_expiry|
-        context "with_expiry(#{with_expiry})" do
-          before(:each) { source.expire(key, 100) } if with_expiry
-          context 'before' do
-            context 'source' do
-              let(:redis) { source }
-              subject { source.hgetall(key) }
-              it { should_not be_empty }
-              it { should eq source_hash }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.hgetall(key) }
-              it { should be_empty }
-              it_should_behave_like :no_ttl
-            end
-          end
-
-          context 'after' do
-            before(:each) { strategy.copy(key) }
-            context 'source' do
-              let(:redis) { source }
-              subject { source.hgetall(key) }
-              it { should_not be_empty }
-              it { should eq source_hash }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.hgetall(key) }
-              it { should_not be_empty }
-              it { should eq source_hash }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            it_should_behave_like '#verify?'
-          end
-        end
-      end
-    end
-
-    context 'zset' do
-      let(:source_zset) do
-        {
-          'foo' => 1.0,
-          'baz' => 2.5,
-          'bar' => 1.1,
-          'buz' => 2.7
-        }
-      end
-      let(:vs_source_zset) { source_zset.to_a }
-      let(:sv_source_zset) { vs_source_zset.map(&:reverse) }
-      let(:populate) { proc { source.zadd(key, sv_source_zset) } }
-      [true,false].each do |with_expiry|
-        context "with_expiry(#{with_expiry})" do
-          before(:each) { source.expire(key, 100) } if with_expiry
-          context 'before' do
-            context 'source' do
-              let(:redis) { source }
-              subject { source.zrange(key, 0, -1, :with_scores => true) }
-              it { should_not be_empty }
-              it { should =~ vs_source_zset }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.zrange(key, 0, -1, :with_scores => true) }
-              it { should be_empty }
-              it_should_behave_like :no_ttl
-            end
-          end
-
-          context 'after' do
-            before(:each) { strategy.copy(key) }
-            context 'source' do
-              let(:redis) { source }
-              subject { source.zrange(key, 0, -1, :with_scores => true) }
-              it { should_not be_empty }
-              it { should =~ vs_source_zset }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            context 'destination' do
-              let(:redis) { destination }
-              subject { destination.zrange(key, 0, -1, :with_scores => true) }
-              it { should_not be_empty }
-              it { should =~ vs_source_zset }
-              it_should_behave_like (with_expiry ? :ttl_set : :no_ttl)
-            end
-            it_should_behave_like '#verify?'
-          end
-        end
-      end
-    end
-  end
-end
-
-
-describe RedisCopy::Strategy::New do
-  it_should_behave_like RedisCopy::Strategy
-end
-
-describe RedisCopy::Strategy::Classic do
-  it_should_behave_like RedisCopy::Strategy do
-    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