pt-osc 0.1.2 → 0.1.3

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.1
 env:
   - CODECLIMATE_REPO_TOKEN=0b58d4e91bfac6ed6e48b31606f6792598a3a59c27bded19d58ef8406c09f57c
 cache:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.3
+
+- fix for loading percona config
+- added test coverage for loading run_mode from config
+
 ## 0.1.2
 
 - report `adapter_name` as `mysql2` for compatibility with gems that check it (e.g. [mceachen/with_advisory_lock](https://github.com/mceachen/with_advisory_lock))

data/README.md

@@ -53,6 +53,7 @@ This gem is not considered production ready. There will be bugs.
   - Ruby 1.9.3
   - Ruby 2.0.0
   - Ruby 2.1.2
+  - Ruby 2.1 latest
 
 Support for other versions of Ruby or ActiveRecord is unknown and not guaranteed.
 

data/lib/active_record/pt_osc_migration.rb

@@ -155,8 +155,7 @@ module ActiveRecord
     end
 
     def database_config
-      # @TODO better way to config?
-      @connection.instance_variable_get(:@config) || ActiveRecord::Base.connection_config
+      @db_config ||= (@connection.instance_variable_get(:@config) || ActiveRecord::Base.connection_config).with_indifferent_access
     end
 
     def percona_config

data/lib/pt-osc/version.rb

@@ -1,5 +1,5 @@
 module Pt
   module Osc
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/test/config/database.yml

@@ -1,6 +1,26 @@
-test:
+test: &test
   pool: 5
   host: localhost
   username: root
   database: pt_osc_test
   reconnect: true
+
+test_print:
+  <<: *test
+  percona:
+    run_mode: print
+
+test_execute:
+  <<: *test
+  percona:
+    run_mode: execute
+
+test_print_string:
+  <<: *test
+  percona:
+    run_mode: 'print'
+
+test_execute_string:
+  <<: *test
+  percona:
+    run_mode: 'execute'

data/test/test_helper.rb

@@ -12,8 +12,8 @@ require 'mocha'
 
 Rails.backtrace_cleaner.remove_silencers!
 
-def test_spec
-  test_spec = YAML.load_file(Rails.root.join(*%w(.. config database.yml)))['test']
+def test_spec(key = 'test')
+  test_spec = YAML.load_file(Rails.root.join(*%w(.. config database.yml)))[key]
   test_spec['adapter'] = 'mysql_pt_osc'
   test_spec
 end

data/test/unit/pt_osc_migration_unit_test.rb

@@ -9,10 +9,15 @@ class PtOscMigrationUnitTest < Test::Unit::TestCase
     context '#percona_command' do
       context 'connected to a pt-osc database' do
         setup do
+          @old_connection = @migration.instance_variable_get(:@connection)
           ActiveRecord::Base.establish_connection(test_spec)
           @migration.instance_variable_set(:@connection, ActiveRecord::Base.connection)
         end
 
+        teardown do
+          @migration.instance_variable_set(:@connection, @old_connection)
+        end
+
         should 'only include flags in PERCONA_FLAGS' do
           flag = ActiveRecord::PtOscMigration.percona_flags.first
           begin
@@ -76,6 +81,94 @@ class PtOscMigrationUnitTest < Test::Unit::TestCase
           end
         end
       end
+
+      context 'connected to a pt-osc database in print mode' do
+        setup do
+          @old_connection = @migration.instance_variable_get(:@connection)
+          ActiveRecord::Base.establish_connection(test_spec('test_print'))
+          @migration.instance_variable_set(:@connection, ActiveRecord::Base.connection)
+        end
+
+        teardown do
+          @migration.instance_variable_set(:@connection, @old_connection)
+        end
+
+        should 'have print as the run_mode' do
+          assert_equal 'print', @migration.send(:percona_config)[:run_mode]
+        end
+
+        should 'call print_pt_osc' do
+          @migration.expects(:print_pt_osc).once.returns(nil)
+          @migration.expects(:execute_pt_osc).never
+          @migration.migrate(:up)
+        end
+      end
+
+      context 'connected to a pt-osc database in print mode as string' do
+        setup do
+          @old_connection = @migration.instance_variable_get(:@connection)
+          ActiveRecord::Base.establish_connection(test_spec('test_print_string'))
+          @migration.instance_variable_set(:@connection, ActiveRecord::Base.connection)
+        end
+
+        teardown do
+          @migration.instance_variable_set(:@connection, @old_connection)
+        end
+
+        should 'have print as the run_mode' do
+          assert_equal 'print', @migration.send(:percona_config)[:run_mode]
+        end
+
+        should 'call print_pt_osc' do
+          @migration.expects(:print_pt_osc).once.returns(nil)
+          @migration.expects(:execute_pt_osc).never
+          @migration.migrate(:up)
+        end
+      end
+
+      context 'connected to a pt-osc database in execute mode' do
+        setup do
+          @old_connection = @migration.instance_variable_get(:@connection)
+          ActiveRecord::Base.establish_connection(test_spec('test_execute'))
+          @migration.instance_variable_set(:@connection, ActiveRecord::Base.connection)
+        end
+
+        teardown do
+          @migration.instance_variable_set(:@connection, @old_connection)
+        end
+
+        should 'have execute as the run_mode' do
+          assert_equal 'execute', @migration.send(:percona_config)[:run_mode]
+        end
+
+        should 'call execute_pt_osc' do
+          @migration.expects(:execute_pt_osc).once.returns(nil)
+          @migration.expects(:print_pt_osc).never
+          @migration.migrate(:up)
+        end
+      end
+
+      context 'connected to a pt-osc database in execute mode as string' do
+        setup do
+          @old_connection = @migration.instance_variable_get(:@connection)
+          ActiveRecord::Base.establish_connection(test_spec('test_execute_string'))
+          @migration.instance_variable_set(:@connection, ActiveRecord::Base.connection)
+        end
+
+        teardown do
+          @migration.instance_variable_set(:@connection, @old_connection)
+        end
+
+        should 'have execute as the run_mode' do
+          assert_equal 'execute', @migration.send(:percona_config)[:run_mode]
+        end
+
+        should 'call execute_pt_osc' do
+          @migration.expects(:execute_pt_osc).once.returns(nil)
+          @migration.expects(:print_pt_osc).never
+          @migration.migrate(:up)
+        end
+      end
     end
 
     context '#make_path_absolute' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pt-osc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -246,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4362070600124829883
+      hash: -738209304282433145
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4362070600124829883
+      hash: -738209304282433145
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23