fcshd 0.2 → 0.3

data/Makefile

@@ -0,0 +1,6 @@
+build:
+	gem build fcshd.gemspec
+clean:
+	rm *.gem
+push: build
+	gem push fcshd-$(shell ruby -r lib/fcshd/version -e 'print FCSHD::VERSION').gem

data/bin/fcshc

@@ -23,15 +23,6 @@ $extra_arguments = []
 OptionParser.new do |parser|
   parser.banner = "Usage: fcshc MAIN [SRCDIR|LIB]... -o OUTPUT"
 
-  parser.on("--halo", "Use the Halo theme") do
-    if ENV["FLEX_HOME"]
-      $extra_arguments << "-theme=" +
-        File.join(ENV["FLEX_HOME"], *%w(frameworks themes Halo halo.swc))
-    else
-      die "must set $FLEX_HOME to use --halo option"
-    end
-  end
-
   parser.on("-o", "--output FILENAME", "Write SWF to FILENAME") do |value|
     $output_filename = File.expand_path(value)
   end
@@ -40,7 +31,16 @@ OptionParser.new do |parser|
     $extra_arguments << "-compatibility-version=3"
   end
 
-  parser.on("-X EXTRA-ARGUMENT", "Pass EXTRA-ARGUMENT to mxmlc") do |value|
+  parser.on("--no-flex", "Remove all runtime shared libraries (RSLs)") do
+    $extra_arguments << "-runtime-shared-library-path="
+  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
   end
 
@@ -68,6 +68,10 @@ if $source_filename == nil
   die "missing source file to compile"
 end
 
+if $source_directories == []
+  $source_directories << File.dirname($source_filename)
+end
+
 if $output_filename == nil
   $source_filename.sub(/\.(as|mxml)$/, ".swf").tap do |filename|
     local_filename = File.basename(filename)
@@ -79,6 +83,7 @@ $fcshd_arguments = ["mxmlc #$source_filename -output=#$output_filename"]
 
 for directory in $source_directories
   $fcshd_arguments << "-compiler.source-path+=#{directory}"
+  $fcshd_arguments << "-compiler.library-path+=#{directory}"
 end
 
 for filename in $library_filenames
@@ -88,10 +93,10 @@ end
 $fcshd_arguments.concat($extra_arguments)
 
 begin
-  host, port = "localhost", 34345
+  host, port = "localhost", FCSHD::Server::PORT
   socket = TCPSocket.new(host, port)
 rescue Errno::ECONNREFUSED
-  die "Could not connect to fcshd at #{host}:#{port}."
+  die "could not connect to fcshd at #{host}:#{port}"
 end
 
 basedir = File.join(File.expand_path("."), "")

data/bin/fcshd

@@ -9,16 +9,24 @@ rescue LoadError
 end
 
 logger = FCSHD::Logger.new(STDERR)
+
+logger.die <<"^D" if not FCSHD::FlexHome.known?
+Please put the Flex SDK in #{FlexHome.default} or set $FLEX_HOME.
+^D
+
+logger.log "This is fcshd #{FCSHD::VERSION}."
+logger.log "Flex SDK: #{FCSHD::FlexHome}"
+
 compiler = FCSHD::Compiler.new(logger)
 compiler.start! 
 
 Thread.abort_on_exception = true
 
-FCSHD_PORT = 34345
-
 begin
-  logger.log "Listening to port #{FCSHD_PORT}."
-  FCSHD::Server.new(FCSHD_PORT, compiler, logger).run!
+  FCSHD::Server.new(FCSHD::Server::PORT, compiler, logger).run!
+  logger.log "Now listening to port #{FCSHD_PORT}."
 rescue Interrupt
   logger.log "Exiting."
+rescue Exception => error
+  logger.error "Could not listen to port #{FCSHD_PORT}: #{error}"
 end

data/lib/fcshd.rb

@@ -1,6 +1,7 @@
-require "fcshd/compiler-output-writer"
-require "fcshd/compiler-output"
 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"

data/lib/fcshd/compiler.rb

@@ -1,52 +1,6 @@
 require "find"
 
 module FCSHD
