fcshd 0.3.1 → 0.5

data/Makefile

@@ -1,6 +1,12 @@
+version=$(shell ruby -r lib/fcshd/version -e 'print FCSHD::VERSION')
+
+default: install
+
 build:
 	gem build fcshd.gemspec
+install: build
+	sudo gem install fcshd-${version}.gem
+push: build
+	gem push fcshd-${version}.gem
 clean:
 	rm *.gem
-push: build
-	gem push fcshd-$(shell ruby -r lib/fcshd/version -e 'print FCSHD::VERSION').gem

data/bin/fcshc

@@ -16,82 +16,159 @@ def die(message)
   exit 1
 end
 
-$source_directories = []
-$library_filenames = []
+$output_file = nil
+$source_files = []
+$library_files = []
+$directories = []
+$production = false
 $extra_arguments = []
+$verbose = false
+$dry_run = false
 
 OptionParser.new do |parser|
-  parser.banner = "Usage: fcshc MAIN [SRCDIR|LIB]... -o OUTPUT"
+  parser.banner = <<EOF
+Usage: fcshc MAIN.[as|mxml] [SRCDIR|SWCDIR|SWC]... [-o OUTPUT.swf]
+       fcshc -o OUTPUT.swc [SRCDIR|SWCDIR|SWC]...
 
-  parser.on("-o", "--output FILENAME", "Write SWF to FILENAME") do |value|
-    $output_filename = File.expand_path(value)
+To compile an SWF, name the main application source file, then any
+additional source directories, SWC directories, or SWC files.
+
+To compile an SWC using `compc', you must provide the `-o' option, and
+then at least one source directory, SWC directory, or SWC file.
+
+To pass extra arguments, use e.g. `-X -include-file -X NAME -X FILE'.
+
+EOF
+
+  parser.on("-o", "--output OUTPUT.[swf|swc]", "Name of the resulting binary") do |value|
+    $output_file = File.expand_path(value)
   end
 
-  parser.on("-3", "Use -compatibility-version=3") do |value|
-    $extra_arguments << "-compatibility-version=3"
+  parser.on("-X", "--extra-argument ARGUMENT", "Pass ARGUMENT to the compiler") do |value|
+    $extra_arguments << value
   end
 
-  parser.on("--no-flex", "Remove all runtime shared libraries (RSLs)") do
+  parser.on("-p", "--production", "Leave out debugging metadata") do
+    $production = true
+  end
+
+  parser.on("--static-rsls", "Use static linking for RSLs") do
+    $extra_arguments << "-static-link-runtime-shared-libraries=true"
+  end
+
+  parser.on("--no-rsls", "Remove all runtime shared libraries") do
     $extra_arguments << "-runtime-shared-library-path="
   end
 
+  parser.separator ""
+
+  parser.on("-3", "--flex-3", "Use -compatibility-version=3") do |value|
+    $extra_arguments << "-compatibility-version=3"
+  end
+
   parser.on("--halo", "Use the Halo theme") do
     die "must set $FLEX_HOME to use --halo option" if not FlexHome.known?
     $extra_arguments << "-theme=#{FlexHome.halo_swc}"
   end
 
-  parser.on("-X EXTRA-ARGUMENT", "Pass EXTRA-ARGUMENT to mxmlc (multiple allowed)") do |value|
-    $extra_arguments << value
+  parser.separator ""
+
+  parser.on("-n", "--dry-run", "Only print the compiler command") do
+    $dry_run = true
   end
 
-  parser.on("-v", "--verbose", "Print mxmlc command line") do
+  parser.on("--verbose", "Also print the compiler command") do
     $verbose = true
   end
+
+  parser.on("-v", "--version", "Show `fcshc #{FCSHD::VERSION}'") do
+    puts "fcshc #{FCSHD::VERSION}"
+    exit
+  end
+
+  parser.on("-h", "--help", "Show this message") do
+    puts parser
+    exit
+  end
+
+  parser.separator ""
+  parser.separator "TL;DR: $ fcshc src/my_app.mxml"
 end.parse!
 
+$extra_arguments << "-debug" unless $production
+
 for name in ARGV
   if not File.exists? name
     die "no such file or directory: #{name}"
   elsif File.directory? name
-    $source_directories << File.expand_path(name)
+    $directories << File.expand_path(name)
   elsif %w(.as .mxml).include? File.extname(name)
-    die "multiple source files not allowed" if $source_filename
-    $source_filename = File.expand_path(name)
+    $source_files << File.expand_path(name)
   elsif %w(.swc).include? File.extname(name)
-    $library_filenames << File.expand_path(name)
+    $library_files << File.expand_path(name)
   else
     die "don't know what to do with file: #{name}"
   end
 end
 
-if $source_filename == nil
-  die "missing source file to compile"
-end
+$compiling_swc = $output_file && $output_file.end_with?(".swc")
 
-if $source_directories == []
-  $source_directories << File.dirname($source_filename)
-end
+if $compiling_swc
+  if [$source_files, $directories, $library_files] == [[], [], []]
+    die "must include at least one source file, directory, or SWC"
+  end
+
+  $fcshd_arguments = ["compc"]
+
+  for file in $source_files
+    $fcshd_arguments << "-include-sources+=#{file}"
+  end
+
+  for directory in $directories
+    $fcshd_arguments << "-include-sources+=#{directory}"
+  end
+else
+  case $source_files.size
+  when 0: die "missing main application source file"
+  when 1: $source_file = $source_files.first
+  else die "multiple source files not allowed when compiling SWF"
+  end
+
+  if $directories.empty?
+    $directories << File.dirname($source_file)
+  end
 
-if $output_filename == nil
-  $source_filename.sub(/\.(as|mxml)$/, ".swf").tap do |filename|
-    local_filename = File.basename(filename)
-    $output_filename = File.expand_path(local_filename)
+  if $output_file == nil
+    $source_file.sub(/\.(as|mxml)$/, ".swf").tap do |x|
+      $output_file = File.expand_path(File.basename(x))
+    end
   end
+
+  $fcshd_arguments = ["mxmlc", "#$source_file"]
 end
 
-$fcshd_arguments = ["mxmlc #$source_filename -output=#$output_filename"]
+$fcshd_arguments << "-output=#$output_file"
 
-for directory in $source_directories
+for directory in $directories
   $fcshd_arguments << "-compiler.source-path+=#{directory}"
   $fcshd_arguments << "-compiler.library-path+=#{directory}"
 end
 
-for filename in $library_filenames
-  $fcshd_arguments << "-compiler.library-path+=#{filename}"
+for file in $library_files
+  $fcshd_arguments << "-compiler.library-path+=#{file}"
 end
 
 $fcshd_arguments.concat($extra_arguments)
 
+basedir = File.join(File.expand_path("."), "")
+fcshd_command = $fcshd_arguments.join(" ")
+
+if $verbose || $dry_run
+  warn fcshd_command.gsub(basedir, "")
+end
+
+exit if $dry_run
+
 begin
   host, port = "localhost", FCSHD::Server::PORT
   socket = TCPSocket.new(host, port)
@@ -99,10 +176,6 @@ rescue Errno::ECONNREFUSED
   die "could not connect to fcshd at #{host}:#{port}"
 end
 
-basedir = File.join(File.expand_path("."), "")
-
-fcshd_command = $fcshd_arguments.join(" ")
-warn fcshd_command.gsub(basedir, "") if $verbose
 socket.puts fcshd_command
 
 compiler_output = ""
@@ -115,7 +188,6 @@ socket.each_line do |line|
   end
 end
 
-output = FCSHD::CompilerOutput[compiler_output, basedir]
-output.write! FCSHD::CompilerOutputWriter.new(STDOUT, basedir)
-
-exit 1 if not output.succeeded?
+transcript = FCSHD::Transcript[compiler_output]
+STDOUT.write transcript.to_s(basedir)
+exit 1 if not transcript.succeeded?

data/bin/fcshd

@@ -8,6 +8,11 @@ rescue LoadError
   require "fcshd"
 end
 
