wolverine 0.1.2 → 0.1.3

data/lib/wolverine/script.rb

@@ -1,15 +1,19 @@
 require 'digest/sha1'
 
 module Wolverine
-  class InvalidScriptError < StandardError ; end
+  class LuaError < StandardError ; end
+  class LuaCompilationError < LuaError ; end
+  class LuaRuntimeError < LuaError ; end
+
   class Script
-    attr_reader :content, :digest
+    attr_reader :content, :digest, :file
     def initialize file
       @file = file
       @content = load_lua file
       @digest = Digest::SHA1.hexdigest @content
     end
 
+    # Wolverine::InvalidScriptError: ERR Error running script (call to f_f5fbb1da9ad036109842747becb4e2abb5e95966): [string "func definition"]:27: attempt to compare nil with number  (in #<Pathname:/Users/burke/src/s/shopify/app/wolverine/reservations/reserve.lua>)
     def call redis, *args
       begin
         run_evalsha redis, *args
@@ -17,8 +21,10 @@ module Wolverine
         e.message =~ /NOSCRIPT/ ? run_eval(redis, *args) : raise
       end
     rescue => e
-      if e.message =~ /ERR Error (compiling|running) script/
-        raise InvalidScriptError, "#{e.message} (in #{@file.inspect})"
+      if e.message =~ /ERR Error (compiling|running) script \(.*?\): \[.*?\]:(\d+): (.*)/
+        stage, line_number, message = $1, $2, $3
+        klass = (stage == "compiling") ? LuaCompilationError : LuaRuntimeError
+        raise klass, "[#{relative_path}:#{line_number}] #{message}"
       else
         raise
       end
@@ -26,6 +32,13 @@ module Wolverine
 
     private
 
+    def relative_path
+      file.relative_path_from(Wolverine.config.script_path)
+    end
+
+    def format_error_message(error)
+    end
+
     def run_evalsha redis, *args
       redis.evalsha digest, args.size, *args
     end

data/lib/wolverine/version.rb

@@ -1,3 +1,3 @@
 module Wolverine
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/wolverine/script_test.rb

@@ -14,15 +14,35 @@ module Wolverine
       @script ||= Wolverine::Script.new('file1')
     end
 
-    def test_errors_are_better
-      assert_raises Wolverine::InvalidScriptError do
-        script = Wolverine::Script.new('file1')
+    def test_compilation_error
+      base = Pathname.new('/a/b/c/d')
+      file = Pathname.new('/a/b/c/d/e/file1.lua')
+      Wolverine.config.script_path = base
+      begin
+        script = Wolverine::Script.new(file)
         script.instance_variable_set("@content", "asdfasdfasdf+31f")
         script.instance_variable_set("@digest", "79437f5edda13f9c1669b978dd7a9066dd2059f1")
         script.call(Redis.new)
+      rescue Wolverine::LuaCompilationError => e
+        assert_equal "[e/file1.lua:1] '=' expected near '+'", e.message
       end
     end
 
+    def test_runtime_error
+      base = Pathname.new('/a/b/c/d')
+      file = Pathname.new('/a/b/c/d/e/file1.lua')
+      Wolverine.config.script_path = base
+      begin
+        script = Wolverine::Script.new(file)
+        script.instance_variable_set("@content", "return nil > 3")
+        script.instance_variable_set("@digest", "39437f5edda13f9c1669b978dd7a9066dd2059f1")
+        script.call(Redis.new)
+      rescue Wolverine::LuaRuntimeError => e
+        assert_equal "[e/file1.lua:1] attempt to compare number with nil", e.message
+      end
+    end
+
+
     def test_digest_and_content
       content = "return 1" 
       assert_equal CONTENT, script.content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wolverine
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2012-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70212795870940 !ruby/object:Gem::Requirement
+  requirement: &70177107053640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212795870940
+  version_requirements: *70177107053640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70212795869140 !ruby/object:Gem::Requirement
+  requirement: &70177107053140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212795869140
+  version_requirements: *70177107053140
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70212795890120 !ruby/object:Gem::Requirement
+  requirement: &70177107051360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212795890120
+  version_requirements: *70177107051360
 description: Wolverine provides a simple way to run server-side redis scripts from
   a rails app
 email: