textmate_fcsh 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/bin/textmate_fcsh

@@ -7,6 +7,7 @@ require "open3"
 
 #a = TextmateFcsh.new
 
+$DEBUG = false
 
 require 'optparse'
 
@@ -26,9 +27,15 @@ OptionParser.new do |opts|
     options[:run] = false
   end
   
+  opts.on("-v", "--verbose", "Verbose mode") do |v|
+    $DEBUG = true
+  end
+  
 end.parse!
 
 
+
+
 if options[:run] != false
   TextmateFcsh.new
 end

data/lib/fcsh/fcsh.rb

@@ -2,6 +2,7 @@ class Fcsh
   attr_reader :stdout, :stderr, :error_output_last_run
   
   def initialize(location)
+
     @targets = []
     @stdin, @stdout, @stderr = Open3.popen3(location)
     @error_output_last_run = ''
@@ -15,8 +16,8 @@ class Fcsh
         puts errors
         exit
       end
-      
     end
+    
     puts "Compiling..."
     @error_output_last_run = ''
     @stdin.puts "compile %d" % [@targets.index(command) + 1]
@@ -25,11 +26,18 @@ class Fcsh
     
     # watch std out till files changed
     @stdout.each_line do |line|
+      puts "FCSH OUT: " + line.inspect if $DEBUG
+      
       if /.+\.swf/.match(line)
         puts ""
         break
       end
       
+      if /Nothing has changed/.match(line)
+        puts "Nothing has changed"
+        break
+      end
+      
       if /Files changed/.match(line)
         capture_error_output
         break
@@ -42,7 +50,7 @@ class Fcsh
   # Create a target if this is the first time.
   def compile_first_time!(command)
     puts "Assigning target..."
-    @stdin.puts command
+    @stdin.puts command if $DEBUG
     
     @mxmlc_errors = nil
     a = Thread.new do 
@@ -67,18 +75,18 @@ class Fcsh
   # will be enough.
   def capture_error_output
     puts "Capturing error output"
-    first_line_captured = nil
+    last_line_captured = nil
     started = Time.now
     a = Thread.new do 
       @stderr.each_line do |line|
-        puts line.inspect
-        first_line_captured = Time.now if first_line_captured.nil?
+        puts "FCSH ERROR: " + line.inspect  if $DEBUG
+        last_line_captured = Time.now
         @error_output_last_run  << line
       end
     end
     
     loop do
-      if (!first_line_captured.nil? && Time.now - first_line_captured > 1) || Time.now - started > 4
+      if (!last_line_captured.nil? && Time.now - last_line_captured > 1)
         break
       end
     end

data/lib/mxmlc_output/mxmlc_output_reader.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), 'mxmlc_error')
 # Formats the mxmlc to errors
 class MxmlcOutputReader
   attr_reader :errors
-  ERROR_LINE = /^((\/([\w\.]+))+)(\((\d+)\))?:\s*(col: (\d+))?\s*(\w+): (.+)$/
+  ERROR_LINE = /^((\/([\w\.]+))+)(\((\d+)\))?:\s*(col: (\d+))?:?\s*(Error|Warning+): (.+)$/
 
   def initialize(output)
     @output = output

data/lib/textmate_fcsh.rb

@@ -55,6 +55,9 @@ class TextmateFcsh
         if k == :default_size
           splitter = ' '
         end
+        if k == :library_path
+          splitter = '+='
+        end
         mxmlc_command << " -%s%s%s" % [k.to_s.gsub(/\_/, '-'),splitter,vsplitted]
       end
     end

data/spec/mxmlc_output_reader_spec.rb

@@ -48,5 +48,23 @@ EOD
     reader = MxmlcOutputReader.new(out)
     reader.errors.size.should be 1
   end
+   
+   
+  it "should process error" do
+    out = <<EOD
+/Users/japetheape/Projects/worldlogger/flash/src/com/worldlogger/air/view/globe/NebulaSkybox.as(12): col: 3: Error: unable to resolve 'assets/hot_nebula_0_lowquality.jpg' for transcoding.
+  
+  sometext
+EOD
+    reader = MxmlcOutputReader.new(out)
+    reader.errors.size.should be 1
+    error = reader.errors.first
+    error.line.should == "12"
+    error.level.should == "Error"    
+
+    error.column.should == "3"
+
+    
+  end
     
 end

data/textmate_fcsh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{textmate_fcsh}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jaap van der Meer"]
-  s.date = %q{2010-03-04}
+  s.date = %q{2010-03-08}
   s.default_executable = %q{textmate_fcsh}
   s.description = %q{Compile Flex in Textmate using FCSH. Advanced error reporting.}
   s.email = %q{jaapvandermeer@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: textmate_fcsh
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Jaap van der Meer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: textmate_fcsh
 dependencies: 
 - !ruby/object:Gem::Dependency