Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ Try to write a test case and include it in your report (have a look at the
[regression test suite](spec/regressions) if you need inspiration).

1. Bundle with `bundle install`
1. Run the unit test suite with `rake rspec`
2. Compile native extension with `rake compile`
3. Run the unit test suite with `rake rspec`
* Using this rake task will install necessary ruby extensions as a prerequisite
* For `bundle exec rspec` to be successful, run `bundle exec rake compile` once, beforehand

Expand Down
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,26 @@ source 'https://rubygems.org/'

gemspec

gem 'debug', group: [:development, :test]
gem 'cliver', group: [:development, :test]
gem 'lz4-ruby', group: [:development, :test]
gem 'rake-compiler', group: [:development, :test]
gem 'snappy', group: [:development, :test]
gem 'ione', github: "hornet-network/ione", branch: "main"

group :development do
platforms :mri_19 do
gem 'perftools.rb'
end
gem 'rubocop', '~> 0.51', require: false
gem 'rubocop'
end

group :test do
gem 'ansi'
gem 'aruba'
gem 'cucumber'
gem 'delorean'
gem 'minitest', '< 5.0.0'
gem 'minitest'
gem 'os'
gem 'rspec'
gem 'rspec-collection_matchers'
Expand Down
246 changes: 162 additions & 84 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,127 +1,205 @@
GIT
remote: https://github.com/hornet-network/ione.git
revision: e665ea33e98003ca029cdeafb37116dc0a5dae85
branch: main
specs:
ione (1.3.1)

PATH
remote: .
specs:
cassandra-driver (3.2.5)
ione (~> 1.2)
ione
sorted_set

GEM
remote: https://rubygems.org/
specs:
ansi (1.5.0)
aruba (0.13.0)
childprocess (~> 0.5.6)
contracts (~> 0.9)
cucumber (>= 1.3.19)
ffi (~> 1.9.10)
rspec-expectations (>= 2.99)
thor (~> 0.19)
ast (2.3.0)
builder (3.2.2)
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
aruba (2.3.1)
bundler (>= 1.17, < 3.0)
contracts (>= 0.16.0, < 0.18.0)
cucumber (>= 8.0, < 11.0)
rspec-expectations (~> 3.4)
thor (~> 1.0)
ast (2.4.3)
base64 (0.3.0)
bigdecimal (3.2.2)
builder (3.3.0)
chronic (0.10.2)
cliver (0.3.2)
contracts (0.13.0)
cucumber (2.3.2)
builder (>= 2.1.2)
cucumber-core (~> 1.4.0)
cucumber-wire (~> 0.0.1)
diff-lcs (>= 1.1.3)
gherkin (~> 3.2.0)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.2)
cucumber-core (1.4.0)
gherkin (~> 3.2.0)
cucumber-wire (0.0.1)
contracts (0.17.2)
cucumber (10.0.0)
base64 (~> 0.2)
builder (~> 3.2)
cucumber-ci-environment (> 9, < 11)
cucumber-core (> 15, < 17)
cucumber-cucumber-expressions (> 17, < 19)
cucumber-html-formatter (> 20.3, < 22)
diff-lcs (~> 1.5)
logger (~> 1.6)
mini_mime (~> 1.1)
multi_test (~> 1.1)
sys-uname (~> 1.3)
cucumber-ci-environment (10.0.1)
cucumber-core (15.1.0)
cucumber-gherkin (> 27, < 31)
cucumber-messages (> 26, < 29)
cucumber-tag-expressions (> 5, < 7)
cucumber-cucumber-expressions (18.0.1)
bigdecimal
cucumber-gherkin (30.0.4)
cucumber-messages (> 25, < 28)
cucumber-html-formatter (21.10.1)
cucumber-messages (> 19, < 28)
cucumber-messages (27.2.0)
cucumber-tag-expressions (6.1.2)
date (3.4.1)
debug (1.10.0)
irb (~> 1.10)
reline (>= 0.3.8)
delorean (2.1.0)
chronic
diff-lcs (1.2.5)
docile (1.1.5)
ffi (1.9.25)
ffi (1.9.25-java)
gherkin (3.2.0)
ione (1.2.4)
json (1.8.6)
json (1.8.6-java)
diff-lcs (1.6.2)
docile (1.4.1)
erb (5.0.1)
ffi (1.17.2)
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-aarch64-linux-musl)
ffi (1.17.2-arm-linux-gnu)
ffi (1.17.2-arm-linux-musl)
ffi (1.17.2-arm64-darwin)
ffi (1.17.2-x86-linux-gnu)
ffi (1.17.2-x86-linux-musl)
ffi (1.17.2-x86_64-darwin)
ffi (1.17.2-x86_64-linux-gnu)
ffi (1.17.2-x86_64-linux-musl)
io-console (0.8.0)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.12.2)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
lz4-ruby (0.3.3)
lz4-ruby (0.3.3-java)
minitest (4.7.5)
multi_json (1.11.2)
multi_test (0.1.2)
os (0.9.6)
parallel (1.12.0)
parser (2.4.0.2)
ast (~> 2.3)
perftools.rb (2.0.4)
powerpack (0.1.1)
rainbow (2.2.2)
rake
rake (13.0.1)
rake-compiler (0.9.5)
mini_mime (1.1.5)
minitest (5.25.5)
multi_test (1.1.0)
os (1.1.4)
parallel (1.27.0)
parser (3.3.8.0)
ast (~> 2.4.1)
racc
perftools.rb (2.0.5)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
prism (1.4.0)
psych (5.2.6)
date
stringio
racc (1.8.1)
rainbow (3.1.1)
rake (13.3.0)
rake-compiler (1.3.0)
rake
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-collection_matchers (1.2.0)
rbtree (0.4.6)
rdoc (6.14.0)
erb
psych (>= 4.0.0)
regexp_parser (2.10.0)
reline (0.6.1)
io-console (~> 0.5)
rspec (3.13.1)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-collection_matchers (1.2.1)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.1)
rspec-core (3.13.4)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.2)
rspec-wait (0.0.9)
rspec (>= 3, < 4)
rubocop (0.51.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.4)
rspec-wait (1.0.1)
rspec (>= 3.4)
rubocop (1.76.2)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 3.0)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.45.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
simplecov (0.11.2)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
snappy (0.0.14)
snappy (0.0.14-java)
snappy-jars (~> 1.1.0)
snappy-jars (1.1.0.1.2-java)
thor (0.19.1)
unicode-display_width (1.3.0)
yard (0.9.20)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.45.1)
parser (>= 3.3.7.2)
prism (~> 1.4)
ruby-progressbar (1.13.0)
set (1.1.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
snappy (0.4.0)
sorted_set (1.0.3)
rbtree
set (~> 1.0)
stringio (3.1.7)
sys-uname (1.3.1)
ffi (~> 1.1)
thor (1.3.2)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
yard (0.9.37)

PLATFORMS
java
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-musl
arm64-darwin
ruby
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
ansi
aruba
bundler (~> 1.6)
bundler
cassandra-driver!
cliver
cucumber
debug
delorean
ione!
lz4-ruby
minitest (< 5.0.0)
minitest
os
perftools.rb
rake (~> 13.0)
rake
rake-compiler
rspec
rspec-collection_matchers
rspec-wait
rubocop (~> 0.51)
rubocop
simplecov
snappy
yard

BUNDLED WITH
1.17.3
2.6.9
7 changes: 4 additions & 3 deletions cassandra-driver.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ Gem::Specification.new do |s|
s.files << 'ext/cassandra_murmur3/cassandra_murmur3.c'
end

s.add_runtime_dependency 'ione', '~> 1.2'
s.add_runtime_dependency 'ione'
s.add_runtime_dependency 'sorted_set'

s.add_development_dependency 'bundler', '~> 1.6'
s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'bundler'
s.add_development_dependency 'rake'
end
6 changes: 3 additions & 3 deletions lib/cassandra/cluster/schema/cql_type_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@ def lookup_type(node, types)
end

def parse_node(string)
root = node = Node.new(nil, '', [])
root = node = Node.new(nil, +'', [])

string.each_char do |char|
case char
when '<' # starting type params
child = Node.new(node, '', [])
child = Node.new(node, +'', [])
node.children << child
node = child
when ','
child = Node.new(node.parent, '', [])
child = Node.new(node.parent, +'', [])
node.parent.children << child
node = child
when '>'
Expand Down
6 changes: 3 additions & 3 deletions lib/cassandra/cluster/schema/fqcn_type_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,16 @@ def lookup_type(node)
end

def parse_node(string)
root = node = Node.new(nil, '', [])
root = node = Node.new(nil, +'', [])

string.each_char do |char|
case char
when '(' # starting type params
child = Node.new(node, '', [])
child = Node.new(node, +'', [])
node.children << child
node = child
when ','
child = Node.new(node.parent, '', [])
child = Node.new(node.parent, +'', [])
node.parent.children << child
node = child
when ')'
Expand Down
2 changes: 1 addition & 1 deletion lib/cassandra/errors.rb
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ class NoHostsAvailable < ::StandardError
def initialize(errors = nil)
if errors
first = true
message = 'All attempted hosts failed'
message = +'All attempted hosts failed'
errors.each do |(host, error)|
if first
first = false
Expand Down
Loading