Various housekeeping/cleanup

Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'raven'
 require 'rubygems/package_task'
 
-gemspec = eval(IO.read('sentry-raven.gemspec'))
+gemspec = Gem::Specification.load(Dir['*.gemspec'].first)
 
 Gem::PackageTask.new(gemspec).define
 

bin/raven

@@ -4,8 +4,6 @@ require "raven"
 require "raven/cli"
 require "optparse"
 
-options = {}
-
 parser = OptionParser.new do |opt|
   opt.banner = "Usage: raven COMMAND [OPTIONS]"
   opt.separator  ""

lib/raven/backtrace.rb

@@ -61,7 +61,7 @@ def ==(other)
       end
 
       def inspect
-        "<Line:#{to_s}>"
+        "<Line:#{self}>"
       end
 
       private
@@ -77,16 +77,16 @@ def self.parse(ruby_backtrace, opts = {})
 
       filters = opts[:filters] || []
       filtered_lines = ruby_lines.to_a.map do |line|
-        filters.reduce(line) do |line, proc|
-          proc.call(line)
+        filters.reduce(line) do |nested_line, proc|
+          proc.call(nested_line)
         end
       end.compact
 
       lines = filtered_lines.map do |unparsed_line|
         Line.parse(unparsed_line)
       end
 
-      instance = new(lines)
+      new(lines)
     end
 
     def initialize(lines)

lib/raven/base.rb

@@ -101,7 +101,7 @@ def capture(options = {}, &block)
 
     def capture_exception(exception, options = {})
       send_or_skip(exception) do
-        if evt = Event.from_exception(exception, options)
+        if (evt = Event.from_exception(exception, options))
           yield evt if block_given?
           if configuration.async?
             configuration.async.call(evt)
@@ -114,7 +114,7 @@ def capture_exception(exception, options = {})
 
     def capture_message(message, options = {})
       send_or_skip(message) do
-        if evt = Event.from_message(message, options)
+        if (evt = Event.from_message(message, options))
           yield evt if block_given?
           if configuration.async?
             configuration.async.call(evt)

lib/raven/cli.rb

@@ -7,7 +7,7 @@ def self.test(dsn = nil)
 
       logger = ::Logger.new(STDOUT)
       logger.level = ::Logger::ERROR
-      logger.formatter = proc do |severity, datetime, progname, msg|
+      logger.formatter = proc do |_severity, _datetime, _progname, msg|
         "-> #{msg}\n"
       end
 

lib/raven/client.rb

@@ -33,7 +33,7 @@ def send(event)
 
       content_type, encoded_data = encode(event)
       begin
-        transport.send(generate_auth_header(encoded_data), encoded_data,
+        transport.send(generate_auth_header, encoded_data,
                        :content_type => content_type)
       rescue => e
         Raven.logger.error "Unable to record event with remote Sentry server (#{e.class} - #{e.message})"
@@ -78,7 +78,7 @@ def transport
         end
     end
 
-    def generate_auth_header(data)
+    def generate_auth_header
       now = Time.now.to_i.to_s
       fields = {
         'sentry_version' => PROTOCOL_VERSION,

lib/raven/event.rb

@@ -76,7 +76,7 @@ def initialize(options = {}, &block)
     def get_hostname
       # Try to resolve the hostname to an FQDN, but fall back to whatever the load name is
       hostname = Socket.gethostname
-      hostname = Socket.gethostbyname(hostname).first rescue hostname
+      Socket.gethostbyname(hostname).first rescue hostname
     end
 
     def get_modules
@@ -140,7 +140,7 @@ def self.from_exception(exc, options = {}, &block)
       context_lines = configuration[:context_lines]
 
       new(options) do |evt|
-        evt.message = "#{exc.class.to_s}: #{exc.message}"
+        evt.message = "#{exc.class}: #{exc.message}"
         evt.level = options[:level] || :error
 
         evt.interface(:exception) do |int|
@@ -186,7 +186,7 @@ def self.from_message(message, options = {})
     end
 
     # Because linecache can go to hell
-    def self._source_lines(path, from, to)
+    def self._source_lines(_path, _from, _to)
     end
 
     def get_file_context(filename, lineno, context)

lib/raven/integrations/sidekiq.rb

@@ -3,10 +3,10 @@
 
 module Raven
   class Sidekiq
-    def call(worker, msg, queue)
+    def call(_worker, msg, _queue)
       started_at = Time.now
       yield
-    rescue => ex
+    rescue Exception => ex
       Raven.capture_exception(ex, :extra => { :sidekiq => msg },
                                   :time_spent => Time.now-started_at)
       raise

lib/raven/integrations/tasks.rb

@@ -4,7 +4,7 @@
 
 namespace :raven do
   desc "Send a test event to the remote Sentry server"
-  task :test, [:dsn] do |t, args|
+  task :test, [:dsn] do |_t, args|
     Rake::Task["environment"].invoke if defined? Rails
 
     Raven::CLI.test(args.dsn)

lib/raven/processor/utf8conversion.rb

@@ -3,9 +3,9 @@ class Processor::UTF8Conversion < Processor
 
     def process(value)
       if value.is_a? Array
-        value.map { |v_| process v_ }
+        value.map { |v| process v }
       elsif value.is_a? Hash
-        value.merge(value) { |k, v_| process v_ }
+        value.merge(value) { |_, v| process v }
       else
         clean_invalid_utf8_bytes(value)
       end

lib/raven/transports.rb

@@ -10,8 +10,8 @@ def initialize(configuration)
         @configuration = configuration
       end
 
-      def send(auth_header, data, options = {})
-        raise Error.new('Abstract method not implemented')
+      def send#(auth_header, data, options = {})
+        raise NotImplementedError.new('Abstract method not implemented')
       end
 
       protected

lib/raven/transports/udp.rb

@@ -7,7 +7,7 @@ module Raven
   module Transports
     class UDP < Transport
 
-      def send(auth_header, data, options = {})
+      def send(auth_header, data, _options = {})
         conn.send "#{auth_header}\n\n#{data}", 0
       end
 

spec/raven/configuration_spec.rb

@@ -93,7 +93,7 @@
     end
 
     it 'should be configurable to send events async' do
-      subject.async = lambda { |event| :ok }
+      subject.async = lambda { |_e| :ok }
       expect(subject.async.respond_to?(:call)).to eq(true)
       expect(subject.async.call('event')).to eq(:ok)
     end

spec/raven/integrations/rack_spec.rb

@@ -8,9 +8,7 @@
 
     expect(Raven::Rack).to receive(:capture_exception).with(exception, env)
 
-    app = lambda do |e|
-      raise exception
-    end
+    app = lambda { |_e| raise exception }
 
     stack = Raven::Rack.new(app)
     expect { stack.call(env) }.to raise_error

spec/raven/integrations/rake_spec.rb

@@ -3,8 +3,6 @@
 describe 'Rake tasks' do
 
   it 'should capture exceptions in Rake tasks' do
-    exception = build_exception
-
     expect(`cd spec/support && bundle exec rake raise_exception 2>&1`).to match(/Sending event/)
   end
 

spec/raven/raven_spec.rb

@@ -33,7 +33,7 @@
       expect(Raven).not_to receive(:send).with(event)
 
       prior_async = Raven.configuration.async
-      Raven.configuration.async = lambda { |e| :ok }
+      Raven.configuration.async = lambda { :ok }
       expect(Raven.configuration.async).to receive(:call).with(event)
       Raven.capture_message(message, options)
       Raven.configuration.async = prior_async
@@ -63,7 +63,7 @@
       expect(Raven).not_to receive(:send).with(event)
 
       prior_async = Raven.configuration.async
-      Raven.configuration.async = lambda { |e| :ok }
+      Raven.configuration.async = lambda { :ok }
       expect(Raven.configuration.async).to receive(:call).with(event)
       Raven.capture_exception(exception, options)
       Raven.configuration.async = prior_async
@@ -77,7 +77,7 @@
       expect(Raven).not_to receive(:send).with(event)
 
       prior_should_send = Raven.configuration.should_send
-      Raven.configuration.should_send = Proc.new { |e| false }
+      Raven.configuration.should_send = Proc.new { false }
       expect(Raven.configuration.should_send).to receive(:call).with(exception)
       Raven.capture_exception(exception, options)
       Raven.configuration.should_send = prior_should_send