fcshd 0.7.1 → 0.7.2

data/README.md

@@ -9,7 +9,7 @@ prefer to compile code from the terminal or their favorite editor:
   * It abstracts away the crazy command-line interface of `mxmlc` and
     gives you a simpler and more `gcc`-like interface to work with.
 
-  * It postprocesses all compiler output, simplifies most of the
+  * It post-processes all compiler output, simplifies most of the
     verbose (sometimes bordering on rambling) error messages, and
     converts the stack traces into a more conventional GNU-style
     format (so that tools like Emacs can understand them).
@@ -18,11 +18,10 @@ prefer to compile code from the terminal or their favorite editor:
     reference any source directory or SWC you link into `~/.fcshd-lib`
     (or `$FCSHD_LIBRARY_PATH`, if set) through the `-l` option.
 
-
 It makes the easy easy:
 
 ```
-$ fcshc src/foo.mxml
+$ fcshc src/foo.mxml -o foo.swf
 ```
 
 And the hard possible:
@@ -46,7 +45,7 @@ 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`.
 
 ```
-    -o, --output OUTPUT.[swf|swc]    Name of the resulting binary
+    -o, --output OUTPUT.{swf,swc}    Name of the resulting binary
     -l, --library LIBRARY            Search LIBRARY when compiling
 
     -p, --production                 Leave out debugging metadata

data/bin/fcshc

@@ -28,22 +28,49 @@ $restart_compiler = false
 $run_compilation = nil
 $dry_run = false
 
+def run_command(command)
+  begin
+    host, port = "localhost", FCSHD::Server::PORT
+    socket = TCPSocket.new(host, port)
+  rescue Errno::ECONNREFUSED
+    die "could not connect to fcshd at #{host}:#{port}"
+  end
+
+  socket.puts command
+
+  compiler_output = ""
+  socket.each_line do |line|
+    case line
+    when /^fcshd: /
+      warn line.chomp
+    else
+      compiler_output << line
+    end
+  end
+
+  if $verbose
+    STDOUT.write compiler_output
+  end
+
+  compiler_output
+end
+
 OptionParser.new do |parser|
   parser.banner = <<EOF
-Usage: fcshc MAIN.[as|mxml] [-l LIB] [SRCDIR|SWCDIR|SWC]... [-o OUT.swf]
-       fcshc -o OUT.swc SRCDIR... [-l LIB]... [SWCDIR|SWC]...
+Usage: fcshc MAIN.{as,mxml} [SRCDIR|SWCDIR|SWC]... [-o OUT.swf]
+       fcshc SRCDIR... [SWCDIR|SWC]... -o OUT.swc
 
 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
+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
+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'.
+To pass extra arguments, use e.g. `-X -include-file -X NAME -X FILE`.
 
 EOF
 
@@ -57,10 +84,7 @@ EOF
     $libraries << value
   end
 
-  parser.on("-X", "--extra-argument ARGUMENT", "Pass ARGUMENT to the compiler") do |value|
-    $run_compilation = true
-    $extra_arguments << value
-  end
+  parser.separator ""
 
   parser.on("-p", "--production", "Leave out debugging metadata") do
     $run_compilation = true
@@ -95,6 +119,13 @@ EOF
 
   parser.separator ""
 
+  parser.on("-X", "--extra-argument ARGUMENT", "Pass ARGUMENT to the compiler") do |value|
+    $run_compilation = true
+    $extra_arguments << value
+  end
+
+  parser.separator ""
+
   parser.on("-R", "--restart", "Restart the compiler first") do
     $run_compilation = false if $run_compilation == nil
     $restart_compiler = true
@@ -110,18 +141,25 @@ EOF
     $verbose = true
   end
 
-  parser.on("-v", "--version", "Show `fcshc #{FCSHD::VERSION}'") do
+  parser.separator ""
+
+  parser.on("-v", "--version", "Show the fcshd version`") do
     puts "fcshc #{FCSHD::VERSION}"
     exit
   end
 
+  parser.on("--sdk-version", "Show the Flex SDK version") do
+    puts run_command("sdk-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"
+  parser.separator "Report bugs to <https://github.com/dbrock/fcshd>."
 end.parse!
 
 $extra_arguments << "-debug" unless $production
@@ -232,33 +270,6 @@ if $run_compilation
   $compilation_command.concat($extra_arguments)
 end
 
-def run_command(command)
-  begin
-    host, port = "localhost", FCSHD::Server::PORT
-    socket = TCPSocket.new(host, port)
-  rescue Errno::ECONNREFUSED
-    die "could not connect to fcshd at #{host}:#{port}"
-  end
-
-  socket.puts command
-
-  compiler_output = ""
-  socket.each_line do |line|
-    case line
-    when /^fcshd: /
-      warn line.chomp
-    else
-      compiler_output << line
-    end
-  end
-
-  if $verbose
-    STDOUT.write compiler_output
-  end
-
-  compiler_output
-end
-
 run_command "restart" if $restart_compiler
 
 if $run_compilation

data/lib/fcshd/compiler.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 module FCSHD
   class Compiler
+    attr_reader :sdk_version
+
     def initialize(logger)
       @logger = logger
       @output_buffer = ""
@@ -37,6 +39,12 @@ module FCSHD
       @logger.log "starting #{FlexHome.fcsh}"
       @fcsh_process = IO.popen("#{FlexHome.fcsh} 2>&1", "r+")
       read_until_prompt!
+      case @output
+      when /^Version (\S+)/
+        @sdk_version = $1
+      else
+        @logger.die "could not find Flex SDK version"
+      end
     end
 
     def stop_fcsh_process!

data/lib/fcshd/server.rb

@@ -26,6 +26,8 @@ module FCSHD
         when "restart"
           compiler.restart!
           socket.puts "fcshd: compiler restarted"
+        when "sdk-version"
+          socket.puts compiler.sdk_version
         else
           socket.puts "fcshd: unrecognized command: #{command}"
         end

data/lib/fcshd/version.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fcshd
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-13 00:00:00 +02:00
-default_executable: 
+date: 2012-04-20 00:00:00 Z
 dependencies: []
 
 description: |
@@ -55,7 +55,6 @@ files:
 - lib/fcshd/transcript-parser.rb
 - lib/fcshd/transcript.rb
 - lib/fcshd/version.rb
-has_rdoc: true
 homepage: http://github.com/dbrock/fcshd
 licenses: []
 
@@ -65,23 +64,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Usable CLI for the Adobe Flex compiler shell (fcsh)