ar_mysql_flexmaster 1.0.2 → 1.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +9 -10
  3. data/README.md +60 -54
  4. data/Rakefile +1 -1
  5. data/ar_mysql_flexmaster.gemspec +11 -8
  6. data/bin/master_cut +6 -9
  7. data/gemfiles/rails3.2.gemfile.lock +42 -42
  8. data/gemfiles/rails4.2.gemfile +2 -2
  9. data/gemfiles/rails4.2.gemfile.lock +65 -64
  10. data/gemfiles/rails5.0.gemfile +2 -2
  11. data/gemfiles/rails5.0.gemfile.lock +76 -123
  12. data/lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb +12 -10
  13. data/test/ar_flexmaster_test.rb +10 -7
  14. data/test/boot_mysql_env.rb +5 -5
  15. data/test/boot_slave +4 -4
  16. data/test/integration/no_traffic_test.rb +0 -1
  17. data/test/integration/with_queries_to_be_killed_test.rb +1 -1
  18. data/test/integration/wrong_setup_test.rb +1 -1
  19. data/test/integration_helper.rb +1 -2
  20. metadata +32 -15
  21. data/gemfiles/rails4.0.gemfile +0 -6
  22. data/gemfiles/rails4.0.gemfile.lock +0 -104
  23. data/gemfiles/rails4.1.gemfile +0 -6
  24. data/gemfiles/rails4.1.gemfile.lock +0 -109
data/gemfiles/rails4.2.gemfile CHANGED
@@ -2,5 +2,5 @@ source "https://rubygems.org"
2
2
 
3
3
  gemspec :path => "../"
4
4
 
5
- gem "rails", "~> 4.2.0"
6
- gem "mysql2"
5
+ # Before https://github.com/rails/rails/commit/c6bf2b89471f14075d1de8f42b4c0eac9585ca98
6
+ gem "rails", "~> 4.2.0", "< 4.2.8"
data/gemfiles/rails4.2.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
- remote: ../
2
+ remote: ..
3
3
  specs:
4
- ar_mysql_flexmaster (0.6.0)
4
+ ar_mysql_flexmaster (1.0.2)
5
5
  activerecord
6
6
  activesupport
7
7
  mysql2
@@ -9,109 +9,111 @@ PATH
9
9
  GEM
10
10
  remote: https://rubygems.org/
11
11
  specs:
12
- actionmailer (4.2.5)
13
- actionpack (= 4.2.5)
14
- actionview (= 4.2.5)
15
- activejob (= 4.2.5)
12
+ actionmailer (4.2.7.1)
13
+ actionpack (= 4.2.7.1)
14
+ actionview (= 4.2.7.1)
15
+ activejob (= 4.2.7.1)
16
16
  mail (~> 2.5, >= 2.5.4)
17
17
  rails-dom-testing (~> 1.0, >= 1.0.5)
18
- actionpack (4.2.5)
19
- actionview (= 4.2.5)
20
- activesupport (= 4.2.5)
18
+ actionpack (4.2.7.1)
19
+ actionview (= 4.2.7.1)
20
+ activesupport (= 4.2.7.1)
21
21
  rack (~> 1.6)
22
22
  rack-test (~> 0.6.2)
23
23
  rails-dom-testing (~> 1.0, >= 1.0.5)
24
24
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
25
- actionview (4.2.5)
26
- activesupport (= 4.2.5)
25
+ actionview (4.2.7.1)
26
+ activesupport (= 4.2.7.1)
27
27
  builder (~> 3.1)
28
28
  erubis (~> 2.7.0)
29
29
  rails-dom-testing (~> 1.0, >= 1.0.5)
30
30
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
31
- activejob (4.2.5)
32
- activesupport (= 4.2.5)
31
+ activejob (4.2.7.1)
32
+ activesupport (= 4.2.7.1)
33
33
  globalid (>= 0.3.0)
34
- activemodel (4.2.5)
35
- activesupport (= 4.2.5)
34
+ activemodel (4.2.7.1)
35
+ activesupport (= 4.2.7.1)
36
36
  builder (~> 3.1)
37
- activerecord (4.2.5)
38
- activemodel (= 4.2.5)
39
- activesupport (= 4.2.5)
37
+ activerecord (4.2.7.1)
38
+ activemodel (= 4.2.7.1)
39
+ activesupport (= 4.2.7.1)
40
40
  arel (~> 6.0)