+if ARGV == ["-v"] || ARGV == ["--version"]
+  puts "fcshd #{FCSHD::VERSION}"
+  exit
+end
+
 logger = FCSHD::Logger.new(STDERR)
 
 logger.die <<"^D" if not FCSHD::FlexHome.known?
@@ -26,6 +31,7 @@ begin
   FCSHD::Server.new(FCSHD::Server::PORT, compiler, logger).run!
   logger.log "Now listening to port #{FCSHD_PORT}."
 rescue Interrupt
+  logger.log ""
   logger.log "Exiting."
 rescue Exception => error
   logger.error "Could not listen to port #{FCSHD_PORT}: #{error}"

data/lib/fcshd/compiler.rb

@@ -51,7 +51,7 @@ module FCSHD
     end
 
     def compile_new!
-      @frontend.puts "fcshd: compiling from scratch"
+      @frontend.puts "fcshd: Compiling from scratch"
       @frontend.flush
       send_fcsh_command! @command
       parse_compilation_output!

data/lib/fcshd/problem.rb

@@ -1,153 +1,7 @@
-# -*- coding: utf-8 -*-
-
 module FCSHD
-  class Problem < Struct.new(:source_location, :raw_mxmlc_message)
-    ERROR_PREFIX = /^\s*Error: /
-
-    def mxmlc_message
-      raw_mxmlc_message.sub(ERROR_PREFIX, "")
-    end
-
-    def error?
-      raw_mxmlc_message =~ ERROR_PREFIX
-    end
-
-    def quote(string)
-      "‘#{string}’"
-    end
-
-    def message
-      case raw = raw_message
-      when String then raw
-      when Array then raw * "\n"
-      else fail
-      end
-    end
-
-    def raw_message
-      case mxmlc_message
-
-      when "Unable to resolve MXML language version. Please specify the language namespace on the root document tag."
-      then
-        <<"^D"
-missing MXML version
-→ xmlns:fx="library://ns.adobe.com/mxml/2009"
-→ xmlns="library://ns.adobe.com/flex/spark"
-→ xmlns:mx="library://ns.adobe.com/flex/mx" (Flex 3 compatibility)
-→ xmlns="http://www.adobe.com/2006/mxml" (Flex 3)
-^D
-
-      when /^Incorrect number of arguments.  Expected (\d+)\.$/
-      then "expected #$1 arguments"
-
-      when /^(?:Access of possibly undefined property|Call to a possibly undefined method) (.+) through a reference with static type (.+)\.$/
-      then "#{quote $1} undeclared in #$2"
-
-      when /^Attempted access of inaccessible property (.+) through a reference with static type (.+)\.$/
-      then "#{quote $1} inaccessible in #$2"
-
-      when
-        /^Could not resolve <(.+)> to a component implementation.$/,
-        /^Call to a possibly undefined method (.+).$/,
-        /^Access of undefined property (.+).$/,
-        /^The definition of base class (.+) was not found.$/,
-        /^Type was not found or was not a compile-time constant: (.+)\.$/
-      then
-        ["#{quote $1} undeclared"].tap do |result|
-          FlexHome.find_component($1).tap do |package|
-            result << "→ import #{package}.*" if package
-          end
-        end
-
-      when /^Definition (.+) could not be found\.$/
-      then "#{quote $1} not found"
-
-      when
-        /^Implicit coercion of a value of type (.+) to an unrelated type (.+)\.$/,
-
-        /^Implicit coercion of a value with static type (.+) to a possibly unrelated type (.+)\./
-
-      then
-        actual, expected = $1, $2
-        expected_base = expected.sub(/.+:/, "")
-        actual_base = actual.sub(/.+:/, "")
-        if actual_base != expected_base
-          "expected #{expected_base} (got #{actual_base})"
-        else
-          "expected #{expected} (got #{actual})"
-        end
-
-      when "Method marked override must override another method."
-      then "overriding nonexistent method"
-
-      when "Overriding a function that is not marked for override."
-      then ["unmarked override", "→ add override keyword"]
-
-      when "Incompatible override."
-      then "incompatible override"
-
-      when /^Ambiguous reference to (.+)\.$/
-      then "#{quote $1} is ambiguous"
-
-      when /^A conflict exists with definition (.+) in namespace internal\.$/
-      then "#{quote $1} is conflicting"
-
-      when
-        /^Warning: parameter '(.+)' has no type declaration\.$/,
-        /^Warning: return value for function '(.+)' has no type declaration\.$/
-      then
-        case $1
-        when "anonymous" then "anonymous function"
-        else quote $1
-        end + " missing type declaration"
-
-      when /^A file found in a source-path must have the same package structure '(.*)', as the definition's package, '(.*)'\.$/
-      then "package should be #{quote $1}"
-
-      when /^Comparison between a value with static type (.+) and a possibly unrelated type (.+)\.$/
-      then "comparing #$1 to #$2"
-
-      when "Illegal assignment to a variable specified as constant."
-      then "modifying constant"
-
-      when "Function does not have a body."
-      then "missing function body"
-
-      when "Return type of a setter definition must be unspecified or void."
-      then "setter must return void"
-
-      when "Function does not return a value."
-      then "missing return statement"
-
-      when "Syntax error: expecting identifier before rightparen."
-      then "#{quote ")"} unexpected"
-
-      when
-        /^The (.+) attribute can only be used inside a package\./,
-        /^The (.+) attribute may be used only on class property definitions\./
-      then
-        "#{quote $1} unexpected"
-
-      else
-        mxmlc_message
-      end
-    end
-
-    def formatted_message_lines
-      lines = message.lines.entries
-      if error?
-        first = <<"^D"
-error: #{lines[0].chomp}
-^D
-        rest = lines[1..-1].map do |line|
-          <<"^D"
-       #{line.chomp}
-^D
-        end
-        [first] + rest
-      else
-        lines
-      end
+  class Problem < Struct.new(:location, :message)
+    def to_s(basedir)
+      "#{location.to_s(basedir)}: #{message}"
     end
   end
 end

