ucc 2.0.3 → 2.0.4

data/lib/ucc.rb

@@ -28,15 +28,19 @@ module Ucc
         opts.banner = "Usage: #{CURRENT_EXECUTABLE} [options] file..."
         
         options[:runopts] = nil
-        opts.on( '-r', '--runopts "STRING"', 'Pass STRING as the command line argument to the compiled app' ) do |s|
+        opts.on( '-r', '--runopts STRING', 'Pass STRING as the command line argument to the compiled app' ) do |s|
           options[:runopts] = s
         end
         
         options[:compileopts] = nil
-        opts.on( '-c', '--compileopts "STRING"', 'Pass STRING as the command line argument to the compiler' ) do |s|
+        opts.on( '-c', '--compileopts STRING', 'Pass STRING as the command line argument to the compiler' ) do |s|
           options[:compileopts] = s
         end
         
+        opts.on( '-o', '--output FILE', 'Use FILE as the output file' ) do |s|
+          @app_filename = s
+        end
+        
         options[:memcheck] = false
         opts.on( '-V', '--valgrind', 'Run the app in valgrind' ) do
           options[:memcheck] = true
@@ -67,7 +71,9 @@ module Ucc
     # Filename to use when executing compiled app
     def app_filename
       return @app_filename if @app_filename
-      @app_filename = source_files[0].sub(/\.\w+$/, '')
+      @app_filename = source_files.find{ |param| param !~ /^-/ }      
+      return nil unless @app_filename
+      @app_filename = @app_filename.sub(/\.\w+$/, '')
       @app_filename += ".exe" if WINDOWS
       @app_filename
     end
@@ -84,9 +90,9 @@ module Ucc
         exit(1)
       end      
       
-      # Here we have already parsed ARGV
+      # Here we have already clean ARGV
       @source_files = ARGV
-      if @source_files.empty?
+      unless app_filename
         puts "#{CURRENT_EXECUTABLE}: no input files"
         exit(1)
       end
@@ -94,8 +100,7 @@ module Ucc
     
     # Everything special goes here
     def work
-      compilation_params = %Q[#{@compiler} -Wall -o "#{app_filename}" #{source_files.map{ |f| enquote(f) }.join(" ")}]
-      compilation_params = "#{compilation_params} #{options[:compileopts]}" if options[:compileopts]
+      compilation_params = %Q[#{@compiler} #{options[:compileopts]} -Wall -o #{enquote(app_filename)} #{source_files.map{ |f| enquote(f) }.join(" ")}]
       trace compilation_params
       exit unless system compilation_params
       
@@ -104,7 +109,7 @@ module Ucc
       exec_params = "#{exec_params} #{options[:runopts]}" if options[:runopts]
       exec_params = "valgrind #{exec_params}" if options[:memcheck]
       trace exec_params
-      puts "=== Compiled successfully, executing... === "
+      puts "=== Compiled successfully, executing... ==="
       exec exec_params
     end
     

data/lib/ucc/version.rb

@@ -1,3 +1,3 @@
 module Ucc
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucc
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors: