as3 1.0.3.pre → 1.0.4.pre

data/lib/as3.rb

@@ -14,7 +14,7 @@ module AS3
     module VERSION #:nodoc:
       MAJOR  = 1
       MINOR  = 0
-      TINY   = 3
+      TINY   = 4
       SUFFIX = 'pre'
 
       STRING = [MAJOR, MINOR, TINY, SUFFIX].join('.')

data/lib/as3/generators/templates/rakefile.rb

@@ -13,3 +13,5 @@ end
 desc "Compile and run the debug swf"
 flashplayer :debug => "<%= bin %>/<%= debug_swf_name %>"
 
+task :default => :debug
+

data/lib/as3/tasks/mxmlc.rb

@@ -678,140 +678,6 @@ module AS3
   end
 end
 
-=begin
-    def define # :nodoc:
-      super
-
-      if(!output)
-        if(name.match(/.swf/) || name.match(/swc/))
-          self.output = name
-        end
-      end
-      
-      if(input && !input.match(/.css/) && File.exists?(input))
-        source_path << File.dirname(input)
-      end
-      
-      if(include_path)
-        include_path.each do |path|
-          process_include_path(path) if(File.directory?(path))
-        end
-      end
-      
-      self.include_path = []
-      
-      if(link_report)
-        CLEAN.add(link_report)
-      end
-      
-      source_path.uniq!
-      param_hash['source_path'].value = clean_nested_source_paths(source_path)
-      
-      CLEAN.add(output)
-      if(incremental)
-        CLEAN.add(FileList['**/**/*.cache'])
-      end
-
-      self
-    end
-    
-    protected 
-    
-    def process_include_path(path)
-      symbols = []
-      FileList["#{path}/**/*[.as|.mxml]"].each do |file|
-        next if File.directory?(file)
-        file.gsub!(path, '')
-        file.gsub!(/^\//, '')
-        file.gsub!('/', '.')
-        file.gsub!(/.as$/, '')
-        file.gsub!(/.mxml$/, '')
-        file.gsub!(/.css$/, '')
-        symbols << file
-      end
-      
-      symbols.each do |symbol|
-        self.includes << symbol
-      end
-    end
-    
-    def clean_nested_source_paths(paths)
-      results = []
-      paths.each do |path|
-        # TODO: This should only happen if: allow_source_path_overlap != true
-        if(check_nested_source_path(results, path))
-          results << path
-        end
-      end
-      return results
-    end
-    
-    def check_nested_source_path(array, path)
-      array.each_index do |index|
-        item = array[index]
-        if(item =~ /^#{path}/)
-          array.slice!(index, 1)
-        elsif(path =~ /^#{item}/)
-          return false
-        end
-      end
-      return true
-    end
-
-    # Use the swc path if possible
-    # Otherwise add to source
-    def resolve_library(library_task)
-      #TODO: Add support for libraries that don't get
-      # copied into the project
-      path = library_task.project_path
-      if(path.match(/.swc$/))
-        library_path << library_task.project_path
-      else
-        source_path << library_task.project_path
-      end
-    end
-    
-    def execute_with_fcsh(command)
-      begin
-        display_preprocess_message
-        puts FCSHSocket.execute("mxmlc #{command}")
-      rescue FCSHError => fcsh_error
-        raise fcsh_error
-      rescue StandardError => std_error
-        # TODO: Capture a more concrete error here...
-        raise MXMLCError.new("[ERROR] There was a problem connecting to the Flex Compiler SHell, run 'rake fcsh:start' in another terminal.")
-      end
-    end
-    
-    def execute(*args)
-      begin
-        start = Time.now.to_i
-        if(@use_fcsh)
-          execute_with_fcsh(to_shell)
-        else
-          super
-        end
-        Log.puts "mxmlc finished compiling #{name} in #{Time.now.to_i - start} seconds"
-      rescue ExecutionError => e
-        if(e.message.index('Warning:'))
-          # MXMLC sends warnings to stderr....
-          Log.puts(e.message.gsub('[ERROR]', '[WARNING]'))
-        else
-          raise e
-        end
-      end
-    end
-
-  end
-end
-
-# Helper method for definining and accessing MXMLC instances in a rakefile
-def mxmlc(args, &block)
-  AS3::MXMLC.define_task(args, &block)
-end
-
-=end
-
 # TODO: Assign mxmlc.output = args || args.first_key
 def mxmlc args, &block
   mxmlc_tool = AS3::MXMLC.new

data/lib/as3/tasks/mxmlc_legacy.rb

@@ -0,0 +1,135 @@
+
+=begin
+    def define # :nodoc:
+      super
+
+      if(!output)
+        if(name.match(/.swf/) || name.match(/swc/))
+          self.output = name
+        end
+      end
+      
+      if(input && !input.match(/.css/) && File.exists?(input))
+        source_path << File.dirname(input)
+      end
+      
+      if(include_path)
+        include_path.each do |path|
+          process_include_path(path) if(File.directory?(path))
+        end
+      end
+      
+      self.include_path = []
+      
+      if(link_report)
+        CLEAN.add(link_report)
+      end
+      
+      source_path.uniq!
+      param_hash['source_path'].value = clean_nested_source_paths(source_path)
+      
+      CLEAN.add(output)
+      if(incremental)
+        CLEAN.add(FileList['**/**/*.cache'])
+      end
+
+      self
+    end
+    
+    protected 
+    
+    def process_include_path(path)
+      symbols = []
+      FileList["#{path}/**/*[.as|.mxml]"].each do |file|
+        next if File.directory?(file)
+        file.gsub!(path, '')
+        file.gsub!(/^\//, '')
+        file.gsub!('/', '.')
+        file.gsub!(/.as$/, '')
+        file.gsub!(/.mxml$/, '')
+        file.gsub!(/.css$/, '')
+        symbols << file
+      end
+      
+      symbols.each do |symbol|
+        self.includes << symbol
+      end
+    end
+    
+    def clean_nested_source_paths(paths)
+      results = []
+      paths.each do |path|
+        # TODO: This should only happen if: allow_source_path_overlap != true
+        if(check_nested_source_path(results, path))
+          results << path
+        end
+      end
+      return results
+    end
+    
+    def check_nested_source_path(array, path)
+      array.each_index do |index|
+        item = array[index]
+        if(item =~ /^#{path}/)
+          array.slice!(index, 1)
+        elsif(path =~ /^#{item}/)
+          return false
+        end
+      end
+      return true
+    end
+
+    # Use the swc path if possible
+    # Otherwise add to source
+    def resolve_library(library_task)
+      #TODO: Add support for libraries that don't get
+      # copied into the project
+      path = library_task.project_path
+      if(path.match(/.swc$/))
+        library_path << library_task.project_path
+      else
+        source_path << library_task.project_path
+      end
+    end
+    
+    def execute_with_fcsh(command)
+      begin
+        display_preprocess_message
+        puts FCSHSocket.execute("mxmlc #{command}")
+      rescue FCSHError => fcsh_error
+        raise fcsh_error
+      rescue StandardError => std_error
+        # TODO: Capture a more concrete error here...
+        raise MXMLCError.new("[ERROR] There was a problem connecting to the Flex Compiler SHell, run 'rake fcsh:start' in another terminal.")
+      end
+    end
+    
+    def execute(*args)
+      begin
+        start = Time.now.to_i
+        if(@use_fcsh)
+          execute_with_fcsh(to_shell)
+        else
+          super
+        end
+        Log.puts "mxmlc finished compiling #{name} in #{Time.now.to_i - start} seconds"
+      rescue ExecutionError => e
+        if(e.message.index('Warning:'))
+          # MXMLC sends warnings to stderr....
+          Log.puts(e.message.gsub('[ERROR]', '[WARNING]'))
+        else
+          raise e
+        end
+      end
+    end
+
+  end
+end
+
+# Helper method for definining and accessing MXMLC instances in a rakefile
+def mxmlc(args, &block)
+  AS3::MXMLC.define_task(args, &block)
+end
+
+=end
+

data/test/unit/mxmlc_test.rb

@@ -30,8 +30,8 @@ class MXMLCTest < Test::Unit::TestCase
       mxmlc.input = @input
       # Turn on to trigger an actual compilation:
       # (This is too damn slow to leave in the every-time test run)
-      mxmlc.execute
-      assert_file @expected_output
+      #mxmlc.execute
+      #assert_file @expected_output
     end
 
     should "assign simple output" do
@@ -40,6 +40,8 @@ class MXMLCTest < Test::Unit::TestCase
       end
       assert_equal 'bin/SomeProject.swf', t.output
     end
+
   end
+
 end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
+  - 4
   - pre
-  version: 1.0.3.pre
+  version: 1.0.4.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -107,6 +107,7 @@ files:
 - lib/as3/generators/templates/Gemfile
 - lib/as3/generators/templates/rakefile.rb
 - lib/as3/tasks/mxmlc.rb
+- lib/as3/tasks/mxmlc_legacy.rb
 - lib/as3.rb
 - rakefile.rb
 - README.rdoc