herbert 0.0.5 → 0.0.6

data/.gitignore

@@ -3,3 +3,6 @@
 Gemfile.lock
 pkg/*
 nbproject
+.project
+.yardoc
+doc

data/lib/herbert.rb

@@ -2,8 +2,9 @@ require 'sinatra/base'
 require 'active_support'
 
 #
-# By default, if there was an error in Herbert, Sinatra would crash without
-# catching the error and Rack would repond with empty 200 response afterwards.
+# FIXME this is ugly
+# By default, if there were an error in Herbert, Sinatra would crash without
+# catching the error and Rack would respond with empty 200 response afterwards.
 # This emulates somewhat consistent behaviour and encapsulation.
 #
 class Sinatra::Base

data/lib/herbert/Configurator.rb

@@ -7,7 +7,7 @@ module Herbert
 			#
       def self.registered(app)
         # Enable envs such as development;debug, where debug is herberts debug flag
-        if ENV['RACK_ENV'] === nil then
+        if (ENV['RACK_ENV'] === nil) || (ENV['RACK_ENV'] === 'test') then
           app.set :environment, :test
           ENV['HERBERT_DEBUG'] = '1'
         end

data/lib/herbert/Error.rb

@@ -26,7 +26,7 @@ module Herbert
           }
           # Add backtrace, Kwalify validation report and other info if
           # running in development mode
-          if settings.development? then
+          if (settings.development? || settings.test?) then
             log.h_debug("Adding stacktrace and report to the error")
             body[:error][:stacktrace] = err.backtrace.join("\n")
             body[:error][:info] = (err.errors || [])
@@ -34,9 +34,9 @@ module Herbert
           response.body = body
         else
         # If the exception is not manageable, bust it
-          log.h_error("A non-managed error occured! Backtrace: #{err.backtrace.join("\n")}")
+          log.h_error("A non-managed error occured! Backtrace: #{err.to_s + err.backtrace.join("\n")}")
           response.status = 500
-          response.body = settings.development? ? err.to_s : nil
+          response.body = (settings.development? || settings.test?) ? err.to_s : nil
         end
       end
 

data/lib/herbert/Utils.rb

@@ -11,8 +11,12 @@ module Herbert
     # Assert v<major>.<minor>.<etc> tags
     def self.version
       version = `git describe --long`.strip
-      version[0] = '' if version[0] == 'v'
-      version
+      if $?.success?
+        version[0] = '' if version[0] == 'v'
+        return version
+      else
+        return IO.read("#{Dir.getwd}/VERSION")
+      end
     end
     
     module Helpers

data/lib/herbert/version.rb

@@ -1,3 +1,3 @@
 module Herbert
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Pavel Kalvoda
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 +02:00
+date: 2011-08-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency