sprout-flashplayer-bundle 10.22.6 → 10.22.7

data/lib/sprout/flashplayer/version.rb

@@ -3,7 +3,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 10
       MINOR = 22
-      TINY  = 6
+      TINY  = 7
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       MAJOR_MINOR = [MAJOR, MINOR].join('.')

data/lib/sprout/tasks/flashplayer_task.rb

@@ -217,7 +217,8 @@ module Sprout
 
       # Don't let trust or log file failures break other features...
       begin
-        log_file = FlashPlayerConfig.new().log
+        config = FlashPlayerConfig.new
+        log_file = config.log_file
         FlashPlayerTrust.new(File.expand_path(File.dirname(swf)))
 
         if(File.exists?(log_file))
@@ -365,20 +366,8 @@ module Sprout
 
     @@file_name = 'mm.cfg'
 
-    def initialize
-      osx_fp9 = File.join(User.library, 'Application Support', 'Macromedia')
-      if(FlashPlayerTask.home == osx_fp9)
-        @config = File.join(osx_fp9, @@file_name)
-      else
-        @config = File.join(User.home, @@file_name)
-      end
-      
-      if(!File.exists?(@config))
-        write_config(@config, content)
-      end
-    end
-
-    def log
+    def log_file
+      create_config_file
       path = File.join(FlashPlayerTask.home, 'Logs', 'flashlog.txt')
       if(User.new().is_a?(CygwinUser))
         parts = path.split("/")
@@ -395,17 +384,42 @@ module Sprout
       return path
     end
 
-    def content
+    def content(file)
       return <<EOF
 ErrorReportingEnable=1
 MaxWarnings=0
 TraceOutputEnable=1
-TraceOutputFileName=#{log}
+TraceOutputFileName=#{file}
 EOF
     end
 
+    def create_config_file
+      path = config_path 
+
+      if(file_blank?(path))
+        write_config(path, content(path))
+      end
+
+      path
+    end
+
     private
-    def write_config(location, content)
+
+    def file_blank?(file)
+      !File.exists?(file) || File.read(file).empty?
+    end
+
+    def config_path
+      osx_fp9 = File.join(User.library, 'Application Support', 'Macromedia')
+      if(FlashPlayerTask.home == osx_fp9)
+        path = File.join(osx_fp9, @@file_name)
+      else
+        path = File.join(User.home, @@file_name)
+      end
+      path
+    end
+
+    def user_confirmation?(location)
       puts <<EOF
 
 Correctly configured mm.cfg file not found at: #{location}
@@ -416,7 +430,11 @@ Would you like this file created automatically? [Yn]
 
 EOF
       answer = $stdin.gets.chomp.downcase
-      if(answer == 'y' || answer == '')
+      return (answer == 'y' || answer == '')
+    end
+
+    def write_config(location, content)
+      if(user_confirmation?(location))
         File.open(location, 'w') do |f|
           f.write(content)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout-flashplayer-bundle
 version: !ruby/object:Gem::Version 
-  version: 10.22.6
+  version: 10.22.7
 platform: ruby
 authors: 
 - Pattern Park
@@ -9,7 +9,7 @@ autorequire: sprout/flashplayer
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -04:00
+date: 2010-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency