bleetz 1.1 → 1.2

data/lib/bleetz.rb

@@ -1,21 +1,19 @@
 require 'rubygems'
 require 'net/ssh'
 require 'yaml'
-require 'bleetz/conf.rb'
-require 'bleetz/object.rb'
 
 class Bleetz
 
-  VERSION = "1.1"
+  VERSION = "1.2"
 
   USAGE = <<-EOF
-Usage: bleetz [-c conf_file -h -l -s][[-t -v -c conf_file] task]
+Usage: bleetz [-c conf_file -h -l -s][[-t -v -c conf_file] action]
 
 -c <conf_file>         - Specify a special bleetz configuration file.
 -h                     - Help.
--l                     - List available task(s) defined in bleetz configuration file.
+-l                     - List available action(s) defined in bleetz configuration file.
 -s                     - Test ssh connection defined in bleetz conf.
--t <task_name>         - Test tasks (just print command that will be executed.
+-t <action_name>         - Test actions (just print command that will be executed.
 -v                     - Verbose Mode.
 -V                     - Print bleetz version.
 EOF
@@ -26,6 +24,8 @@ EOF
     begin
       if @file.nil?
         cnf = YAML::load(File.open("#{Dir.pwd}/.bleetz"))
+        require 'bleetz/conf.rb'
+        require 'bleetz/object.rb'
         @file = cnf[:config] || cnf['config']
       end
       load @file
@@ -34,7 +34,7 @@ EOF
     end
     list if @list
     test_ssh if @ssh_test
-    abort "You need to specify a task." if @action.nil?
+    abort "You need to specify an action." if @action.nil?
     format_cmds
     test if @test
     connect
@@ -75,11 +75,11 @@ EOF
   end
 
   def format_cmds(action = @action)
-    abort "Unknown task: '#{action}'." unless @@actions.include?(action.to_sym)
+    abort "Unknown action: '#{action}'." unless @@actions.include?(action.to_sym)
     begin
       @@actions[action.to_sym].each { |c|
         if c.is_a? Symbol
-          abort "Undefined task: :#{c}. You have to define it." unless @@tasks.include?(c)
+          abort "Undefined action: :#{c}. You have to define it." unless @@tasks.include?(c)
           format_cmds(c)
         else
           @cmd_to_exec << c
@@ -91,7 +91,7 @@ EOF
   end
 
   def list
-    puts "Available tasks:"
+    puts "Available actions:"
     @@tasks.each { |k,v|
       desc = (v.empty? ? "No desc" : v)
       puts "#{k}: #{desc}"
@@ -145,7 +145,7 @@ EOF
   end
 
   def version
-    puts "bleetz version #{VERSION}. Fuck yeah !"
+    puts "bleetz version #{VERSION}. Frak yeah !"
     exit(0)
   end
 

data/lib/bleetz/conf.rb

@@ -8,8 +8,8 @@ module Conf
     base.extend(self)
   end
 
-  def task(action, desc = "")
-    check_main_call(:task)
+  def action(action, desc = "")
+    check_main_call(:action)
     @cmds = []
     yield
     h = { action.to_sym => @cmds }
@@ -24,10 +24,10 @@ module Conf
     @cmds << cmd
   end
 
-  def call(task)
+  def call(action)
     check_sub_call(:call)
-    raise "'call :task_name'. You didn't pass a Symbol." unless task.is_a? Symbol
-    @cmds << task
+    raise "'call :action_name'. You didn't pass a Symbol." unless action.is_a? Symbol
+    @cmds << action
   end
 
   def set(opt, value)
@@ -39,12 +39,12 @@ module Conf
 
   def check_main_call(func)
     method = caller[2][/`([^']*)'/, 1]
-    raise "Main configuration function, you cannot call '#{func}' it in '#{method}'." unless method.eql?("load")
+    raise "Main configuration function, you cannot call '#{func}' in '#{method}'." unless method.eql?("load")
   end
 
   def check_sub_call(func)
     method = caller[2][/`([^']*)'/, 1]
-    raise "'#{func}' has to be called in 'task'." unless method.eql?("task")
+    raise "'#{func}' has to be called in 'action' function." unless method.eql?("action")
   end
 
 end

metadata

@@ -1,84 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bleetz
-version: !ruby/object:Gem::Version
-  version: '1.1'
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  version: "1.2"
 platform: ruby
-authors:
+authors: 
 - Thibaut Deloffre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-14 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: []
+