bleetz 1.5 → 2.0

data/lib/bleetz.rb

@@ -6,7 +6,7 @@ require 'bleetz/object.rb'
 
 class Bleetz
 
-  VERSION = "1.5"
+  VERSION = "2.0"
 
   USAGE = <<-EOF
 Usage: bleetz [-c conf_file -h -l -s][[-t -v -c conf_file] action]
@@ -107,7 +107,13 @@ EOF
 
   def test
     puts "Simulation, command printing without SSH. No excution."
+    unless @@before[@action.to_sym].nil?
+      @@before[@action.to_sym].each { |b| puts "before ssh (local): #{b}" }
+    end
     @cmd_to_exec.each { |c| puts c }
+    unless @@after[@action.to_sym].nil?
+      @@after[@action.to_sym].each { |a| puts "after ssh (local): #{a}" }
+    end
     exit(0)
   end
 
@@ -120,6 +126,9 @@ EOF
 
   def connect
     abort "You have to configure SSH options." if @@options.empty?
+    unless @ssh_test
+      @@before[@action.to_sym].each { |b| execute!(b) } unless @@before[@action.to_sym].nil?
+    end
     begin
         Timeout::timeout(@@options.delete(:timeout) || 10) {
           Net::SSH.start(@@options.delete(:host), @@options.delete(:username), @@options) { |ssh|
@@ -143,6 +152,14 @@ EOF
     rescue Timeout::Error
       abort "Timed out trying to get a connection."
     end
+    unless @ssh_test
+      @@after[@action.to_sym].each { |a| execute!(a) } unless @@after[@action.to_sym].nil?
+    end
+  end
+
+  def execute!(cmd)
+    out = `#{cmd} 2>&1`
+    puts out if @verbose
   end
 
   def usage

data/lib/bleetz/conf.rb

@@ -8,7 +8,9 @@ end
 
 module Conf
 
+  @@before = {}
   @@actions = {}
+  @@after = {}
   @@tasks = {}
   @@options = {}
 
@@ -34,10 +36,56 @@ module Conf
     @@tasks = @@tasks.merge(t)
   end
 
+  def before(action)
+    check_main_call(:before)
+    @before = []
+    begin
+      yield
+    rescue Exception => e
+      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 => @before }
+    if @@before[action.to_sym].nil?
+      @@before = @@before.merge(h)
+    else
+      raise "You specified two 'before' callbacks for :#{action} action."
+    end
+  end
+
+  def after(action)
+    @after = []
+    check_main_call(:after)
+    begin
+      yield
+    rescue Exception => e
+      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 => @after }
+    if @@before[action.to_sym].nil?
+      @@after = @@after.merge(h)
+    else
+      raise "You specified two 'after' callbacks for :#{action} action."
+    end
+  end
+
   def shell(cmd)
-    check_sub_call(:shell)
+    check_sub_call_for_shell
     raise "'shell' needs a String as parameter." unless cmd.is_a? String
-    @cmds << cmd
+    if caller[1][/`([^']*)'/, 1].eql?("action")
+      @cmds << cmd
+    elsif caller[1][/`([^']*)'/, 1].eql?("before")
+      @before << cmd
+    else
+      @after << cmd
+    end
   end
 
   def call(action)
@@ -55,12 +103,23 @@ module Conf
 
   def check_main_call(func)
     method = caller[2][/`([^']*)'/, 1]
-    raise "#{caller[1].split(" ")[0]} '#{func}'. Main functions cannot be called in functions." unless method.eql?("load")
+    unless method.eql?("load")
+      raise "#{caller[1].split(" ")[0]} '#{func}'. Main functions cannot be called in functions."
+    end
+  end
+
+  def check_sub_call_for_shell
+    method = caller[2][/`([^']*)'/, 1]
+    if !method.eql?("action") && !method.eql?("before") && !method.eql?("after")
+      raise "#{caller[1].split(" ")[0]} 'shell'. 'shell' has to be called in 'action', 'before' or 'after' functions."
+    end
   end
 
   def check_sub_call(func)
     method = caller[2][/`([^']*)'/, 1]
-    raise "#{caller[1].split(" ")[0]} '#{func}'. '#{func}' has to be called in 'action' function." unless method.eql?("action")
+    unless method.eql?("action")
+      raise "#{caller[1].split(" ")[0]} '#{func}'. '#{func}' has to be called in 'action' function."
+    end
   end
 
 end

metadata

@@ -1,84 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bleetz
-version: !ruby/object:Gem::Version
-  version: '1.5'
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 2
+  - 0
+  version: "2.0"
 platform: ruby
-authors:
+authors: 
 - Thibaut Deloffre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  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
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fast KISS deployment tool
 test_files: []
+