41
- activesupport (4.2.5)
41
+ activesupport (4.2.7.1)
42
42
  i18n (~> 0.7)
43
43
  json (~> 1.7, >= 1.7.7)
44
44
  minitest (~> 5.1)
45
45
  thread_safe (~> 0.3, >= 0.3.4)
46
46
  tzinfo (~> 1.1)
47
- arel (6.0.3)
48
- builder (3.2.2)
49
- bump (0.5.3)
50
- coderay (1.1.0)
51
- concurrent-ruby (1.0.0)
47
+ arel (6.0.4)
48
+ builder (3.2.3)
49
+ bump (0.5.4)
50
+ coderay (1.1.1)
51
+ concurrent-ruby (1.0.5)
52
52
  erubis (2.7.0)
53
- globalid (0.3.6)
54
- activesupport (>= 4.1.0)
55
- i18n (0.7.0)
56
- json (1.8.3)
53
+ globalid (0.4.0)
54
+ activesupport (>= 4.2.0)
55
+ i18n (0.8.6)
56
+ isolated_server (0.4.12)
57
+ json (1.8.6)
57
58
  loofah (2.0.3)
58
59
  nokogiri (>= 1.5.9)
59
- mail (2.6.3)
60
- mime-types (>= 1.16, < 3)
60
+ mail (2.6.6)
61
+ mime-types (>= 1.16, < 4)
61
62
  metaclass (0.0.4)
62
63
  method_source (0.8.2)
63
- mime-types (2.99)
64
- mini_portile2 (2.0.0)
65
- minitest (5.8.3)
64
+ mime-types (3.1)
65
+ mime-types-data (~> 3.2015)
66
+ mime-types-data (3.2016.0521)
67
+ mini_portile2 (2.2.0)
68
+ minitest (5.10.3)
66
69
  mocha (1.1.0)
67
70
  metaclass (~> 0.0.1)
68
- mysql2 (0.4.2)
69
- mysql_isolated_server (0.5.3)
70
- nokogiri (1.6.7.1)
71
- mini_portile2 (~> 2.0.0.rc2)
72
- pry (0.10.3)
71
+ mysql2 (0.4.9)
72
+ nokogiri (1.8.0)
73
+ mini_portile2 (~> 2.2.0)
74
+ pry (0.10.4)
73
75
  coderay (~> 1.1.0)
74
76
  method_source (~> 0.8.1)
75
77
  slop (~> 3.4)
76
- rack (1.6.4)
78
+ rack (1.6.8)
77
79
  rack-test (0.6.3)
78
80
  rack (>= 1.0)
79
- rails (4.2.5)
80
- actionmailer (= 4.2.5)
81
- actionpack (= 4.2.5)
82
- actionview (= 4.2.5)
83
- activejob (= 4.2.5)
84
- activemodel (= 4.2.5)
85
- activerecord (= 4.2.5)
86
- activesupport (= 4.2.5)
81
+ rails (4.2.7.1)
82
+ actionmailer (= 4.2.7.1)
83
+ actionpack (= 4.2.7.1)
84
+ actionview (= 4.2.7.1)
85
+ activejob (= 4.2.7.1)
86
+ activemodel (= 4.2.7.1)
87
+ activerecord (= 4.2.7.1)
88
+ activesupport (= 4.2.7.1)
87
89
  bundler (>= 1.3.0, < 2.0)
88
- railties (= 4.2.5)
90
+ railties (= 4.2.7.1)
89
91
  sprockets-rails
90
92
  rails-deprecated_sanitizer (1.0.3)
91
93
  activesupport (>= 4.2.0.alpha)
92
- rails-dom-testing (1.0.7)
94
+ rails-dom-testing (1.0.8)
93
95
  activesupport (>= 4.2.0.beta, < 5.0)
94
- nokogiri (~> 1.6.0)
96
+ nokogiri (~> 1.6)
95
97
  rails-deprecated_sanitizer (>= 1.0.1)
96
- rails-html-sanitizer (1.0.2)
98
+ rails-html-sanitizer (1.0.3)
97
99
  loofah (~> 2.0)
98
- railties (4.2.5)
99
- actionpack (= 4.2.5)
100
- activesupport (= 4.2.5)
100
+ railties (4.2.7.1)
101
+ actionpack (= 4.2.7.1)
102
+ activesupport (= 4.2.7.1)
101
103
  rake (>= 0.8.7)
102
104
  thor (>= 0.18.1, < 2.0)
