flashplayer 10.1.3.pre → 10.1.6.pre

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "sprout", ">= 1.0.pre"
+gem "sprout", ">= 1.0.11.pre"
 
 group :development do
   gem "shoulda"

data/VERSION

@@ -1 +1 @@
-10.1.3.pre
+10.1.6.pre

data/lib/flashplayer/clix_wrapper.rb

@@ -17,6 +17,6 @@ begin
   # Open the SWF:
   Appscript.app(player).open(MacTypes::Alias.path(swf))
 rescue LoadError => e
-  raise "\n\n[ERROR] You must install the rb-appscript gem to use the desktop debug Flash Player, you do this by running:\n\nsudo gem install rb-appscript"
+  raise "\n\n[ERROR] You must install the rb-appscript gem to use the desktop debug Flash Player, you do this by running:\n\ngem install rb-appscript"
 end
 

data/lib/flashplayer/log_file.rb

@@ -6,12 +6,10 @@ module FlashPlayer
     attr_accessor :logger
 
     def initialize
-      @config      = MMConfig.new
       @logger      = $stdout
     end
 
     def tail thread
-      @config.create
       tail_path flashlog_path, thread
     end
 
@@ -31,17 +29,7 @@ module FlashPlayer
       trap("INT") { thread.kill }
       
       while thread.alive? do
-        File.open(path, 'r') do |file|
-          lines_read = 0
-          file.readlines.each do |line|
-            if(lines_read >= lines_put)
-              logger.puts "[trace] #{line}"
-              logger.flush
-              lines_put += 1
-            end
-            lines_read += 1
-          end
-        end
+        lines_put = read_from_file path, lines_put
         logger.flush
         sleep(0.2)
       end
@@ -50,8 +38,27 @@ module FlashPlayer
       logger.puts ">> Exiting from tailing '#{path}' at user request"
     end
 
+    def read_from_file path, lines_put
+      File.open(path, 'r') do |file|
+        lines_read = 0
+        file.readlines.each do |line|
+          if(lines_read >= lines_put)
+            logger.puts "[trace] #{line}"
+            logger.flush
+            lines_put += 1
+          end
+          lines_read += 1
+        end
+      end unless !File.exists?(path)
+      lines_put
+    end
+
     def flashlog_path
-      File.join(FlashPlayer.home, 'Logs', 'flashlog.txt')
+      begin
+        FlashPlayer.flashlog
+      rescue FlashPlayer::PathError
+        "/dev/null"
+      end
     end
 
     def clear_flashlog_at path
@@ -71,9 +78,7 @@ module FlashPlayer
 end
 
 desc "Tail the flashlog.txt and block"
-def flashlog args
-  task args do
-    reader = FlashPlayer::LogFile.new
-    reader.tail
-  end
+task :flashlog do
+  reader = FlashPlayer::LogFile.new
+  reader.tail
 end

data/lib/flashplayer/mm_config.rb

@@ -18,11 +18,9 @@ module FlashPlayer
     private
 
     def create_if_necessary_at path
-      write_config(path, content(path)) if(file_blank?(path))
-    end
-
-    def flashplayer_home
-      FlashPlayer.home
+      if(File.exists?(File.dirname(path)))
+        write_config(path, content(flashlog_path)) if(file_blank?(path))
+      end
     end
 
     def config_path
@@ -33,28 +31,38 @@ module FlashPlayer
       end
     end
 
+    def flashplayer_home
+      FlashPlayer.home
+    end
+
+    def flashlog_path
+      FlashPlayer.flashlog
+    end
+
     def file_blank?(file)
       !File.exists?(file) || File.read(file).empty?
     end
 
     def write_config(location, content)
       if(user_confirmation?(location))
+        FileUtils.makedirs File.dirname(location)
+
         File.open(location, 'w') do |f|
           f.write(content)
         end
         logger.puts ">> Created file: " + File.expand_path(location)
         location
       else
-        raise FlashPlayer::PathError.new("Unable to create #{file_name} at: #{location}")
+        raise FlashPlayer::PathError.new("Unable to create #{location}")
       end
     end
 
