asautotest 0.0.1 → 0.0.2

data/bin/asautotest

@@ -44,7 +44,6 @@ require "asautotest/utilities"
 module ASAutotest
   FCSH = ENV["FCSH"] || "fcsh"
   FLASHPLAYER = ENV["FLASHPLAYER"] || "flashplayer"
-  WATCH_GLOB = "**/[^.]*.{as,mxml}"
   DEFAULT_TEST_PORT = 50102
   GROWL_ERROR_TOKEN = "ASAutotest-#{ARGV.inspect.hash}"
 
@@ -60,6 +59,7 @@ module ASAutotest
     attr_reader :test_port
     attr_reader :output_file_name
     attr_reader :extra_mxmlc_options
+    attr_reader :demo_command
 
     def production? ; @production end
     def test? ; @test end
@@ -73,6 +73,7 @@ module ASAutotest
       @test = options[:test?]
       @test_port = options[:test_port] || DEFAULT_TEST_PORT
       @extra_mxmlc_options = options[:extra_mxmlc_options] || []
+      @demo_command = options[:demo_command]
 
       if options.include? :output_file_name
         @output_file_name = File.expand_path(options[:output_file_name])
@@ -96,34 +97,55 @@ module ASAutotest
       else
         build_string do |result|
           result << %{mxmlc}
-          for source_directory in @source_directories do
-            result << %{ -compiler.source-path=#{source_directory}}
+          for source_directory in source_directories do
+            result << %{ -compiler.source-path+=#{source_directory}}
           end
-          for library in @library_file_names do
-            result << %{ -compiler.library-path=#{library}}
+          for library in library_file_names do
+            result << %{ -compiler.library-path+=#{library}}
           end
-          result << %{ -output=#@output_file_name}
+          result << %{ -output=#{output_file_name}}
           result << %{ -static-link-runtime-shared-libraries}
           result << %{ -compiler.strict}
-          result << %{ -debug} unless @production
+          result << %{ -debug} unless production?
           for option in @extra_mxmlc_options
             result << %{ #{option}}
           end
-          result << %{ #@source_file_name}
+          result << %{ #{source_file_name}}
         end
       end
     end
 
     attr_accessor :compile_id
     attr_accessor :index
+
+    def run_test!
+      TestRunner.new(output_file_name, test_port).run if test?
+    end
+
+    def stop_demo!
+      Process.kill("TERM", @demo_pid) if @demo_pid
+    rescue Errno::ESRCH # No such process.
+    ensure
+      @demo_pid = nil
+    end
+
+    def start_demo!
+      if @demo_command
+        @demo_pid = fork { exec("exec #@demo_command") }
+        Process.detach(@demo_pid)
+      end
+    end
   end
 
   class Main
     include Logging
 
+    attr_reader :compilation_requests
+
     def initialize(options)
       initialize_growl if options[:enable_growl?]
       @typing = options[:typing]
+      @watch_globs = options[:watch_globs]
       @compilation_requests = options[:compilation_requests].
         map(&method(:make_compilation_request))
     end
@@ -158,10 +180,6 @@ module ASAutotest
       CompilationRequest.new(options)
     end
 
-    def self.run(*arguments)
-      new(*arguments).run
-    end
-
     def run
       print_header
       start_compiler_shell
@@ -191,7 +209,7 @@ module ASAutotest
           say_tabbed "  Source directory:",
             format_file_name(source_directory)
         end
-        
+
         for library in request.library_file_names
           say_tabbed "  Library:", format_file_name(library)
         end
@@ -210,6 +228,10 @@ module ASAutotest
           say "  Running as test (using port #{request.test_port})."
         end
 
+        if request.demo_command
+          say_tabbed "  Demo command:", "$ #{request.demo_command}"
+        end
+
         say "  Compiling in production mode." if request.production?
       end
 
@@ -219,6 +241,8 @@ module ASAutotest
         say "Not warning about missing type declarations."
       end
 
+      say "Monitoring #{@watch_globs * " "} for changes."
+
       new_logging_section
     end
 
@@ -242,7 +266,7 @@ module ASAutotest
         monitor = FSSM::Monitor.new
 
         for source_directory in source_directories
-          monitor.path(source_directory, WATCH_GLOB) do |watch|
+          monitor.path(source_directory, watch_glob) do |watch|
             watch.update { handle_change }
             watch.create { handle_change ; throw :asautotest_interrupt }
             watch.delete { handle_change ; throw :asautotest_interrupt }
@@ -258,6 +282,14 @@ module ASAutotest
       end
     end
 
+    def watch_glob
+      if @watch_globs.size == 1
+        "**/#@watch_globs"
+      else
+        "**/{#{@watch_globs * ","}}"
+      end
+    end
+
     def source_directories
       @compilation_requests.map(&:source_directories).flatten.uniq
     end
@@ -272,9 +304,12 @@ module ASAutotest
       compile
 
       for summary in @compilation.result.summaries
+        summary[:request].stop_demo!
+
         if summary[:successful?]
-          if compilation_successful? and summary[:request].test?
-            run_test(summary[:request])
+          if compilation_successful?
+            summary[:request].run_test!
+            summary[:request].start_demo!
           end
 
           if summary[:request].temporary_output?
@@ -304,10 +339,6 @@ module ASAutotest
       @compilation.run
     end
 
-    def run_test(request)
-      TestRunner.new(request.output_file_name, request.test_port).run
-    end
-
     def delete_output_file(file_name)
       begin
         File.delete(file_name)
@@ -334,6 +365,7 @@ $typing = nil
 $verbose = false
 $enable_growl = RUBY_PLATFORM =~ /darwin/
 $parsing_global_options = false
+$watch_globs = []
 
 until ARGV.empty?
   request = $compilation_requests.last
@@ -378,6 +410,8 @@ until ARGV.empty?
     for request in requests
       request[:source_directories] << value
     end
+  when /^--watch(?:=(.*))$/
+    $watch_globs << $1 || ARGV.shift
   when "--dynamic-typing"
     $typing = :dynamic
   when "--static-typing"
@@ -386,6 +420,8 @@ until ARGV.empty?
     $verbose = true
   when "--no-growl"
     $enable_growl = false
+  when /^--demo-command(?:=(.*))$/
+    request[:demo_command] = $1 || ARGV.shift
   when /^--mxmlc-option(?:=(.*))?$/, "-X"
     value = ($1 || ARGV.shift)
     for request in requests
@@ -425,13 +461,22 @@ end
 
 ASAutotest::Logging.verbose = $verbose
 
+$watch_globs = %w|*.as *.mxml| if $watch_globs.empty?
+
+$main = ASAutotest::Main.new \
+  :compilation_requests => $compilation_requests,
+  :typing => $typing,
+  :enable_growl? => $enable_growl,
+  :watch_globs => $watch_globs
+
 begin
-  ASAutotest::Main.run \
-    :compilation_requests => $compilation_requests,
-    :typing => $typing,
-    :enable_growl? => $enable_growl
+  $main.run
 rescue Interrupt
 end
 
+for request in $main.compilation_requests
+  request.stop_demo!
+end
+
 # Signal successful exit.
 exit 200

data/bin/flash-policy-server

@@ -21,7 +21,9 @@
 require "socket"
 require "timeout"
 
-class PolicyServer
+PROGRAM_NAME = File.basename($0)
+
+class FlashPolicyServer
   PORT = 843
 
   def initialize
@@ -44,7 +46,7 @@ class PolicyServer
   end
 
   def info_string(message)
-    "policy-server: #{message}"
+    "#{PROGRAM_NAME}: #{message}"
   end
 
   def begin_info(message)
@@ -85,4 +87,4 @@ class PolicyServer
   end
 end
 
-PolicyServer.new.run
+FlashPolicyServer.new.run

data/lib/asautotest/problematic-file.rb

@@ -511,7 +511,7 @@ module ASAutotest
     end
 
     def identifier_source_line_parts
-      source_line =~ /^(.{#{column_number}})([\w$]+)(.*)$/
+      source_line =~ /^(.{#{column_number.to_i}})([\w$]+)(.*)$/
       [$1, $2, $3]
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: asautotest
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 Z
+date: 2011-06-07 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
 description: 
@@ -41,6 +42,7 @@ files:
 - bin/flash-policy-server
 - README.rdoc
 - LICENSE
+has_rdoc: true
 homepage: http://github.com/dbrock/asautotest
 licenses: []
 
@@ -70,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Detects source changes and compiles ActionScript.