103
- rake (10.4.2)
105
+ rake (12.0.0)
104
106
  slop (3.6.0)
105
- sprockets (3.5.2)
107
+ sprockets (3.7.1)
106
108
  concurrent-ruby (~> 1.0)
107
109
  rack (> 1, < 3)
108
- sprockets-rails (3.0.0)
110
+ sprockets-rails (3.2.0)
109
111
  actionpack (>= 4.0)
110
112
  activesupport (>= 4.0)
111
113
  sprockets (>= 3.0.0)
112
- thor (0.19.1)
113
- thread_safe (0.3.5)
114
- tzinfo (1.2.2)
114
+ thor (0.20.0)
115
+ thread_safe (0.3.6)
116
+ tzinfo (1.2.3)
115
117
  thread_safe (~> 0.1)
116
118
  wwtd (1.3.0)
117
119
 
@@ -121,14 +123,13 @@ PLATFORMS
121
123
  DEPENDENCIES
122
124
  ar_mysql_flexmaster!
123
125
  bump
126
+ isolated_server
124
127
  minitest
125
128
  mocha (~> 1.1.0)
126
- mysql2
127
- mysql_isolated_server (~> 0.5)
128
129
  pry
129
- rails (~> 4.2.0)
130
+ rails (~> 4.2.0, < 4.2.8)
130
131
  rake
131
132
  wwtd
132
133
 
133
134
  BUNDLED WITH
134
- 1.11.2
135
+ 1.15.4
data/gemfiles/rails5.0.gemfile CHANGED
@@ -2,5 +2,5 @@ source "https://rubygems.org"
2
2
 
3
3
  gemspec :path => "../"
4
4
 
5
- gem "rails", "~> 5.0.0.beta1"
6
- gem "mysql2"
5
+ # Before https://github.com/rails/rails/commit/99c0cb58d189503da0f532c3e34bc0262cdff46c
6
+ gem "rails", "~> 5.0.0", "< 5.0.1"
data/gemfiles/rails5.0.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
- remote: ../
2
+ remote: ..
3
3
  specs:
4
- ar_mysql_flexmaster (0.6.0)
4
+ ar_mysql_flexmaster (1.0.2)
5
5
  activerecord
6
6
  activesupport
7
7
  mysql2
@@ -9,160 +9,114 @@ PATH
9
9
  GEM
10
10
  remote: https://rubygems.org/
11
11
  specs:
12
- actioncable (5.0.0.beta1)
13
- actionpack (= 5.0.0.beta1)
14
- celluloid (~> 0.17.2)
15
- coffee-rails (~> 4.1.0)
16
- em-hiredis (~> 0.3.0)
17
- faye-websocket (~> 0.10.0)
18
- redis (~> 3.0)
12
+ actioncable (5.0.0.1)
13
+ actionpack (= 5.0.0.1)
14
+ nio4r (~> 1.2)
19
15
  websocket-driver (~> 0.6.1)
20
- actionmailer (5.0.0.beta1)
21
- actionpack (= 5.0.0.beta1)
22
- actionview (= 5.0.0.beta1)
23
- activejob (= 5.0.0.beta1)
16
+ actionmailer (5.0.0.1)
17
+ actionpack (= 5.0.0.1)
18
+ actionview (= 5.0.0.1)
19
+ activejob (= 5.0.0.1)
24
20
  mail (~> 2.5, >= 2.5.4)
25
- rails-dom-testing (~> 1.0, >= 1.0.5)
26
- actionpack (5.0.0.beta1)
27
- actionview (= 5.0.0.beta1)
28
- activesupport (= 5.0.0.beta1)
29
- rack (~> 2.x)
21
+ rails-dom-testing (~> 2.0)
22
+ actionpack (5.0.0.1)
23
+ actionview (= 5.0.0.1)
24
+ activesupport (= 5.0.0.1)
25
+ rack (~> 2.0)
30
26
  rack-test (~> 0.6.3)
31
- rails-dom-testing (~> 1.0, >= 1.0.5)
27
+ rails-dom-testing (~> 2.0)
32
28
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
33
- actionview (5.0.0.beta1)
34
- activesupport (= 5.0.0.beta1)
29
+ actionview (5.0.0.1)
30
+ activesupport (= 5.0.0.1)
35
31
  builder (~> 3.1)
36
32
  erubis (~> 2.7.0)
