asproject 0.1.41 → 0.1.42

data/lib/asproject.rb

@@ -4,6 +4,8 @@ require 'rubygems'
 require 'rake/clean'
 require 'rake/tasklib'
 require 'zip/zipfilesystem'
+require 'zlib'
+require 'archive/tar/minitar'
 require 'net/http'
 require 'yaml'
 require 'optparse'
@@ -232,7 +234,7 @@ EOF
 
   #######################################
   # ignore_file?
-  @@COPY_IGNORE_FILES = ['.', '..', '.svn', '.DS_Store', 'CVS', '.cvs' 'Thumbs.db', '.crap_file']
+  @@COPY_IGNORE_FILES = ['.', '..', '.svn', '.DS_Store', 'CVS', '.cvs' 'Thumbs.db', '.crap_file', '.Trashes', 'Desktop DB', 'Desktop DF']
   # Do not copy files found in the ignore_files list
   def AsProject.ignore_file? file
     @@COPY_IGNORE_FILES.each do |name|

data/lib/asproject/version.rb

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

data/lib/eclipse_project.rb

@@ -15,9 +15,13 @@ module AsProject
     
     def file_path=(path)
       @file_path = path
-      file = File.open(path, 'r')
-      parse(file.read)
-      file.close
+      begin
+        File.open(path, 'r') do |f|
+          parse(f.read)
+        end
+      rescue
+        @project_name = File.dirname(Dir.pwd)
+      end
     end
     
     def parse(str)

data/lib/path_finder.rb

@@ -181,13 +181,17 @@ module AsProject
     # Over multiple lines?
     private
     def is_project?(dir)
-      return (has_config_yaml?(dir) || has_eclipse_project?(dir) || has_src_eclipse_project?(dir) || has_src_and_test?(dir))
+      return (has_config_rb?(dir) || has_config_yaml?(dir) || has_eclipse_project?(dir) || has_src_eclipse_project?(dir) || has_src_and_test?(dir))
     end
     
     def has_config_yaml?(dir)
       return File.exists?(File.join(dir, 'config', 'asproject.yaml'))
     end
     
+    def has_config_rb?(dir)
+      return File.exists?(File.join(dir, 'config', '*.rb'))
+    end
+    
     def has_eclipse_project?(dir)
       return File.exists?(File.join(dir, '.project'))
     end
@@ -367,6 +371,7 @@ EOF
           raise UsageError.new("There was a problem finding a target for #{task.name}, it doesn't appear as if this task was expected to run on your system...")
         end
         t.url = task.osx_url
+        t.mounted_path = task.osx_mounted_path
         t.extracted_file = task.osx_extracted_file
       end
     end

data/lib/tasks/flash_player.rb

@@ -37,8 +37,9 @@ 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 = nil
-        @osx_extracted_file = nil
+        @osx_url = "http://download.macromedia.com/pub/flashplayer/updaters/8/sa_flashplayer_8_all_debug.dmg"
+        @osx_mounted_path = "/Volumes/Adobe Flash Standalone Players"
+        @osx_extracted_file = "/en/SAFlashPlayer"
         @unix_url = nil
         @unix_extracted_file = nil
       elsif(version == 9)

data/lib/tasks/hamtasc.rb

@@ -1,64 +1,64 @@
-
-module AsProject
-  class HAMTASCError < StandardError; end
-
-  class HAMTASC < MTASC
-  
-    attr_accessor :pack_path,
-                  :rb_entry,
-                  :rb_exclude_swf,
-                  :rb_exclude_path
-
-    def initialize(name=:compile, do_not_define=false)
-      @pack_path = []
-      @exclude_packages = []
-      @rb_exclude_path = []
-      super(name, true) do |s|
-        s.compiler_version = '1.12.rb.20'
-        s.win_url = "http://asproject.googlecode.com/files/hamtasc-#{compiler_version}.zip"
-        s.win_extracted_file = "/hamtasc-#{compiler_version}/hamtasc.exe"
-        s.osx_url = nil
-        s.osx_extracted_file = nil
-        s.unix_url = nil
-        s.unix_extracted_file = nil
-      end
-      yield self if block_given?
-      define unless do_not_define
-    end
-    
-    def define
-      if(rb_exclude_path.size > 0)
-        @exclude_packages = rb_exclude_path
-#        rb_exclude_path.each do |path|
-#          @exclude_packages << recurse_exclude_path(path)
-#        end
-      end
-      
-      @cleaned_pack_path = []
-      pack_path.each do |path|
-        add_path(path, @cleaned_pack_path)
-      end
-
-      super
-    end
-    
-    def remote_task_name
-      return "hamtasc-#{compiler_version}"
-    end
-
-    def compile_task_desc
-      return "Compile #{name} using HAMTASC"
-    end
-    
-    def option_list
-      result = super
-      input = result.pop if(input) 
-      result << "-rb_entry" << rb_entry if rb_entry
-      result << "-rb_exclude_swf" << clean_path(rb_exclude_swf) if rb_exclude_swf
-      result << "-rb_exclude_package " << @exclude_packages.join(" -rb_exclude_package ") if @exclude_packages.size > 0
-      result << "-pack " + @cleaned_pack_path.join(" -pack ") if pack_path.size > 0
-      result << input if input
-      return result
-    end
-  end
+
+module AsProject
+  class HAMTASCError < StandardError; end
+
+  class HAMTASC < MTASC
+  
+    attr_accessor :pack_path,
+                  :rb_entry,
+                  :rb_exclude_swf,
+                  :rb_exclude_path
+
+    def initialize(name=:compile, do_not_define=false)
+      @pack_path = []
+      @exclude_packages = []
+      @rb_exclude_path = []
+      super(name, true) do |s|
+        s.compiler_version = '1.12.rb.20'
+        s.win_url = "http://asproject.googlecode.com/files/hamtasc-#{compiler_version}.zip"
+        s.win_extracted_file = "/hamtasc-#{compiler_version}/hamtasc.exe"
+        s.osx_url = nil
+        s.osx_extracted_file = nil
+        s.unix_url = nil
+        s.unix_extracted_file = nil
+      end
+      yield self if block_given?
+      define unless do_not_define
+    end
+    
+    def define
+      if(rb_exclude_path.size > 0)
+        @exclude_packages = rb_exclude_path
+#        rb_exclude_path.each do |path|
+#          @exclude_packages << recurse_exclude_path(path)
+#        end
+      end
+      
+      @cleaned_pack_path = []
+      pack_path.each do |path|
+        add_path(path, @cleaned_pack_path)
+      end
+
+      super
+    end
+    
+    def remote_task_name
+      return "hamtasc-#{compiler_version}"
+    end
+
+    def compile_task_desc
+      return "Compile #{name} using HAMTASC"
+    end
+    
+    def option_list
+      result = super
+      input = result.pop if(input) 
+      result << "-rb_entry" << rb_entry if rb_entry
+      result << "-rb_exclude_swf" << clean_path(rb_exclude_swf) if rb_exclude_swf
+      result << "-rb_exclude_package " << @exclude_packages.join(" -rb_exclude_package ") if @exclude_packages.size > 0
+      result << "-pack " + @cleaned_pack_path.join(" -pack ") if pack_path.size > 0
+      result << input if input
+      return result
+    end
+  end
 end

data/lib/tasks/mtasc.rb

@@ -24,10 +24,10 @@ module AsProject
       @user_task = nil
       @win_url = "http://www.mtasc.org/zip/mtasc-#{compiler_version}.zip"
       @win_extracted_file = "/mtasc-#{compiler_version}/mtasc.exe"
-      @osx_url = "http://www.mtasc.org/zip/mtasc-#{compiler_version}.dmg"
-      @osx_extracted_file = "/mtasc-#{compiler_version}/mtasc.app"
-      @unix_url = "http://www.mtasc.org/zip/mtasc-#{compiler_version}.tar.gz"
-      @unix_extracted_file = "/mtasc-#{compiler_version}/mtasc"
+      @osx_url = "http://mtasc.org/zip/mtasc-1.12-osx.zip"
+      @osx_extracted_file = "/mtasc-1.12-osx/mtasc"
+      @unix_url = nil
+      @unix_extracted_file = nil
       super(name, true)
       define unless do_not_define
     end

data/lib/tasks/remote_file_task.rb

@@ -12,6 +12,7 @@ module AsProject
   # each platform will seamlessly download and 
   # target these tools.
   class RemoteFileTask < Rake::TaskLib
+
     attr_accessor :name,
                   :user_task,
                   :remote_task_name,
@@ -20,7 +21,8 @@ module AsProject
                   :unix_url,
                   :win_extracted_file,
                   :osx_extracted_file,
