cowtech-lib 1.9.7.0 → 1.9.8.0

data/cowtech-lib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cowtech-lib"
-  s.version = "1.9.7.0"
+  s.version = "1.9.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shogun"]
-  s.date = "2012-01-08"
+  s.date = "2012-01-11"
   s.description = "A general purpose utility library."
   s.email = "shogun_panda@me.com"
   s.extra_rdoc_files = [

data/lib/cowtech-lib/option_parser.rb

@@ -104,7 +104,7 @@ module Cowtech
             if option[:choices] == nil then
               @console.fatal(:msg => "Option \"#{option[:name]}\" of type choice requires a valid choices list (every element should be a regular expression).")
             else
-              option[:choices].collect! do |choice| Regexp.new(choice) end
+              option[:choices].collect! { |choice| Regexp.new(choice) }
             end
           end
       
@@ -134,7 +134,7 @@ module Cowtech
         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
+        sopts = @options.each_value.collect { |option| [option[:long], option[:short], noat.include?(option[:type]) ? GetoptLong::NO_ARGUMENT : GetoptLong::REQUIRED_ARGUMENT] }
 
         opts = GetoptLong.new(*sopts)
         opts.quiet = true
@@ -146,17 +146,28 @@ module Cowtech
             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.", :dots => false) 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+))?$/ && 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
+                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
@@ -264,17 +275,17 @@ module Cowtech
         # Print app name
         if @app_name then
           print "#{@app_name}"
-          if @app_version > 0 then print " #{@app_version}" end
-          if @description then print " - #{@description}" end
+          print " #{@app_version}" if @app_version > 0
+          print " - #{@description}" if @description
           print "\n"
         end
       
         # Print usage
-        if @messages["pre_usage"] then print "#{@messages["pre_usage"]}\n" end
-        print "#{if @usage then @usage else "Usage: #{ARGV[0]} [OPTIONS]" end}\n"
+        print "#{@messages["pre_usage"]}\n" if @messages["pre_usage"]
+        print "#{@usage ? @usage : "Usage: #{ARGV[0]} [OPTIONS]"}\n"
 
         # Print pre_options
-        if @messages["pre_options"] then print "#{@messages["pre_options"]}\n" end
+        print "#{@messages["pre_options"]}\n" if @messages["pre_options"]
         print "\nValid options are:\n"
       
         # Order options for printing
@@ -289,7 +300,7 @@ module Cowtech
           opt = @options[key]
         
           popt = "#{[opt[:short], opt[:long]].join(", ")}"
-          popt += ("=" + (if opt[:meta] then opt[:meta] else "ARG" end)) if ![:bool, :action].include?(opt[:type])
+          popt += ("=" + (opt[:meta] ? opt[:meta] : "ARG")) if ![:bool, :action].include?(opt[:type])
           popts[key] = popt
           maxlen = popt.length if popt.length > maxlen
         end
@@ -301,7 +312,7 @@ module Cowtech
         end
       
         # Print post_options
-        if @messages["post_options"] then print "#{@messages["post_options"]}\n" end
+        print "#{@messages["post_options"]}\n" if @messages["post_options"] then
       end
     
       #Creates a new OptionParser.
@@ -327,7 +338,11 @@ module Cowtech
 
         # 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
+        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 = Console.new

data/lib/cowtech-lib/shell.rb

@@ -243,13 +243,13 @@ module Cowtech
               end
             rescue StandardError => e
               if args[:show_errors] && e.message =~ /^Permission denied - (.+)/ then
-                self.error("Cannot #{if must_move then "move" else "copy" end} entry <text style=\"bold white\">#{file}</text> to non-writable entry <text style=\"bold white\">#{dest}</text>", false, false, false) if m != nil
+                self.error("Cannot #{must_move ? "move" : "copy"} entry <text style=\"bold white\">#{file}</text> to non-writable entry <text style=\"bold white\">#{dest}</text>", false, false, false) if m != nil
               end
 
               rv = false
             rescue Exception => e
               if args[:show_errors] then
-                @console.error("Cannot #{if move then "move" else "copy" end} following entries to <text style=\"bold white\">#{dest}</text>:", :dots => false)
+                @console.error("Cannot #{move ? "move" : "copy"} following entries to <text style=\"bold white\">#{dest}</text>:", :dots => false)
                 @console.indent_region(3) do
                   files.each do |afile|
                     @console.write(:msg => afile, :dots => false)
@@ -283,10 +283,10 @@ module Cowtech
                 FileUtils.cp(files, dest, {:noop => @console.skip_commands, :verbose => @console.skip_commands})
               end
             rescue StandardError => e
-              @console.error("Cannot #{if move then "move" else "copy" end} entry <text style=\"bold white\">#{files}</text> to non-writable entry<text style=\"bold white\"> #{dest}</text>", :dots => false, :fatal => args[:fatal]) if args[:show_errors] && (e.message =~ /^Permission denied - (.+)/)
+              @console.error("Cannot #{move ? "move" : "copy"} entry <text style=\"bold white\">#{files}</text> to non-writable entry<text style=\"bold white\"> #{dest}</text>", :dots => false, :fatal => args[:fatal]) if args[:show_errors] && (e.message =~ /^Permission denied - (.+)/)
               rv = false
             rescue Exception => e
-              @console.error("Cannot #{if move then "move" else "copy" end} <text style=\"bold white\">#{files}</text> to <text style=\"bold_white\">#{dest}</text> due to an error: <text style=\"bold red\">#{e}</text>", :dots => false, :fatal => args[:fatal]) if args[:show_errors]
+              @console.error("Cannot #{move ? "move" : "copy"} <text style=\"bold white\">#{files}</text> to <text style=\"bold_white\">#{dest}</text> due to an error: <text style=\"bold red\">#{e}</text>", :dots => false, :fatal => args[:fatal]) if args[:show_errors]
               rv = false
             end
           end

data/lib/cowtech-lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-lib
 version: !ruby/object:Gem::Version
-  version: 1.9.7.0
+  version: 1.9.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70156023682820 !ruby/object:Gem::Requirement
+  requirement: &70357825387040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70156023682820
+  version_requirements: *70357825387040
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70156023680520 !ruby/object:Gem::Requirement
+  requirement: &70357825386560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70156023680520
+  version_requirements: *70357825386560
 description: A general purpose utility library.
 email: shogun_panda@me.com
 executables: []