37
- rails-dom-testing (~> 1.0, >= 1.0.5)
33
+ rails-dom-testing (~> 2.0)
38
34
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
39
- activejob (5.0.0.beta1)
40
- activesupport (= 5.0.0.beta1)
35
+ activejob (5.0.0.1)
36
+ activesupport (= 5.0.0.1)
41
37
  globalid (>= 0.3.6)
42
- activemodel (5.0.0.beta1)
43
- activesupport (= 5.0.0.beta1)
44
- builder (~> 3.1)
45
- activerecord (5.0.0.beta1)
46
- activemodel (= 5.0.0.beta1)
47
- activesupport (= 5.0.0.beta1)
38
+ activemodel (5.0.0.1)
39
+ activesupport (= 5.0.0.1)
40
+ activerecord (5.0.0.1)
41
+ activemodel (= 5.0.0.1)
42
+ activesupport (= 5.0.0.1)
48
43
  arel (~> 7.0)
49
- activesupport (5.0.0.beta1)
50
- concurrent-ruby (~> 1.0)
44
+ activesupport (5.0.0.1)
45
+ concurrent-ruby (~> 1.0, >= 1.0.2)
51
46
  i18n (~> 0.7)
52
- json (~> 1.7, >= 1.7.7)
53
- method_source
54
47
  minitest (~> 5.1)
55
48
  tzinfo (~> 1.1)
56
- arel (7.0.0)
57
- builder (3.2.2)
58
- bump (0.5.3)
59
- celluloid (0.17.2)
60
- celluloid-essentials
61
- celluloid-extras
62
- celluloid-fsm
63
- celluloid-pool
64
- celluloid-supervision
65
- timers (>= 4.1.1)
66
- celluloid-essentials (0.20.5)
67
- timers (>= 4.1.1)
68
- celluloid-extras (0.20.5)
69
- timers (>= 4.1.1)
70
- celluloid-fsm (0.20.5)
71
- timers (>= 4.1.1)
72
- celluloid-pool (0.20.5)
73
- timers (>= 4.1.1)
74
- celluloid-supervision (0.20.5)
75
- timers (>= 4.1.1)
76
- coderay (1.1.0)
77
- coffee-rails (4.1.1)
78
- coffee-script (>= 2.2.0)
79
- railties (>= 4.0.0, < 5.1.x)
80
- coffee-script (2.4.1)
81
- coffee-script-source
82
- execjs
83
- coffee-script-source (1.10.0)
84
- concurrent-ruby (1.0.0)
85
- em-hiredis (0.3.0)
86
- eventmachine (~> 1.0)
87
- hiredis (~> 0.5.0)
49
+ arel (7.1.4)
50
+ builder (3.2.3)
51
+ bump (0.5.4)
52
+ coderay (1.1.1)
53
+ concurrent-ruby (1.0.5)
88
54
  erubis (2.7.0)
89
- eventmachine (1.0.8)
90
- execjs (2.6.0)
91
- faye-websocket (0.10.2)
92
- eventmachine (>= 0.12.0)
93
- websocket-driver (>= 0.5.1)
94
- globalid (0.3.6)
95
- activesupport (>= 4.1.0)
96
- hiredis (0.5.2)
97
- hitimes (1.2.3)
98
- i18n (0.7.0)
99
- json (1.8.3)
55
+ globalid (0.4.0)
56
+ activesupport (>= 4.2.0)
57
+ i18n (0.8.6)
58
+ isolated_server (0.4.12)
100
59
  loofah (2.0.3)
101
60
  nokogiri (>= 1.5.9)
102
- mail (2.6.3)
103
- mime-types (>= 1.16, < 3)
61
+ mail (2.6.6)
62
+ mime-types (>= 1.16, < 4)
104
63
  metaclass (0.0.4)
105
64
  method_source (0.8.2)
106
- mime-types (2.99)
107
- mini_portile2 (2.0.0)
108
- minitest (5.8.3)
65
+ mime-types (3.1)
66
+ mime-types-data (~> 3.2015)
67
+ mime-types-data (3.2016.0521)
68
+ mini_portile2 (2.2.0)
69
+ minitest (5.10.3)
109
70
  mocha (1.1.0)
110
71
  metaclass (~> 0.0.1)
111
- mysql2 (0.4.2)
112
- mysql_isolated_server (0.5.3)
113
- nokogiri (1.6.7.1)
114
- mini_portile2 (~> 2.0.0.rc2)
115
- pry (0.10.3)
72
+ mysql2 (0.4.9)
73
+ nio4r (1.2.1)
74
+ nokogiri (1.8.0)
75
+ mini_portile2 (~> 2.2.0)
76
+ pry (0.10.4)
116
77
  coderay (~> 1.1.0)
117
78
  method_source (~> 0.8.1)
118
79
  slop (~> 3.4)
119
- rack (2.0.0.alpha)
120
- json
80
+ rack (2.0.3)
121
81
  rack-test (0.6.3)
122
82
  rack (>= 1.0)
123
- rails (5.0.0.beta1)
124
- actioncable (= 5.0.0.beta1)
125
- actionmailer (= 5.0.0.beta1)
126
- actionpack (= 5.0.0.beta1)
127
- actionview (= 5.0.0.beta1)
128
- activejob (= 5.0.0.beta1)
129
- activemodel (= 5.0.0.beta1)
130
- activerecord (= 5.0.0.beta1)
131
- activesupport (= 5.0.0.beta1)
83
+ rails (5.0.0.1)
84
+ actioncable (= 5.0.0.1)
85
+ actionmailer (= 5.0.0.1)
86
+ actionpack (= 5.0.0.1)
87
+ actionview (= 5.0.0.1)
88
+ activejob (= 5.0.0.1)
89
+ activemodel (= 5.0.0.1)
90
+ activerecord (= 5.0.0.1)
91
+ activesupport (= 5.0.0.1)
132
92
  bundler (>= 1.3.0, < 2.0)
133
- railties (= 5.0.0.beta1)
93
+ railties (= 5.0.0.1)
134
94
  sprockets-rails (>= 2.0.0)
135
- rails-deprecated_sanitizer (1.0.3)
136
- activesupport (>= 4.2.0.alpha)
137
- rails-dom-testing (1.0.7)
138
- activesupport (>= 4.2.0.beta, < 5.0)
139
- nokogiri (~> 1.6.0)
140
- rails-deprecated_sanitizer (>= 1.0.1)
141
- rails-html-sanitizer (1.0.2)
95
+ rails-dom-testing (2.0.3)
96
+ activesupport (>= 4.2.0)
97
+ nokogiri (>= 1.6)
98
+ rails-html-sanitizer (1.0.3)
142
99
  loofah (~> 2.0)
143
- railties (5.0.0.beta1)
144
- actionpack (= 5.0.0.beta1)
145
- activesupport (= 5.0.0.beta1)
100
+ railties (5.0.0.1)
101
+ actionpack (= 5.0.0.1)
102
+ activesupport (= 5.0.0.1)
146
103
  method_source
147
104
  rake (>= 0.8.7)
148
105
  thor (>= 0.18.1, < 2.0)
149
- rake (10.4.2)
150
- redis (3.2.2)
106
+ rake (12.0.0)
151
107
  slop (3.6.0)
152
- sprockets (3.5.2)
108
+ sprockets (3.7.1)
153
109
  concurrent-ruby (~> 1.0)
154
110
  rack (> 1, < 3)
155
- sprockets-rails (3.0.0)
111
+ sprockets-rails (3.2.0)
156
112
  actionpack (>= 4.0)
157
113
  activesupport (>= 4.0)
158
114
  sprockets (>= 3.0.0)
159
- thor (0.19.1)
160
- thread_safe (0.3.5)
161
- timers (4.1.1)
162
- hitimes
163
- tzinfo (1.2.2)
115
+ thor (0.20.0)
116
+ thread_safe (0.3.6)
117
+ tzinfo (1.2.3)
164
118
  thread_safe (~> 0.1)
165
- websocket-driver (0.6.3)
119
+ websocket-driver (0.6.5)
166
120
  websocket-extensions (>= 0.1.0)
167
121
  websocket-extensions (0.1.2)
168
122
  wwtd (1.3.0)
@@ -173,14 +127,13 @@ PLATFORMS
173
127
  DEPENDENCIES
174
128
  ar_mysql_flexmaster!
175
129
  bump
130
+ isolated_server
176
131
  minitest
177
132
  mocha (~> 1.1.0)
178
- mysql2
179
- mysql_isolated_server (~> 0.5)
180
133
  pry
181
- rails (~> 5.0.0.beta1)
134
+ rails (~> 5.0.0, < 5.0.1)
182
135
  rake
183
136
  wwtd
184
137
 
185
138
  BUNDLED WITH
186
- 1.11.2
139
+ 1.15.4