redis 3.3.5 → 4.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (127) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -0
  3. data/.travis/Gemfile +8 -1
  4. data/.travis.yml +34 -62
  5. data/CHANGELOG.md +45 -2
  6. data/Gemfile +5 -1
  7. data/README.md +32 -76
  8. data/benchmarking/logging.rb +1 -1
  9. data/bin/build +71 -0
  10. data/bors.toml +14 -0
  11. data/lib/redis/client.rb +38 -20
  12. data/lib/redis/cluster/command.rb +81 -0
  13. data/lib/redis/cluster/command_loader.rb +32 -0
  14. data/lib/redis/cluster/key_slot_converter.rb +72 -0
  15. data/lib/redis/cluster/node.rb +104 -0
  16. data/lib/redis/cluster/node_key.rb +35 -0
  17. data/lib/redis/cluster/node_loader.rb +35 -0
  18. data/lib/redis/cluster/option.rb +76 -0
  19. data/lib/redis/cluster/slot.rb +69 -0
  20. data/lib/redis/cluster/slot_loader.rb +47 -0
  21. data/lib/redis/cluster.rb +285 -0
  22. data/lib/redis/connection/command_helper.rb +2 -8
  23. data/lib/redis/connection/hiredis.rb +2 -2
  24. data/lib/redis/connection/ruby.rb +13 -30
  25. data/lib/redis/connection/synchrony.rb +12 -4
  26. data/lib/redis/connection.rb +2 -2
  27. data/lib/redis/distributed.rb +29 -8
  28. data/lib/redis/errors.rb +46 -0
  29. data/lib/redis/hash_ring.rb +20 -64
  30. data/lib/redis/pipeline.rb +9 -7
  31. data/lib/redis/version.rb +1 -1
  32. data/lib/redis.rb +287 -52
  33. data/makefile +74 -0
  34. data/redis.gemspec +9 -10
  35. data/test/bitpos_test.rb +13 -19
  36. data/test/blocking_commands_test.rb +3 -5
  37. data/test/client_test.rb +18 -1
  38. data/test/cluster_abnormal_state_test.rb +38 -0
  39. data/test/cluster_blocking_commands_test.rb +15 -0
  40. data/test/cluster_client_internals_test.rb +77 -0
  41. data/test/cluster_client_key_hash_tags_test.rb +88 -0
  42. data/test/cluster_client_options_test.rb +147 -0
  43. data/test/cluster_client_pipelining_test.rb +59 -0
  44. data/test/cluster_client_replicas_test.rb +36 -0
  45. data/test/cluster_client_slots_test.rb +94 -0
  46. data/test/cluster_client_transactions_test.rb +71 -0
  47. data/test/cluster_commands_on_cluster_test.rb +165 -0
  48. data/test/cluster_commands_on_connection_test.rb +40 -0
  49. data/test/cluster_commands_on_geo_test.rb +74 -0
  50. data/test/cluster_commands_on_hashes_test.rb +11 -0
  51. data/test/cluster_commands_on_hyper_log_log_test.rb +17 -0
  52. data/test/cluster_commands_on_keys_test.rb +134 -0
  53. data/test/cluster_commands_on_lists_test.rb +15 -0
  54. data/test/cluster_commands_on_pub_sub_test.rb +101 -0
  55. data/test/cluster_commands_on_scripting_test.rb +56 -0
  56. data/test/cluster_commands_on_server_test.rb +221 -0
  57. data/test/cluster_commands_on_sets_test.rb +39 -0
  58. data/test/cluster_commands_on_sorted_sets_test.rb +35 -0
  59. data/test/cluster_commands_on_streams_test.rb +196 -0
  60. data/test/cluster_commands_on_strings_test.rb +15 -0
  61. data/test/cluster_commands_on_transactions_test.rb +41 -0
  62. data/test/cluster_commands_on_value_types_test.rb +14 -0
  63. data/test/command_map_test.rb +3 -5
  64. data/test/commands_on_geo_test.rb +116 -0
  65. data/test/commands_on_hashes_test.rb +2 -16
  66. data/test/commands_on_hyper_log_log_test.rb +3 -17
  67. data/test/commands_on_lists_test.rb +2 -15
  68. data/test/commands_on_sets_test.rb +2 -72
  69. data/test/commands_on_sorted_sets_test.rb +2 -132
  70. data/test/commands_on_strings_test.rb +2 -96
  71. data/test/commands_on_value_types_test.rb +80 -6
  72. data/test/connection_handling_test.rb +5 -7
  73. data/test/distributed_blocking_commands_test.rb +10 -4
  74. data/test/distributed_commands_on_hashes_test.rb +16 -5
  75. data/test/distributed_commands_on_hyper_log_log_test.rb +8 -15
  76. data/test/distributed_commands_on_lists_test.rb +4 -7
  77. data/test/distributed_commands_on_sets_test.rb +58 -36
  78. data/test/distributed_commands_on_sorted_sets_test.rb +51 -10
  79. data/test/distributed_commands_on_strings_test.rb +30 -10
  80. data/test/distributed_commands_on_value_types_test.rb +38 -4
  81. data/test/distributed_commands_requiring_clustering_test.rb +1 -3
  82. data/test/distributed_connection_handling_test.rb +1 -3
  83. data/test/distributed_internals_test.rb +8 -19
  84. data/test/distributed_key_tags_test.rb +4 -6
  85. data/test/distributed_persistence_control_commands_test.rb +1 -3
  86. data/test/distributed_publish_subscribe_test.rb +1 -3
  87. data/test/distributed_remote_server_control_commands_test.rb +1 -3
  88. data/test/distributed_scripting_test.rb +1 -3
  89. data/test/distributed_sorting_test.rb +1 -3
  90. data/test/distributed_test.rb +12 -14
  91. data/test/distributed_transactions_test.rb +1 -3
  92. data/test/encoding_test.rb +4 -8
  93. data/test/error_replies_test.rb +2 -4
  94. data/test/fork_safety_test.rb +1 -6
  95. data/test/helper.rb +179 -66
  96. data/test/helper_test.rb +1 -3
  97. data/test/internals_test.rb +47 -56
  98. data/test/lint/blocking_commands.rb +40 -16
  99. data/test/lint/hashes.rb +41 -0
  100. data/test/lint/hyper_log_log.rb +15 -1
  101. data/test/lint/lists.rb +16 -0
  102. data/test/lint/sets.rb +142 -0
  103. data/test/lint/sorted_sets.rb +183 -2
  104. data/test/lint/strings.rb +108 -20
  105. data/test/lint/value_types.rb +8 -0
  106. data/test/persistence_control_commands_test.rb +1 -3
  107. data/test/pipelining_commands_test.rb +12 -8
  108. data/test/publish_subscribe_test.rb +1 -3
  109. data/test/remote_server_control_commands_test.rb +60 -3
  110. data/test/scanning_test.rb +1 -7
  111. data/test/scripting_test.rb +1 -3
  112. data/test/sentinel_command_test.rb +1 -3
  113. data/test/sentinel_test.rb +1 -3
  114. data/test/sorting_test.rb +1 -3
  115. data/test/ssl_test.rb +45 -49
  116. data/test/support/cluster/orchestrator.rb +199 -0
  117. data/test/support/connection/hiredis.rb +1 -1
  118. data/test/support/connection/ruby.rb +1 -1
  119. data/test/support/connection/synchrony.rb +1 -1
  120. data/test/support/redis_mock.rb +1 -1
  121. data/test/synchrony_driver.rb +6 -9
  122. data/test/thread_safety_test.rb +1 -3
  123. data/test/transactions_test.rb +11 -3
  124. data/test/unknown_commands_test.rb +1 -3
  125. data/test/url_param_test.rb +44 -46
  126. metadata +109 -16
  127. data/Rakefile +0 -87
@@ -1,6 +1,4 @@
1
- # encoding: UTF-8
2
-
3
- require File.expand_path("helper", File.dirname(__FILE__))
1
+ require_relative "helper"
4
2
 
5
3
  class TestUrlParam < Test::Unit::TestCase
6
4
 
@@ -9,104 +7,104 @@ class TestUrlParam < Test::Unit::TestCase
9
7
  def test_url_defaults_to_______________
10
8
  redis = Redis.new
11
9
 
12
- assert_equal "127.0.0.1", redis.client.host
13
- assert_equal 6379, redis.client.port
14
- assert_equal 0, redis.client.db
15
- assert_equal nil, redis.client.password
10
+ assert_equal "127.0.0.1", redis._client.host
11
+ assert_equal 6379, redis._client.port
12
+ assert_equal 0, redis._client.db
13
+ assert_equal nil, redis._client.password
16
14
  end
17
15
 
18
16
  def test_allows_to_pass_in_a_url
19
17
  redis = Redis.new :url => "redis://:secr3t@foo.com:999/2"
20
18
 
21
- assert_equal "foo.com", redis.client.host
22
- assert_equal 999, redis.client.port
23
- assert_equal 2, redis.client.db
24
- assert_equal "secr3t", redis.client.password
19
+ assert_equal "foo.com", redis._client.host
20
+ assert_equal 999, redis._client.port
21
+ assert_equal 2, redis._client.db
22
+ assert_equal "secr3t", redis._client.password
25
23
  end
26
24
 
27
25
  def test_allows_to_pass_in_a_url_with_string_key
28
26
  redis = Redis.new "url" => "redis://:secr3t@foo.com:999/2"
29
27
 
30
- assert_equal "foo.com", redis.client.host
31
- assert_equal 999, redis.client.port
32
- assert_equal 2, redis.client.db
33
- assert_equal "secr3t", redis.client.password
28
+ assert_equal "foo.com", redis._client.host
29
+ assert_equal 999, redis._client.port
30
+ assert_equal 2, redis._client.db
31
+ assert_equal "secr3t", redis._client.password
34
32
  end
35
33
 
36
34
  def test_unescape_password_from_url
37
35
  redis = Redis.new :url => "redis://:secr3t%3A@foo.com:999/2"
38
36
 
39
- assert_equal "secr3t:", redis.client.password
37
+ assert_equal "secr3t:", redis._client.password
40
38
  end
41
39
 
42
40
  def test_unescape_password_from_url_with_string_key
43
41
  redis = Redis.new "url" => "redis://:secr3t%3A@foo.com:999/2"
44
42
 
45
- assert_equal "secr3t:", redis.client.password
43
+ assert_equal "secr3t:", redis._client.password
46
44
  end
47
45
 
48
46
  def test_does_not_unescape_password_when_explicitly_passed
49
47
  redis = Redis.new :url => "redis://:secr3t%3A@foo.com:999/2", :password => "secr3t%3A"
50
48
 
51
- assert_equal "secr3t%3A", redis.client.password
49
+ assert_equal "secr3t%3A", redis._client.password
52
50
  end
53
51
 
54
52
  def test_does_not_unescape_password_when_explicitly_passed_with_string_key
55
53
  redis = Redis.new :url => "redis://:secr3t%3A@foo.com:999/2", "password" => "secr3t%3A"
56
54
 
57
- assert_equal "secr3t%3A", redis.client.password
55
+ assert_equal "secr3t%3A", redis._client.password
58
56
  end
59
57
 
60
58
  def test_override_url_if_path_option_is_passed
61
59
  redis = Redis.new :url => "redis://:secr3t@foo.com/foo:999/2", :path => "/tmp/redis.sock"
62
60
 
63
- assert_equal "/tmp/redis.sock", redis.client.path
64
- assert_equal nil, redis.client.host
65
- assert_equal nil, redis.client.port
61
+ assert_equal "/tmp/redis.sock", redis._client.path
62
+ assert_equal nil, redis._client.host
63
+ assert_equal nil, redis._client.port
66
64
  end