-  module FlexHome
-    extend self
-
-    DEFAULT_FLEX_HOME = "/Library/Flex"
-
-    def known?
-      !!flex_home
-    end
-
-    def fcsh
-      flex_path("bin", "fcsh")
-    end
-
-    def find_standard_component(name)
-      Find.find(standard_source_directory_root) do |filename|
-        if barename(filename) == name
-          break File.dirname(filename).
-            sub(%r{.+/src/}, "").gsub("/", ".")
-        end
-      end
-    end
-
-  private
-
-    def flex_home
-      ENV["FLEX_HOME"] or
-        if File.directory? DEFAULT_FLEX_HOME
-          DEFAULT_FLEX_HOME
-        else
-          nil
-        end
-    end
-
-    def flex_path(*components)
-      File.join(flex_home, *components)
-    end
-
-    def standard_source_directory_root
-      flex_path("frameworks", "projects")
-    end
-
-    def barename(filename)
-      File.basename(filename).sub(/\..*/, "")
-    end
-  end
-
   class Compiler
     def initialize(logger)
       @logger = logger
@@ -54,7 +8,6 @@ module FCSHD
     end
 
     def start!
-      ensure_flex_home_known!
       start_fcsh_process!
       parse_fcsh_boilerplate!
       @logger.log "Started Flex #@flex_version compiler shell."
@@ -76,15 +29,6 @@ module FCSHD
 
   private
 
-    def ensure_flex_home_known!
-      if not FlexHome.known?
-        @logger.log <<"^D" 
-Please put the Flex SDK in #{FlexHome::DEFAULT_FLEX_HOME} or set $FLEX_HOME.
-^D
-        @logger.exit
-      end
-    end
-
     def start_fcsh_process!
       stop_fcsh_process!
       @fcsh_process = IO.popen("#{FlexHome.fcsh} 2>&1", "r+")
@@ -107,7 +51,7 @@ Please put the Flex SDK in #{FlexHome::DEFAULT_FLEX_HOME} or set $FLEX_HOME.
     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!
@@ -115,6 +59,9 @@ Please put the Flex SDK in #{FlexHome::DEFAULT_FLEX_HOME} or set $FLEX_HOME.
       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
       end
     end
 

data/lib/fcshd/flex-home.rb

@@ -0,0 +1,49 @@
+module FCSHD
+  module FlexHome
+    extend self
+
+    def default
+      "/Library/Flex"
+    end
+
+    def known?
+      !value.nil?
+    end
+
+    def value
+      ENV["FLEX_HOME"] or
+        if File.directory? default
+          default
+        else
+          nil
+        end
+    end
+
+    def to_s
+      value
+    end
+
+    def [](*components)
+      File.join(value, *components)
+    end
+
+    # ------------------------------------------------------
+
+    def fcsh
+      self["bin/fcsh"]
+    end
+
+    def halo_swc
+      self["frameworks/themes/Halo/halo.swc"]
+    end
+
+    # ------------------------------------------------------
+
+    def find_component(name)
+      Find.find(self["frameworks/projects"]) do |filename|
+        break File.dirname(filename).sub(%r{.+/src/}, "").gsub("/", ".") if
+          File.basename(filename).sub(/\..*/, "") == name
+      end
+    end
+  end
+end

data/lib/fcshd/server.rb

@@ -2,6 +2,8 @@ require "socket"
 
 module FCSHD
   class Server
+    PORT = 34345
+
     def initialize(port, compiler, logger)
       @server = TCPServer.new("localhost", port)
       @compiler = compiler
@@ -22,7 +24,7 @@ module FCSHD
         when /^mxmlc /
           compiler.compile! command, socket
         else
-          sockets.puts "fcshd: Unrecognized command: #{command}"
+          sockets.puts "fcshd: unrecognized command: #{command}"
         end
       rescue Errno::EPIPE
         logger.log "Broken pipe."

data/lib/fcshd/version.rb

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

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fcshd
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 Z
+date: 2011-11-02 00:00:00 Z
 dependencies: []
 
 description: |
@@ -35,6 +35,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- Makefile
 - README
 - bin/fcshc
 - bin/fcshd
@@ -43,6 +44,7 @@ files:
 - 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
@@ -77,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Usable CLI for the Adobe Flex compiler shell (fcsh)