asproject 0.1.92 → 0.1.118

data/lib/asclass_arguments.rb

@@ -86,7 +86,7 @@ EOF
 #          self[:copy_to_home] = true
 #        end
 #
-#        opts.on('-d', '--default-templates', "Set default templates for this project eg: 'mxml,fb2mxml,asunit'") do
+#        opts.on('-d', '--default-templates', "Set default templates for this project eg: 'mxml,fb2mxml'") do
 #          self[:default_templates] = true
 #        end
 #

data/lib/asproject.rb

@@ -29,7 +29,9 @@ require 'test_suite_generator'
 
 require 'tasks/simple_resolver'
 require 'tasks/env_task'
+require 'tasks/remote_file_loader'
 require 'tasks/remote_file_task'
+require 'tasks/remote_library_task'
 require 'tasks/flash_log'
 require 'tasks/mxmlc'
 require 'tasks/fcsh'
@@ -46,7 +48,7 @@ module AsProject
   class AsProject < AsProjectBase
     @@ASPROJECT_FILE_NAME               = 'AsProject'
     @@TEMPLATE_TYPE                     = 'asproject'
-    @@DEFAULT_TEMPLATES                 = ['as2', 'config', 'asunit25', 'fdt']
+    @@DEFAULT_TEMPLATES                 = ['as2', 'config', 'fdt']
     
     def initialize(args=nil)
       execute(args)

data/lib/asproject/version.rb

@@ -2,7 +2,7 @@ module AsProject
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 93
+    TINY  = 119
         
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/asproject_arguments.rb

@@ -68,7 +68,7 @@ rake
 
 mkdir projects
 cd projects
-asproject -t 'as2,asunit25,config,fdt' MyProjectName
+asproject -t 'as2,config,fdt' MyProjectName
 cd MyProjectName/project
 asclass -s utils.MathUtil
 rake test
@@ -100,7 +100,7 @@ EOF
           self[:copy_to_home] = true
         end
 
-#        opts.on('-d', '--default-templates', "Set default templates for this project eg: 'mxml,fb2mxml,asunit'") do
+#        opts.on('-d', '--default-templates', "Set default templates for this project eg: 'mxml,fb2mxml'") do
 #          self[:default_templates] = true
 #        end
 #
@@ -167,11 +167,11 @@ EOF
   
     def get_templates_by_type(type)
       if(type == 'as2')
-        return ['as2', 'asunit25', 'fdt']
+        return ['as2', 'fdt']
       elsif(type == 'as3')
-        return ['as3', 'asunit3', 'fb2as']
+        return ['as3', 'fb2as']
       elsif(type == 'mxml')
-        return ['mxml', 'asunit3', 'fb2as']
+        return ['mxml', 'fb2as']
       end
     end
     

data/lib/path_finder.rb

@@ -50,6 +50,14 @@ module AsProject
       parent = File.dirname(File.dirname(__FILE__))
       return File.expand_path(parent)
     end
+
+    def lib_downloads
+      return File.join(downloads, 'lib')
+    end
+        
+    def downloads
+      return user.downloads
+    end
     
     def user
       return @user
@@ -367,13 +375,11 @@ EOF
     @@LIBRARY = 'Library'
     def initialize
       super
-      @flash_player_7_url = "/pub/flashplayer/updaters/7/sa_flashplayer_7_all_debug.dmg"
-      @flash_player_8_url = "/pub/flashplayer/updaters/8/flash_player_update3_flash8_win.zip"
-      @flash_player_9_url = "/pub/flashplayer/updaters/9/sa_flashplayer_9_all_debug_ub.dmg"
-
-      @zip_target = File.join('Players', 'Debug', 'SAFlashPlayer.dmg')
-    
-      @flash_player_8_target = File.join('Players', 'Debug', 'SAFlashPlayer.exe')
+#      @flash_player_7_url = "/pub/flashplayer/updaters/7/sa_flashplayer_7_all_debug.dmg"
+#      @flash_player_8_url = "/pub/flashplayer/updaters/8/flash_player_update3_flash8_win.zip"
+#      @flash_player_9_url = "/pub/flashplayer/updaters/9/sa_flashplayer_9_all_debug_ub.dmg"
+#      @zip_target = File.join('Players', 'Debug', 'SAFlashPlayer.dmg')   
+#      @flash_player_8_target = File.join('Players', 'Debug', 'SAFlashPlayer.exe')
 
       @osx_asproject = 'AsProject'
     end
@@ -393,6 +399,10 @@ EOF
       return File.join(library, 'Preferences', 'Macromedia', 'Flash Player')
     end
     
+    def flash_player_config
+        return File.join('/Library/Application Support/Macromedia/', 'mm.cfg')
+    end
+    
     def library
       lib = File.join(home, @@LIBRARY)
       if(File.exists?(lib))

data/lib/tasks/asunit.rb

@@ -0,0 +1,8 @@
+
+AsProject::RemoteLibraryTask.new(:asunit25) do |t|
+  t.url = 'http://asproject.googlecode.com/files/asunit25.zip'
+end
+
+AsProject::RemoteLibraryTask.new(:asunit3) do |t|
+  t.url = 'http://asproject.googlecode.com/files/asunit3.zip'
+end

data/lib/tasks/flash_log.rb

@@ -32,7 +32,8 @@ This file is required in order to capture trace output.
 Would you like this file created automatically? [Yn]
 
 EOF
-      if($stdin.gets.chomp.downcase.index('y'))
+      answer = $stdin.gets.chomp.downcase
+      if(answer.index('y') || answer == '')
         File.open(location, 'w') do |f|
           f.write(content)
         end

data/lib/tasks/flash_player.rb

@@ -30,19 +30,17 @@ module AsProject
       elsif(version == 8)
         @win_url = "http://download.macromedia.com/pub/flashplayer/updaters/8/flash_player_update3_flash8_win.zip"
         @win_extracted_file = "/Players/Debug/SAFlashPlayer.exe"
-        @osx_url = "http://download.macromedia.com/pub/flashplayer/updaters/9/sa_flashplayer_9_all_debug_ub.dmg"
-        @osx_mounted_path = "Adobe Flash Player Standalone"
+        @osx_url = "http://download.macromedia.com/pub/flashplayer/updaters/9/sa_flashplayer_9_debug.app.zip"
         @osx_extracted_file = "Flash\ Player.app"
 #        @osx_url = "http://download.macromedia.com/pub/flashplayer/updaters/8/sa_flashplayer_8_all_debug.dmg"
-#        @osx_mounted_path = "Adobe Flash Standalone Players"
 #        @osx_extracted_file = "en/SAFlashPlayer"
+#        @osx_mounted_path = "Adobe Flash Standalone Players"
         @unix_url = nil
         @unix_extracted_file = nil
       elsif(version == 9)
         @win_url = "http://download.macromedia.com/pub/flashplayer/updaters/9/sa_flashplayer_9_debug.exe"
         @win_extracted_file = "sa_flashplayer_9_debug.exe"
-        @osx_url = "http://download.macromedia.com/pub/flashplayer/updaters/9/sa_flashplayer_9_all_debug_ub.dmg"
-        @osx_mounted_path = "Adobe Flash Player Standalone"
+        @osx_url = "http://download.macromedia.com/pub/flashplayer/updaters/9/sa_flashplayer_9_debug.app.zip"
         @osx_extracted_file = "Flash\ Player.app"
         @unix_url = nil
         @unix_extracted_file = nil
@@ -86,7 +84,13 @@ module AsProject
       end
       
       def run_osx
