ucc 2.0.1 → 2.0.2

data/lib/ucc.rb

@@ -2,12 +2,16 @@ require "ucc/version"
 require "optparse"
 
 module Ucc
+  # Are we on windows?
   WINDOWS = !!((`uname` rescue "") =~ /^$|windows/)
+  
+  # What executable was used to run ucc?
   CURRENT_EXECUTABLE = File.basename($0)
 
   class Runner
     attr_reader :source_files
     
+    # Herewe pass the compiler (to be able to choose between gcc or g++)
     def initialize(compiler)
       @compiler = compiler
       raise "Compiler must be specified" unless @compiler
@@ -18,6 +22,7 @@ module Ucc
     # Variables
     # =========
     
+    # Defines options for ucc
     def optparse
       @optparse ||= OptionParser.new do |opts|
         opts.banner = "Usage: #{CURRENT_EXECUTABLE} [options] file..."
@@ -36,23 +41,30 @@ module Ucc
         opts.on( '-V', '--valgrind', 'Run the app in valgrind' ) do
           options[:memcheck] = true
         end
+                
+        options[:verbose] = false
+        opts.on( '--verbose', 'Enable debug messages' ) do
+          options[:verbose] = true
+        end
         
-        opts.on( '-v', '--version', 'Show app version' ) do
+        opts.on_tail( '-v', '--version', 'Show app version' ) do
           puts "#{CURRENT_EXECUTABLE} #{VERSION}"
           exit
         end
         
-        opts.on( '-h', '--help', 'Display this screen' ) do
+        opts.on_tail( '-h', '--help', 'Display this screen' ) do
           puts opts
           exit
         end
       end
     end
     
+    # Options array accessor
     def options
       @options ||= {}
     end
     
+    # Filename to use when executing compiled app
     def app_filename
       return @app_filename if @app_filename
       @app_filename = source_files[0].sub(/\.\w+$/, '')
@@ -62,6 +74,7 @@ module Ucc
     # Main logic
     # ==========
     
+    # Does option parsing using `optparse`
     def parse_options
       begin
         optparse.parse!
@@ -73,24 +86,37 @@ module Ucc
       # Here we have already parsed ARGV
       @source_files = ARGV
       if @source_files.empty?
-        #puts optparse
         puts "#{CURRENT_EXECUTABLE}: no input files"
         exit(1)
       end
     end
     
+    # Everything special goes here
     def work
-      compilation_params = %Q[#{@compiler} -Wall -o "#{app_filename}" #{source_files.map{ |f| '"'+f+'"' }.join(" ")}]
+      compilation_params = %Q[#{@compiler} -Wall -o "#{app_filename}" #{source_files.map{ |f| enquote(f) }.join(" ")}]
       compilation_params = "#{compilation_params} #{options[:compileopts]}" if options[:compileopts]
+      trace compilation_params
       exit unless system compilation_params
       
-      exec_params = %Q["#{app_filename}"]
+      exec_params = enquote(app_filename)
       exec_params = "./#{exec_params}" unless WINDOWS
       exec_params = "#{exec_params} #{options[:runopts]}" if options[:runopts]
       exec_params = "valgrind #{exec_params}" if options[:memcheck]
+      trace exec_params
       puts "=== Compiled successfully, executing... === "
       exec exec_params
     end
-  
+    
+    # Prints text if verbose mode is on
+    def trace(text)
+      puts "[ucc] Debug: #{text}" if options[:verbose]
+    end
+    
+    # Enquotes param if needed, also pre-escapes quotes that already are inside the param
+    def enquote(param)
+      param = param.gsub(/(["'])/, '\\\\\\1')
+      param = %Q["#{param}"] if param =~ /\s/
+      param
+    end
   end
 end

data/lib/ucc/version.rb

@@ -1,3 +1,3 @@
 module Ucc
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucc
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies: []
 description: This gem makes it easy to compile small apps using gcc or g++, you even
   don't need a makefile!