bleetz 2.0 → 2.1

data/lib/bleetz.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'net/ssh'
+require 'net/ssh/proxy/command'
 require 'yaml'
 require 'bleetz/conf.rb'
 require 'bleetz/object.rb'
@@ -127,18 +128,29 @@ 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?
+      @@before[@action.to_sym].each { |b|
+        execute!(b) } unless @@before[@action.to_sym].nil?
     end
+    if @@options[:proxycmd]
+      cmd = @@options.delete(:proxycmd)
+      abort "You need specify a proxy command !" if cmd.nil?
+      begin
+        @@options[:proxy] = Net::SSH::Proxy::Command.new(cmd)
+      rescue Exception => e
+        abort "SSH proxy command error: #{e.message}"
+      end
+    end
+    @@options[:timeout] = 10 unless @@options[:timeout]
     begin
-        Timeout::timeout(@@options.delete(:timeout) || 10) {
-          Net::SSH.start(@@options.delete(:host), @@options.delete(:username), @@options) { |ssh|
-            if !@cmd_to_exec.empty?
-              @cmd_to_exec.each { |command|
-                output = ssh.exec!(command)
-                puts output if @verbose
-              }
-            end
-          }
+         Net::SSH.start(@@options.delete(:host),
+                         @@options.delete(:username),
+                         @@options) { |ssh|
+           if !@cmd_to_exec.empty?
+             @cmd_to_exec.each { |command|
+               output = ssh.exec!(command)
+               puts output if @verbose
+             }
+           end
         }
     rescue NotImplementedError => e
       abort "SSH error: #{e.message}"
@@ -153,7 +165,8 @@ EOF
       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?
+      @@after[@action.to_sym].each { |a|
+        execute!(a) } unless @@after[@action.to_sym].nil?
     end
   end
 

data/lib/bleetz/conf.rb

@@ -8,6 +8,14 @@ end
 
 module Conf
 
+  MAIN_CALLS = {:func => ['action', 'before', 'after', 'set'],
+                :from => ['load']}
+
+  SUB_CALLS =  {:shell => ['action', 'before', 'after'],
+                :call => ['action'],
+                :error => { :shell => "'shell'. 'shell' has to be called in 'action', 'before' or 'after' functions.",
+                            :call => "'call'. 'call' has to be called in 'action' function."} }
+
   @@before = {}
   @@actions = {}
   @@after = {}
@@ -19,17 +27,8 @@ module Conf
   end
 
   def action(action, desc = "")
-    check_main_call(:action)
-    @cmds = []
-    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
+    check_call(:action)
+    load_conf { yield }
     h = { action.to_sym => @cmds }
     t = { action.to_sym => desc.to_s }
     @@actions = @@actions.merge(h)
@@ -37,17 +36,8 @@ module Conf
   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
+    check_call(:before)
+    load_conf { yield }
     h = { action.to_sym => @before }
     if @@before[action.to_sym].nil?
       @@before = @@before.merge(h)
@@ -57,17 +47,8 @@ module Conf
   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
+    check_call(:after)
+    load_conf { yield }
     h = { action.to_sym => @after }
     if @@before[action.to_sym].nil?
       @@after = @@after.merge(h)
@@ -77,7 +58,7 @@ module Conf
   end
 
   def shell(cmd)
-    check_sub_call_for_shell
+    check_call(:shell)
     raise "'shell' needs a String as parameter." unless cmd.is_a? String
     if caller[1][/`([^']*)'/, 1].eql?("action")
       @cmds << cmd
@@ -89,36 +70,42 @@ module Conf
   end
 
   def call(action)
-    check_sub_call(:call)
+    check_call(:call)
     raise "'call :action_name'. You didn't pass a Symbol." unless action.is_a? Symbol
     @cmds << action
   end
 
   def set(opt, value)
-    check_main_call(:set)
+    check_call(:set)
     @@options[opt.to_sym] = value
   end
 
   private
 
-  def check_main_call(func)
-    method = caller[2][/`([^']*)'/, 1]
-    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."
+  def check_call(func)
+    if MAIN_CALLS[:func].include?(func.to_s)
+      parent_call = caller[2][/`([^']*)'/, 1]
+      unless MAIN_CALLS[:from].include?(parent_call)
+        raise "#{caller[1].split(" ")[0]} '#{func}'. Main functions cannot be called in functions."
+      end
+    else
+      parent_call = caller[4][/`([^']*)'/, 1]
+      unless SUB_CALLS[func].include?(parent_call)
+        raise "#{caller[1].split(" ")[0]} #{SUB_CALLS[:error][func]}"
+      end
     end
   end
 
-  def check_sub_call(func)
-    method = caller[2][/`([^']*)'/, 1]
-    unless method.eql?("action")
-      raise "#{caller[1].split(" ")[0]} '#{func}'. '#{func}' has to be called in 'action' function."
+  def load_conf
+    @after = @cmds = @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
   end
 

metadata

@@ -1,95 +1,84 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bleetz
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: '2.1'
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  version: "2.0"
 platform: ruby
-authors: 
+authors:
 - Thibaut Deloffre
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-28 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: []
-