67
65
 
68
66
  def test_override_url_if_path_option_is_passed_with_string_key
69
67
  redis = Redis.new :url => "redis://:secr3t@foo.com/foo:999/2", "path" => "/tmp/redis.sock"
70
68
 
71
- assert_equal "/tmp/redis.sock", redis.client.path
72
- assert_equal nil, redis.client.host
73
- assert_equal nil, redis.client.port
69
+ assert_equal "/tmp/redis.sock", redis._client.path
70
+ assert_equal nil, redis._client.host
71
+ assert_equal nil, redis._client.port
74
72
  end
75
73
 
76
74
  def test_overrides_url_if_another_connection_option_is_passed
77
75
  redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", :port => 1000
78
76
 
79
- assert_equal "foo.com", redis.client.host
80
- assert_equal 1000, redis.client.port
81
- assert_equal 2, redis.client.db
82
- assert_equal "secr3t", redis.client.password
77
+ assert_equal "foo.com", redis._client.host
78
+ assert_equal 1000, redis._client.port
79
+ assert_equal 2, redis._client.db
80
+ assert_equal "secr3t", redis._client.password
83
81
  end
84
82
 
85
83
  def test_overrides_url_if_another_connection_option_is_passed_with_string_key
86
84
  redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", "port" => 1000
87
85
 
88
- assert_equal "foo.com", redis.client.host
89
- assert_equal 1000, redis.client.port
90
- assert_equal 2, redis.client.db
91
- assert_equal "secr3t", redis.client.password
86
+ assert_equal "foo.com", redis._client.host
87
+ assert_equal 1000, redis._client.port
88
+ assert_equal 2, redis._client.db
89
+ assert_equal "secr3t", redis._client.password
92
90
  end
93
91
 
94
92
  def test_does_not_overrides_url_if_a_nil_option_is_passed
95
93
  redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", :port => nil
96
94
 
97
- assert_equal "foo.com", redis.client.host
98
- assert_equal 999, redis.client.port
99
- assert_equal 2, redis.client.db
100
- assert_equal "secr3t", redis.client.password
95
+ assert_equal "foo.com", redis._client.host
96
+ assert_equal 999, redis._client.port
97
+ assert_equal 2, redis._client.db
98
+ assert_equal "secr3t", redis._client.password
101
99
  end
102
100
 
103
101
  def test_does_not_overrides_url_if_a_nil_option_is_passed_with_string_key
104
102
  redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", "port" => nil
105
103
 
106
- assert_equal "foo.com", redis.client.host
107
- assert_equal 999, redis.client.port
108
- assert_equal 2, redis.client.db
109
- assert_equal "secr3t", redis.client.password
104
+ assert_equal "foo.com", redis._client.host
105
+ assert_equal 999, redis._client.port
106
+ assert_equal 2, redis._client.db
107
+ assert_equal "secr3t", redis._client.password
110
108
  end
111
109
 
112
110
  def test_does_not_modify_the_passed_options
@@ -122,10 +120,10 @@ class TestUrlParam < Test::Unit::TestCase
122
120
 
123
121
  redis = Redis.new
124
122
 
125
- assert_equal "foo.com", redis.client.host
126
- assert_equal 999, redis.client.port
127
- assert_equal 2, redis.client.db
128
- assert_equal "secr3t", redis.client.password
123
+ assert_equal "foo.com", redis._client.host
124
+ assert_equal 999, redis._client.port
125
+ assert_equal 2, redis._client.db
126
+ assert_equal "secr3t", redis._client.password
129
127
 
130
128
  ENV.delete("REDIS_URL")
131
129
  end
@@ -133,6 +131,6 @@ class TestUrlParam < Test::Unit::TestCase
133
131
  def test_defaults_to_localhost
134
132
  redis = Redis.new(:url => "redis:///")
135
133
 