-    def content(file)
+    def content(flashlog)
       return <<EOF
 ErrorReportingEnable=1
 MaxWarnings=0
 TraceOutputEnable=1
-TraceOutputFileName=#{file}
+TraceOutputFileName=#{flashlog}
 EOF
     end
 

data/lib/flashplayer/module.rb

@@ -21,7 +21,11 @@ module FlashPlayer
     end
 
     def trust
-      File.join(home, '#Security', 'FlashPlayerTrust', 'sprout.cfg')
+      File.join home, '#Security', 'FlashPlayerTrust', 'sprout.cfg'
+    end
+
+    def flashlog
+      File.join home, 'Logs', 'flashlog.txt'
     end
 
     private

data/lib/flashplayer/task.rb

@@ -27,8 +27,10 @@ module FlashPlayer
       super
       #puts ">> invoke with: #{args} and input: #{input}"
       update_input_if_necessary
-      update_mm_config
-      update_trust_config_with input
+      execute_safely do
+        update_mm_config
+        update_trust_config_with input
+      end
       player_thread = launch_player_with input
       tail_flashlog player_thread
     end
@@ -46,6 +48,14 @@ module FlashPlayer
 
     private
 
+    def execute_safely
+      begin
+        yield if block_given?
+      rescue FlashPlayer::PathError => e
+        logger.puts ">> [WARNING] It seems this was the first time FlashPlayer was launched on this system and as a result, the expected folders were not found. Please close the Player and run again - this message should only ever be displayed once."
+      end
+    end
+
     def update_input_if_necessary
       return if input.match(/\.swf$/)
       prerequisites.each do |prereq|

data/lib/flashplayer/trust.rb

@@ -18,7 +18,8 @@ module FlashPlayer
     private
 
     def create file
-      FileUtils.makedirs File.dirname(file)
+      dir = File.dirname file
+      FileUtils.makedirs(dir) unless File.exists?(dir)
       FileUtils.touch file
     end
 

data/test/unit/mm_config_test.rb

@@ -6,35 +6,62 @@ class MMConfigTest < Test::Unit::TestCase
   context "An MMConfig" do
 
     setup do
-      @fixture = File.join(fixtures, 'home')
-      @osx_fp9 = File.join(@fixture, 'Application Support', 'Macromedia')
+      @home = File.join(fixtures, 'home')
+      @osx_fp  = File.join(@home, 'Application Support', 'Macromedia')
+      @linux_fp = File.join(@home, '.macromedia', 'Flash_Player')
 
-      FileUtils.mkdir_p @fixture
-      FlashPlayer::MMConfig.any_instance.stubs(:user_confirmation?).returns true
+      FileUtils.mkdir_p @home
 
       @mm_config = FlashPlayer::MMConfig.new
+      @mm_config.stubs(:user_confirmation?).returns true
       @mm_config.logger = StringIO.new
     end
 
     teardown do
-      remove_file @fixture
+      remove_file @home
     end
 
-    should "create a config file on OS X with FP 9" do
-      FileUtils.mkdir_p @osx_fp9
+    should "ignore failure if flashplayer has never run" do
+      # No creation of expected FlashPlayer folders...
+      
+      as_a_mac_system do
+        @mm_config.stubs(:system_library).returns @home
+        @mm_config.stubs(:flashplayer_home).returns @osx_fp
+        @mm_config.create
+      end
+    end
 
-      @mm_config.stubs(:system_library).returns @fixture
-      @mm_config.stubs(:flashplayer_home).returns @osx_fp9
-      @mm_config.create
+    should "create a config file on OS X with FP 9" do
+      FileUtils.mkdir_p @osx_fp
+      flashlog = File.expand_path(File.join(@osx_fp, 'Logs', 'flashlog.txt'))
 
-      assert_file File.join(@osx_fp9, mm_config_file)
+      as_a_mac_system do
+        @mm_config.stubs(:system_library).returns @home
+        @mm_config.stubs(:flashplayer_home).returns @osx_fp
+        @mm_config.stubs(:flashlog_path).returns flashlog
+        @mm_config.create
+        mm_cfg = File.join(@osx_fp, mm_config_file)
+        assert_file mm_cfg do |content|
+          assert_matches /#{@flashlog}/, content
+        end
+      end
     end
 
-    should "create a config file on OS X with FP 10+" do
-      @mm_config.stubs(:system_home).returns @fixture
-      @mm_config.create
+    should "create a config file on linux" do
+      FileUtils.mkdir_p @linux_fp
+      flashlog = File.expand_path(File.join(@linux_fp, 'Logs', 'flashlog.txt'))
 
-      assert_file File.join(@fixture, mm_config_file)
+      as_a_unix_system do
+        @mm_config.stubs(:system_library).returns @home
+        @mm_config.stubs(:system_home).returns @home
+        @mm_config.stubs(:flashlog_path).returns flashlog
+        @mm_config.stubs(:flashplayer_home).returns @linux_fp
+        @mm_config.create
+        mm_cfg = File.join(@home, mm_config_file)
+        assert_file mm_cfg do |content|
+          assert_matches /#{flashlog}/, content
+        end
+      end
     end
   end
 

data/test/unit/task_test.rb

@@ -11,9 +11,31 @@ class FlashPlayerTaskTest < Test::Unit::TestCase
       # Executable.clear_entities! but 'require'
       # only runs once per VM run...
       load 'flashplayer/specification.rb'
-      @swf = File.join(fixtures, 'AsUnit4.swf')
+      @swf          = File.join(fixtures, 'AsUnit4.swf')
+      @missing_home = File.join(fixtures, 'missing_folder')
+      @config_path  = File.join(@missing_home, 'fp_config', 'mm.cfg')
     end
 
+    teardown do
+      remove_file @missing_home
+    end
+
+=begin
+    should "wait for SWF even if clean system" do
+      # No creation of expected FlashPlayer folders...
+
+      FlashPlayer.stubs(:home).returns @missing_home
+      FlashPlayer::MMConfig.any_instance.stubs(:system_home).returns @missing_home
+      FlashPlayer::MMConfig.any_instance.stubs(:config_path).returns @config_path
+      FlashPlayer::MMConfig.any_instance.stubs(:user_confirmation?).returns false
+
+      as_a_mac_system do
+        t = flashplayer @swf
+        t.invoke
+      end
+    end
+=end
+
     should "work with swf as task name" do
       t = flashplayer @swf
       configure_task t
@@ -24,6 +46,7 @@ class FlashPlayerTaskTest < Test::Unit::TestCase
       t = flashplayer :run do |t|
         t.input = @swf
       end
+      file @swf
       configure_task t
       t.invoke
       assert_equal @swf, t.input
@@ -31,6 +54,7 @@ class FlashPlayerTaskTest < Test::Unit::TestCase
 
     should "work with swf as prerequisite" do
       t = flashplayer :run => @swf
+      file @swf
       configure_task t
       t.invoke
       assert_equal @swf, t.input
@@ -38,6 +62,7 @@ class FlashPlayerTaskTest < Test::Unit::TestCase
 
     should "fire when declared as a dependency" do
       t = flashplayer :run => @swf
+      file @swf
       configure_task t
       other = task :parent => :run
       other.invoke

data/test/unit/trust_test.rb

@@ -6,11 +6,10 @@ class TrustTest < Test::Unit::TestCase
   context "A Trust instance" do
 
     setup do
-      @fixture = File.join fixtures, 'trust'
-      @file = File.join @fixture, 'trust.cfg'
-      @project = File.join fixtures, 'SomeProject'
-
-      @trust = FlashPlayer::Trust.new
+      @fixture      = File.join fixtures, 'trust'
+      @file         = File.join @fixture, 'trust.cfg'
+      @project      = File.join fixtures, 'SomeProject'
+      @trust        = FlashPlayer::Trust.new
       @trust.logger = StringIO.new
       @trust.stubs(:trust_file).returns @file
     end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 10
   - 1
-  - 3
+  - 6
   - pre
-  version: 10.1.3.pre
+  version: 10.1.6.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -27,8 +27,9 @@ dependencies:
         segments: 
         - 1
         - 0
+        - 11
         - pre
-        version: 1.0.pre
+        version: 1.0.11.pre
   type: :runtime
   prerelease: false
   version_requirements: *id001