flashplayer 10.1.6.pre → 10.1.7.pre

data/VERSION

@@ -1 +1 @@
-10.1.6.pre
+10.1.7.pre

data/lib/flashplayer/log_file.rb

@@ -9,7 +9,7 @@ module FlashPlayer
       @logger      = $stdout
     end
 
-    def tail thread
+    def tail thread=nil
       tail_path flashlog_path, thread
     end
 
@@ -23,7 +23,7 @@ module FlashPlayer
     end
 
     def read_flashlog_at path, thread=nil
-      thread ||= Thread.new{}
+      thread ||= fake_thread
       lines_put = 0
 
       trap("INT") { thread.kill }
@@ -74,11 +74,22 @@ module FlashPlayer
       end
     end
 
+    def fake_thread
+      Thread.new do
+        while true
+          sleep(0.2)
+        end
+      end
+    end
+
   end
 end
 
-desc "Tail the flashlog.txt and block"
-task :flashlog do
-  reader = FlashPlayer::LogFile.new
-  reader.tail
-end
+#desc "Tail the flashlog.txt and block"
+#task :flashlog do
+  #mm_config = FlashPlayer::MMConfig.new
+  #mm_config.create
+  #reader = FlashPlayer::LogFile.new
+  #reader.tail 
+#end
+

data/test/unit/log_file_test.rb

@@ -20,7 +20,6 @@ class LogFileTest < Test::Unit::TestCase
     end
 
     should "read until killed" do
-
       blocked = true
       t = Thread.new {
         @reader.tail
@@ -31,6 +30,18 @@ class LogFileTest < Test::Unit::TestCase
       t.kill
     end
 
+
+    # This method only works when run alone -
+    # Under normal circumstances, the SproutTestCase
+    # clears out any Rake tasks that have been defined
+    # and we don't have an easy way to redefine the
+    # task...
+    #should "read from rake task" do
+      #FlashPlayer::LogFile.any_instance.stubs(:logger).returns StringIO.new
+      #FlashPlayer::LogFile.any_instance.expects(:read_flashlog_at)
+      #Rake.application[:flashlog].invoke
+    #end
+
   end
 end
 

data/test/unit/task_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class FlashPlayerTaskTest < Test::Unit::TestCase
+class TaskTest < Test::Unit::TestCase
   include SproutTestCase
 
   context "A FlashPlayerTask" do
@@ -73,10 +73,11 @@ class FlashPlayerTaskTest < Test::Unit::TestCase
 
   def configure_task t
     t.logger = StringIO.new
+
     # Comment following lines to really launch the player:
     sys = FakeSystem.new
     t.stubs(:current_system).returns sys
-    sys.expects(:open_flashplayer_with)
+    sys.expects(:open_flashplayer_with).returns Thread.new{}
   end
 end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 10
   - 1
-  - 6
+  - 7
   - pre
-  version: 10.1.6.pre
+  version: 10.1.7.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 -07:00
+date: 2010-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency