asproject 0.1.80 → 0.1.84

data/bin/fcshs

@@ -11,8 +11,8 @@ if ARGV.size > 0 && ARGV[0][0]==95 && ARGV[0][-1]==95
   end
 end
 
-require_gem 'asproject', version
-require 'fcshs.rb'
+#require_gem 'asproject', version
+#require 'fcshs.rb'
 
-#AsProject::FCSHS.new(ARGS.shift, ARGS.shift)
+require File.dirname(__FILE__) + '/../lib/fcshs.rb'
 AsProject::FCSHS.new

data/lib/asproject/version.rb

@@ -2,7 +2,7 @@ module AsProject
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 81
+    TINY  = 85
         
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/fcshs.rb

@@ -1,22 +1,87 @@
 require 'rubygems'
 require 'rake'
-require "socket"
+require 'socket'
+require 'optparse'
 
 module AsProject
 
-  class FCSHS
-    
+  class FCSHS < Hash
+    attr_accessor :kill_process,
+                  :start_process
+
     def initialize(ip=nil, port=nil)
       @ip = (ip.nil?) ? "127.0.0.1" : ip
       @port = (port.nil?) ? 20569 : port
+      parse!
+      if(self.kill_process)
+        puts '>> Attempting to kill process now!'
+        kill(@ip, @port)
+      elsif(self.start_process)
+        open(@ip, @port)
+      end
+    end
+    
+    def instances
+      if(@instances.nil?)
+        @instances = Hash.new
+      end
+      return @instances
+    end
+    
+    def parse!
+      opts = OptionParser.new do |opts|
+        opts.banner = <<EOF
+
+Usage: #$0 [options]
+
+Begin or kill the Flex Command Sell Socket (fcshs).
 
-      @compile_commands = Hash.new
-      @fcsh = nil
-      start_fcsh
+This is a simple ruby socket server that sits on top of the Flex Command Shell terminal tool that makes shell-based MXMLC compilation exponentially more performant.
 
-      @socket = TCPServer.new(@ip, @port)
-      @socket.setsockopt(Socket::SOL_SOCKET, Socket::TCP_NODELAY, true)
-      puts "fcsh server started on #{@ip}:#{@port}"
+Running this command with no options will start the service. This is not really necessary, as the FCSHS Rake task will automatically begin this process, you just need to know how to kill it later - when you want to shut down your shell.
+
+Options:
+EOF
+
+       opts.on('-k', '--kill', 'Kill the running fcshs process') do
+          self.kill_process = true
+        end
+
+        opts.on_tail('-h', '--help', 'Display this help and exit') do
+          puts opts
+          exit
+        end
+      end
+      if(ARGV.size > 0)
+        opts.parse!(ARGV)
+      else
+        self.start_process = true
+      end
+    end
+    
+    def kill(ip, port)
+      begin
+        @socket = TCPSocket.open(@ip, @port) do |s|
+          s.puts '0'
+        end
+        puts '>> Successfully killed running fcshs process'
+      rescue SystemCallError
+        puts ">> Was unable to find the currently running process at #{ip}:#{port}, try running 'ps -a | egrep ruby' and then 'kill -9 [process id]'"
+      end
+    end
+    
+    def open(ip, port)
+      begin
+        @compile_commands = Hash.new
+        @fcsh = nil
+        @socket = TCPServer.new(@ip, @port)
+        @socket.setsockopt(Socket::SOL_SOCKET, Socket::TCP_NODELAY, true)
+        puts "fcsh server started on #{@ip}:#{@port}"
+        puts "enter 'fcsh -k' to kill this process when you're done"
+      rescue StandardError => e
+        puts 'Error opening socket: ' + e.to_s + "\nTry running fcshs -k to kill the currently-running socket."
+        @compile_commands = nil
+      end
       start
     end
     
@@ -24,6 +89,11 @@ module AsProject
       while
         session = @socket.accept
         dir = session.gets
+        if(dir.match(/^0/))
+          puts '>> Kill all fcsh instances and the open socket now!'
+          close_fcsh
+          return
+        end
         command = session.gets
         execute(session, dir, command)
         session.close
@@ -32,30 +102,65 @@ module AsProject
     end
     
     def execute(io, dir, command)
-      puts "[execute] #{command} at #{Dir.pwd} and #{dir}"
-      if(File.exists?(dir))
-        Dir.chdir(dir)
-      else
-        puts "Dir: #{dir} does not exist!?"
-      end
+      io.puts "[execute] #{command} at #{Dir.pwd} and #{dir}"
+      fcsh = get_fcsh(io, dir)
+
       cmd = @compile_commands[command]
       if(cmd.nil?)
         cmd = CompileCommand.new(command)
         @compile_commands[command] = cmd
         cmd.index = @compile_commands.size
-        io.write(command)
-        @fcsh.write(command) do |f|
-          io.write f.read
+        
+        fcsh.puts(command)
+        
+        t = Thread.new {
+          IO.new(2, 'r+') do |err|
+            while(line = err.gets)
+              puts '[error] ' + line
+            end
+          end
+        }
+
+        while(line = fcsh.gets)
+          io.puts '[socket] ' + line
+          puts '[line] ' + line
         end
+
+        puts 'FINISHED FCSH WRITE!'
       else
         msg = "compile #{cmd.index}"
-        @fcsh.write(msg + "\n")
-        io.write(msg)
+#        io.write(msg)
+        fcsh.write(msg + "\n") do |f|
+          io.puts(f.read)
+        end
       end
     end
 
-    def start_fcsh
-      @fcsh = IO.popen('fcsh', 'a')
+    def close_fcsh
+      @instances.each do |fc|
+        fc.close
+      end
+    end
+    
+    def get_fcsh(session, dir)
+      begin
+        if(instances[dir])
+          return instances[dir]
+        else
+          dir.chomp!
+          if(File.directory?(dir))
+            Dir.chdir(dir)
+          else
+            msg = ">> Error - unable to locate: #{dir}"
+            session.puts msg
+            raise StandardError.new(msg)
+          end
+
+          instances[dir] = IO.popen('fcsh', 'r+')
+        end
+      rescue SystemCallError
+        puts ">> Failed to start the actual fcsh application, please make sure it's in your class path by opening a new terminal and typing 'fcsh'"
+      end
     end
   end
 
@@ -68,5 +173,3 @@ module AsProject
     end
   end
 end
-
-AsProject::FCSHS.new

data/lib/tasks/fcsh.rb

@@ -26,11 +26,15 @@ module AsProject
         @socket = TCPSocket.open(@ip, @port) do |s|
           s.puts Dir.pwd
           s.puts "#{cmd} #{args}"
-          puts s.read
+          s.close_write
+          while(line = s.gets)
+            puts line
+          end
         end
+        puts 'finished!'
       rescue StandardError
-        IO.popen("fcshs &", "r")
-        execute(cmd, args, retries)
+#        IO.popen("fcshs &", "r")
+#        execute(cmd, args, retries)
       end
     end
   end

data/lib/tasks/flash_player.rb

@@ -74,7 +74,6 @@ module AsProject
         if(Logger.debug)
           thread = ThreadMock.new
         elsif(@user_task.is_a?(OSXRemoteFileTask) && !Logger.debug)
-          @osx_process = true
           thread = run_osx
         else
           thread = run_other
@@ -83,11 +82,14 @@ module AsProject
       end
       
       def run_osx
-        @osx_process = extracted_file_path
-        app = "#{clean_path(extracted_file_path)}"
-        swf = "#{clean_path(@swf)}"
-        msg = "open -a #{app} ./#{swf}"
-        `#{msg}`
+        player = clean_path(extracted_file_path)
+        swf = clean_path(File.expand_path(@swf))
+
+        t = Thread.new {
+          IO.popen(player) do |p|
+            IO.popen("open #{swf}")
+          end
+        }
       end
       
       def run_other
@@ -95,18 +97,7 @@ module AsProject
           execute("./#{@swf}")
         }
       end
-      
-      def player_alive?(thread)
-        if(@osx_process)
-          processes = `ps -A`
-          match = processes.match(/#{@osx_process}/)
-          return !match.nil?
-        else
-          return thread.alive?
-        end
-
-      end
-      
+            
       def read_log(player_thread, log_file)
         index = 0
 
@@ -114,7 +105,7 @@ module AsProject
           raise UsageError.new('Unable to find the trace output log file in the expected location: ' + log_file)
         end
 
-        while(player_alive?(player_thread))
+        while(player_thread.alive?)
           sleep(0.2)
           incr = 0
 
@@ -138,22 +129,5 @@ module AsProject
       return false
     end
   end
-  
-  class OSXPlayerThread
-  
-    def initialize
-      @alive = true
-    end
-    
-#    def begin_listening
-#      while(alive?)
-#        sleep(0.4)
-#        result = sh "ps -A"
-#      end
-#    end
-    
-    def alive?
-      return @alive
-    end
-  end
+
 end

data/lib/tasks/mxmlc.rb

@@ -11,6 +11,8 @@ module AsProject
                   :frames,
                   :incremental,
                   :library_path,
+                  :link_report,
+                  :load_externs,
                   :locale,
                   :optimize,
                   :show_actionscript_warnings,
@@ -94,11 +96,13 @@ module AsProject
       result << "-default-background-color" << default_background_color if default_background_color
       result << "-default-script-limits" << default_script_limits if default_script_limits
       result << "-default-size" << default_size if default_size
+      result << "-load-externs" << load_externs if load_externs
+      result << "-link-report" << link_report if link_report
       result << "-output" << clean_path(output) if output
       result << "-theme " + theme.join(" -theme ") if theme.size > 0
       result << "-frame " + frames.join(" -frame ") if frames.size > 0
-      result << "-rsl " + runtime_shared_libraries.join(" -rsl ") if runtime_shared_libraries.size > 0
-      result << "-el=" + external_library_path.join(" -el=") if external_library_path.size > 0
+      result << "-rsl=" + runtime_shared_libraries.join(" -rsl=") if runtime_shared_libraries.size > 0
+      result << "-el+=" + external_library_path.join(" -el+=") if external_library_path.size > 0
       result << "-l=" + library_path.join(" -l=") if library_path.size > 0
       result << "-sp=" + source_path.join(" -sp=") if source_path.size > 0
       result << "-incremental" if incremental

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: asproject
 version: !ruby/object:Gem::Version 
-  version: 0.1.80
-date: 2007-03-18 00:00:00 -07:00
+  version: 0.1.84
+date: 2007-03-24 00:00:00 -07:00
 summary: AsProject is a tool set that simplifies the process of beginning and growing a new ActionScript project.
 require_paths: 
 - lib
@@ -35,6 +35,7 @@ files:
 - lib
 - Manifest.txt
 - MIT-LICENSE.txt
+- pkg
 - rakefile.rb
 - README.txt
 - setup.rb