-                  :unix_extracted_file
+                  :unix_extracted_file,
+                  :osx_mounted_path
 
     def initialize(name=:remote_file_task, do_not_define=false)
       @name = name
@@ -65,8 +67,11 @@ module AsProject
   # Concrete instances returned from
   # User objects
   class AbstractRemoteFileTask
+    include Archive::Tar
+
     attr_accessor :name,
                   :url,
+                  :mounted_path,
                   :extracted_file
 
     def initialize(name, user)
@@ -110,9 +115,14 @@ module AsProject
     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, File.dirname(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
@@ -129,6 +139,33 @@ module AsProject
        end
     end
     
+    def unpack_targz(tgz_file, dir)
+      tar = Zlib::GzipReader.new(File.open(tgz_file, 'rb'))
+      Minitar.unpack(tar, dir)
+    end
+    
+    # This probably NOT the correct way to do this,
+    # But I don't know much about macs, osx or dmgs
+    # and it seems to work...
+    # IF you know a better way - PLEASE let me know
+    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
+      
+      puts "Creating mounted path task: #{File.exists?(mounted_path)}"
+      if(!File.exists?(mounted_path))
+        system(%{hdiutil mount #{dmg_file}})
+      end
+      resolver = TemplateResolver.new
+      resolver.copy_files(mounted_path, dir, false)
+      File.chmod(0755, extracted_file)
+      system(%{hdiutil unmount #{mounted_path}})
+    end
+    
     def is_exe?(file)
       return (file.split('.').pop == 'exe')
     end
@@ -137,8 +174,9 @@ module AsProject
       return (file.split('.').pop == 'zip')
     end
     
-    def is_tar?(file)
-      return (file.split('.').pop == 'tar')
+    def is_targz?(file)
+      parts = file.split('.')
+      return (parts.pop == 'gz' && parts.pop == 'tar')
     end
     
     def is_gzip?(file)

data/lib/tasks/swfmill.rb

@@ -21,10 +21,10 @@ module AsProject
       @version = '0.2.12' 
       @win_url = "http://www.swfmill.org/releases/swfmill-#{version}-win32.zip"
       @win_extracted_file = "/swfmill-#{version}-win32/swfmill.exe"
-#      @osx_url = "http://www.swfmill.org/releases/swfmill-0.2.12-macosx.tar.gz"
-#      @osx_extracted_file = nil
-#      @unix_url = nil
-#      @unix_extracted_file = nil
+      @osx_url = "http://swfmill.org/releases/swfmill-#{version}-macosx.tar.gz"
+      @osx_extracted_file = "swfmill-#{version}-macosx/swfmill"
+      @unix_url = nil
+      @unix_extracted_file = nil
       super(name, true)
       define unless do_not_define
     end

data/lib/template_resolver.rb

@@ -1,151 +1,151 @@
-
-module AsProject
-  #######################################
-  # TemplateResolver
-  class TemplateResolver < Hash
-    attr_accessor :replace_all, :ignore_all
-    @@ASPROJECT_FILE_NAME = 'AsProject'
-    @@RENDER_IGNORE_FILES = ['asclass_config.rb', 'SWFMillTemplate.erb']
-    @@BINARY_EXTENSIONS = ['.jpg', '.png', '.gif', '.doc', '.xls', '.exe']
-    
-    def initialize
-      @replace_all = false
-      @ignore_all = false
-    end
-    
-    def copy_files(from, to, render=false)
-      created_files = Array.new
-      if(!File.exists? from)
-        raise ProjectError.new('TemplateResolver attempted to copy files from (' + from + ') but it does not exist...')
-      end
-      if(File.directory? from)
-        Dir.open(from).each do |filename|
-          if(!AsProject.ignore_file? filename)
-            fullname = File.join(from, filename)
-            new_fullname = File.join(to, filename)
-            cleaned_filename = clean_file_name(filename)
-            cleaned_fullname = File.join(to, cleaned_filename)
-            if(File.directory? fullname)
-              Dir.mkdir(new_fullname) unless File.exists? new_fullname
-              copy_files(fullname, new_fullname, render).each do |file|
-                created_files << file
-              end
-            else
-              file = copy_file(fullname, cleaned_fullname, render)
-              if(file)
-                created_files << file
-              end
-            end
-          end
-        end
-      else
-        raise ProjectError.new("copy_files called with a file (" + from + ") instead of a directory!")
-      end
-      return created_files
-    end
-    
-    def copy_file(from, to, render=false)
-      if(write_file?(to))
-        content = File.open(from, 'r').read
-        parts = to.split(File::SEPARATOR)
-        parts.pop
-        File.makedirs(parts.join(File::SEPARATOR))
-        target = File.open(to, 'w')
-        if(render && should_render?(from))
-          begin
-            content = ERB.new(content, nil, '>').result(binding)
-          rescue NameError => e
-            puts '>> Template ' + from + ' references a value that is not defined'
-            raise e
-          end
-        end
-        target.write(content)
-        target.close
-        return to
-      end
-      return nil
-    end
-    
-    def should_render?(file)
-      if(is_binary?(file) || @@RENDER_IGNORE_FILES.index(File.basename(file)))
-        return false
-      end
-      return true
-    end
-    
-    def write_file?(file)
-      if(!File.exists?(file))
-        return true
-      elsif(@replace_all)
-        File.delete(file)
-        return true
-      elsif(@ignore_all)
-        return false
-      end
-
-      relative = file.gsub(Dir.pwd, '')
-      msg = <<EOF
-
-AsProject Encountered an existing file at [#{relative}], what would you like to do?
-(r)eplace, (i)gnore, (R)eplace all or (I)gnore all?
-
-EOF
-      puts msg
-      answer = gets.chomp!
-      if(answer == 'r')
-        return true
-      elsif(answer == 'i')
-        return false
-      elsif(answer == 'R')
-        msg = <<EOF
-        
-Are you sure you want to replace ALL duplicate files?
-(y)es or (n)o
-
-EOF
-        puts msg
-        answer = gets.chomp!
-        if(answer == 'y')
-          @replace_all = true
-        else
-          write_file?(file)
-        end
-      elsif(answer == 'I')
-        @ignore_all = true
-        return false
-      else
-        puts "I didn't understand that response... Please choose from the following choices:\n\n"
-        write_file?(file)
-      end
-    end
-    
-    def render_file filename
-      file = File.open(filename, 'r')
-      resolved = ERB.new(file.read, nil, '>').result(binding)
-      file.close
-      file = File.open(filename, 'w')
-      file.write(resolved)
-      file.close
-    end
-    
-    def clean_file_name name
-      return name.gsub(@@ASPROJECT_FILE_NAME, project_name)
-    end
-    
-    # Override in subclasses!
-    def project_name
-      return @@ASPROJECT_FILE_NAME
-    end
-    
-    #TODO: Figure out if the file is plain text or not... Possible?
-    def is_binary? file
-      file_extension = File.extname(file).downcase
-      @@BINARY_EXTENSIONS.each do |ext|
-        if(file_extension == ext)
-          return true
-        end
-      end
-      return false
-    end
-  end
+
+module AsProject
+  #######################################
+  # TemplateResolver
+  class TemplateResolver < Hash
+    attr_accessor :replace_all, :ignore_all
+    @@ASPROJECT_FILE_NAME = 'AsProject'
+    @@RENDER_IGNORE_FILES = ['asclass_config.rb', 'SWFMillTemplate.erb']
+    @@BINARY_EXTENSIONS = ['.jpg', '.png', '.gif', '.doc', '.xls', '.exe']
+    
+    def initialize
+      @replace_all = false
+      @ignore_all = false
+    end
+    
+    def copy_files(from, to, render=false)
+      created_files = Array.new
+      if(!File.exists? from)
+        raise ProjectError.new('TemplateResolver attempted to copy files from (' + from + ') but it does not exist...')
+      end
+      if(File.directory? from)
+        Dir.open(from).each do |filename|
+          if(!AsProject.ignore_file? filename)
+            fullname = File.join(from, filename)
+            new_fullname = File.join(to, filename)
+            cleaned_filename = clean_file_name(filename)
+            cleaned_fullname = File.join(to, cleaned_filename)
+            if(File.directory? fullname)
+              Dir.mkdir(new_fullname) unless File.exists? new_fullname
+              copy_files(fullname, new_fullname, render).each do |file|
+                created_files << file
+              end
+            else
+              file = copy_file(fullname, cleaned_fullname, render)
+              if(file)
+                created_files << file
+              end
+            end
+          end
+        end
+      else
+        raise ProjectError.new("copy_files called with a file (" + from + ") instead of a directory!")
+      end
+      return created_files
+    end
+    
+    def copy_file(from, to, render=false)
+      if(write_file?(to))
+        content = File.open(from, 'r').read
+        parts = to.split(File::SEPARATOR)
+        parts.pop
+        File.makedirs(parts.join(File::SEPARATOR))
+        target = File.open(to, 'w')
+        if(render && should_render?(from))
+          begin
+            content = ERB.new(content, nil, '>').result(binding)
+          rescue NameError => e
+            puts '>> Template ' + from + ' references a value that is not defined'
+            raise e
+          end
+        end
+        target.write(content)
+        target.close
+        return to
+      end
+      return nil
+    end
+    
+    def should_render?(file)
+      if(is_binary?(file) || @@RENDER_IGNORE_FILES.index(File.basename(file)))
+        return false
+      end
+      return true
+    end
+    
+    def write_file?(file)
+      if(!File.exists?(file))
+        return true
+      elsif(@replace_all)
+        File.delete(file)
+        return true
+      elsif(@ignore_all)
+        return false
+      end
+
+      relative = file.gsub(Dir.pwd, '')
+      msg = <<EOF
+
+AsProject Encountered an existing file at [#{relative}], what would you like to do?
+(r)eplace, (i)gnore, (R)eplace all or (I)gnore all?
+
+EOF
+      puts msg
+      answer = gets.chomp!
+      if(answer == 'r')
+        return true
+      elsif(answer == 'i')
+        return false
+      elsif(answer == 'R')
+        msg = <<EOF
+        
+Are you sure you want to replace ALL duplicate files?
+(y)es or (n)o
+
+EOF
+        puts msg
+        answer = gets.chomp!
+        if(answer == 'y')
+          @replace_all = true
+        else
+          write_file?(file)
+        end
+      elsif(answer == 'I')
+        @ignore_all = true
+        return false
+      else
+        puts "I didn't understand that response... Please choose from the following choices:\n\n"
+        write_file?(file)
+      end
+    end
+    
+    def render_file filename
+      file = File.open(filename, 'r')
+      resolved = ERB.new(file.read, nil, '>').result(binding)
+      file.close
+      file = File.open(filename, 'w')
+      file.write(resolved)
+      file.close
+    end
+    
+    def clean_file_name name
+      return name.gsub(@@ASPROJECT_FILE_NAME, project_name)
+    end
+    
+    # Override in subclasses!
+    def project_name
+      return @@ASPROJECT_FILE_NAME
+    end
+    
+    #TODO: Figure out if the file is plain text or not... Possible?
+    def is_binary? file
+      file_extension = File.extname(file).downcase
+      @@BINARY_EXTENSIONS.each do |ext|
+        if(file_extension == ext)
+          return true
+        end
+      end
+      return false
+    end
+  end
 end

data/rakefile.rb

@@ -60,6 +60,7 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('rake', '>= 0.7.1')
   s.add_dependency('rubyzip', '>= 0.9.1')
+  s.add_dependency('archive-tar-minitar', '>= 0.5.1')
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
 

data/templates/asproject/as2/project/rakefile.rb

@@ -38,9 +38,9 @@ end
 
 task :compile_main => [:compile_skin]
 
-AsProject::HAMTASC.new(:compile_main) do |t|
+AsProject::MTASC.new(:compile_main) do |t|
   t.input = '<%= project_name %>'
-  t.rb_entry = '<%= project_name %>.main'
+  t.main = true
   t.version = 8
   t.frame = 2
   t.input_swf = 'bin/<%= project_name %>Skin.swf'
@@ -51,11 +51,11 @@ end
 ############################################
 # Compile your Application using HAMTASC
 
-AsProject::HAMTASC.new(:compile_tests) do |t|
+AsProject::MTASC.new(:compile_tests) do |t|
   t.input = '<%= project_name %>Runner'
   t.version = 8
   t.frame = 2
-  t.rb_entry = '<%= project_name %>Runner.main'
+  t.main = true
   t.input_swf = 'bin/<%= project_name %>Skin.swf'
   t.output = 'bin/<%= project_name %>Runner.swf'
   t.class_path << 'src'

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: asproject
 version: !ruby/object:Gem::Version 
-  version: 0.1.41
+  version: 0.1.42
 date: 2007-03-04 00:00:00 -08:00
 summary: AsProject is a tool set that simplifies the process of beginning and growing a new ActionScript project.
 require_paths: 
@@ -304,3 +304,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: archive-tar-minitar
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.1
+    version: