flashsdk_sqe 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flashsdk_sqe (0.0.2)
+    flashsdk_sqe (0.0.3)
       sprout (>= 1.1.18.pre)
 
 GEM

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/flashplayer/log_file.rb

@@ -5,6 +5,8 @@ module FlashPlayer
 
     attr_accessor :logger
     attr_accessor :player_pid
+    attr_accessor :result_string
+    attr_accessor :result_failure
 
     def initialize
       @logger = $stdout
@@ -30,33 +32,35 @@ module FlashPlayer
       lines_put = 0
 
       while thread.alive? do
-        lines_put, last_line = read_from_file path, lines_put
+        lines_put = read_from_file path, lines_put
         logger.flush
-        sleep(0.1)
-
-        unless last_line.nil?
+        if !result_string.nil?
           thread.kill
           Process.kill('KILL', self.player_pid) if self.player_pid
-          raise 'FlexUnit ERROR: ' + last_line
+          if self.result_failure
+            raise self.result_string.join('')
+          else
+            logger.puts self.result_string
+          end
         end
+        sleep(0.1)
       end
     end
 
     def read_from_file path, lines_put
-      last_line = nil
       File.open(path, 'r') do |file|
         lines_read = 0
-        file.readlines.each do |line|
-          last_line = line if line =~ /ALL TESTS ARE COMPLETED/
+        all_lines = file.readlines
+        all_lines.each.with_index do |line, index|
           if(lines_read >= lines_put)
-            logger.puts "[trace] #{line}"
-            logger.flush
+            self.result_failure = true if line =~ /TESTS HAS FAILURES/
+            self.result_string = all_lines[index+1 .. -1] if line =~ /ALL TESTS ARE COMPLETED/ && self.result_string.nil?
             lines_put += 1
           end
           lines_read += 1
         end
       end unless !File.exists?(path)
-      [lines_put, last_line]
+      lines_put
     end
 
     def flashlog_path

data/lib/flashsdk/generators/project_generator.rb

@@ -1,31 +1,28 @@
 module FlashSDK
   class ProjectGenerator < ClassGenerator
+    include FlashSDK::FlashHelper
 
     add_param :css, Path, { :default => 'css' }
     add_param :images, Path, { :default => 'images' }
-    add_param :fonts, Path, { :default => 'fonts' }    
-        
+    add_param :fonts, Path, { :default => 'fonts' }
+
     def manifest
       directory input do
         template 'rakefile.rb'
         template 'Gemfile'
 
         directory src do
-          template "#{input.camel_case}.as", 'ActionScript3MainClass.as'
           template "#{test_runner_name}.as", 'ActionScript3RunnerClass.as'
         end
 
-        directory assets do
-          directory skins do
-            file 'DefaultProjectImage.png'
-          end
-        end
-
         # Create empty directories:
         directory lib
-        directory bin
       end
     end
 
+    def test
+      "#{class_name}/test"
+    end
+
   end
 end

data/lib/flashsdk/generators/templates/ActionScript3RunnerClass.as

@@ -1,19 +1,19 @@
 package {
-    import asunit.core.TextCore;
-    import flash.display.MovieClip;
+    import flash.display.Sprite;
+    import org.flexunit.runner.FlexUnitCore;
+    import org.mockito.integrations.flexunit4.MockitoClassRunner;
+    <% test_case_classes.each do |test_case| %>import <%= test_case %>;
+    <% end %>
 
-    public class <%= test_runner_name %> extends MovieClip {
-        
-        private var core:TextCore;
+    public class <%= test_runner_name %> extends Sprite {
 
-        public function <%= test_runner_name %>() {
-            core = new TextCore();
-            // You can run a single Test Case with:
-            // core.start(SomeTest, null, this);
-            // Or a single test method with:
-            // core.start(SomeTest, 'testMethod', this);
-            core.start(AllTests, null, this);
-        }
+            private var core:FlexUnitCore;
+
+            public function <%= test_runner_name %>() {
+                MockitoClassRunner;
+                core = new FlexUnitCore();
+                core.addListener(new FlashSDKListener());
+                core.run(<%= test_case_classes.map{|test_case| test_case.split('.').last.to_s}.join(',') %>);
+            }
     }
 }
-

data/lib/flashsdk/generators/templates/FlashSDKListener.as

@@ -0,0 +1,47 @@
+package
+{
+import org.flexunit.internals.TraceListener;
+import org.flexunit.runner.IDescription;
+import org.flexunit.runner.Result;
+import org.flexunit.runner.notification.Failure;
+
+public class FlashSDKListener extends TraceListener
+{
+    public function FlashSDKListener ()
+    {
+    }
+
+    override public function testRunFinished(result:Result):void
+    {
+        if (result.failureCount)
+            trace("TESTS HAS FAILURES");
+        trace("ALL TESTS ARE COMPLETED");
+        super.testRunFinished(result);
+    }
+
+    override public function testStarted(description:IDescription):void
+    {
+//        trace("TEST STARTED", description.displayName, description.testCount);
+//        super.testStarted(description);
+    }
+
+    override public function testFailure(failure:Failure):void
+    {
+        trace("TEST FAILED", failure.testHeader, failure.stackTrace);
+//        super.testFailure(failure);
+    }
+
+    override public function testIgnored(description:IDescription):void
+    {
+        trace("TEST IGNORED", description.displayName, description.testCount);
+//        super.testIgnored(description);
+    }
+
+    override public function testFinished(description:IDescription):void
+    {
+//        trace("TEST FINISHED", description.displayName, description.testCount);
+//        super.testFinished(description);
+    }
+}
+}
+

data/lib/flashsdk/generators/templates/Gemfile

@@ -1,5 +1,4 @@
 source "http://rubygems.org"
 
-gem "flashsdk", ">= 1.0.0.pre"
-gem "asunit4", ">= 4.2.3.pre"
+gem "flashsdk_sqe", ">= 0.0.2"
 

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

@@ -4,7 +4,6 @@ require 'bundler/setup'
 
 require 'rake/clean'
 require 'flashsdk'
-require 'asunit4'
 
 ##
 # Set USE_FCSH to true in order to use FCSH for all compile tasks.
@@ -23,47 +22,23 @@ require 'asunit4'
 # ENV['FCSH_PKG_VERSION'] = '1.0.14.pre'
 # ENV['FCSH_PORT']        = 12321
 
-##############################
-# Debug
-
-# Compile the debug swf
-mxmlc "<%= bin %>/<%= debug_swf_name %>" do |t|
-  t.input = "<%= src %>/<%= class_name %>.as"
-  t.static_link_runtime_shared_libraries = true
-  t.debug = true
-end
-
-desc "Compile and run the debug swf"
-flashplayer :run => "<%= bin %>/<%= debug_swf_name %>"
-
 ##############################
 # Test
 
-library :asunit4
-
 # Compile the test swf
-mxmlc "<%= bin %>/<%= test_swf_name %>" => :asunit4 do |t|
+mxmlc "<%= bin %>/<%= test_swf_name %>" do |t|
   t.input = "<%= src %>/<%= test_runner_name %>.as"
   t.static_link_runtime_shared_libraries = true
-  t.source_path << 'test'
+  t.source_path << 'test' << 'vendor' << 'lib' << 'assets'
+  t.library_path << 'swc'
+  t.show_actionscript_warnings=false
+  t.show_deprecation_warnings=false
   t.debug = true
 end
 
 desc "Compile and run the test swf"
 flashplayer :test => "<%= bin %>/<%= test_swf_name %>"
 
-##############################
-# SWC
-
-compc "<%= bin %>/<%= class_name %>.swc" do |t|
-  t.input_class = "<%= class_name %>"
-  t.static_link_runtime_shared_libraries = true
-  t.source_path << 'src'
-end
-
-desc "Compile the SWC file"
-task :swc => '<%= bin %>/<%= class_name %>.swc'
-
 ##############################
 # DOC
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flashsdk_sqe
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000Z
+date: 2012-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprout
-  requirement: &70255290710220 !ruby/object:Gem::Requirement
+  requirement: &70108878686840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.18.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70255290710220
+  version_requirements: *70108878686840
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70255290709820 !ruby/object:Gem::Requirement
+  requirement: &70108878686420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255290709820
+  version_requirements: *70108878686420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70255290709360 !ruby/object:Gem::Requirement
+  requirement: &70108878685920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255290709360
+  version_requirements: *70108878685920
 description: The Flash SDK Rubygem is brought to you by Project Sprouts (http://projectsprouts.org)
 email: kazantsev.nickolay@gmail.com
 executables:
@@ -92,6 +92,7 @@ files:
 - lib/flashsdk/generators/templates/ActionScript3MainClass.as
 - lib/flashsdk/generators/templates/ActionScript3RunnerClass.as
 - lib/flashsdk/generators/templates/DefaultProjectImage.png
+- lib/flashsdk/generators/templates/FlashSDKListener.as
 - lib/flashsdk/generators/templates/Flex4Application.mxml
 - lib/flashsdk/generators/templates/Flex4Main.css
 - lib/flashsdk/generators/templates/Flex4Rakefile.rb
@@ -105,6 +106,7 @@ files:
 - lib/flex3.rb
 - lib/flex4.rb
 - pkg/flashsdk_sqe-0.0.1.gem
+- pkg/flashsdk_sqe-0.0.2.gem
 - POSTINSTALL.rdoc
 - rakefile.rb
 - README.textile
@@ -180,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2780731179797828062
+      hash: -1090058060885181777
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2780731179797828062
+      hash: -1090058060885181777
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10