136
- assert_equal "127.0.0.1", redis.client.host
134
+ assert_equal "127.0.0.1", redis._client.host
137
135
  end
138
136
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redis
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.5
4
+ version: 4.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ezra Zygmuntowicz
@@ -16,40 +16,67 @@ authors:
16
16
  autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
- date: 2017-09-28 00:00:00.000000000 Z
19
+ date: 2018-10-31 00:00:00.000000000 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- name: rake
22
+ name: test-unit
23
23
  requirement: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - "<"
25
+ - - ">="
26
26
  - !ruby/object:Gem::Version
27
- version: 11.0.0
27
+ version: 3.1.5
28
28
  type: :development
29
29
  prerelease: false
30
30
  version_requirements: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - "<"
32
+ - - ">="
33
33
  - !ruby/object:Gem::Version
34
- version: 11.0.0
34
+ version: 3.1.5
35
35
  - !ruby/object:Gem::Dependency
36
- name: test-unit
36
+ name: mocha
37
37
  requirement: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - '='
39
+ - - ">="
40
40
  - !ruby/object:Gem::Version
41
- version: 3.1.5
41
+ version: '0'
42
42
  type: :development
43
43
  prerelease: false
44
44
  version_requirements: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - '='
46
+ - - ">="
47
47
  - !ruby/object:Gem::Version
48
- version: 3.1.5
48
+ version: '0'
49
+ - !ruby/object:Gem::Dependency
50
+ name: hiredis
51
+ requirement: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - ">="
54
+ - !ruby/object:Gem::Version
55
+ version: '0'
56
+ type: :development
57
+ prerelease: false
58
+ version_requirements: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
63
+ - !ruby/object:Gem::Dependency
64
+ name: em-synchrony
65
+ requirement: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
70
+ type: :development
71
+ prerelease: false
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - ">="
75
+ - !ruby/object:Gem::Version
76
+ version: '0'
49
77
  description: |2
50
78
  A Ruby client that tries to match Redis' API one-to-one, while still
51
- providing an idiomatic interface. It features thread-safety,
52
- client-side sharding, pipelining, and an obsession for performance.
79
+ providing an idiomatic interface.
53
80
  email:
54
81
  - redis-db@googlegroups.com
55
82
  executables: []
@@ -64,12 +91,13 @@ files:
64
91
  - Gemfile
65
92
  - LICENSE
66
93
  - README.md
67
- - Rakefile
68
94
  - benchmarking/logging.rb
69
95
  - benchmarking/pipeline.rb
70
96
  - benchmarking/speed.rb
71
97
  - benchmarking/suite.rb
72
98
  - benchmarking/worker.rb
99
+ - bin/build
100
+ - bors.toml
73
101
  - examples/basic.rb
74
102
  - examples/consistency.rb
75
103
  - examples/dist_redis.rb
@@ -84,6 +112,16 @@ files:
84
112
  - examples/unicorn/unicorn.rb
85
113
  - lib/redis.rb
86
114
  - lib/redis/client.rb
115
+ - lib/redis/cluster.rb
116
+ - lib/redis/cluster/command.rb
117
+ - lib/redis/cluster/command_loader.rb
118
+ - lib/redis/cluster/key_slot_converter.rb
119
+ - lib/redis/cluster/node.rb
120
+ - lib/redis/cluster/node_key.rb
121
+ - lib/redis/cluster/node_loader.rb
122
+ - lib/redis/cluster/option.rb
123
+ - lib/redis/cluster/slot.rb
124
+ - lib/redis/cluster/slot_loader.rb
87
125
  - lib/redis/connection.rb
88
126
  - lib/redis/connection/command_helper.rb
89
127
  - lib/redis/connection/hiredis.rb
@@ -96,11 +134,38 @@ files:
96
134
  - lib/redis/pipeline.rb
97
135
  - lib/redis/subscribe.rb
98
136
  - lib/redis/version.rb
137
+ - makefile
99
138
  - redis.gemspec
