asproject 0.1.37 → 0.1.38

data/lib/asclass.rb

@@ -1,8 +1,6 @@
 $:.push(File.dirname(__FILE__))
 
 require 'asproject'
-require 'asclass_arguments'
-require 'test_suite_generator'
 
 module AsProject
   class AsClass < AsProjectBase

data/lib/asproject.rb

@@ -1,11 +1,16 @@
 $:.push(File.dirname(__FILE__))
 
 require 'rubygems'
+require 'rake/clean'
+require 'rake/tasklib'
+require 'zip/zipfilesystem'
+require 'net/http'
 require 'yaml'
 require 'optparse'
 require 'fileutils'
 require 'erb'
 require 'ftools'
+require 'uri'
 
 require 'asproject/version'
 require 'asproject_base'
@@ -17,7 +22,18 @@ require 'project'
 require 'eclipse_project'
 require 'asproject_arguments'
 require 'asclass'
+require 'asclass_arguments'
+require 'test_suite_generator'
+
+require 'tasks/simple_resolver'
 require 'tasks/remote_file_task'
+require 'tasks/flash_log'
+require 'tasks/mtasc'
+require 'tasks/hamtasc'
+require 'tasks/flash_player'
+require 'tasks/swfmill_input_resolver'
+require 'tasks/swfmill_input'
+require 'tasks/swfmill'
 
 module AsProject
   class AsProject < AsProjectBase

data/lib/asproject/version.rb

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

data/lib/path_finder.rb

@@ -1,7 +1,4 @@
 
-require 'player_fetcher'
-require 'ftools'
-
 module AsProject
   class PathFinder < TemplateResolver
     attr_accessor :execution_dir
@@ -33,10 +30,6 @@ module AsProject
       return @user.flash_player_config_content
     end
     
-    def flash_player_debug(version)
-      return @user.flash_player_debug(version)
-    end
-    
     def flash_player_trust
       return @user.flash_player_trust
     end
@@ -284,27 +277,6 @@ EOF
       return File.join(asproject_home, 'players', 'FlashPlayer' + version.to_s)
     end
     
-    def flash_player_debug(version)
-      path = flash_player_path(version)
-      if(File.exists?(path))
-        return path
-      else
-        url = get_player_url(version)
-        if(url.nil?)
-          raise UsageError.new("Unable to find appropriate player version #{version} for your system...")
-        end
-        fetch_player(url, path)
-      end
-    end
-    
-    def fetch_player(url, path)
-      dir = path.split(File::SEPARATOR)
-      dir.pop
-      File.makedirs(dir.join(File::SEPARATOR))
-      PlayerFetcher.new(url, path, @zip_target)
-      return path
-    end
-    
     def flash_player_log
       dir = File.join(flash_player_home, 'Logs')
       File.makedirs(dir)

data/lib/tasks/flash_log.rb

@@ -1,6 +1,4 @@
 
-require 'asproject'
-
 module AsProject
   class FlashLog
     attr_accessor :version

data/lib/tasks/flash_player.rb

@@ -1,11 +1,4 @@
 
-require File.dirname(__FILE__) + '/../asproject'
-require File.dirname(__FILE__) + '/remote_file_task'
-require File.dirname(__FILE__) + '/flash_log'
-#require 'config/asclass_config'
-#require 'tasks/flash_log'
-#require 'asproject'
-
 # Pull in the project-local config file
 # if it exists...
 if(File.exists?('script/asclass_config.rb'))
@@ -76,7 +69,6 @@ module AsProject
         end
 
         player_thread = Thread.new {
-          puts 'PLAYER THREAD with: ' + @swf
           execute("./#{@swf}")
         }
 

data/lib/tasks/hamtasc.rb

@@ -1,6 +1,4 @@
 
-require File.dirname(__FILE__) + '/remote_file_task'
-
 module AsProject
   class HAMTASCError < StandardError; end
 

data/lib/tasks/mtasc.rb

@@ -1,6 +1,4 @@
 
-require File.dirname(__FILE__) + '/remote_file_task'
-
 module AsProject
   class MTASCError < StandardError; end
 

data/lib/tasks/remote_file_task.rb

@@ -1,10 +1,6 @@
-require 'rake/tasklib'
-require 'rake/clean'
-require 'uri'
-require 'ftools'
 
 # Tell Rake NOT to remove directory(ies) named 'core'
-CLEAN.exclude("core") 
+CLEAN.exclude("core")
 
 module AsProject
   # The RemoteFileTask was created to resolve
@@ -240,7 +236,7 @@ module AsProject
     end
     
     def execute(params)
-      sh %{"#{extracted_file_path}" #{params}}
+      sh(%{"#{extracted_file_path}" #{params}})
     end
   end
   

data/lib/tasks/simple_resolver.rb

@@ -0,0 +1,62 @@
+
+class SimpleResolver
+
+  def initialize(template, output, files, base_dir=nil)
+    @template = template
+    @output = output
+    @files = files
+    @base_dir = base_dir
+    @ignored_files = []
+    execute
+    finish
+  end
+  
+  def execute
+    template_file = File.open(@template, 'r')
+    content = template_file.read
+    result = ERB.new(content, nil, '>').result(binding)
+
+    output_file = File.open(@output, 'w')
+    output_file.write(result)
+    
+    template_file.close
+    output_file.close
+  end
+  
+  def files
+    return @files
+  end
+
+  def finish
+    if(@ignored_files.size > 0) 
+      puts '>> SimpleResolver ignored the following files because their names were invalid:'
+      @ignored_files.each do |file|
+        puts file
+      end
+    end
+  end
+  
+  def xml_edit_warning
+    return <<EOF
+  <!--
+  DO NOT EDIT THIS FILE!
+  This file was auto-generated from
+  an ERB template which can be
+  found at: 
+  #{@template}
+  -->
+EOF
+  end
+  
+  def edit_warning
+    return <<EOF
+/*************************************
+ * DO NOT EDIT THIS FILE!
+ * This file was auto-generated from
+ * an ERB template which can be
+ * found at: 
+ * #{@template}
+ *************************************/
+EOF
+  end
+end

data/lib/tasks/swfmill.rb

@@ -1,6 +1,4 @@
 
-require File.dirname(__FILE__) + '/remote_file_task'
-
 module AsProject
   class SWFMillError < StandardError; end
 
@@ -8,12 +6,16 @@ module AsProject
     attr_accessor :name,
                   :simple,
                   :input,
+                  :input_expr,
                   :output,
+                  :template,
                   :version
 
     def initialize(name, do_not_define=false)
       @simple = true
       @input = nil
+      @template = nil
+      @input_expr = nil
       @output = nil
       @options = []
       @version = '0.2.12' 
@@ -35,16 +37,24 @@ module AsProject
       super
       
       if(@input.nil?)
-        raise Error.new('SWFMill task requires that input be set')
+        raise SWFMillError.new('SWFMill task requires that input be set')
       end
       
       if(@output.nil?)
-        raise Error.new('SWFMill task requires that output be set')
+        raise SWFMillError.new('SWFMill task requires that output be set')
+      end
+      
+      if(File.directory?(input))
+        @input = define_xml_task(input).xml_file
       end
+      
       file input
-      file output => [input] do |f|
-        user_task.execute(option_list.join(' '))
-#        sh %{swfmill #{option_list}}
+      file output => input do |f|
+        cleaned_options = []
+        option_list.each do |item|
+          cleaned_options << clean_path(item)
+        end
+        execute(cleaned_options.join(' '))
       end
 
       desc "#{name} using SWFMill"
@@ -55,6 +65,16 @@ module AsProject
       self
     end
 
+    def define_xml_task(path)
+      # build the input xml file automatically
+      # Based on a directory full of images...
+      if(@template.nil?)
+        raise SWFMillError.new('If input is a directory, you must assign a template to use for the generated xml document')
+      end
+      
+      return SWFMillInput.new(path, template, input_expr)
+    end
+    
     def option_list
       result = @options.dup
       result << "simple" if simple

data/lib/tasks/swfmill_input.rb

@@ -0,0 +1,56 @@
+
+module AsProject
+  class SWFMillInputError < StandardError; end
+
+  class SWFMillInput
+    attr_accessor :path,
+                  :template,
+                  :input_expr
+    
+    def initialize(path, template, input_expr=nil)
+      @path = path
+      @template = template
+      if(input_expr.nil?)
+        @input_expr = '/**/**/*'
+      else
+        @input_expr = input_expr
+      end
+      define
+    end
+    
+    def define
+      if(@path.nil?)
+        raise SWFMillInputError.new('SWFMillInput needs a valid input');
+      end
+      
+      if(@template.nil?)
+        raise SWFMillInputError.new('CompileSkins needs a valid template to use');
+      end
+
+      input_files = FileList.new(path + input_expr)
+      file xml_file => input_files
+      file xml_file => path
+      file xml_file => template
+
+      file xml_file do |f|
+        write_xml(xml_file, input_files, path)
+      end
+      
+      CLEAN.add(xml_file)
+      self
+    end
+    
+    def skin_name
+      return File.basename(path).capitalize
+    end
+    
+    def xml_file
+      return File.join(File.dirname(path), skin_name + '.xml')
+    end
+    
+    def write_xml(file, files, base_dir)
+      SWFMillInputResolver.new(template, file, files, base_dir)
+      puts 'Created file at: ' + file
+    end
+  end
+end

data/lib/tasks/swfmill_input_resolver.rb

@@ -0,0 +1,24 @@
+
+class SWFMillInputResolver < SimpleResolver
+  
+  def ignore_file?(file)
+    base = File.basename(file)
+    if(base == '.DS_Store' || base == 'Thumbs.db' || base.match(/^\d/))
+      @ignored_files << file
+      return true
+    end
+    return false
+  end
+  
+  def get_symbol_id(file)
+    trimmed = file.gsub(@base_dir, '')
+    parts = trimmed.split('.')
+    parts.pop
+    trimmed = parts.join('.')
+
+    result = trimmed.split(File::SEPARATOR).join('.')
+    result = result.gsub(/^./, '')
+    return result
+  end
+  
+end

data/lib/template_resolver.rb

@@ -5,7 +5,7 @@ module AsProject
   class TemplateResolver < Hash
     attr_accessor :replace_all, :ignore_all
     @@ASPROJECT_FILE_NAME = 'AsProject'
-    @@RENDER_IGNORE_FILES = ['asclass_config.rb']
+    @@RENDER_IGNORE_FILES = ['asclass_config.rb', 'SWFMillTemplate.erb']
     @@BINARY_EXTENSIONS = ['.jpg', '.png', '.gif', '.doc', '.xls', '.exe']
     
     def initialize
@@ -16,7 +16,7 @@ module AsProject
     def copy_files(from, to, render=false)
       created_files = Array.new
       if(!File.exists? from)
-        raise ProjectError.new('AsProject attempted to copy files from (' + from + ') but it does not exist...')
+        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|

data/templates/asproject/as2/project/assets/img/skins/SWFMillTemplate.erb

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<%= xml_edit_warning %>
+<movie width="600" height="450" framerate="24" version="8">
+	<background color="#ffffff"/>
+	<frame>
+		<library><% files.each do |file| if(!ignore_file?(file) && !File.directory?(file)) %>
+			<clip id="<%=get_symbol_id(file)%>" import="<%=file%>" /><% end end %>
+		</library>
+	</frame>
+	<frame>
+		<stop />
+	</frame>
+</movie>

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

@@ -1,8 +1,5 @@
 require 'rubygems'
-require 'tasks/mtasc'
-require 'tasks/hamtasc'
-require 'tasks/swfmill'
-require 'tasks/flash_player'
+require 'asproject'
 
 ############################################
 # Launch the Application using Flash Player 8
@@ -31,7 +28,8 @@ end
 # Compile your library using SWFMill
 
 AsProject::SWFMill.new(:compile_skin) do |t|
-  t.input = 'assets/img/skins/Default.xml'
+  t.input = 'assets/img/skins/default'
+  t.template = 'assets/img/skins/SWFMillTemplate.erb'
   t.output = 'bin/<%= project_name %>Skin.swf'
 end
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: asproject
 version: !ruby/object:Gem::Version 
-  version: 0.1.37
+  version: 0.1.38
 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: 
@@ -54,7 +54,6 @@ files:
 - lib/eclipse_project.rb
 - lib/path_finder.rb
 - lib/platform.rb
-- lib/player_fetcher.rb
 - lib/project.rb
 - lib/tasks
 - lib/template_resolver.rb
@@ -64,9 +63,11 @@ files:
 - lib/tasks/flash_player.rb
 - lib/tasks/hamtasc.rb
 - lib/tasks/mtasc.rb
-- lib/tasks/rake.rb
 - lib/tasks/remote_file_task.rb
+- lib/tasks/simple_resolver.rb
 - lib/tasks/swfmill.rb
+- lib/tasks/swfmill_input.rb
+- lib/tasks/swfmill_input_resolver.rb
 - templates/asclass
 - templates/asproject
 - templates/ide
@@ -106,7 +107,7 @@ files:
 - templates/asproject/as2/project/assets/img
 - templates/asproject/as2/project/assets/img/skins
 - templates/asproject/as2/project/assets/img/skins/default
-- templates/asproject/as2/project/assets/img/skins/Default.xml
+- templates/asproject/as2/project/assets/img/skins/SWFMillTemplate.erb
 - templates/asproject/as2/project/assets/img/skins/default/PatternPark.jpg
 - templates/asproject/as2/project/src/AsProject.as
 - templates/asproject/as2/project/test/AsProjectRunner.as

data/lib/player_fetcher.rb

@@ -1,118 +0,0 @@
-
-require 'net/http'
-require 'zip/zipfilesystem'
-
-module AsProject
-
-  class PlayerFetcher
-  
-    def initialize(url, target, zipped_file, debug=false)
-      @debug = debug
-      if(!debug)
-        verify_download(target)
-        fetch(url, target, zipped_file)
-      end
-    end
-    
-    def verify_download(target)
-      puts <<EOF
-
-Unable to find Flash Player at:
-#{target}
-
-Download now? [Yn]
-
-EOF
-      if(!$stdin.gets.chomp.downcase.index('y'))
-        raise UsageError.new("Cannot find the Flash Player at #{target}, and automatic download was refused...")
-      end
-    end
-
-    def fetch(url, target, zipped_file)
-      puts "Fetching: #{url} to: #{target} now!"
-      zip_name = url.split(File::SEPARATOR).pop
-      parts = target.split(File::SEPARATOR)
-      parts.pop
-      zip_dir = parts.join(File::SEPARATOR)
-      zip_file = File.join(zip_dir, zip_name)
-      
-      puts 'zip_file: ' + zip_file
-
-      if(File.exists?(zip_file))
-        result = extract(zip_file, zipped_file, target)
-        write_file(target, result)
-        return
-      end
-
-      response = nil
-      host = 'download.macromedia.com'
-        
-      t = Thread.new {
-        response = Net::HTTP.get_response(host, url)
-      }
-
-      while t.alive?
-        print(".")
-        $stdout.flush
-        sleep(0.3)
-      end
-      
-      if(response.nil?)
-        msg1 = "Download failed for\n"
-        msg1 << "http://#{host}#{url}\n"
-        raise UsageError.new(msg1)
-      end
-      
-      if(response.code != '200')
-        msg = "Download failed for\n"
-        msg << "http://#{host}#{url}\n"
-        msg << "with HTTP Status code: #{response.code.to_s}\n"
-        msg << response.message
-        raise UsageError.new(msg)
-      end
-      
-      puts ""
-      puts "Downloaded: #{(response.body.size / 1024).to_s} KB"
-      puts ""
-      
-
-      result = ''
-
-      if(is_zip?(url))
-        File.open(zip_file, 'w') do |f|
-          f.write(response.body)
-        end
-        result = extract(zip_file, zipped_file, target)
-      else
-        result = response.body
-      end
-
-      write_file(target, result)
-    end
-    
-    def write_file(file, content)
-      File.open(file, 'w') do |f|
-        f.write(content)
-      end
-      
-      File.chmod(0755, file)
-    end
-    
-    def extract(zip_file, zipped_file, unzipped_file)
-      result = nil
-      Zip::ZipFile.open(zip_file) do |file|
-        entry = file.get_entry(zipped_file)
-        result = file.get_input_stream(entry).read
-      end
-      return result
-    end
-    
-    def is_zip?(file)
-      return file.match(/\.zip$/)
-    end
-    
-    def is_dmg?(file)
-      return file.match(/\.dmg$/)
-    end
-  end
-end

data/lib/tasks/rake.rb

@@ -1,6 +0,0 @@
-
-require 'rake/clean'
-require 'rake/tasklib'
-require 'tasks/remote_file_task'
-require 'tasks/mtasc'
-require 'tasks/hamtasc'

data/templates/asproject/as2/project/assets/img/skins/Default.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-  <!--
-  DO NOT EDIT THIS FILE!
-  This file was auto-generated from
-  an ERB template which can be
-  found at:
-  config/templates/wickyd/SWFMill.erb
-  -->
-
-<movie width="600" height="450" framerate="24" version="8">
-	<background color="#ffffff"/>
-	<frame>
-		<library>
-			<clip id="PatternPark" import="assets/img/skins/default/PatternPark.jpg" />
-		</library>
-	</frame>
-	<frame>
-		<stop />
-	</frame>
-</movie>