data/lib/fcshd/server.rb

@@ -21,10 +21,10 @@ module FCSHD
     class Client < Struct.new(:socket, :compiler)
       def run!
         case command = socket.gets
-        when /^mxmlc /
+        when /^(mxmlc|compc) /
           compiler.compile! command, socket
         else
-          sockets.puts "fcshd: unrecognized command: #{command}"
+          socket.puts "fcshd: unrecognized command: #{command}"
         end
       rescue Errno::EPIPE
         logger.log "Broken pipe."

data/lib/fcshd/source-location.rb

@@ -1,27 +1,15 @@
 module FCSHD
-  class SourceLocation < Struct.new \
-    :filename, :line_number, :column_number, :basedir
-
-    def to_s
-      relative_filename.tap do |result|
-        result << ":#{line_number}" if line_number
-      end
+  class SourceLocation < Struct.new(:filename, :line_number)
+    def to_s(basedir=nil)
+      "#{relative_filename(basedir)}:#{line_number || 0}"
     end
 
-    def relative_filename
+    def relative_filename(basedir)
       if basedir
         filename.sub(/^#{Regexp.quote(basedir)}/, "")
       else
         filename
       end
     end
-
-    def with_basedir(new_basedir)
-      dup.tap { |result| result.basedir = new_basedir }
-    end
-
-    def without_column_number
-      dup.tap { |result| result.column_number = nil }
-    end
   end
 end

data/lib/fcshd/transcript-item.rb

@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+
+module FCSHD
+  class Transcript; end
+  class Transcript::Item < Struct.new(:location, :mxmlc_message)
+    def to_s(basedir)
+      problems.map { |problem| problem.to_s(basedir) }.join("\n")
+    end
+
+    def problems
+      get_problems(parsed_message)
+    end
+
+  private
+
+    def get_problems(item)
+      case item
+      when String
+        get_problems_at(location, item)
+      when Array
+        if item.first.is_a? SourceLocation
+          get_problems_at(item[0], item[1])
+        else
+          item.map { |item| get_problems(item) }.flatten(1)
+        end
+      else fail
+      end
+    end
+
+    def get_problems_at(location, message)
+      message.split("\n").map do |message|
+        Problem[location, message]
+      end
+    end
+
+    def parsed_message
+      case FCSHD.trim(mxmlc_message).sub(/^Error: /, "")
+      when "Unable to resolve MXML language version. Please specify the language namespace on the root document tag.": <<EOF
+error: missing MXML version
+error: hint: xmlns:fx="library://ns.adobe.com/mxml/2009"
+error: hint: xmlns="library://ns.adobe.com/flex/spark"
+error: hint: xmlns:mx="library://ns.adobe.com/flex/mx" (Flex 4)
+error: hint: xmlns="http://www.adobe.com/2006/mxml" (Flex 3)
+EOF
+      when /^Incorrect number of arguments. Expected (\d+)\.$/: <<EOF
+error: expected #$1 arguments
+EOF
+      when
+        /^Access of possibly undefined property (.+) through a reference with static type (.+)\.$/,
+        /^Call to a possibly undefined method (.+) through a reference with static type (.+)\.$/,
+        /^Cannot resolve attribute '(.+)' for component type (.+)\.$/
+      then <<EOF
+error: #{quote $1} undeclared in #{name $2}
+EOF
+      when /^Attempted access of inaccessible property (.+) through a reference with static type (.+)\.$/: <<EOF
+error: #{quote $1} inaccessible in #{name $2}
+EOF
+      when
+        /^Could not resolve <(.+)> to a component implementation\.$/,
+        /^Call to a possibly undefined method (.+)\.$/,
+        /^Access of undefined property (.+)\.$/,
+        /^The definition of base class (.+) was not found\.$/,
+        /^Type was not found or was not a compile-time constant: (.+)\.$/
+      then
+         [<<EOF].tap do |result|
+error: #{quote $1} undeclared
+EOF
+          FlexHome.find_component($1).tap do |package|
+            result << <<EOF if package
+error: hint: import #{package}.#$1
+EOF
+          end
+        end
+      when /^Definition (.+) could not be found\.$/: <<EOF
+error: #{quote $1} not found
+EOF
+      when /^Implicit coercion of a value of type (.+) to an unrelated type (.+)\.$/, /^Implicit coercion of a value with static type (.+) to a possibly unrelated type (.+)\./
+        actual, expected = $1, $2
+        expected_local = expected.sub(/.+:/, "")
+        actual_local = actual.sub(/.+:/, "")
+        actual_local != expected_local ? <<EOF : <<EOF
+error: expected #{expected_local} (got #{actual_local})
+EOF
+error: expected #{expected} (got #{actual})
+EOF
+      when "Method marked override must override another method.": <<EOF
+error: overriding nonexistent method
+EOF
+      when "Overriding a function that is not marked for override.": <<EOF
+error: unmarked override
+EOF
+      when "Incompatible override.": <<EOF
+error: incompatible override
+EOF
+      when /^Ambiguous reference to (.+)\.$/: <<EOF
+error: #{quote $1} is ambiguous
+EOF
+      when /^Can not resolve a multiname reference unambiguously. (\S+) \(from ([^)]+)\) and (\S+) \(from ([^)]+)\) are available\.$/
+      then
+        [<<EOF, [SourceLocation[$2], <<EOF], [SourceLocation[$4], <<EOF]]
+error: #{quote name $1} conflicts with #{quote name $3}
+EOF
+error: conflicting definition
+EOF
+error: conflicting definition
+EOF
+      when /^A conflict exists with definition (.+) in namespace internal\.$/: <<EOF
+error: #{quote $1} conflicts with an internal name
+EOF
+      when
+        /^Warning: parameter '(.+)' has no type declaration\.$/,
+        /^Warning: return value for function '(.+)' has no type declaration\.$/
+      then
+        who = $1 == "anonymous" ? "anonymous function" : quote($1)
+        <<EOF
+error: #{who} missing type declaration
+EOF
+      when /^A file found in a source-path must have the same package structure '(.*)', as the definition's package, '(.*)'\.$/: <<EOF
+error: package should be #{quote $1}
+EOF
+      when /^Comparison between a value with static type (.+) and a possibly unrelated type (.+)\.$/: <<EOF
+error: comparing #$1 to #$2
+EOF
+      when "Illegal assignment to a variable specified as constant.": <<EOF
+error: modifying constant
+EOF
+      when "Function does not have a body.": <<EOF
+error: missing function body"
+EOF
+      when "Return type of a setter definition must be unspecified or void.": <<EOF
+error: setter must return void"
+EOF
+      when "Function does not return a value.": <<EOF
+error: missing return statement"
+EOF
+      when "Syntax error: expecting identifier before rightparen.": <<EOF
+error: #{quote ")"} unexpected"
+EOF
+      when
+        /^The (.+) attribute can only be used inside a package\./,
+        /^The (.+) attribute may be used only on class property definitions\./
+      then
+        <<EOF
+error: #{quote $1} unexpected
+EOF
+      else
+        mxmlc_message
+      end
+    end
+
+    def quote(string) "‘#{string}’" end
+    def name(string) string.sub! ":", "." end
+  end
+end

data/lib/fcshd/transcript-parser.rb

@@ -0,0 +1,65 @@
+module FCSHD
+  class Transcript; end
+  class Transcript::Parser < Struct.new(:lines)
+    def parse!
+      Transcript.new.tap do |result|
+        @result = result
+        parse_line! until lines.empty?
+      end
+    end
+
+    attr_reader :result
+
+    def parse_line!
+      take_line! do |line|
+        case FCSHD.trim(line)
+        when / \((\d+) bytes\)$/
+          result.succeeded = true
+
+        when "Nothing has changed since the last compile. Skip..."
+          result.n_compiled_files = 0
+
+        when /^Files changed: (\d+) Files affected: (\d+)$/
+          result.n_compiled_files = $1.to_i + $2.to_i
+
+        when /^(\/.+?)(?:\((\d+)\))?: (?:col: \d+ )?(.+)$/
+          result << Transcript::Item[SourceLocation[$1, $2.to_i], $3]
+          skip_indented_lines! # Ignore the "diagram" of the problem.
+
+        when /^Required RSLs:$/
+          skip_indented_lines! # Does anybody care about this?
+
+        when /^(Recompile|Reason): /
+        when /^Loading configuration file /
+
+        else
+          # Let unrecognized lines pass through verbatim.
+          if line.start_with? "fcshd: "
+            result << line
+          else
+            # XXX: What about when we support compc?
+            result << "mxmlc: #{line}"
+          end
+        end
+      end
+    end
+
+    def take_line!
+      yield skip_line!
+    end
+
+    def skip_line!
+      current_line
+    ensure
+      lines.shift
+    end
+
+    def current_line
+      lines.first.chomp
+    end
+
+    def skip_indented_lines!
+      skip_line! until lines.empty? or current_line =~ /^\S/
+    end
+  end
+end

data/lib/fcshd/transcript.rb

@@ -0,0 +1,35 @@
+module FCSHD
+  class Transcript
+    def self.[] text
+      Parser.new(text.split("\n")).parse!
+    end
+
+    def initialize
+      @items = []
+    end
+
+    def << item
+      @items << item
+    end
+
+    attr_accessor :n_compiled_files
+
+    def succeeded= value; @succeeded = value; end
+    def succeeded?; @succeeded; end
+
+    def to_s(basedir)
+      @items.map do |item|
+        case item
+        when Item
+          item.to_s(basedir)
+        else
+          item.to_s
+        end
+      end.join("\n")
+    end
+
+    def nothing_to_do?
+      n_compiled_files == 0
+    end
+  end
+end

data/lib/fcshd/version.rb

@@ -1,5 +1,5 @@
 unless defined? FCSHD::VERSION
   module FCSHD
-    VERSION = "0.3.1"
+    VERSION = "0.5"
   end
 end

data/lib/fcshd.rb

@@ -1,9 +1,16 @@
+module FCSHD
+  def self.trim(string)
+    string.gsub(/\s+/, " ").gsub(/^ | $/, "")
+  end
+end
+
 require "fcshd/compiler"
-require "fcshd/compiler-output"
-require "fcshd/compiler-output-writer"
 require "fcshd/flex-home"
 require "fcshd/logger"
 require "fcshd/problem"
 require "fcshd/server"
 require "fcshd/source-location"
+require "fcshd/transcript"
+require "fcshd/transcript-item"
+require "fcshd/transcript-parser"
 require "fcshd/version"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fcshd
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 1
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-12-01 00:00:00 Z
 dependencies: []
 
 description: |
@@ -42,14 +41,15 @@ files:
 - bin/fcshd
 - fcshd.gemspec
 - lib/fcshd.rb
-- lib/fcshd/compiler-output-writer.rb
-- lib/fcshd/compiler-output.rb
 - lib/fcshd/compiler.rb
 - lib/fcshd/flex-home.rb
 - lib/fcshd/logger.rb
 - lib/fcshd/problem.rb
 - lib/fcshd/server.rb
 - lib/fcshd/source-location.rb
+- lib/fcshd/transcript-item.rb
+- lib/fcshd/transcript-parser.rb
+- lib/fcshd/transcript.rb
 - lib/fcshd/version.rb
 homepage: http://github.com/dbrock/fcshd
 licenses: []
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Usable CLI for the Adobe Flex compiler shell (fcsh)

data/lib/fcshd/compiler-output-writer.rb

@@ -1,19 +0,0 @@
-module FCSHD
-  class CompilerOutputWriter
-    def initialize(output, basedir)
-      @output = output
-      @basedir = basedir
-    end
-
-    def write_uninterpreted_line! line
-      @output.puts line
-    end
-
-    def write_problem! problem
-      location = problem.source_location.with_basedir(@basedir)
-      for line in problem.formatted_message_lines do
-        @output.puts "#{location}: #{line}"
-      end
-    end
-  end
-end

data/lib/fcshd/compiler-output.rb

@@ -1,91 +0,0 @@
-module FCSHD
-  class CompilerOutput
-    def self.[] text, basedir
-      new.tap do |result|
-        Parser.new(text.lines.entries, basedir, result).parse!
-      end
-    end
-
-    attr_accessor :n_compiled_files
-
-    def initialize
-      @events = []
-    end
-
-    def << event
-      @events << event
-    end
-
-    def write! writer
-      for event in @events
-        case event
-        when String
-          writer.write_uninterpreted_line! event
-        when Problem
-          writer.write_problem! event
-        end
-      end
-    end
-
-    def nothing_to_do?
-      n_compiled_files == 0
-    end
-
-    def succeeded!
-      @succeeded = true
-    end
-
-    def succeeded?
-      @succeeded
-    end
-
-    class Parser < Struct.new(:lines, :basedir, :result)
-      def parse!
-        parse_line! until lines.empty?
-      end
-
-      def parse_line!
-        take_line! do |line|
-          case line
-          when /^(Recompile|Reason): /
-          when /^Loading configuration file /
-          when /^(.+\.swf) \((\d+) bytes\)$/
-            result.succeeded!
-          when "Nothing has changed since the last compile. Skip..."
-            result.n_compiled_files = 0
-          when /^Files changed: (\d+) Files affected: (\d+)$/
-            result.n_compiled_files = $1.to_i + $2.to_i
-          when /^(\/.+?)(?:\((\d+)\))?: (?:col: (\d+) )?(.+)$/
-            location = SourceLocation[$1, $2.to_i, $3.to_i, basedir]
-            result << Problem[location, $4]
-            skip_indented_lines!
-          when /^Required RSLs:$/
-            skip_indented_lines!
-          when /^fcshd: /
-            result << line
-          else
-            result << "mxmlc: #{line}"
-          end
-        end
-      end
-
-      def take_line!
-        yield skip_line!
-      end
-
-      def skip_line!
-        current_line
-      ensure
-        lines.shift
-      end
-
-      def current_line
-        lines[0].chomp
-      end
-
-      def skip_indented_lines!
-        skip_line! until lines.empty? or current_line =~ /^\S/
-      end
-    end
-  end
-end