100
139
  - test/bitpos_test.rb
101
140
  - test/blocking_commands_test.rb
102
141
  - test/client_test.rb
142
+ - test/cluster_abnormal_state_test.rb
143
+ - test/cluster_blocking_commands_test.rb
144
+ - test/cluster_client_internals_test.rb
145
+ - test/cluster_client_key_hash_tags_test.rb
146
+ - test/cluster_client_options_test.rb
147
+ - test/cluster_client_pipelining_test.rb
148
+ - test/cluster_client_replicas_test.rb
149
+ - test/cluster_client_slots_test.rb
150
+ - test/cluster_client_transactions_test.rb
151
+ - test/cluster_commands_on_cluster_test.rb
152
+ - test/cluster_commands_on_connection_test.rb
153
+ - test/cluster_commands_on_geo_test.rb
154
+ - test/cluster_commands_on_hashes_test.rb
155
+ - test/cluster_commands_on_hyper_log_log_test.rb
156
+ - test/cluster_commands_on_keys_test.rb
157
+ - test/cluster_commands_on_lists_test.rb
158
+ - test/cluster_commands_on_pub_sub_test.rb
159
+ - test/cluster_commands_on_scripting_test.rb
160
+ - test/cluster_commands_on_server_test.rb
161
+ - test/cluster_commands_on_sets_test.rb
162
+ - test/cluster_commands_on_sorted_sets_test.rb
163
+ - test/cluster_commands_on_streams_test.rb
164
+ - test/cluster_commands_on_strings_test.rb
165
+ - test/cluster_commands_on_transactions_test.rb
166
+ - test/cluster_commands_on_value_types_test.rb
103
167
  - test/command_map_test.rb
168
+ - test/commands_on_geo_test.rb
104
169
  - test/commands_on_hashes_test.rb
105
170
  - test/commands_on_hyper_log_log_test.rb
106
171
  - test/commands_on_lists_test.rb
@@ -154,6 +219,7 @@ files:
154
219
  - test/sentinel_test.rb
155
220
  - test/sorting_test.rb
156
221
  - test/ssl_test.rb
222
+ - test/support/cluster/orchestrator.rb
157
223
  - test/support/connection/hiredis.rb
158
224
  - test/support/connection/ruby.rb
159
225
  - test/support/connection/synchrony.rb
@@ -187,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
187
253
  requirements:
188
254
  - - ">="
189
255
  - !ruby/object:Gem::Version
190
- version: '0'
256
+ version: 2.2.2
191
257
  required_rubygems_version: !ruby/object:Gem::Requirement
192
258
  requirements:
193
259
  - - ">="
@@ -203,7 +269,33 @@ test_files:
203
269
  - test/bitpos_test.rb
204
270
  - test/blocking_commands_test.rb
205
271
  - test/client_test.rb
272
+ - test/cluster_abnormal_state_test.rb
273
+ - test/cluster_blocking_commands_test.rb
274
+ - test/cluster_client_internals_test.rb
275
+ - test/cluster_client_key_hash_tags_test.rb
276
+ - test/cluster_client_options_test.rb
277
+ - test/cluster_client_pipelining_test.rb
278
+ - test/cluster_client_replicas_test.rb
279
+ - test/cluster_client_slots_test.rb
280
+ - test/cluster_client_transactions_test.rb
281
+ - test/cluster_commands_on_cluster_test.rb
282
+ - test/cluster_commands_on_connection_test.rb
283
+ - test/cluster_commands_on_geo_test.rb
284
+ - test/cluster_commands_on_hashes_test.rb
285
+ - test/cluster_commands_on_hyper_log_log_test.rb
286
+ - test/cluster_commands_on_keys_test.rb
287
+ - test/cluster_commands_on_lists_test.rb
288
+ - test/cluster_commands_on_pub_sub_test.rb
289
+ - test/cluster_commands_on_scripting_test.rb
290
+ - test/cluster_commands_on_server_test.rb
291
+ - test/cluster_commands_on_sets_test.rb
292
+ - test/cluster_commands_on_sorted_sets_test.rb
293
+ - test/cluster_commands_on_streams_test.rb
294
+ - test/cluster_commands_on_strings_test.rb
295
+ - test/cluster_commands_on_transactions_test.rb
296
+ - test/cluster_commands_on_value_types_test.rb
206
297
  - test/command_map_test.rb
