Lint; mostly code reformatting

Author: stamhankar999

.rubocop.yml

@@ -4,6 +4,13 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   TargetRubyVersion: 1.9
+  Exclude:
+    - 'spec/**/*'
+    - 'benchmarking/**/*'
+    - 'support/**/*'
+    - 'integration/**/*'
+    - 'features/**/*'
+    - 'tmp/**/*'
 
 # We shouldn't rescue Exception!
 Lint/RescueException:
@@ -20,6 +27,12 @@ Metrics/ModuleLength:
 Metrics/ClassLength:
   Enabled: false
 
+Metrics/ParameterLists:
+  Enabled: false
+
+Style/MultilineBlockLayout:
+  Enabled: false
+
 Style/MultilineTernaryOperator:
   Enabled: false
 

Gemfile

@@ -2,10 +2,10 @@ source 'https://rubygems.org/'
 
 gemspec
 
-gem 'snappy',        :group => [:development, :test]
-gem 'lz4-ruby',      :group => [:development, :test]
-gem 'rake-compiler', :group => [:development, :test]
-gem 'cliver',        :group => [:development, :test]
+gem 'snappy',        group: [:development, :test]
+gem 'lz4-ruby',      group: [:development, :test]
+gem 'rake-compiler', group: [:development, :test]
+gem 'cliver',        group: [:development, :test]
 
 group :development do
   platforms :mri_19 do

Rakefile

@@ -7,16 +7,16 @@ require 'cucumber/rake/task'
 require 'rake/testtask'
 require 'bundler/gem_tasks'
 
-ENV["FAIL_FAST"] ||= 'Y'
+ENV['FAIL_FAST'] ||= 'Y'
 
-RSpec::Core::RakeTask.new(:rspec => :compile)
+RSpec::Core::RakeTask.new(rspec: :compile)
 
-Cucumber::Rake::Task.new(:cucumber => :compile)
+Cucumber::Rake::Task.new(cucumber: :compile)
 
 desc 'Run all tests'
-task :test => [:rspec, :integration, :cucumber]
+task test: [:rspec, :integration, :cucumber]
 
-ruby_engine = defined?(RUBY_ENGINE)? RUBY_ENGINE : 'ruby'
+ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
 
 case ruby_engine
 when 'jruby'
@@ -29,19 +29,19 @@ else
   Rake::ExtensionTask.new('cassandra_murmur3')
 end
 
-Rake::TestTask.new(:integration => :compile) do |t|
-  t.libs.push "lib"
+Rake::TestTask.new(integration: :compile) do |t|
+  t.libs.push 'lib'
   t.test_files = FileList['integration/*_test.rb',
-                  'integration/security/*_test.rb',
-                  'integration/load_balancing/*_test.rb',
-                  'integration/types/*_test.rb',
-                  'integration/functions/*_test.rb',
-                  'integration/indexes/*_test.rb']
+                          'integration/security/*_test.rb',
+                          'integration/load_balancing/*_test.rb',
+                          'integration/types/*_test.rb',
+                          'integration/functions/*_test.rb',
+                          'integration/indexes/*_test.rb']
   t.verbose = true
 end
 
-Rake::TestTask.new(:stress => :compile) do |t|
-  t.libs.push "lib"
+Rake::TestTask.new(stress: :compile) do |t|
+  t.libs.push 'lib'
   t.test_files = FileList['integration/stress_tests/*_test.rb']
   t.verbose = true
 end

cassandra-driver.gemspec

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-$: << File.expand_path('../lib', __FILE__)
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
 
 require 'cassandra/version'
 
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.authors       = ['Theo Hultberg', 'Bulat Shakirzyanov', 'Sandeep Tamhankar']
   s.email         = ['[email protected]', '[email protected]', '[email protected]']
   s.homepage      = 'http://datastax.github.io/ruby-driver'
-  s.summary       = %q{Datastax Ruby Driver for Apache Cassandra}
-  s.description   = %q{A pure Ruby driver for Apache Cassandra}
+  s.summary       = 'Datastax Ruby Driver for Apache Cassandra'
+  s.description   = 'A pure Ruby driver for Apache Cassandra'
   s.license       = 'Apache License 2.0'
   s.files         = Dir['lib/**/*.rb', 'README.md', '.yardopts']
   s.require_paths = %w(lib)

docs.yaml

@@ -23,6 +23,8 @@ rewrites:
     replace: http://docs.datastax.com/en/cql/3.3/cql/cql_using/useAboutCQL.html
   - search: https://datastax.github.io/java-driver/features
     replace: https://datastax.github.io/java-driver/manual
+  - search: http://dsdocs30_java
+    replace: http://docs.datastax.com/en/developer/java-driver/3.0
 links:
   - title: Code
     href:  https://github.com/datastax/ruby-driver/

lib/cassandra.rb

@@ -528,12 +528,11 @@ def self.validate_and_massage_options(options)
     if options.key?(:execution_profiles)
       options[:execution_profiles].each do |name, profile|
         timeout = profile.timeout
-        unless timeout.nil?
-          Util.assert_instance_of(::Numeric, timeout,
-                                  ":timeout of execution profile #{name} must be a number of seconds, " \
-                                "#{timeout.inspect} given")
-          Util.assert(timeout > 0, ":timeout of execution profile #{name} must be greater than 0, #{timeout} given")
-        end
+        next if timeout.nil?
+        Util.assert_instance_of(::Numeric, timeout,
+                                ":timeout of execution profile #{name} must be a number of seconds, " \
+                              "#{timeout.inspect} given")
+        Util.assert(timeout > 0, ":timeout of execution profile #{name} must be greater than 0, #{timeout} given")
       end
     end
 
@@ -599,12 +598,11 @@ def self.validate_and_massage_options(options)
                  :distance, :plan]
       options[:execution_profiles].each do |name, profile|
         load_balancing_policy = profile.load_balancing_policy
-        unless load_balancing_policy.nil?
-          Util.assert_responds_to_all(methods, load_balancing_policy,
-            ":load_balancing_policy in execution profile #{name} #{load_balancing_policy.inspect} must respond " \
-            "to #{methods.inspect}, but doesn't"
-          )
-        end
+        next if load_balancing_policy.nil?
+        Util.assert_responds_to_all(methods, load_balancing_policy,
+                                    ":load_balancing_policy in execution profile #{name} " \
+                                    "#{load_balancing_policy.inspect} must respond " \
+                                    "to #{methods.inspect}, but doesn't")
       end
     end
 
@@ -629,12 +627,10 @@ def self.validate_and_massage_options(options)
       methods = [:read_timeout, :write_timeout, :unavailable]
       options[:execution_profiles].each do |name, profile|
         retry_policy = profile.retry_policy
-        unless retry_policy.nil?
-          Util.assert_responds_to_all(methods, retry_policy,
-                                      ":retry_policy in execution profile #{name} #{retry_policy.inspect} must " \
-                                      "respond to #{methods.inspect}, but doesn't"
-          )
-        end
+        next if retry_policy.nil?
+        Util.assert_responds_to_all(methods, retry_policy,
+                                    ":retry_policy in execution profile #{name} #{retry_policy.inspect} must " \
+                                    "respond to #{methods.inspect}, but doesn't")
       end
     end
 
@@ -643,19 +639,16 @@ def self.validate_and_massage_options(options)
     if options.key?(:consistency)
       consistency = options[:consistency]
       Util.assert_one_of(CONSISTENCIES, consistency,
-        ":consistency must be one of #{CONSISTENCIES.inspect}, " \
-            "#{consistency.inspect} given"
-      )
+                         ":consistency must be one of #{CONSISTENCIES.inspect}, " \
+                             "#{consistency.inspect} given")
     end
     if options.key?(:execution_profiles)
       options[:execution_profiles].each do |name, profile|
         consistency = profile.consistency
-        unless consistency.nil?
-          Util.assert_one_of(CONSISTENCIES, consistency,
-            ":consistency in execution profile #{name} must be one of #{CONSISTENCIES.inspect}, " \
-            "#{consistency.inspect} given"
-          )
-        end
+        next if consistency.nil?
+        Util.assert_one_of(CONSISTENCIES, consistency,
+                           ":consistency in execution profile #{name} must be one of #{CONSISTENCIES.inspect}, " \
+                           "#{consistency.inspect} given")
       end
     end
 
@@ -681,9 +674,8 @@ def self.validate_and_massage_options(options)
       unless protocol_version.nil?
         Util.assert_instance_of(::Integer, protocol_version)
         Util.assert_one_of(1..Cassandra::Protocol::Versions::MAX_SUPPORTED_VERSION, protocol_version,
-          ':protocol_version must be a positive integer between 1 and ' \
-          "#{Cassandra::Protocol::Versions::MAX_SUPPORTED_VERSION}, #{protocol_version.inspect} given"
-        )
+                           ':protocol_version must be a positive integer between 1 and ' \
+                           "#{Cassandra::Protocol::Versions::MAX_SUPPORTED_VERSION}, #{protocol_version.inspect} given")
       end
     end