bleetz 1.4 → 1.5

data/lib/bleetz.rb

@@ -6,7 +6,7 @@ require 'bleetz/object.rb'
 
 class Bleetz
 
-  VERSION = "1.4"
+  VERSION = "1.5"
 
   USAGE = <<-EOF
 Usage: bleetz [-c conf_file -h -l -s][[-t -v -c conf_file] action]
@@ -32,7 +32,7 @@ EOF
     rescue TypeError
       abort "Didn't you make a mistake in .bleetz file ?"
     rescue BleetzException => e
-      abort e.message
+      abort "Problem during configuration loading: #{e.message}"
     rescue ArgumentError
       abort "Did you configure attribute like this: 'attribute: <value>'"
     rescue Exception => e

data/lib/bleetz/conf.rb

@@ -22,7 +22,11 @@ module Conf
     begin
       yield
     rescue Exception => e
-      raise BleetzException.new("Conf error: #{e.class}: #{e.message} in #{e.backtrace[0]}")
+      if e.class.eql? RuntimeError
+        raise BleetzException.new(e.message)
+      else
+        raise BleetzException.new("#{e.class}: #{e.message} in #{e.backtrace[0]}")
+      end
     end
     h = { action.to_sym => @cmds }
     t = { action.to_sym => desc.to_s }
@@ -51,12 +55,12 @@ module Conf
 
   def check_main_call(func)
     method = caller[2][/`([^']*)'/, 1]
-    raise "Main configuration function, you cannot call '#{func}' in '#{method}'." unless method.eql?("load")
+    raise "#{caller[1].split(" ")[0]} '#{func}'. Main functions cannot be called in functions." unless method.eql?("load")
   end
 
   def check_sub_call(func)
     method = caller[2][/`([^']*)'/, 1]
-    raise "'#{func}' has to be called in 'action' function." unless method.eql?("action")
+    raise "#{caller[1].split(" ")[0]} '#{func}'. '#{func}' has to be called in 'action' function." unless method.eql?("action")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bleetz
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline