cowtech-lib 1.9.0 → 1.9.1

data/cowtech-lib.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cowtech-lib}
-  s.version = "1.9.0"
+  s.version = "1.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shogun"]
@@ -18,8 +18,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -42,15 +40,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/cowtech-lib.rb

@@ -22,8 +22,12 @@
 #	A copy of the GNU General Public License is available at: http://www.gnu.org/licenses/gpl.txt
 #
 
-require "rubygems"
-require "CowtechLib/Console"
-require "CowtechLib/OptionParser"
-require "CowtechLib/Shell"
-require "CowtechLib/Script"
+module Cowtech
+  module Lib
+    autoload :Version, 'cowtech-lib/version'
+    autoload :Console, 'cowtech-lib/console'
+    autoload :OptionParser, 'cowtech-lib/option_parser'
+    autoload :Shell, 'cowtech-lib/shell'
+    autoload :Script, 'cowtech-lib/script'
+  end
+end

data/lib/cowtech-lib/console.rb

@@ -26,289 +26,331 @@
 #
 
 require "rexml/document"
-require "open4"
-require "find"
-require "fileutils"
 
 class String
   def to_a
     [self]
   end
 end
+
+class Hash
+  def method_missing(method, *arg)
+    # PER ORA SUPPORTIAMO SOLO I GETTER
+    self[method.to_sym]
+  end
   
-module CowtechLib
-=begin rdoc
-A class which provides some method to operate with files and to format pretty messages.
-=end
-  class Console
-    public
-    
-    # Indentation level
-    attr :indent_level
-    
-    # Whether show executed commands
-    attr :show_commands
-    
-    # Whether show output of executed commands
-    attr :show_outputs
-    
-    # Whether simply print commands rather than executing them
-    attr :skip_commands
-    
-    # Exit status for commands
-    attr_reader :statuses
-    
-    # Indentation string(s)
-    attr :indentator, true
-
-    # Sets indentation level.
-    # Arguments:
-    # * <em>indent</em>: The new indentation level
-    # * <em></em>: If the level is absolute or relative to the current level
-    def indent_set(level, absolute = false)
-	    @indent_level = Math.max((!absolute ? @indent_level : 0) + level, 0)
-    end
-    
-    # Resets indentation level to 0.
-    def indent_reset
-	    @indent_level = 0
-    end
+  def respond_to?(method)
+    self.has_key?(method.to_sym)
+  end
+end
 
-    # Execute codes in an indented block
-    def indent_region(level, absolute = false, &block)
-      old_level = @indent_level
-      self.indent_set(level, absolute)
-      yield
-      @indent_level = old_level      
-    end
-    
-    # Indents a message.
-    # 
-    # Arguments:
-    # * <em>msg</em>: The message to indent
-    # * <em>add_additional</em>: Whether add extra space to align to initial message "*"
-    # Returns: The indentated message
-    def indent(msg, level = nil)
-      (@@indentator * (level || @indent_level)) + msg
-    end
-    
-=begin rdoc
-Substitute tag with color.
-
-Arguments:
-* <em>node</em>: The node which operate on
-* <em>stack</em>: The stack of old styles. <b>Do not set this by yourself!</b>
-
-Returns: The new text
-=end
-    def subst_color(node, stack = [])
-      rv = ""
-      styles = (node.name == "text" and node.attributes["style"]) ? node.attributes["style"].split(" ") : nil
-
-      # Add style of current tag
-      if styles then
-        styles.each do |style|
-          rv += @@styles[style] || ""
-        end
+module Cowtech
+  module Lib
+    # A class which provides some method to operate with files and to format pretty messages.
+    # @author Shogun
+    class Console
+      # Indentation level
+      attr_accessor :indent_level
+
+      # Whether show executed commands
+      attr_accessor :show_commands
+
+      # Whether show output of executed commands
+      attr_accessor :show_outputs
 
-        stack.push(styles)
+      # Whether simply print commands rather than executing them
+      attr_accessor :skip_commands
+
+      # Exit status for commands
+      attr_reader :statuses
+
+      # Indentation string(s)
+      attr_accessor :indentator
+
+      # Sets indentation level.
+      # Arguments:
+      # * <em>indent</em>: The new indentation level
+      # * <em></em>: If the level is absolute or relative to the current level
+      def indent_set(level, absolute = false)
+        @indent_level = [(!absolute ? @indent_level : 0) + level, 0].max
       end
 
-      # Now parse subnodes
-      node.children.each do |child|
-        if child.node_type == :text then
-          rv += child.to_s
-        elsif child.name == "text" then
-          rv += self.subst_color(child, stack)
-        end
+      # Resets indentation level to 0.
+      def indent_reset
+        @indent_level = 0
+      end
+
+      # Execute codes in an indented block
+      def indent_region(level, absolute = false)
+        old_level = @indent_level
+        self.indent_set(level, absolute)
+        yield
+        @indent_level = old_level      
       end
 
