cowtech-lib 1.9.5.1 → 1.9.6.0

data/cowtech-lib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cowtech-lib}
-  s.version = "1.9.5.1"
+  s.version = "1.9.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Shogun}]
-  s.date = %q{2011-07-08}
+  s.date = %q{2011-07-13}
   s.description = %q{A general purpose utility library.}
   s.email = %q{shogun_panda@me.com}
   s.extra_rdoc_files = [

data/lib/cowtech-lib/console.rb

@@ -176,7 +176,7 @@ module Cowtech
         end
         
         # Parse the message
-        unless args[:plain] then
+        if !args[:plain] then
           begin
             xml = "<text>#{msg}</text>"
             msg = self.parse_message(REXML::Document.new(xml).root)
@@ -286,11 +286,11 @@ module Cowtech
       def read(args)
         # Adjust prompt
         msg = args[:msg] + ((msg !~ /([:?](\s*))$/) ? ":" : "")
-        msg += " " unless msg =~ / ^/
+        msg += " " if msg !~ / ^/
 
         # Turn choices into regular expressions
         regexps = (args[:valids] || []).force_array.collect do |valid|
-          unless valid.is_a?(Regexp) then
+          if !valid.is_a?(Regexp) then
             valid = Regexp.new((valid !~ /^\^/ ? "^" : "") + valid + (valid !~ /\$$/ ? "$" : ""), Regexp::EXTENDED + (args[:case_sensitive] ? Regexp::IGNORECASE : 0), "U")
           else
             valid

data/lib/cowtech-lib/option_parser.rb

@@ -66,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] unless options.is_a?(Array)
+        options = [options] if !options.is_a?(Array)
 
         options.each do |option|
-          @console.fatal(:msg => "Every attribute must be an Hash.", :dots => false) unless option.is_a?(Hash)
+          @console.fatal(:msg => "Every attribute must be an Hash.", :dots => false) if !option.is_a?(Hash)
       
           # Use symbols for names
           option[:name] = option[:name].to_sym
@@ -78,26 +78,26 @@ 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(", ")}.", :dots => false) 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) if !@@valid_types.keys.include?(option[:type])
         
           # Adjust the default value
           case option[:type]
             when :bool then
-              option[:default] = false unless option[:default] == true
+              option[:default] = false if !option[:default] == true
             when :action then
               option[:required] = false
             else
-              option[:default] = @@valid_types[option[:type]][1] unless option[:default].is_a?(@@valid_types[option[:type]][0]) == true || option[:default] != nil
+              option[:default] = @@valid_types[option[:type]][1] if ! (option[:default].is_a?(@@valid_types[option[:type]][0]) == true && option[:default] != nil)
           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 if !option[:priority].is_a?(Integer)
       
           # Prepend dashes
-          option[:short] = "-" + option[:short] unless option[:short] =~ /^-/
+          option[:short] = "-" + option[:short] if !option[:short] =~ /^-/
           while not option[:long] =~ /^--/ do option[:long] = "-" + option[:long] end
-          @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
+          @console.fatal(:msg => "Invalid short form \"#{option[:short]}\".", :dots => false) if !option[:short] =~ /^-[0-9a-z]$/i
+          @console.fatal(:msg => "Invalid long form \"#{option[:long]}\".", :dots => false) if !option[:long] =~ /^--([0-9a-z-]+)$/i
       
           # Check for choices if the type is choices
           if option[:type] == :choice then
@@ -170,7 +170,7 @@ module Cowtech
             given = $1
 
             if exception.is_a?(GetoptLong::InvalidOption) then
-              @console.fatal(:msg => "Unknown option \"#{given}\".", :dots => false) unless args[:ignore_unknown]
+              @console.fatal(:msg => "Unknown option \"#{given}\".", :dots => false) if !args[:ignore_unknown]
             elsif exception.is_a?(GetoptLong::MissingArgument) then
               @console.fatal(:msg => "Option \"-#{given}\" requires an argument.", :dots => false)
             end
@@ -240,7 +240,7 @@ 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.is_a?(Array)
+        options = [options] if !options.is_a?(Array)
         options = @options.keys if options.length == 0
 
         if options.length == 1 then
@@ -289,7 +289,7 @@ module Cowtech
           opt = @options[key]
         
           popt = "#{[opt[:short], opt[:long]].join(", ")}"
-          popt += ("=" + (if opt[:meta] then opt[:meta] else "ARG" end)) unless [:bool, :action].include?(opt[:type])
+          popt += ("=" + (if opt[:meta] then opt[:meta] else "ARG" end)) if ![:bool, :action].include?(opt[:type])
           popts[key] = popt
           maxlen = popt.length if popt.length > maxlen
         end

data/lib/cowtech-lib/script.rb

@@ -88,8 +88,8 @@ module Cowtech
       
         # Run the block
         rv = yield
-        rv = :ok unless rv.is_a?(Symbol)
-        rv = [rv, true] unless rv.is_a?(Array)
+        rv = :ok if !rv.is_a?(Symbol)
+        rv = [rv, true] if !rv.is_a?(Array)
       
         # Show the result
         if args.fetch(:show_result, true) then

data/lib/cowtech-lib/shell.rb

@@ -55,7 +55,7 @@ module Cowtech
           @console.status(:ok)
         end
 
-        unless @console.skip_commands == true then
+        if !@console.skip_commands == true then
           rv[:status] = Open4::open4(command + " 2>&1") { |pid, stdin, stdout, stderr|
             stdout.each_line do |line|
               rv[:output] << line
@@ -207,7 +207,7 @@ module Cowtech
             end
           end
 
-          break unless rv
+          break if !rv
         end
 
         rv ? rv : @console.status(:fail, :fatal => args[:fatal])
@@ -261,16 +261,16 @@ module Cowtech
               rv = false
             end
 
-            break unless rv
+            break if !rv
           end
         else # If we are copying or moving to a file
-          unless files.kind_of?(String) == true and dest.kind_of?(String) == true then
+          if !files.kind_of?(String) == true and dest.kind_of?(String) == true then
             @console.error("Cowtech::Lib::Shell#copy: To copy a single file, both files and dest arguments must be a string.", :dots => false, :fatal => args[:fatal])
             rv = false
           else
             dst_dir = File.dirname(dest)
 
-            unless self.file_check?(:file => dst_dir, :tests => [:exists, :directory]) then
+            if !self.file_check?(:file => dst_dir, :tests => [:exists, :directory]) then
               self.create_directories(:files => dst_dir, :mode => 0755, :fatal => args[:fatal], :show_errors => args[:show_errors])
             end
 

data/lib/cowtech-lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-lib
 version: !ruby/object:Gem::Version
-  version: 1.9.5.1
+  version: 1.9.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-08 00:00:00.000000000Z
+date: 2011-07-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &2153430560 !ruby/object:Gem::Requirement
+  requirement: &2152805660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153430560
+  version_requirements: *2152805660
 description: A general purpose utility library.
 email: shogun_panda@me.com
 executables: []