bleetz 1.3 → 1.4

data/lib/bleetz.rb

@@ -6,7 +6,7 @@ require 'bleetz/object.rb'
 
 class Bleetz
 
-  VERSION = "1.3"
+  VERSION = "1.4"
 
   USAGE = <<-EOF
 Usage: bleetz [-c conf_file -h -l -s][[-t -v -c conf_file] action]
@@ -26,11 +26,13 @@ EOF
     begin
       if @file.nil?
         cnf = YAML::load(File.open("#{Dir.pwd}/.bleetz"))
-        @file = cnf[:config] || cnf['config']
+        @file = cnf['config']
       end
       load @file
     rescue TypeError
       abort "Didn't you make a mistake in .bleetz file ?"
+    rescue BleetzException => e
+      abort e.message
     rescue ArgumentError
       abort "Did you configure attribute like this: 'attribute: <value>'"
     rescue Exception => e

data/lib/bleetz/conf.rb

@@ -1,3 +1,11 @@
+class BleetzException < Exception
+  attr_accessor :message
+
+  def initialize(message)
+    @message = message
+  end
+end
+
 module Conf
 
   @@actions = {}
@@ -11,7 +19,11 @@ module Conf
   def action(action, desc = "")
     check_main_call(:action)
     @cmds = []
-    yield
+    begin
+      yield
+    rescue Exception => e
+      raise BleetzException.new("Conf error: #{e.class}: #{e.message} in #{e.backtrace[0]}")
+    end
     h = { action.to_sym => @cmds }
     t = { action.to_sym => desc.to_s }
     @@actions = @@actions.merge(h)

metadata

@@ -1,95 +1,84 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bleetz
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: '1.4'
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  version: "1.3"
 platform: ruby
-authors: 
+authors:
 - Thibaut Deloffre
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fast KISS deployment tool
 email: tib@rocknroot.org
-executables: 
+executables:
 - bleetz
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
-files: 
+files:
 - lib/bleetz.rb
 - lib/bleetz/conf.rb
 - lib/bleetz/object.rb
 - LICENSE.txt
 - bin/bleetz
 homepage: https://github.com/TibshoOT/bleetz
-licenses: 
+licenses:
 - BSD
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fast KISS deployment tool
 test_files: []
-