wolverine 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf4207f40c547957cd25192cd7d340436621215e
-  data.tar.gz: 313dc90cebe900a51b469f5ce486331f830ebbf9
+  metadata.gz: c99e5c41a4cefcc95117a816b79749347384c113
+  data.tar.gz: 6e5f1372a5dee252622f964edc15ca38bd24d20f
 SHA512:
-  metadata.gz: 518af0757e2192af3b6c93378fbb1ac9b6e7ed6fca3fa2d08f441bc9cd9b68b8f40b199fa6b49884bbb476dfc1e580b3554e107296c1b80df00f7e562d419795
-  data.tar.gz: f5b866107a41eafb8c265dbea9280000d7041fc0b298c2ee8bd0e22202bc7825b588811dc5bf306befe9a9651ef1269f61d26744e2e50131e192beca7baaba4d
+  metadata.gz: 6afecaf7f571d80b536344babb0e4cc60829ff310885e728a09bf4e017f3065cc78a1e1a9fbc2b564338446b163b50be40fd910eea05217f3676a2f20955119d
+  data.tar.gz: 26169bdd7b1e5f9c5c464248950afca91e59772011a92142e8fb5a259b63dfa53cee69c69ac9672581422b2a684bb1f1ba99970e5d96582c979dfd4f9d38796d

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - jruby-18mode
+  - 2.0.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - ruby-head
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-
+  - jruby-9.1.9.0

data/README.md

@@ -1,4 +1,4 @@
-# Wolverine [![Dependency Status](https://gemnasium.com/Shopify/wolverine.png)](https://gemnasium.com/Shopify/wolverine)
+# Wolverine [![Dependency Status](https://gemnasium.com/Shopify/wolverine.png)](https://gemnasium.com/Shopify/wolverine) [![Build Status](https://travis-ci.org/Shopify/wolverine.svg?branch=master)](https://travis-ci.org/Shopify/wolverine)
 
 Wolverine is a simple library to allow you to manage and run redis server-side lua scripts from a rails app, or other ruby code.
 

data/lib/wolverine.rb

@@ -24,7 +24,7 @@ class Wolverine
   end
 
   def self.statsd_enabled?
-    @statsd_enabled
+    defined?(@statsd_enabled) && @statsd_enabled
   end
 
   def self.enable_statsd!

data/lib/wolverine/lua_error.rb

@@ -7,6 +7,9 @@ class Wolverine
   class LuaError < StandardError
     PATTERN = /ERR Error (compiling|running) script \(.*?\): .*?:(\d+): (.*)/
     WOLVERINE_LIB_PATH = File.expand_path('../../', __FILE__)
+    CONTEXT_LINE_NUMBER = 2
+
+    attr_reader :error, :file, :content
 
     # Is this error one that should be reformatted?
     #
@@ -21,19 +24,35 @@ class Wolverine
     #
     # @param error [StandardError] the original error raised by redis
     # @param file [Pathname] full path to the lua file the error ocurred in
-    def initialize error, file
+    # @param content [String] lua file content the error ocurred in
+    def initialize error, file, content
       @error = error
       @file = file
+      @content = content
 
       @error.message =~ PATTERN
-      stage, line_number, message = $1, $2, $3
+      _stage, line_number, message = $1, $2, $3
+      error_context = generate_error_context(content, line_number.to_i)
 
-      super message
+      super "#{message}\n\n#{error_context}\n\n"
       set_backtrace generate_backtrace file, line_number
     end
 
     private
 
+    def generate_error_context(content, line_number)
+      lines = content.lines.to_a
+      beginning_line_number = [1, line_number - CONTEXT_LINE_NUMBER].max
+      ending_line_number = [lines.count, line_number + CONTEXT_LINE_NUMBER].min
+      line_number_width = ending_line_number.to_s.length
+
+      (beginning_line_number..ending_line_number).map do |number|
+        indicator = number == line_number ? '=>' : '  '
+        formatted_number = "%#{line_number_width}d" % number
+        " #{indicator} #{formatted_number}: #{lines[number - 1]}"
+      end.join.chomp
+    end
+
     def generate_backtrace(file, line_number)
       pre_wolverine = backtrace_before_entering_wolverine(@error.backtrace)
       index_of_first_wolverine_line = (@error.backtrace.size - pre_wolverine.size - 1)

data/lib/wolverine/path_component.rb

@@ -50,7 +50,7 @@ class Wolverine
     end
 
     def file?(path)
-      File.exists?(path) && !File.directory?(path)
+      File.exist?(path) && !File.directory?(path)
     end
 
     def define_directory_method path, sym
@@ -64,7 +64,7 @@ class Wolverine
     def define_script_method path, sym, *args
       redis, options = @redis, @options.merge({:cache_to => nil})
       script = Wolverine::Script.new(path, options)
-      cb = proc { |*args| script.call(redis, *args) }
+      cb = proc { |*cb_args| script.call(redis, *cb_args) }
       define_metaclass_method(sym, &cb) 
       cache_metaclass_method(sym, &cb)
     end

data/lib/wolverine/script.rb

@@ -39,7 +39,7 @@ class Wolverine
       end
     rescue => e
       if LuaError.intercepts?(e)
-        raise LuaError.new(e, @file)
+        raise LuaError.new(e, @file, @content)
       else
         raise
       end

data/lib/wolverine/version.rb

@@ -1,3 +1,3 @@
 class Wolverine
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/wolverine/script_test.rb

@@ -3,7 +3,16 @@ require 'digest/sha1'
 
 class Wolverine
   class ScriptTest < MiniTest::Unit::TestCase
-    CONTENT = "return 1"
+    CONTENT = <<EOC
+local key, score, member, context, max_rank = KEYS[1], ARGV[1], ARGV[2], ARGV[3], ARGV[4]
+redis.call('ZADD', key, score, member)
+
+local rank = redis.call('ZRANK', key, member)
+if rank > max_rank then
+  return {}
+end
+return redis.call('ZRANGE', start, end, 'WITHSCORES')
+EOC
     DIGEST = Digest::SHA1.hexdigest(CONTENT)
 
     def setup
@@ -22,13 +31,22 @@ class Wolverine
 
     def test_error
       redis = stub
-      redis.expects(:evalsha).raises(%q{ERR Error running script (call to f_178d75adaa46af3d8237cfd067c9fdff7b9d504f): [string "func definition"]:1: attempt to compare nil with number})
+      redis.expects(:evalsha).raises(%q{ERR Error running script (call to f_178d75adaa46af3d8237cfd067c9fdff7b9d504f): [string "func definition"]:5: attempt to compare nil with number})
       begin
         script.call(redis)
       rescue Wolverine::LuaError => e
-        assert_equal "attempt to compare nil with number", e.message
-        assert_equal "/a/b/c/d/e/file1.lua:1", e.backtrace.first
-        assert_match /script.rb/, e.backtrace[1]
+        assert_equal <<EOS, e.message
+attempt to compare nil with number
+
+    3: 
+    4: local rank = redis.call('ZRANK', key, member)
+ => 5: if rank > max_rank then
+    6:   return {}
+    7: end
+
+EOS
+        assert_equal "/a/b/c/d/e/file1.lua:5", e.backtrace.first
+        assert_match(/script.rb/, e.backtrace[1])
       end
     end
 

data/test/wolverine_test.rb

@@ -8,10 +8,10 @@ class WolverineTest < MiniTest::Unit::TestCase
   end
 
   def test_reset!
-    dir = Wolverine.root_directory
-    assert_equal Wolverine.root_directory, dir
+    dir = Wolverine.send(:root_directory)
+    assert_equal Wolverine.send(:root_directory), dir
     Wolverine.reset!
-    refute_equal Wolverine.root_directory, dir
+    refute_equal Wolverine.send(:root_directory), dir
   end
 
   def test_instantiate_wolverine_with_config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wolverine
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -136,19 +136,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wolverine
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Wolverine provides a simple way to run server-side redis scripts from a rails
   app
-test_files:
-- test/integration/lua/util/mexists.lua
-- test/integration/wolverine_integration_test.rb
-- test/test_helper.rb
-- test/wolverine/configuration_test.rb
-- test/wolverine/lua/outer.lua
-- test/wolverine/lua/shared/_inner.lua
-- test/wolverine/path_component_test.rb
-- test/wolverine/script_templating_test.rb
-- test/wolverine/script_test.rb
-- test/wolverine_test.rb
+test_files: []