298
+ - test/commands_on_geo_test.rb
207
299
  - test/commands_on_hashes_test.rb
208
300
  - test/commands_on_hyper_log_log_test.rb
209
301
  - test/commands_on_lists_test.rb
@@ -257,6 +349,7 @@ test_files:
257
349
  - test/sentinel_test.rb
258
350
  - test/sorting_test.rb
259
351
  - test/ssl_test.rb
352
+ - test/support/cluster/orchestrator.rb
260
353
  - test/support/connection/hiredis.rb
261
354
  - test/support/connection/ruby.rb
262
355
  - test/support/connection/synchrony.rb
data/Rakefile DELETED
@@ -1,87 +0,0 @@
1
- require "rake/testtask"
2
-
3
- ENV["REDIS_BRANCH"] ||= "unstable"
4
-
5
- REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
6
- REDIS_CNF = File.join(REDIS_DIR, "test.conf")
7
- REDIS_CNF_TEMPLATE = File.join(REDIS_DIR, "test.conf.erb")
8
- REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
9
- REDIS_LOG = File.join(REDIS_DIR, "db", "redis.log")
10
- REDIS_SOCKET = File.join(REDIS_DIR, "db", "redis.sock")
11
- BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
12
-
13
- task :default => :run
14
-
15
- desc "Run tests and manage server start/stop"
16
- task :run => [:start, :test, :stop]
17
-
18
- desc "Start the Redis server"
19
- task :start => [BINARY, REDIS_CNF] do
20
- sh "#{BINARY} --version"
21
-
22
- redis_running = \
23
- begin
24
- File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i)
25
- rescue Errno::ESRCH
26
- FileUtils.rm REDIS_PID
27
- false
28
- end
29
-
30
- unless redis_running
31
- unless system("#{BINARY} #{REDIS_CNF}")
32
- abort "could not start redis-server"
33
- end
34
- end
35
-
36
- at_exit do
37
- Rake::Task["stop"].invoke
38
- end
39
- end
40
-
41
- desc "Stop the Redis server"
42
- task :stop do
43
- if File.exists?(REDIS_PID)
44
- Process.kill "INT", File.read(REDIS_PID).to_i
45
- FileUtils.rm REDIS_PID
46
- end
47
- end
48
-
49
- desc "Clean up testing artifacts"
50
- task :clean do
51
- FileUtils.rm_f(BINARY)
52
- FileUtils.rm_f(REDIS_CNF)
53
- end
54
-
55
- file BINARY do
56
- branch = ENV.fetch("REDIS_BRANCH")
57
-
58
- sh <<-SH
59
- mkdir -p tmp;
60
- cd tmp;
61
- rm -rf redis-#{branch};
62
- wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz;
63
- tar xf #{branch}.tar.gz;
64
- cd redis-#{branch};
65
- make
66
- SH
67
- end
68
-
69
- file REDIS_CNF => [REDIS_CNF_TEMPLATE, __FILE__] do |t|
70
- require 'erb'
71
-
72
- erb = t.prerequisites[0]
73
- template = File.read(erb)
74
-
75
- File.open(REDIS_CNF, 'w') do |file|
76
- file.puts "\# This file was auto-generated at #{Time.now}",
77
- "\# from (#{erb})",
78
- "\#"
79
- conf = ERB.new(template).result
80
- file << conf
81
- end
82
- end
83
-
84
- Rake::TestTask.new do |t|
85
- t.options = "-v" if $VERBOSE
86
- t.test_files = FileList["test/*_test.rb"]
87
- end