cowtech-lib 1.9.6.0 → 1.9.6.1

data/cowtech-lib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cowtech-lib}
-  s.version = "1.9.6.0"
+  s.version = "1.9.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Shogun}]
-  s.date = %q{2011-07-13}
+  s.date = %q{2011-07-14}
   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

@@ -107,7 +107,7 @@ module Cowtech
       # Returns: The new text
       def parse_message(node, stack = [])
         rv = ""
-        styles = (node.name == "text" and node.attributes["style"]) ? node.attributes["style"].split(" ") : nil
+        styles = (node.name == "text" && node.attributes["style"]) ? node.attributes["style"].split(" ") : nil
 
         # Add style of current tag
         if styles then

data/lib/cowtech-lib/option_parser.rb

@@ -83,11 +83,11 @@ module Cowtech
           # Adjust the default value
           case option[:type]
             when :bool then
-              option[:default] = false if !option[:default] == true
+              option[:default] = false if option[:default] == false
             when :action then
               option[:required] = false
             else
-              option[:default] = @@valid_types[option[:type]][1] if ! (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]) && option[:default] != nil
           end
 
           # Adjust priority
@@ -95,9 +95,9 @@ module Cowtech
       
           # Prepend dashes
           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) if !option[:short] =~ /^-[0-9a-z]$/i
-          @console.fatal(:msg => "Invalid long form \"#{option[:long]}\".", :dots => false) if !option[:long] =~ /^--([0-9a-z-]+)$/i
+          while option[:long] !~ /^--/ do option[:long] = "-" + option[:long] end
+          @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
@@ -154,7 +154,7 @@ module Cowtech
               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.", :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.", :dots => false) end
+                if arg.strip =~ /^(-?)(\d*)(\.(\d+))?$/ && 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}\".", :dots => false) end
               when :list then
@@ -183,7 +183,7 @@ module Cowtech
         @args = ARGV
 
         # CHECK IF HELP WAS REQUESTED
-        if self.provided?("help") and !args[:ignore_help] then
+        if self.provided?("help") && !args[:ignore_help] then
           self.print_help
           exit(0)
         end
@@ -192,9 +192,9 @@ module Cowtech
         @inserted[:name].each do |key|
           option = @options[key]
 
-          if option[:required] == true and option[:value] == nil then
+          if option[:required] == true && option[:value] == nil then
             @console.fatal(:msg => "Required option \"#{option[:name]}\" not specified.", :dots => false)          
-          elsif option[:value] == true and option[:type] == :action then
+          elsif option[:value] == true && option[:type] == :action then
             option.action.call
           end
         end      

data/lib/cowtech-lib/shell.rb

@@ -55,7 +55,7 @@ module Cowtech
           @console.status(:ok)
         end
 
-        if !@console.skip_commands == true then
+        if !@console.skip_commands then
           rv[:status] = Open4::open4(command + " 2>&1") { |pid, stdin, stdout, stderr|
             stdout.each_line do |line|
               rv[:output] << line
@@ -66,7 +66,7 @@ module Cowtech
         rv[:output] = rv[:output].join("\n")
 
         @console.status(:status => rv[:status] == 0 ? :ok : :fail, :fatal => false) if args[:show_exit]
-        exit(1) if args[:fatal] and rv[:status] != 0
+        exit(1) if args[:fatal] && rv[:status] != 0
         rv
       end
 
@@ -232,7 +232,7 @@ module Cowtech
         # If we are copy or moving to a directory
         if args[:destination_is_directory] then
           files = (args[:files] || []).force_array
-          dest += "/" if self.file_check?(:file => dest, :tests => :directory) and dest !~ /\/$/
+          dest += "/" if self.file_check?(:file => dest, :tests => :directory) && dest !~ /\/$/
 
           files.each do |file|
             begin
@@ -264,7 +264,7 @@ module Cowtech
             break if !rv
           end
         else # If we are copying or moving to a file
-          if !files.kind_of?(String) == true and dest.kind_of?(String) == true then
+          if !files.kind_of?(String) && !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
@@ -275,7 +275,7 @@ module Cowtech
             end
 
             begin
-              if move == true then
+              if move then
                 FileUtils.move(files, dest, {:noop => @console.skip_commands, :verbose => @console.skip_commands})
               else
                 FileUtils.cp(files, dest, {:noop => @console.skip_commands, :verbose => @console.skip_commands})
@@ -305,7 +305,7 @@ module Cowtech
       def rename(args)
         rv = true
 
-        if src.is_a?(String) and dst.is_a?(String) then
+        if src.is_a?(String) && dst.is_a?(String) then
           rv = self.copy(:from => src, :to => dst, :show_errors => args[:show_errors], :fatal => args[:fatal])
         else
           @console.error("Cowtech::Lib::Shell#rename: Both :src and :dst arguments must be a string.", :dots => false, :fatal => args[:fatal]) if args[:show_error]

data/lib/cowtech-lib/version.rb

@@ -4,7 +4,7 @@ module Cowtech
       MAJOR = 1
       MINOR = 9
       PATCH = 6
-      BUILD = 0
+      BUILD = 1
 
       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.6.0
+  version: 1.9.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-13 00:00:00.000000000Z
+date: 2011-07-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &2152805660 !ruby/object:Gem::Requirement
+  requirement: &2153527200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152805660
+  version_requirements: *2153527200
 description: A general purpose utility library.
 email: shogun_panda@me.com
 executables: []