-      # Remove style of current tag
-      if styles then 
-        stack.pop()
+      # Indents a message.
+      # 
+      # Arguments:
+      # * <em>msg</em>: The message to indent
+      # * <em>add_additional</em>: Whether add extra space to align to initial message "*"
+      # Returns: The indentated message
+      def indent(msg, level = nil)
+        (@@indentator * (level || @indent_level)) + msg
+      end
+
+      # Substitute tag with color.
+      # 
+      # Arguments:
+      # * <em>node</em>: The node which operate on
+      # * <em>stack</em>: The stack of old styles. <b>Do not set this by yourself!</b>
+      # 
+      # Returns: The new text
+      def parse_message(node, stack = [])
+        rv = ""
+        styles = (node.name == "text" and node.attributes["style"]) ? node.attributes["style"].split(" ") : nil
+
+        # Add style of current tag
+        if styles then
+          styles.each do |style|
+            rv += @@styles[style] || ""
+          end
+
+          stack.push(styles)
+        end
+
+        # Now parse subnodes
+        node.children.each do |child|
+          if child.node_type == :text then
+            rv += child.to_s
+          elsif child.name == "text" then
+            rv += self.parse_message(child, stack)
+          end
+        end
+
+        # Remove style of current tag
+        if styles then 
+          stack.pop()
 
-        # Restore previous style
-        (stack.pop || ["default"]).each do |style|
-          rv += @@styles[style]
+          # Restore previous style
+          (stack.pop || ["default"]).each do |style|
+            rv += @@styles[style]
+          end
         end
+
+        rv
       end
-      
-      rv
-    end
 
-    # Prints a message.
-    # Arguments:
-    # * <em>msg</em>: The message to print
-    # * <em>dots</em>: Whether add "..." to the message
-    # * <em>newline</em>: Whether add a newline to the message
-    # * <em>plain</em>: Whether ignore tags
-    # * <em>must_indent</em>: Whether indent the message
-    # * <em>internal</em>: If the method is called by another method. <b>Do not set this by yourself!</b>
-    def write(*args)
-      msg = args[:msg]
-      
-      # Check some alternative syntax
-      [:begin, :warn, :error, :debug, :info, :right, :end].each do |t|
-        if args[t] then
-        msg = args[t]
-        args[:type] = :t
-        args[t] = nil
+      # Prints a message.
+      # Arguments:
+      # * <em>msg</em>: The message to print
+      # * <em>dots</em>: Whether add "..." to the message
+      # * <em>newline</em>: Whether add a newline to the message
+      # * <em>plain</em>: Whether ignore tags
+      # * <em>must_indent</em>: Whether indent the message
+      # * <em>internal</em>: If the method is called by another method. <b>Do not set this by yourself!</b>
+      def write(args)
+        msg = args[:msg]
+
+        # Check some alternative syntax
+        [:begin, :warn, :error, :debug, :info, :right, :end].each do |t|
+          if args[t] then
+            msg = args[t]
+            args[:type] = t
+            args[t] = nil
+          end
+        end
+        args[:fatal] = true if args[:status] == :fail
+
+        # Check for specific msg type
+        if [:begin, :warn, :error, :debug, :info].include?(args[:type]) then
+          mc = {:begin => "bold green", :warn => "bold yellow", :error => "bold red", :debug => "magenta", :info => "bold cyan"}
+          color = args[:color] || mc[args[:type]]
+          msg = !args[:full_color] ? "<text style=\"#{color}\">*</text> #{self.indent(msg)}" : "<text style=\"#{color}\">* #{self.indent(msg)}</text>"
+        end
+
+        # Add dots and indentation if needed
+        msg = self.indent(msg + (args.fetch(:dots, true) ? "..." : ""), args[:indent] ? @indent_level : 0)
+        
+        # Parse the message
+        unless args[:plain] then
+          begin
+            xml = "<text>#{msg}</text>"
+            msg = self.parse_message(REXML::Document.new(xml).root)
+          rescue Exception => e
+            print "[ERROR] Invalid message tagging, check XML syntax (or color requested) of the following message:\n\n\t#{xml}\n\n"
+            print "\tThe errors was: #{e.message} (#{e.class.to_s})\n\n"
+            exit(1)
+          end
+        end
+
+        # Add newline if needed
+        msg += "\n" if args.fetch(:newline, true)
+
+        if args[:internal] then 
+          msg 
+        else 
+          if [:end, :right].include?(args[:type]) then
+            # Get screen width
+            @tty_width = `tput cols`.to_i if @tty_width < 0
+
+            # Get padding
+            pad = @tty_width - msg.inspect.gsub(/(\\e\[[0-9]+m)|(\")|(\\n)/, "").length
+
+            print "\033[A" if args[:up]
+            print "\033[0G\033[#{pad}C"
+          end
+
+          print(msg)
+        end
+
+        exit(args[:code] || 0) if args[:exit_after] || args[:fatal]
       end
-      args[:fatal] = true if args[:status] == :fail
-      
-      # Check for specific msg type
-      if [:begin, :warn, :error, :debug, :info].include?(args[:type]) then
-        mc = {:begin => "bold green", :warn => "bold yellow", :error => "bold red", :debug => "magenta", :info => "bold cyan"}
-        color = args[:color] || mc[args[:type]]
+
+      # Syntatic sugar
+      # Prints a warning message.
+      def warn(msg, args = nil)
+        args ||= {}
         
-        if args[:full_color] then
-          msg = "<text style=\"#{color}\">*</text> #{self.indent(msg)}"
+        if msg.is_a?(Hash) then
+          args.merge!(msg)
         else
-          msg = "<text style=\"#{color}\">* #{self.indent(msg)}</text>"
+          args[:msg] = msg
         end
+        
+        args[:warn] = args[:msg]
+
+        self.write(args)
       end
-      
-	    # Add dots and indentation if needed
-	    msg = self.indent(msg + (args[:trailing_dots] ? "..." : ""), args[:indent] ? @indent_level : -1)
-
-      # Parse the message
-      unless args[:plain] then
-        begin
-          msg = self.parse_message(REXML::Document.new("<text>#{msg}</text>").root)
-        rescue Exception => e
-      		print "[ERROR] Invalid message tagging, check XML syntax (or color requested) of the following message:\n\n\t#{msg}\n\n"
-      		exit(1)
+
+      # Prints an error message.
+      def error(msg, args = nil)
+        args ||= {}
+
+        if msg.is_a?(Hash) then
+          args.merge!(msg)
+        else
+          args[:msg] = msg
         end
+
+        args[:error] = args[:msg]
+
+        self.write(args)
       end
 
-      # Add newline if needed
-      msg += "\n" if args[:newline]
-      
-      if args[:internal] then 
-        msg 
-      else 
-        if [:end, :right].include?(args[:type]) then
-          # Get screen width
-          @tty_width = `tput cols`.to_i if @tty_width < 0
-
-          # Get padding
-          pad = @tty_width - msg.inspect.gsub(/(\\e\[[0-9]+m)|(\")|(\\n)/, "").length
-          
-          print "\033[A" if args[:up]
-          print "\033[0G\033[#{pad}C"
+      # Prints and error message then abort.
+      def fatal(msg, args = nil)
+        args ||= {}
+
+        if msg.is_a?(Hash) then
+          args.merge!(msg)
+        else
+          args[:msg] = msg
         end
-        
-        print(msg)
+
+        args[:error] = args[:msg]
+        args[:exit_after] = true
+        args[:code] ||= 1
+
+        self.write(args)
       end
-      
-      exit(args[:code] || 0) if args[:exit_after] || args[:fatal]
-    end
 
-    # Syntatic sugar
-    # Prints a warning message.
-    def warn(msg, *args)
-      args[:warn] = msg
-      self.write(*args)
-    end
+      # Prints an error status
+      def status(status, args = nil)
+        args ||= {}
 
-    # Prints an error message.
-    def error(msg, *args)
-      args[:error] = msg
-      self.write(*args)
-    end
-    
-    # Prints and error message then abort.
-    def fatal(msg, *args)
-      args[:error] = msg
-      args[:exit_after] = true
-      args[:code] ||= 1
-      self.write(*args)
-    end
-    
-    # Prints an error status
-    def status(*args)
-      args[:end] = @@statuses[status] || @@statuses[:ok]
-      self.write(*args)
-    end
-        
-    # Read input from the user.
-    # 
-    # Arguments:
-    # * <em>msg</em>: The prompt to show
-    # * <em>valids</em>: A list of regexp to validate the input
-    # * <em>case_sensitive</em>: Wheter the validation is case_sensitive
-    # 
-    # Returns: The read input
-    def read(*args)
-      # Adjust prompt
-      msg = args[:msg] + (msg !~ /([:?](\s*))$/) ? ":" : "")
-      msg += " " unless msg =~ / ^/
-      
-      # Turn choices into regular expressions
-      regexps = (args[:valids] || []).to_a.collect do |valid|
-        unless valid.is_a?(Regexp) then
-          valid = Regexp.new((valid !~ /^\^/ ? "^" : "") + valid + (valid !~ /\$$/ ? "$" : ""), Regexp::EXTENDED + (args[:case_sensitive] ? Regexp::IGNORECASE : 0), "U")
+        if status.is_a?(Hash) then
+          args.merge!(status)
         else
-          valid
+          args[:status] = status
         end
+
+        status = status.is_a?(Hash) ? status[:status] : status
+        args[:end] = @@statuses[status] || @@statuses[:ok]
+        args[:dots] = false
+        args[:up] = true if args[:up] == nil
+        self.write(args)
       end
 
-      rv = nil
-      
-      # Read input
-      while true do
-        # Show message
-        print(msg)
-        
-        # Get reply
-        bufs = gets.chop()
-        
-        # If we don't have any regexp
-        if regexps.length == 0 then
-          rv = bufs
-          break
+      # Read input from the user.
+      # 
+      # Arguments:
+      # * <em>msg</em>: The prompt to show
+      # * <em>valids</em>: A list of regexp to validate the input
+      # * <em>case_sensitive</em>: Wheter the validation is case_sensitive
+      # 
+      # Returns: The read input
+      def read(args)
+        # Adjust prompt
+        msg = args[:msg] + ((msg !~ /([:?](\s*))$/) ? ":" : "")
+        msg += " " unless msg =~ / ^/
+
+        # Turn choices into regular expressions
+        regexps = (args[:valids] || []).to_a.collect do |valid|
+          unless valid.is_a?(Regexp) then
+            valid = Regexp.new((valid !~ /^\^/ ? "^" : "") + valid + (valid !~ /\$$/ ? "$" : ""), Regexp::EXTENDED + (args[:case_sensitive] ? Regexp::IGNORECASE : 0), "U")
+          else
+            valid
+          end
         end
-        
-        # Validate inputs
-        regexps.each do |re|
-          if bufs =~ re then
+
+        rv = nil
+
+        # Read input
+        while true do
+          # Show message
+          print(msg)
+
+          # Get reply
+          bufs = gets.chop()
+
+          # If we don't have any regexp
+          if regexps.length == 0 then
             rv = bufs
             break
           end
+
+          # Validate inputs
+          regexps.each do |re|
+            if bufs =~ re then
+              rv = bufs
+              break
+            end
+          end
+
+          break if rv
+          self.write(:warn => "Sorry, your reply was not understood. Please try again")
         end
-        
-        break if rv
-        self.write(:warn => "Sorry, your reply was not understood. Please try again")
+
+        rv
+      end
+
+      # Create a new Console.
+      def initialize
+        @indent_level = 0
+        @show_commands = false
+        @show_outputs = false
+        @skip_commands = false
+        @tty_width = -1
+        @@indentator= " "        
+
+        @@styles = {
+          # Default color
+          "default" => "\33[0m",
+          # Text style
+          "bold" => "\33[1m", "underline" => "\33[4m", "blink" => "\33[5m", "reverse" => "\33[7m", "concealed" => "\33[8m",
+          # Foreground colors
+          "black" => "\33[30m", "red" => "\33[31m", "green" => "\33[32m", "yellow" => "\33[33m", "blue" => "\33[34m", "magenta" => "\33[35m", "cyan" => "\33[36m", "white" => "\33[37m",
+          # Background colors
+          "bg_black" => "\33[40m", "bg_red" => "\33[41m", "bg_green" => "\33[42m", "bg_yellow" => "\33[43m", "bg_blue" => "\33[44m", "bg_magenta" => "\33[45m", "bg_cyan" => "\33[46m", "bg_white" => "\33[47m"
+        }
+
+        @@statuses = {
+          :ok => '<text style="bold blue">[ <text style="bold green">OK</text> ]</text> ',
+          :pass => '<text style="bold blue">[<text style="bold cyan">PASS</text>]</text> ',
+          :fail => '<text style="bold blue">[<text style="bold red">FAIL</text>]</text> ',
+          :warn => '<text style="bold blue">[<text style="bold yellow">WARN</text>]</text> ',
+        }
       end
-    end
-    
-    # Create a new Console.
-    def initialize
-      @indent_level = 0
-      @show_commands = false
-      @show_outputs = false
-      @skip_commands = false
-      @tty_width = -1
-      @@indentator= " "        
-    
-      @@styles = {
-      	# Default color
-      	"default" => "\33[0m",
-      	# Text style
-      	"bold" => "\33[1m", "underline" => "\33[4m", "blink" => "\33[5m", "reverse" => "\33[7m", "concealed" => "\33[8m",
-      	# Foreground colors
-      	"black" => "\33[30m", "red" => "\33[31m", "green" => "\33[32m", "yellow" => "\33[33m", "blue" => "\33[34m", "magenta" => "\33[35m", "cyan" => "\33[36m", "white" => "\33[37m",
-      	# Background colors
-      	"bg_black" => "\33[40m", "bg_red" => "\33[41m", "bg_green" => "\33[42m", "bg_yellow" => "\33[43m", "bg_blue" => "\33[44m", "bg_magenta" => "\33[45m", "bg_cyan" => "\33[46m", "bg_white" => "\33[47m"
-      }
-
-      @@statuses = {
-      	:ok => '<text style="bold blue">[ <text style="bold green">OK</text> ]</text> ',
-      	:pass => '<text style="bold blue">[<text style="bold cyan">PASS</text>]</text> ',
-      	:fail => '<text style="bold blue">[<text style="bold red">FAIL</text>]</text> ',
-      	:warn => '<text style="bold blue">[<text style="bold yellow">WARN</text>]</text> ',
-      }
     end
   end
-end
-
+end

data/lib/cowtech-lib/option_parser.rb

@@ -25,9 +25,7 @@
 # THE SOFTWARE.
 #
 
-require "ostruct"
 require "getoptlong"
-require "CowtechLib/Console"
 
 module Cowtech
   module Lib
@@ -35,7 +33,7 @@ module Cowtech
     # @author Shogun
     class OptionParser
       # The specified options
-      attr :options
+      attr_accessor :options
     
       # The full command line provided
       attr_reader :cmdline
@@ -68,10 +66,10 @@ module Cowtech
       # * <em>:required</em>: Whether the option is required
       # * <em>:priority</em>: Priority for the option. Used only on the help message to sort (by increasing priority) the options.
       def <<(options)
-        options = options.to_a
+        options = [options] unless options.is_a?(Array)
 
         options.each do |option|
-          @console.fatal(:msg => "Every attribute must be an Hash.") unless option.kind_of?(Hash)
+          @console.fatal(:msg => "Every attribute must be an Hash.", :dots => false) unless option.is_a?(Hash)
       
           # Use symbols for names
           option[:name] = option[:name].to_sym
@@ -80,7 +78,7 @@ module Cowtech
           option[:type] ||= :string
 
           # Check if type is valid
-          @console.fatal(:msg => "Invalid option type #{option[:type]} for option #{option[:name]}. Valid type are the following:\n\t#{@@valid_types.keys.join(", ")}.") unless @valid_types.keys.include?(option[:type])
+          @console.fatal(:msg => "Invalid option type #{option[:type]} for option #{option[:name]}. Valid type are the following:\n\t#{@@valid_types.keys.join(", ")}.", :dots => false) unless @@valid_types.keys.include?(option[:type])
         
           # Adjust the default value
           case option[:type]
@@ -93,13 +91,13 @@ module Cowtech
           end
 
           # Adjust priority
-          option[:priority] = option[:priority].to_s.to_i unless option[:priority].is_a(Integer)
+          option[:priority] = option[:priority].to_s.to_i unless option[:priority].is_a?(Integer)
       
           # Prepend dashes
-          option[:short] = "-" + option[:short] unless option[:short][0][1] == "-"
+          option[:short] = "-" + option[:short] unless option[:short] =~ /^-/
           while not option[:long] =~ /^--/ do option[:long] = "-" + option[:long] end
-          @console.fatal(:msg > "Invalid short form \"#{option[:short]}\"") unless option[:short] =~ /^-[0-9a-z]$/i
-          @console.fatal(:msg > "Invalid long form \"#{option[:long]}\"") unless option[:loing] =~ /^--([0-9a-z-]+)$/i
+          @console.fatal(:msg => "Invalid short form \"#{option[:short]}\".", :dots => false) unless option[:short] =~ /^-[0-9a-z]$/i
+          @console.fatal(:msg => "Invalid long form \"#{option[:long]}\".", :dots => false) unless option[:long] =~ /^--([0-9a-z-]+)$/i
       
           # Check for choices if the type is choices
           if option[:type] == :choice then
@@ -111,16 +109,16 @@ module Cowtech
           end
       
           # Check that action is a block if the type is action
-          @console.fatal(:msg => "Option \"#{option[:name]}\" of type action requires a action block.") if option[:type] == :action && (option[:action] == nil || !option[:action].kind_of?(Proc.class))
+          @console.fatal("Option \"#{option[:name]}\" of type action requires a action block.") if option[:type] == :action && (option[:action] == nil || !option[:action].is_a?(Proc.class))
 
           # Check for uniqueness of option and its forms
-          @console.fatal(:msg => "An option with name \"#{option[:name]}\" already exists.", false, false, true, 1) if @inserted[:name].include?(option[:name])
-          @console.fatal(:msg => "An option with short or long form \"#{option[:short]}\" already exists.") if @inserted[:short].include?(option[:short])
-          @console.fatal(:msg => "An option with short or long form \"#{option[:long]}\" already exists.") if @inserted[:long].include?(option[:long]) 
+          @console.fatal("An option with name \"#{option[:name]}\" already exists.", :dots => false) if @inserted[:name].include?(option[:name])
+          @console.fatal("An option with short or long form \"#{option[:short]}\" already exists.", :dots => false) if @inserted[:short].include?(option[:short])
+          @console.fatal("An option with short or long form \"#{option[:long]}\" already exists.", :dots => false) if @inserted[:long].include?(option[:long]) 
 
           # Save
           @options[option[:name]] = option
-          @options_map[options[:long]] = option[:name]
+          @options_map[option[:long]] = option[:name]
           @inserted[:name].push(option[:name])
           @inserted[:short].push(option[:short])
           @inserted[:long].push(option[:long])
@@ -132,7 +130,8 @@ module Cowtech
       # Arguments:
       # * <em>ignore_unknown</em>: Whether ignore unknown options
       # * <em>ignore_unknown</em>: Whether ignore help options
-      def parse(*arg)
+      def parse(args = nil)
+        args ||= {}
         # Create options
         noat = [:bool, :action]
         sopts = @options.each_value.collect do |option| [option[:long], option[:short], noat.include?(option[:type]) ? GetoptLong::NO_ARGUMENT : GetoptLong::REQUIRED_ARGUMENT] end
@@ -146,34 +145,34 @@ module Cowtech
             optname = @options_map[given]
             option = @options[optname]
             value = nil
+
           
             # VALIDATE ARGUMENT DUE TO CASE
             case option[:type]
               when :string then
                 value = arg
               when :int then
-                if arg.strip =~ /^(-?)(\d+)$/ then value = arg.to_i(10) else @console.fatal(:msg => "Argument of option \"#{given}\" must be an integer.") end
+                if arg.strip =~ /^(-?)(\d+)$/ then value = arg.to_i(10) else @console.fatal(:msg => "Argument of option \"#{given}\" must be an integer.", :dots => false) end
               when :float then
-                if arg.strip =~ /^(-?)(\d*)(\.(\d+))?$/ and arg.strip() != "." then value = arg.to_f else @console.fatal(:msg => "Argument of option \"#{given}\" must be a float.") end
+                if arg.strip =~ /^(-?)(\d*)(\.(\d+))?$/ and arg.strip() != "." then value = arg.to_f else @console.fatal(:msg => "Argument of option \"#{given}\" must be a float.", :dots => false) end
               when :choice then
-                if @options[optname].choices.find_index { |choice| arg =~ choice } then value = arg else @console.fatal(:msg => "Invalid argument (invalid choice) for option \"#{given}\".")  
+                if @options[optname].choices.find_index { |choice| arg =~ choice } then value = arg else @console.fatal(:msg => "Invalid argument (invalid choice) for option \"#{given}\".", :dots => false) end
               when :list then
                 value = arg.split(",")
               else
                 value = true
             end
           
-            @options[optname] = value
+            @options[optname][:value] = value
           end
         rescue StandardError => exception
-          mo = exception.message =~ /.+-- (.+)/
-          if mo then 
-            given = "-" * $1.length
+          if exception.message =~ /.+-- (.+)$/ then 
+            given = $1
 
-            if exception.kind_of?(GetoptLong::InvalidOption) then
-              @console.fatal(:msg => "Unknown option \"#{given}\".") unless args[:ignore_unknown]
-            elsif exception.kind_of?(GetoptLong::MissingArgument) then
-              @console.fatal(:msg => "Option \"#{given}\" requires an argument.")
+            if exception.is_a?(GetoptLong::InvalidOption) then
+              @console.fatal(:msg => "Unknown option \"#{given}\".", :dots => false) unless args[:ignore_unknown]
+            elsif exception.is_a?(GetoptLong::MissingArgument) then
+              @console.fatal(:msg => "Option \"-#{given}\" requires an argument.", :dots => false)
             end
           else
             @console.fatal("Unexpected error: #{exc.message}.")
@@ -184,7 +183,7 @@ module Cowtech
         @args = ARGV
 
         # CHECK IF HELP WAS REQUESTED
-        if self.provided?("help") and args[:ignore_help] == false then
+        if self.provided?("help") and !args[:ignore_help] then
           self.print_help
           exit(0)
         end
@@ -192,10 +191,11 @@ module Cowtech
         # NOW CHECK IF SOME REQUIRED OPTION WAS NOT SPECIFIED OR IF WE HAVE TO EXECUTE AN ACTION
         @inserted[:name].each do |key|
           option = @options[key]
+
           if option[:required] == true and option[:value] == nil then
-            @console.fatal(:msg => "Required option \"#{opt.name}\" not specified.")          
+            @console.fatal(:msg => "Required option \"#{opt.name}\" not specified.", :dots => false)          
           elsif option[:value] == true and option[:type] == :action then
-            opt.action.call
+            option.action.call
           end
         end      
       end
@@ -205,6 +205,7 @@ module Cowtech
       # * <em>name</em>: Option name
       # Returns: <em>true</em> if options is defined, <em>false</em> otherwise. 
       def exists?(name)
+        name = name.to_sym
         @options.keys.include?(name)
       end
     
@@ -213,7 +214,8 @@ module Cowtech
       # * <em>name</em>: Option name
       # Returns: <em>true</em> if options was provided, <em>false</em> otherwise. 
       def provided?(name)
-        @options[:name][:value] != nil
+        name = name.to_sym
+        (@options[name] || {})[:value] != nil
       end
 
       # Get a list of value for the requested options.
@@ -238,15 +240,15 @@ module Cowtech
       # * <em>options</em>: Options list
       # Returns: If a single argument is provided, only a value is returned, else an hash (name => value). If no argument is provided, return every option
       def [](*options)
-        options = [options] unless options.kind_of?(Array)
-        options = @options.keys if opts.length == 0
+        options = [options] unless options.is_a?(Array)
+        options = @options.keys if options.length == 0
 
         if options.length == 1 then
           self.get(options[0])
         else
           rv = {}
           options.each do |option|
-            rv[option] = self.get(option) if self.exists?(option)
+            rv[option.to_s] = self.get(option) if self.exists?(option)
           end
           rv
         end
@@ -263,21 +265,21 @@ module Cowtech
         if @app_name then
           print "#{@app_name}"
           if @app_version > 0 then print " #{@app_version}" end
-          if @info then print " - #{@info}" end
+          if @description then print " - #{@description}" end
           print "\n"
         end
       
         # Print usage
         if @messages["pre_usage"] then print "#{@messages["pre_usage"]}\n" end
-        print "#{if @usage then @usage else "Usage: #{$0} [OPTIONS]" end}\n"
+        print "#{if @usage then @usage else "Usage: #{ARGV[0]} [OPTIONS]" end}\n"
 
         # Print pre_options
         if @messages["pre_options"] then print "#{@messages["pre_options"]}\n" end
         print "\nValid options are:\n"
       
         # Order options for printing
-        @sorted_opts = @inserted[0].sort do |first, second|
-          @options[first].priority != @options[second].priority ? @options[first].priority <=> @options[second].priority : @inserted[0].index(first) <=> @inserted[0].index(second) end
+        @sorted_opts = @inserted[:name].sort do |first, second|
+          @options[first][:priority] != @options[second][:priority] ? @options[first][:priority] <=> @options[second][:priority] : @inserted[:name].index(first) <=> @inserted[:name].index(second)
         end
       
         # Add options, saving max length
@@ -286,9 +288,8 @@ module Cowtech
         @sorted_opts.each do |key|
           opt = @options[key]
         
-          popt = "#{[opt.short, opt.long].join(", ")}"
-          popt += ("=" + (if opt.meta then opt.meta else "ARG" end)) unless opt.opt_type == :bool or opt.opt_type == :action
-
+          popt = "#{[opt[:short], opt[:long]].join(", ")}"
+          popt += ("=" + (if opt[:meta] then opt[:meta] else "ARG" end)) unless [:bool, :action].include?(opt[:type])
           popts[key] = popt
           maxlen = popt.length if popt.length > maxlen
         end
@@ -296,7 +297,7 @@ module Cowtech
         # Print options
         @sorted_opts.each do |key|
           val = popts[key]
-          print "\t#{val}#{" " * (5 + (maxlen - val.length))}#{@options[key].help}\n"
+          print "\t#{val}#{" " * (5 + (maxlen - val.length))}#{@options[key][:help]}\n"
         end
       
         # Print post_options
@@ -314,22 +315,23 @@ module Cowtech
       #   * <em>:pre_usage</em>: Message to print before the usage string
       #   * <em>:pre_options</em>: Message to print before the options list
       #   * <em>:post_options</em>: Message to print after the options list
-      def initialize(*args)
-  			msgs = if msgs.length > 0 then msgs[0] else {} end
-
+      def initialize(args)
         # Initialize types
         @@valid_types = {:bool => [], :string => [String, ""], :int => [Integer, 0], :float => [Float, 0.0], :choice => [String, ""], :list => [Array, []], :action => []}
         
         # Copy arguments
         @app_name = args[:name] 
-        @app_name = args[:version]
-        @info = args[:info]
+        @app_version = args[:version]
+        @description = args[:description]
         @usage = args[:usage]
-        if msgs.kind_of?(Hash) then @messages = args[:messages] else @console.fatal(:msg => "CowtechLib::OptionParser::initialize msgs argument must be an hash.") end
+
+        # Copy messages
+        messages = args[:messages] || {}
+        if messages.is_a?(Hash) then @messages = messages else @console.fatal(:msg => "CowtechLib::OptionParser::initialize msgs argument must be an hash.") end
       
         # Initialize variables
-        @console = CowtechLib::Console.new
-        @inserted = {:name => [], :short => [], :long => []]      
+        @console = Console.new
+        @inserted = {:name => [], :short => [], :long => []}
         @options = {}
         @options_map = {}
         @args = []

data/lib/cowtech-lib/script.rb

@@ -25,18 +25,11 @@
 # THE SOFTWARE.
 #
 
-require "pp"
-require "rexml/document"
-require "rubygems"
-require "open4"
-require "find"
-require "CowtechLib/Console"
-require "CowtechLib/OptionParser"
-
 module Cowtech
   module Lib
     # Class which implements a script to execute general tasks.
     # @author Shogun 
+
     class Script
       # Console object
       attr_reader :console
@@ -58,25 +51,25 @@ module Cowtech
       #   * <em>pre_usage</em>: Message to print before the usage string
       #   * <em>pre_options</em>: Message to print before the options list
       #   * <em>post_options</em>: Message to print after the options list
-      def initialize(*args)
+      def initialize(args)
         @console = Console.new
-        @shell = Console.new(@console)
-        @options_parser = OptionParser.new(*args)
+        @shell = Shell.new(@console)
+        @options_parser = OptionParser.new(args)
 
         self.add_options()
         @options_parser << [
-          {:name => "command-echo", :short => "-z", :long => "--command-echo", :type => :bool, :help => "Show executed commands."}
-          {:name => "command-show", :short => "-V", :long => "--command-show", :type => :bool, :help => "Show executed commands' output."}
+          {:name => "command-echo", :short => "-z", :long => "--command-echo", :type => :bool, :help => "Show executed commands."},
+          {:name => "command-show", :short => "-V", :long => "--command-show", :type => :bool, :help => "Show executed commands' output."},
           {:name => "command-skip", :short => "-Z", :long => "--command-skip", :type => :bool, :help => "Don't really execut commands, only print them."}
         ]
 
-        @options_parser.parse()
+        @options_parser.parse
 
         @console.show_commands = @options_parser["command-echo"]
         @console.show_outputs = @options_parser["command-show"]
         @console.skip_commands = @options_parser["command-skip"]
 
-        self.run()
+        self.run
       end
     
       # Execute a task, showing a message.
@@ -87,36 +80,41 @@ module Cowtech
       # * <em>show_end</em>: If show message exit status
       # * <em>go_up</em>: If go up one line to show exit status
       # * <em>dots</em>: If show dots after message
-      def task(*args)
-        if args[:show_msg] then
-          @console.msg(:msg => msg, :dots => args[:dots], :begin => true) if args[:show_msg]
-          @console.indent(3)
+      def task(args)
+        if args.fetch(:show_msg, true) then
+          @console.write(:begin => args[:msg], :dots => args[:dots]) if args.fetch(:show_msg, true)
+          @console.indent_set(3)
         end
       
         # Run the block
-        rv = yield || :ok
+        rv = yield
+        rv = :ok unless rv.is_a?(Symbol)
+        rv = [rv, true] unless rv.is_a?(Array)
       
         # Show the result
-        @console.result(:result = rv.try("[]", 0) || rv, :fatal => rv.try("[]", 1) == nil ? true : rv.try("[]", 1)) if args[:show_result]
-        @console.indent(-3)
+        if args.fetch(:show_result, true) then
+          @console.status(:status => rv[0], :fatal => false) if args.fetch(:show_result, true)
+          @console.indent_set(-3)
+        end
+
+        exit(1) if rv[0] != :ok && rv[1]
       end
 
       # Run the script. 
       #<b> MUST BY OVERRIDEN BY SUBCLASSES!</b>
       def run
-        self.console.fatal("Script::run() must be overidden by subclass")
+        self.console.fatal("Cowtech::Lib::Script#run must be overidden by subclasses.")
       end
     
       # Adds the command line options.
       # <b>MUST BE OVERRIDEN BY SUBCLASSES!</b>
       def add_options 
-        self.console.fatal("Cowtech::Lib::Script::add_options must be overidden by subclass.")
+        self.console.fatal("Cowtech::Lib::Script#add_options must be overidden by subclasses.")
       end
       
-      # Executes the script
-      def self.execute!
-        self.new.run
+      def get_binding
+        binding
       end
     end
   end
-end
+end

data/lib/cowtech-lib/shell.rb

@@ -25,12 +25,11 @@
 # THE SOFTWARE.
 #
 
-require "rexml/document"
 require "open4"
 require "find"
 require "fileutils"
 
-module CowtechLib
+module Cowtech
   module Lib
     # A class which provides some useful method for interaction with files and processes.
     # @author Shogun
@@ -45,11 +44,11 @@ module CowtechLib
       # * <em>fatal</em>: If abort on failure
       # 
       # Returns: An object which the status attribute is the exit status of the process, and the output attribute is the output of the command
-      def run(msg, cmd, show_msg = true, show_exit = true, fatal = false)
+      def run(args)
         rv = {:status => 0, :output => []}
         command = args[:command]
 
-        @console.write(:begin => args[:msg]) if args[:msg]
+        @console.write(:begin => args[:msg]) if args[:show_msg]
 
         if @console.show_commands then
           @console.warn("Will run command: \"#{command}\"", :dots => false)
@@ -66,7 +65,8 @@ module CowtechLib
         end
         rv[:output] = rv[:output].join("\n")
 
-        self.status(rv[:status] == 0 ? :ok : :fail) if args[:show_exit]
+        self.status(:status => rv[:status] == 0 ? :ok : :fail, :fatal => false) if args[:show_exit]
+        exit(1) if args[:fatal] and rv[:status] != 0
         rv
       end
 
@@ -78,9 +78,9 @@ module CowtechLib
       # * <em>codec</em>: The encoding used to open the file. <b>UNUSED FOR NOW!</b>
       # 
       # Returns: A new <em>File</em> object
-      def open_file(*args)
+      def open_file(args)
         begin
-          File.new(args[:name], args[:mode] || "r" + (args[:codec] : ? ":#{args[:codce]}" : ""))
+          File.new(args[:name], (args[:mode] || "r") + (args[:codec] ? ":#{args[:codec]}" : ""))
         rescue Exception => e
           @console.write(:error => "Unable to open file #{name}: #{e}")
           nil
@@ -103,9 +103,9 @@ module CowtechLib
       # * <em>:fc_symlink</em>: Check if the file is symbolic link
       # 
       # Returns: <em>true</em> if any of tests had success, <em>false</em> otherwise
-      def file_check?(*args)
+      def file_check?(args)
         rv = false
-        tests = args[:tests].to_a
+        tests = (args[:tests] || [:exists]).to_a
 
         if args[:file] then
           rv = true
@@ -125,7 +125,7 @@ module CowtechLib
       # * <em>show_error</em>: Whether show errors occurred
       # 
       # Returns: <em>true</em> if operation had success, <em>false</em> otherwise.
-      def delete_files!(*args)
+      def delete_files!(args)
         rv = true
         files = args[:files].to_a
 
@@ -135,7 +135,7 @@ module CowtechLib
           if args[:show_errors] == true then
             if e.message =~ /^Permission denied - (.+)/ then
               @console.error("Cannot remove following non writable entry: #{$1}", :dots => false, :fatal => args[:fatal])
-            elsif e.message =~ /^No such file or directory - (.+)/) then
+            elsif e.message =~ /^No such file or directory - (.+)/ then
               @console.error("Cannot remove following non existent entry: #{$1}", :dots => false, :fatal => args[:fatal])
             end
           end
@@ -167,7 +167,7 @@ module CowtechLib
       # * <em>show_error</em>: Whether show errors occurred
       # 
       # Returns: <em>true</em> if operation had success, <em>false</em> otherwise.
-      def create_directories(*args)
+      def create_directories(args)
         rv = true
         files = args[:files].to_a
 
@@ -223,7 +223,7 @@ module CowtechLib
       # * <em>show_error</em>: Whether show errors occurred
       # 
       # Returns: <em>true</em> if operation had success, <em>false</em> otherwise.
-      def copy(*args)
+      def copy(args)
         rv = true
         move = args[:move]
 
@@ -248,7 +248,6 @@ module CowtechLib
               rv = false
             rescue Exception => e
               if args[:show_errors] then
-                self.error(, false)
                 @console.error("Cannot #{if move then "move" else "copy" end} following entries to <text style=\"bold white\">#{dest}</text>:", :dots => false)
                 @console.indent_region(3) do
                   files.each do |afile|
@@ -302,7 +301,7 @@ module CowtechLib
       # * <em>show_error</em>: Whether show errors occurred
       # 
       # Returns: <em>true</em> if operation had success, <em>false</em> otherwise.
-      def rename(*args)
+      def rename(args)
         rv = true
 
         if src.is_a?(String) and dst.is_a?(String) then
@@ -322,7 +321,7 @@ module CowtechLib
       # * <em>patterns</em>: List of requested patterns
       # 
       # Returns: List of found files.
-      def find_by_pattern(*args)
+      def find_by_pattern(args)
         # TODO: E se patterns è vuoto?
         rv = []
 
@@ -362,12 +361,18 @@ module CowtechLib
       # * <em>extensions</em>: List of requested extensions
       # 
       # Returns: List of found files.
-      def find_by_extension(*args)
+      def find_by_extension(args)
         args[:patterns] = (args[:extensions] || "").to_a.collect do |extension| 
           Regexp.new(extension + "$", Regexp::IGNORECASE) 
         end
 
-        self.find_by_pattern(*args)
+        self.find_by_pattern(args)
+      end
+      
+      # Creates a new shell
+      def initialize(console = nil)
+        console ||= Console.new
+        @console = console
       end
     end
   end

data/lib/cowtech-lib/version.rb

@@ -3,10 +3,10 @@ module Cowtech
     module Version
       MAJOR = 1
       MINOR = 9
-      PATCH = 0
+      PATCH = 1
       BUILD = nil
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 9
-  - 0
-  version: 1.9.0
+  - 1
+  version: 1.9.1
 platform: ruby
 authors: 
 - Shogun
@@ -16,35 +16,8 @@ cert_chain: []
 
 date: 2011-02-21 00:00:00 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id002
+dependencies: []
+
 description: A general purpose utility library.
 email: shogun_panda@me.com
 executables: []
@@ -56,8 +29,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile

data/Gemfile

@@ -1,6 +0,0 @@
-source "http://rubygems.org"
-
-group :development do
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
-end

data/Gemfile.lock

@@ -1,17 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rcov (0.9.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jeweler (~> 1.5.1)
-  rcov