fcshd 0.5.2 → 0.6

data/Rakefile

@@ -0,0 +1,29 @@
+require "./lib/fcshd/version"
+
+name, version = "fcshd", FCSHD::VERSION
+
+gem = "#{name}-#{version}.gem"
+gemspec = "#{name}.gemspec"
+sources = FileList["{bin,lib}/**/*"]
+
+task :default => [:uninstall, :install]
+
+task :install => gem do
+  sh "sudo gem install #{gem}"
+end
+
+task :uninstall do
+  sh "sudo gem uninstall #{name} -v #{version}"
+end
+
+file gem => FileList[gemspec, sources] do
+  sh "gem build #{gemspec}"
+end
+
+task :push => gem do
+  sh "gem push #{gem}"
+end
+
+require "rake/clean"
+
+CLEAN << "*.gem"

data/bin/fcshc

@@ -18,17 +18,20 @@ end
 
 $output_file = nil
 $source_files = []
+$libraries = []
 $library_files = []
 $directories = []
 $production = false
 $extra_arguments = []
 $verbose = false
+$restart_compiler = false
+$run_compilation = nil
 $dry_run = false
 
 OptionParser.new do |parser|
   parser.banner = <<EOF
-Usage: fcshc MAIN.[as|mxml] [SRCDIR|SWCDIR|SWC]... [-o OUTPUT.swf]
-       fcshc -o OUTPUT.swc [SRCDIR|SWCDIR|SWC]...
+Usage: fcshc MAIN.[as|mxml] [-l LIB] [SRCDIR|SWCDIR|SWC]... [-o OUT.swf]
+       fcshc -o OUT.swc SRCDIR... [-l LIB]... [SWCDIR|SWC]...
 
 To compile an SWF, name the main application source file, then any
 additional source directories, SWC directories, or SWC files.
@@ -36,37 +39,53 @@ 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.
 
+Dependencies can also be specified by name using the `-l LIB' option,
+which will search for LIB or LIB.swc in `~/.fcshd-lib'.  Both source
+directories, SWC directories, and SWC files can be named in this way.
+
 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|
+    $run_compilation = true
     $output_file = File.expand_path(value)
   end
 
+  parser.on("-l", "--library LIBRARY", "Search LIBRARY when compiling") do |value|
+    $run_compilation = true
+    $libraries << value
+  end
+
   parser.on("-X", "--extra-argument ARGUMENT", "Pass ARGUMENT to the compiler") do |value|
+    $run_compilation = true
     $extra_arguments << value
   end
 
   parser.on("-p", "--production", "Leave out debugging metadata") do
+    $run_compilation = true
     $production = true
   end
 
   parser.on("--static-rsls", "Use static linking for RSLs") do
+    $run_compilation = true
     $extra_arguments << "-static-link-runtime-shared-libraries=true"
   end
 
   parser.on("--no-rsls", "Remove all runtime shared libraries") do
+    $run_compilation = true
     $extra_arguments << "-runtime-shared-library-path="
   end
 
   parser.separator ""
 
   parser.on("-3", "--flex-3", "Use -compatibility-version=3") do |value|
+    $run_compilation = true
     $extra_arguments << "-compatibility-version=3"
   end
 
   parser.on("--halo", "Use the Halo theme") do
+    $run_compilation = true
     if FCSHD::FlexHome.known?
       $extra_arguments << "-theme=#{FCSHD::FlexHome.halo_swc}"
     else 
@@ -76,8 +95,15 @@ EOF
 
   parser.separator ""
 
+  parser.on("-R", "--restart", "Restart the compiler first") do
+    $run_compilation = false if $run_compilation == nil
+    $restart_compiler = true
+  end
+
   parser.on("-n", "--dry-run", "Only print the compiler command") do
+    $run_compilation = true
     $dry_run = true
+    $verbose = true
   end
 
   parser.on("--verbose", "Also print the compiler command") do
@@ -98,6 +124,7 @@ EOF
   parser.separator "TL;DR: $ fcshc src/my_app.mxml"
 end.parse!
 
+$run_compilation = true unless $run_compilation == false
 $extra_arguments << "-debug" unless $production
 
 for name in ARGV
@@ -114,66 +141,96 @@ for name in ARGV
   end
 end
 
-$compiling_swc = $output_file && $output_file.end_with?(".swc")
-
-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}"
+ENV["FCSHD_LIBRARY_PATH"] ||= ""
+ENV["FCSHD_LIBRARY_PATH"] += ":~/.fcshd-lib"
+
+def find_library(name)
+  nil.tap do
+    for x in ENV["FCSHD_LIBRARY_PATH"].split(":")
+      next if x == ""
+      x = File.expand_path(x)
+      if File.basename(x) == "#{name}.swc" and File.file? x
+        return :file, x
+      elsif File.directory? File.join(x, name)
+        return :directory, File.join(x, name)
+      elsif File.file? File.join(x, "#{name}.swc")
+        return :file, File.join(x, "#{name}.swc")
+      end
+    end
   end
+end
 
-  for directory in $directories
-    $fcshd_arguments << "-include-sources+=#{directory}"
+for library in $libraries
+  type, filename = find_library(library)
+  case type
+  when :directory
+    $directories << name
+  when :file
+    $library_files << filename
+  else
+    die "library not found: #{library}"
   end
+end
 
-  if FCSHD::FlexHome.known?
-    $extra_arguments << "-external-library-path+=#{FCSHD::FlexHome.libs}"
-  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"
+if $run_compilation
+  $compiling_swc = $output_file && $output_file.end_with?(".swc")
+  
+  if $compiling_swc
+    if [$source_files, $directories, $library_files] == [[], [], []]
+      die "must include at least one source file, directory, or SWC"
+    end
+  
+    $compilation_command = ["compc"]
+  
+    for file in $source_files
+      $compilation_command << "-include-sources+=#{file}"
+    end
+  
+    for directory in $directories
+      $compilation_command << "-include-sources+=#{directory}"
+    end
+  
+    if FCSHD::FlexHome.known?
+      for dir in FCSHD::FlexHome.framework_lib_dirs
+        $extra_arguments << "-external-library-path+=#{dir}"
+      end
+    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_file == nil
+      $source_file.sub(/\.(as|mxml)$/, ".swf").tap do |x|
+        $output_file = File.expand_path(File.basename(x))
+      end
+    end
+  
+    $compilation_command = ["mxmlc", "#$source_file"]
   end
-
-  if $directories.empty?
-    $directories << File.dirname($source_file)
+  
+  $compilation_command << "-output=#$output_file"
+  
+  for directory in $directories
+    $compilation_command << "-compiler.source-path+=#{directory}"
+    $compilation_command << "-compiler.library-path+=#{directory}"
   end
-
-  if $output_file == nil
-    $source_file.sub(/\.(as|mxml)$/, ".swf").tap do |x|
-      $output_file = File.expand_path(File.basename(x))
-    end
+  
+  for file in $library_files
+    $compilation_command << "-compiler.library-path+=#{file}"
   end
-
-  $fcshd_arguments = ["mxmlc", "#$source_file"]
-end
-
-$fcshd_arguments << "-output=#$output_file"
-
-for directory in $directories
-  $fcshd_arguments << "-compiler.source-path+=#{directory}"
-  $fcshd_arguments << "-compiler.library-path+=#{directory}"
-end
-
-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, "")
+  
+  $compilation_command.concat($extra_arguments)
 end
 
+warn $compilation_command.join(" ") if $verbose
 exit if $dry_run
 
 begin
@@ -183,7 +240,8 @@ rescue Errno::ECONNREFUSED
   die "could not connect to fcshd at #{host}:#{port}"
 end
 
-socket.puts fcshd_command
+socket.puts "restart" if $restart_compiler
+socket.puts $compilation_command.join(" ") if $run_compilation
 
 compiler_output = ""
 socket.each_line do |line|
@@ -196,5 +254,6 @@ socket.each_line do |line|
 end
 
 transcript = FCSHD::Transcript[compiler_output]
+basedir = File.join(File.expand_path("."), "")
 STDOUT.write transcript.to_s(basedir)
 exit 1 if not transcript.succeeded?

data/bin/fcshd

@@ -13,14 +13,13 @@ if ARGV == ["-v"] || ARGV == ["--version"]
   exit
 end
 
-logger = FCSHD::Logger.new(STDERR)
+logger = FCSHD::Logger.new(STDOUT)
 
-logger.die <<"^D" if not FCSHD::FlexHome.known?
+logger.die <<EOF if not FCSHD::FlexHome.known?
 Please put the Flex SDK in #{FlexHome.default} or set $FLEX_HOME.
-^D
+EOF
 
-logger.log "This is fcshd #{FCSHD::VERSION}."
-logger.log "Flex SDK: #{FCSHD::FlexHome}"
+logger.log "fcshd #{FCSHD::VERSION}"
 
 compiler = FCSHD::Compiler.new(logger)
 compiler.start! 

data/lib/fcshd/compiler.rb

@@ -1,25 +1,20 @@
-require "find"
-
+# -*- coding: utf-8 -*-
 module FCSHD
   class Compiler
     def initialize(logger)
       @logger = logger
       @output_buffer = ""
+      @command_ids = {}
     end
 
-    def start!
-      start_fcsh_process!
-      parse_fcsh_boilerplate!
-      @logger.log "Started Flex #@flex_version compiler shell."
-    rescue PromptNotFound => error
-      @logger.error "Could not find fcsh prompt:"
-      @logger.error @logger.format_command(FlexHome.fcsh, error.message)
-      @logger.exit
-    end
+    def start!; restart_fcsh_process! end
+    def restart!; restart_fcsh_process! end
 
     def compile! command, frontend
       @command, @frontend = command, frontend
 
+      log_horizontal_line
+
       if have_command_id?
         recompile!
       else
@@ -29,87 +24,101 @@ module FCSHD
 
   private
 
-    def start_fcsh_process!
+    def log_horizontal_line
+      @logger.log("—" * 60)
+    end
+
+    def have_command_id?
+      @command_ids.include? @command
+    end
+
+    def restart_fcsh_process!
       stop_fcsh_process!
+      @logger.log "starting #{FlexHome.fcsh}"
       @fcsh_process = IO.popen("#{FlexHome.fcsh} 2>&1", "r+")
-      read_fcsh_output!
+      read_until_prompt!
     end
 
     def stop_fcsh_process!
-      @fcsh_process.close if @fcsh_process
-      @fcsh_process = nil
-      @command_ids = {}
-    end
-
-    def parse_fcsh_boilerplate!
-      case @output
-      when /Version (\S+)/
-        @flex_version = $1
-      else
-        @flex_version = "(unknown version)"
+      if @fcsh_process
+        @logger.log "killing fcsh process"
+        @fcsh_process.close
+        @fcsh_process = nil
+        @command_ids = {}
       end
     end
 
     def compile_new!
-      @frontend.puts "fcshd: Compiling from scratch"
       @frontend.flush
       send_fcsh_command! @command
-      parse_compilation_output!
+      process_compilation_output!
     ensure
       if not have_command_id?
-        @logger.error "Could not determine compilation ID:"
-        @logger.error @logger.format_command("(fcsh) #@command", @output)
-
-        @frontend.puts "fcshd: internal error"
-        @frontend.flush
+        report_internal_error "could not determine compilation ID"
       end
     end
 
     def recompile!
       send_fcsh_command! "compile #{command_id}"
-      parse_compilation_output!
+      process_compilation_output!
+    rescue FCSHError => error
+      case error.message
+      when "Error: null"
+        @frontend.puts "fcshd: Adobe-internal error; restarting fcsh..."
+        restart_fcsh_process!
+        @frontend.puts "fcshd: retrying your compilation"
+        compile_new!
+      else
+        report_internal_error "unknown fcsh error: #{error.message}"
+      end
     end
 
     def command_id
       @command_ids[@command]
     end
 
-    def command_id= id
-      @command_ids[@command] = id
-    end
+    class FCSHError < StandardError; end
 
-    def have_command_id?
-      @command_ids.include? @command
+    def report_internal_error(message)
+      @logger.error(message)
+      @frontend.puts "fcshd: internal error; see fcshd log"
+      @frontend.flush
     end
 
-    def parse_compilation_output!
-      for line in @output.lines
+    def process_compilation_output!
+      for line in @output.lines.map(&:chomp)
         case line
         when /^fcsh: Assigned (\d+) as the compile target id$/
           self.command_id = $1
+        when "Error: null"
+          raise FCSHError, line
         else
           @frontend.puts(line)
-          @logger.log_raw(line) if line =~ /^fcsh: /
         end
       end
     end
 