-        player = extracted_file_path + '/Contents/MacOS/standalone'
+        if(extracted_file_path.index('.app'))
+          player = extracted_file_path + "/Contents/MacOS/Flash\ Player"
+        else
+          player = extracted_file_path
+        end
+        File.chmod(0755, player)
+
         swf = clean_path(@swf)
 
         t = Thread.new {

data/lib/tasks/mxmlc.rb

@@ -33,6 +33,7 @@ module AsProject
       @theme = []
       @runtime_shared_libraries = []
       @incremental = false
+      @optimize = false
       path_finder = PathFinder.new
       @target = path_finder.mxmlc
       @name = name
@@ -66,10 +67,20 @@ module AsProject
       task @name => [@output]
     end
     
-    def execute(cmd, args)
+    def execute(cmd, args, retries=0)
       begin
-        sh(%{#{cmd} #{args}})
+        sh("#{cmd} #{args}")
       rescue
+        default_mxmlc_osx_path = "/Applications/Adobe\ Flex\ Builder\ 2/Flex\ SDK\ 2/bin"
+        default_flex_home_path = File.join(ENV['FLEX_HOME'], 'bin', cmd)
+        if(retries == 0 && File.exists?(default_mxmlc_osx_path))
+          ENV['PATH'] = ENV['PATH'] + ':' + default_mxmlc_osx_path
+          execute(cmd, args, 1)
+          return
+        elsif(retries == 0 && File.exists?(default_flex_home_path))
+          execute("'#{default_flex_home_path}'", args, 1)
+          return
+        end
         puts 'There was an error executing mxmlc, please make sure mxmlc is in your class path and can be executed from the same environment this rake task was run from'
       end
     end

data/lib/tasks/remote_file_loader.rb

@@ -0,0 +1,144 @@
+
+module AsProject
+  class RemoteFileLoader < Rake::TaskLib
+
+    def fetch(location, limit = 10)
+      uri = URI.parse(location)
+
+      # Download the file now to the downloads dir
+      # If the file is an archive (zip, gz, tar, tar.gz, dmg), extract to
+      # AsProject/remote_files/@name/@location
+      # Check the location again...
+      raise UsageError.new("The RemoteFileTask can only handle HTTP requests at this time, it seems you were trying: #{uri.scheme}") if uri.scheme != 'http'
+      raise UsageError.new('HTTP redirect too deep') if limit == 0
+      
+      response = nil
+      t = Thread.new {
+        response = Net::HTTP.get_response(uri.host, uri.path)
+      }
+
+      print(">> Downloading")
+      # TODO: Add actual bytesLoaded vs bytesTotal
+      # To the output...
+      while t.alive?
+        print(".")
+        $stdout.flush
+        sleep(0.2)
+      end
+      puts ""
+      
+      if(response.is_a? Net::HTTPSuccess)
+        return response
+      elsif(response.is_a? Net::HTTPRedirection)
+        return fetch(response['location'], limit - 1)
+      else
+        if(response.nil?)
+          raise UsageError.new("Network connection failed!")
+        else
+          puts response.to_s
+          return response.error!
+        end
+      end
+    end
+    
+    def unpack_downloaded_file(file_name, expected_file)
+      dir = File.dirname(file_name)
+      if(!File.exists?(expected_file))
+        if(is_zip?(file_name))
+          unpack_zip(file_name, dir)
+        elsif(is_targz?(file_name))
+          unpack_targz(file_name, dir)
+        elsif(is_dmg?(file_name))
+          unpack_dmg(file_name, dir)
+        elsif(is_swc?(file_name))
+          # just copy the swc...
+        elsif(!is_exe?(file_name))
+          raise UsageError.new("RemoteFileTask does not know how to unpack files of type: #{file_name}")
+        end
+      end
+    end
+    
+    def unpack_zip(zip_file, dir)
+      Zip::ZipFile::open(zip_file) do |zf|
+         zf.each do |e|
+           fpath = File.join(dir, e.name)
+           FileUtils.mkdir_p(File.dirname(fpath))
+           zf.extract(e, fpath)
+         end
+       end
+    end
+    
+    def unpack_targz(tgz_file, dir)
+      tar = Zlib::GzipReader.new(File.open(tgz_file, 'rb'))
+      Minitar.unpack(tar, dir)
+    end
+    
+    # This is actually not unpacking the FlashPlayer
+    # Binary file as expected...
+    # OSX is treated the player binary as if it is
+    # a regular text file, but if it is copied manually,
+    # the command works fine!?
+    def unpack_dmg(dmg_file, dir)
+      # 1) Mount the dmg in place
+      # 2) Recursively Copy it's contents to asproject_home
+      # 3) Unmount the dmg
+      if(mounted_path.nil?)
+        raise StandardError.new('DMG file downloaded, but the RemoteFileTask needs a mounted_path in order to mount it')
+      end
+
+      if(!File.exists?(full_mounted_path))
+        system("hdiutil mount #{dmg_file}")
+      end
+      
+      begin
+        mounted_target = File.join(full_mounted_path, extracted_file)
+  
+        # Copy the DMG contents using system copy rather than ruby utils
+        # Because OS X does something special with .app files that the
+        # Ruby FileUtils and File classes break...
+        puts '=================='
+        from = mounted_target
+#        from = File.join(full_mounted_path, extracted_file)
+        to = File.join(@user.downloads, @name.to_s, extracted_file)
+        puts 'from: ' + from
+        puts 'to: ' + to
+        FileUtils.makedirs(File.dirname(to))
+        
+        if(File.exists?(from))
+          `ditto '#{from}' '#{to}'`
+        end
+      rescue
+        puts 'inside finally!'
+        if(File.exists?(full_mounted_path))
+          puts 'unmounting now!'
+          system("hdiutil unmount -force \"#{full_mounted_path}\"")
+        end
+      end
+    end
+    
+    def is_exe?(file)
+      return (file.split('.').pop == 'exe')
+    end
+    
+    def is_zip?(file)
+      return (file.split('.').pop == 'zip')
+    end
+    
+    def is_targz?(file)
+      parts = file.split('.')
+      return (parts.pop == 'gz' && parts.pop == 'tar')
+    end
+    
+    def is_gzip?(file)
+      return (file.split('.').pop == 'gz')
+    end
+    
+    def is_swc?(file)
+      return (file.split('.').pop == 'swc')
+    end
+    
+    def is_dmg?(file)
+      return (file.split('.').pop == 'dmg')
+    end
+  end
+end

data/lib/tasks/remote_file_task.rb

@@ -70,7 +70,7 @@ module AsProject
   ###################################
   # Concrete instances returned from
   # User objects
-  class AbstractRemoteFileTask
+  class AbstractRemoteFileTask < RemoteFileLoader
     include Archive::Tar
 
     attr_accessor :name,
@@ -119,96 +119,6 @@ module AsProject
       return File.join(@user.downloads, @name.to_s, file)
     end
     
-    def unpack_downloaded_file(file_name, expected_file)
-      # Remove previously downloaded files...
-      dir = File.dirname(file_name)
-      Dir[dir + '/*'].each do |child|
-        if(child != '.' && child != '..' && child != file_name)
-          FileUtils.rm_rf(child)
-        end
-      end
-
-      if(!File.exists?(expected_file))
-        if(is_zip?(file_name))
-          unpack_zip(file_name, dir)
-        elsif(is_targz?(file_name))
-          unpack_targz(file_name, dir)
-        elsif(is_dmg?(file_name))
-          unpack_dmg(file_name, dir)
-        elsif(!is_exe?(file_name))
-          raise UsageError.new("RemoteFileTask does not know how to unpack files of type: #{file_name}")
-        end
-      end
-    end
-    
-    def unpack_zip(zip_file, dir)
-      Zip::ZipFile::open(zip_file) do |zf|
-         zf.each do |e|
-           fpath = File.join(dir, e.name)
-           FileUtils.mkdir_p(File.dirname(fpath))
-           zf.extract(e, fpath)
-         end
-       end
-    end
-    
-    def unpack_targz(tgz_file, dir)
-      tar = Zlib::GzipReader.new(File.open(tgz_file, 'rb'))
-      Minitar.unpack(tar, dir)
-    end
-    
-    # This is actually not unpacking the FlashPlayer
-    # Binary file as expected...
-    # OSX is treated the player binary as if it is
-    # a regular text file, but if it is copied manually,
-    # the command works fine!?
-    def unpack_dmg(dmg_file, dir)
-      # 1) Mount the dmg in place
-      # 2) Recursively Copy it's contents to asproject_home
-      # 3) Unmount the dmg
-      if(mounted_path.nil?)
-        raise StandardError.new('DMG file downloaded, but the RemoteFileTask needs a mounted_path in order to mount it')
-      end
-
-      if(!File.exists?(full_mounted_path))
-        system("hdiutil mount #{dmg_file}")
-      end
-      
-      mounted_target = File.join(full_mounted_path, extracted_file)
-
-      # Copy the DMG contents using system copy rather than ruby utils
-      # Because OS X does something special with .app files that the
-      # Ruby FileUtils and File classes break...
-      from = full_mounted_path
-      to = File.join(@user.downloads, @name.to_s)
-      if(File.exists?(from))
-        `ditto '#{from}' #{to}`
-      end
-      if(File.exists?(full_mounted_path))
-        system("hdiutil unmount -force \"#{full_mounted_path}\"")
-      end
-    end
-    
-    def is_exe?(file)
-      return (file.split('.').pop == 'exe')
-    end
-    
-    def is_zip?(file)
-      return (file.split('.').pop == 'zip')
-    end
-    
-    def is_targz?(file)
-      parts = file.split('.')
-      return (parts.pop == 'gz' && parts.pop == 'tar')
-    end
-    
-    def is_gzip?(file)
-      return (file.split('.').pop == 'gz')
-    end
-    
-    def is_dmg?(file)
-      return (file.split('.').pop == 'dmg')
-    end
-    
     def make_downloaded_dir(file)
       dir = File.dirname(file)
       File.makedirs(dir)
@@ -222,42 +132,6 @@ module AsProject
       return File.join(remote_file_dir, extracted_file)
     end
     
-    def fetch(location, limit = 10)
-      uri = URI.parse(location)
-
-      # Download the file now to the downloads dir
-      # If the file is an archive (zip, gz, tar, tar.gz, dmg), extract to
-      # AsProject/remote_files/@name/@location
-      # Check the location again...
-      raise UsageError.new("The RemoteFileTask can only handle HTTP requests at this time, it seems you were trying: #{uri.scheme}") if uri.scheme != 'http'
-      raise UsageError.new('HTTP redirect too deep') if limit == 0
-      
-      response = nil
-      t = Thread.new {
-        response = Net::HTTP.get_response(uri.host, uri.path)
-      }
-      # TODO: Add actual bytesLoaded vs bytesTotal
-      # To the output...
-      while t.alive?
-        print(".")
-        $stdout.flush
-        sleep(0.2)
-      end
-      
-      if(response.is_a? Net::HTTPSuccess)
-        return response
-      elsif(response.is_a? Net::HTTPRedirection)
-        return fetch(response['location'], limit - 1)
-      else
-        if(response.nil?)
-          raise UsageError.new("Network connection failed!")
-        else
-          puts response.to_s
-          return response.error!
-        end
-      end
-    end
-    
     def get_remote_file(uri, target)
       if(!File.exists?(target))
         puts "Fetching #{uri.to_s} into #{target} now!"
@@ -339,7 +213,7 @@ module AsProject
      end
 
     def full_mounted_path
-      return '/Volumes/' + mounted_path
+      return File.join('/Volumes', mounted_path)
     end
   end