+    def command_id= id
+      @command_ids[@command] = id
+    end
+
     def send_fcsh_command! command
-      @logger.log_raw("> #{command}")
+      @logger.log(command)
       @fcsh_process.puts(command)
-      read_fcsh_output!
+      read_until_prompt!
     end
 
     FCSH_PROMPT = "\n(fcsh) "
-    class PromptNotFound < Exception ; end
 
-    def read_fcsh_output!
+    def read_until_prompt!
       @output_buffer << @fcsh_process.readpartial(256) until
         @output_buffer.include? FCSH_PROMPT
       @output, @output_buffer =
         @output_buffer.split(FCSH_PROMPT, 2)
+      @logger.dump @output
     rescue EOFError
-      raise PromptNotFound, @output_buffer
+      @logger.dump @output_buffer
+      @logger.die "could not find fcsh prompt"
     end
   end
 end

data/lib/fcshd/flex-home.rb

@@ -1,3 +1,5 @@
+require "find"
+
 module FCSHD
   module FlexHome
     extend self
@@ -33,8 +35,12 @@ module FCSHD
       self["bin/fcsh"]
     end
 
-    def libs
-      self["frameworks/libs"]
+    def framework_lib_dirs
+      [].tap do |result|
+        Find.find(self["frameworks/libs"]) do |file|
+          result << file if File.directory? file
+        end
+      end
     end
 
     def halo_swc

data/lib/fcshd/logger.rb

@@ -1,21 +1,17 @@
 module FCSHD
   class Logger
     def initialize(output)
-      @stderr = output
-    end
-
-    def log_raw(message)
-      @stderr.puts message
+      @output = output
     end
 
     def log(message)
       for line in message.lines
-        log_raw "#{program_name}: #{line.chomp}"
+        @output.puts "#{File.basename($0)}: #{line.chomp}"
       end
     end
 
-    def program_name
-      File.basename($0)
+    def dump(output)
+      @output.puts output.chomp
     end
 
     def error(message)
@@ -25,17 +21,8 @@ module FCSHD
     end
 
     def die(message)
-      error message ; exit
-    end
-
-    def exit(code=1)
-      Kernel.exit code
-    end
-
-    def format_command(command, output)
-      ["$ #{command}", *output.lines].
-        map { |line| "    #{line.chomp}" }.
-        join("\n")
+      error message
+      exit 1
     end
   end
 end

data/lib/fcshd/server.rb

@@ -20,9 +20,12 @@ module FCSHD
 
     class Client < Struct.new(:socket, :compiler)
       def run!
-        case command = socket.gets
+        case command = socket.gets.chomp
         when /^(mxmlc|compc) /
           compiler.compile! command, socket
+        when "restart"
+          compiler.restart!
+          socket.puts "fcshd: compiler restarted"
         else
           socket.puts "fcshd: unrecognized command: #{command}"
         end

data/lib/fcshd/transcript-item.rb

@@ -33,6 +33,15 @@ module FCSHD
       end
     end
 
+    def format_type(type)
+      case type
+      when /^__AS3__\.vec:Vector\.<(.*)>$/
+        "Vector.<#{$1.sub(/.+:/, "")}>"
+      else
+        type.sub(/.+:/, "")
+      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
@@ -78,10 +87,9 @@ 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})
+        if format_type(actual) != format_type(expected)
+        then <<EOF else <<EOF end
+error: expected #{format_type(expected)} (got #{format_type(actual)})
 EOF
 error: expected #{expected} (got #{actual})
 EOF

data/lib/fcshd/transcript-parser.rb

@@ -29,8 +29,9 @@ module FCSHD
         when /^Required RSLs:$/
           skip_indented_lines! # Does anybody care about this?
 
-        when /^(Recompile|Reason): /
+        when /^(Recompile|Reason|Updated): /
         when /^Loading configuration file /
+        when "Detected configuration changes. Recompile..."
 
         else
           # Let unrecognized lines pass through verbatim.

data/lib/fcshd/version.rb

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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fcshd
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 Z
+date: 2011-12-19 00:00:00 Z
 dependencies: []
 
 description: |
@@ -36,8 +35,8 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
-- Makefile
 - README
+- Rakefile
 - bin/fcshc
 - bin/fcshd
 - fcshd.gemspec

data/Makefile

@@ -1,12 +0,0 @@
-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