asproject 0.1.84 → 0.1.89

data/bin/fcshs

@@ -11,8 +11,7 @@ if ARGV.size > 0 && ARGV[0][0]==95 && ARGV[0][-1]==95
   end
 end
 
-#require_gem 'asproject', version
-#require 'fcshs.rb'
+require_gem 'asproject', version
+require 'fcshs.rb'
 
-require File.dirname(__FILE__) + '/../lib/fcshs.rb'
 AsProject::FCSHS.new

data/bin/fcshs_test

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+version = "> 0"
+
+if ARGV.size > 0 && ARGV[0][0]==95 && ARGV[0][-1]==95
+  if Gem::Version.correct?(ARGV[0][1..-2])
+    version = ARGV[0][1..-2] 
+    ARGV.shift
+  end
+end
+
+require File.dirname(__FILE__) + '/../lib/fcshs.rb'
+AsProject::FCSHS.new

data/lib/asproject/version.rb

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

data/lib/asproject_arguments.rb

@@ -5,7 +5,7 @@ module AsProject
   # ProjectArguments
   class ProjectArguments < Hash
     attr_accessor :path_finder, 
-                  :execution_dir, 
+                  :execution_dir,
                   :project_templates, 
                   :should_create
 
@@ -19,6 +19,7 @@ module AsProject
       self[:should_create]             = true
       self[:verbose]                   = true
       self[:selected_templates]        = []
+      self[:template_type]             = nil
     end
     
     def parse!(args)
@@ -79,12 +80,15 @@ asproject -C
 
 4) Copy Templates to Project Example:
 
-mkdir projects
-cd projects
 asproject MyProjectName
 cd MyProjectName/project
 asproject -c
 
+5) Specify templates by type Example:
+
+asproject -T as3 MyProjectName
+cd MyProjectName/project
+rake
 
 Options:
 EOF
@@ -117,6 +121,15 @@ EOF
           self[:selected_templates] = process_templates(str)
         end
 
+        opts.on('-T', '--template-type [STRING]', "Define which template type to use (as2, as3 or mxml).") do |str|
+          # Handle space-delimited vs comma-delimited? Do I need to do this?
+          if(str != 'as2' && str != 'as3' && str != 'mxml')
+            msg = 'Template type must be as2, as3 or mxml'
+            raise ProjectError.new(msg)
+          end
+          self[:template_type] = str
+        end
+
         opts.on_tail('-h', '--help', 'display this help and exit') do
           puts opts
           exit
@@ -141,12 +154,27 @@ EOF
           self[:selected_templates] << args.shift
         end
       end
+
+      if(!self[:template_type].nil?)
+        self[:selected_templates] = get_templates_by_type(self[:template_type])
+      end
+      
       if(self[:selected_templates].size == 0)
         self[:selected_templates] = self[:default_templates]
       end
       verify_templates(self[:selected_templates])
     end
   
+    def get_templates_by_type(type)
+      if(type == 'as2')
+        return ['as2', 'asunit25', 'fdt']
+      elsif(type == 'as3')
+        return ['as3', 'asunit3', 'fb2as']
+      elsif(type == 'mxml')
+        return ['mxml', 'asunit3', 'fb2as']
+      end
+    end
+    
     def process_templates(str)
       str = str.split(', ').join(',')
       if(!str.index(' ').nil? && str.index(',').nil?)
@@ -210,6 +238,10 @@ EOF
       return self[:copy_to_project]
     end
     
+    def template_type
+      return self[:template_type]
+    end
+    
     def verbose
       return self[:verbose]
     end

data/lib/fcshs.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'socket'
 require 'optparse'
+require 'open3'
 
 module AsProject
 
@@ -77,7 +78,7 @@ EOF
         @socket = TCPServer.new(@ip, @port)
         @socket.setsockopt(Socket::SOL_SOCKET, Socket::TCP_NODELAY, true)
         puts "fcsh server started on #{@ip}:#{@port}"
-        puts "enter 'fcsh -k' to kill this process when you're done"
+        puts "enter 'fcshs -k' to kill this process when you're done"
       rescue StandardError => e
         puts 'Error opening socket: ' + e.to_s + "\nTry running fcshs -k to kill the currently-running socket."
         @compile_commands = nil
@@ -90,9 +91,9 @@ EOF
         session = @socket.accept
         dir = session.gets
         if(dir.match(/^0/))
-          puts '>> Kill all fcsh instances and the open socket now!'
+          puts '>> Kill all fcsh instances and close the socket now!'
           close_fcsh
-          return
+          exit
         end
         command = session.gets
         execute(session, dir, command)
@@ -102,39 +103,63 @@ EOF
     end
     
     def execute(io, dir, command)
-      io.puts "[execute] #{command} at #{Dir.pwd} and #{dir}"
+      io.puts "#{command} at #{Dir.pwd} and #{dir}"
       fcsh = get_fcsh(io, dir)
 
       cmd = @compile_commands[command]
-      if(cmd.nil?)
-        cmd = CompileCommand.new(command)
-        @compile_commands[command] = cmd
-        cmd.index = @compile_commands.size
-        
-        fcsh.puts(command)
-        
-        t = Thread.new {
-          IO.new(2, 'r+') do |err|
-            while(line = err.gets)
-              puts '[error] ' + line
-            end
-          end
-        }
+      msg = command
+      if(!cmd.nil?)
+        msg = "compile #{cmd.index}"
+      end
 
-        while(line = fcsh.gets)
-          io.puts '[socket] ' + line
-          puts '[line] ' + line
-        end
+      fcsh.stdin.puts(msg)
+      stay_open = true
+      compile_errors = false
 
-        puts 'FINISHED FCSH WRITE!'
-      else
-        msg = "compile #{cmd.index}"
-#        io.write(msg)
-        fcsh.write(msg + "\n") do |f|
-          io.puts(f.read)
+      e = Thread.new {
+        while(line = fcsh.stderr.gets)
+          io.puts line
+          $stderr.puts line
+          compile_errors = true
+        end
+        io.puts 'STD ERROR COMPLETE'
+      }
+      
+      o = Thread.new {
+        while(line = fcsh.stdout.gets)
+          io.puts line
+          $stdout.puts line.size.to_s + " : " + line
+#          io.flush
+#          $stdout.flush
+          if(!preamble.match(line))
+            puts 'CLOSING NOW!'
+            stay_open = false
+          end
         end
+      }
+      
+      while(stay_open)
+        sleep(0.75)
+      end
+      
+      # Close the Connection...
+      io.puts '0xE'
+
+      # Store the successful compilation
+      if(cmd.nil? && !compile_errors)
+        cmd = CompileCommand.new(command)
+        @compile_commands[command] = cmd
+        cmd.index = @compile_commands.size
       end
     end
+    
+    def preamble
+      str <<EOF
+Adobe Flex Compiler SHell (fcsh)
+Version 2.0.1 build 155542
+Copyright (c) 2004-2006 Adobe Systems, Inc. All rights reserved.
+EOF
+    end
 
     def close_fcsh
       @instances.each do |fc|
@@ -156,7 +181,7 @@ EOF
             raise StandardError.new(msg)
           end
 
-          instances[dir] = IO.popen('fcsh', 'r+')
+          instances[dir] = FCSHProcess.new
         end
       rescue SystemCallError
         puts ">> Failed to start the actual fcsh application, please make sure it's in your class path by opening a new terminal and typing 'fcsh'"
@@ -164,6 +189,18 @@ EOF
     end
   end
 
+  class FCSHProcess
+    attr_reader :stdin,
+                :stdout,
+                :stderr
+    def initialize
+      name = 'fcsh'
+      mode = 'r+'
+      @stdin, @stdout, @stderr = Open3.popen3(name, mode)
+    end
+    
+  end
+  
   class CompileCommand
     attr_accessor :index,
                   :command

data/lib/path_finder.rb

@@ -182,7 +182,11 @@ module AsProject
     # Over multiple lines?
     private
     def is_project?(dir)
-      return (has_config_rb?(dir) || has_config_yaml?(dir) || has_eclipse_project?(dir) || has_src_eclipse_project?(dir) || has_src_and_test?(dir))
+      return (has_rakefile?(dir) || 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_rakefile?(dir)
+      return File.exists?(File.join(dir, 'rakefile.rb'))
     end
     
     def has_config_yaml?(dir)

data/lib/project.rb

@@ -35,20 +35,24 @@ module AsProject
     def find_project(dir)
       project = super(dir)
       config_file = File.join(dir, 'config', 'asclass_config.rb')
-      if(File.exists?(File.join(dir, '.as2_classpath')))
+      rakefile = File.join(dir, 'rakefile.rb')
+      if(File.exists?(rakefile))
+        require rakefile
+        @default_templates = DEFAULT_TEMPLATES
+      elsif(File.exists?(File.join(dir, '.as2_classpath')))
         @default_templates = @@DEFAULT_AS2_TEMPLATES
       elsif(File.exists?(File.join(dir, '.actionScriptProperties')))
         @default_templates = @@DEFAULT_AS3_TEMPLATES
       end
       
       # Include the config file if found
-      if(File.exists?(config_file))
-        require config_file
-        class << self
-          include Config
-        end
-        initialize_config
-      end
+      #if(File.exists?(config_file))
+      #  require config_file
+      #  class << self
+      #    include Config
+      #  end
+      #  initialize_config
+      #end
       return project
     end
     

data/lib/tasks/fcsh.rb

@@ -1,5 +1,6 @@
 
 require 'socket'
+require 'delegate'
 
 module AsProject
 
@@ -10,7 +11,7 @@ module AsProject
     attr_accessor :ip,
                   :port
 
-    def initialize(name=:fcsh)
+    def initialize(name=:fcsh, ip=nil, port=nil)
       @ip = (ip.nil?) ? "127.0.0.1" : ip
       @port = (port.nil?) ? 20569 : port
       super(name)
@@ -28,12 +29,15 @@ module AsProject
           s.puts "#{cmd} #{args}"
           s.close_write
           while(line = s.gets)
+            if(line.match(/^0xE/))
+              s.close
+              break
+            end
             puts line
           end
         end
-        puts 'finished!'
       rescue StandardError
-#        IO.popen("fcshs &", "r")
+#        IO.popen("fcshs &", "a+")
 #        execute(cmd, args, retries)
       end
     end

data/lib/tasks/flash_player.rb

@@ -30,9 +30,12 @@ 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/8/sa_flashplayer_8_all_debug.dmg"
-        @osx_mounted_path = "Adobe Flash Standalone Players"
-        @osx_extracted_file = "en/SAFlashPlayer"
+        @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_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"
         @unix_url = nil
         @unix_extracted_file = nil
       elsif(version == 9)
@@ -40,8 +43,7 @@ module AsProject
         @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_extracted_file = "Flash\ Player.app"
-        @osx_extracted_file = "Flash\ Player.app/Contents/MacOS/standalone"
+        @osx_extracted_file = "Flash\ Player.app"
         @unix_url = nil
         @unix_extracted_file = nil
       else
@@ -60,20 +62,22 @@ module AsProject
         log_file = FlashLog.new.get_file
 
         begin
-          # Don't let trust file failures break other features...
+          # Don't let trust or log file failures break other features...
           FlashPlayerTrust.new(user, File.dirname(@swf))
         rescue
           puts 'Warning, was unable to update the FlashPlayerTrust file'
         end
-        
-        File.open(log_file, 'w') do |f|
-          f.write('')
+
+        if(File.exists?(log_file))
+          File.open(log_file, 'w') do |f|
+            f.write('')
+          end
         end
+        
         thread = nil
-        @osx_process = nil
         if(Logger.debug)
           thread = ThreadMock.new
-        elsif(@user_task.is_a?(OSXRemoteFileTask) && !Logger.debug)
+        elsif(@user_task.is_a?(OSXRemoteFileTask))
           thread = run_osx
         else
           thread = run_other
@@ -82,12 +86,13 @@ module AsProject
       end
       
       def run_osx
-        player = clean_path(extracted_file_path)
-        swf = clean_path(File.expand_path(@swf))
+        player = extracted_file_path + '/Contents/MacOS/standalone'
+        swf = clean_path(@swf)
 
         t = Thread.new {
-          IO.popen(player) do |p|
-            IO.popen("open #{swf}")
+          IO.popen("'#{player}'") do |p|
+              sleep(1.0)
+              IO.popen("open #{swf}")
           end
         }
       end
@@ -97,7 +102,7 @@ module AsProject
           execute("./#{@swf}")
         }
       end
-            
+
       def read_log(player_thread, log_file)
         index = 0
 

data/lib/tasks/mxmlc.rb

@@ -48,7 +48,9 @@ module AsProject
         file @output => item
       end
       
-      add_path(File.dirname(@input))
+      if(!@input.nil?)
+        add_path(File.dirname(@input))
+      end
 
       file @output do |t|
         execute(@target, option_list.join(' '))

data/lib/tasks/remote_file_task.rb

@@ -98,8 +98,10 @@ module AsProject
       if(extracted_file_path != downloaded_file)
         if(!Rake::Task.task_defined?(extracted_file_path))
           file extracted_file_path => downloaded_file do |f|
-            unpack_downloaded_file(downloaded_file, extracted_file_path)
-            File.chmod(0755, extracted_file_path)
+            if(!File.exists?(extracted_file_path))
+              unpack_downloaded_file(downloaded_file, extracted_file_path)
+              File.chmod(0755, extracted_file_path)
+            end
           end
         end
      end
@@ -118,6 +120,7 @@ module AsProject
     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)
@@ -175,9 +178,11 @@ module AsProject
       # 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...
-      p = full_mounted_path.split(" ").join("\\ ")
-      sh("cp -Rf #{p}/* #{File.join(@user.downloads, @name.to_s)}")
-        
+      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

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

@@ -1,6 +1,15 @@
 require 'rubygems'
 require 'asproject'
 
+# NOTE: The asclass tools will load this file
+# and use these constants...
+SRC_DIR             = 'src'
+TEST_DIR            = 'test'
+LIB_DIR             = 'lib'
+BIN_DIR             = 'bin'
+SKIN_DIR            = 'assets/img/skins'
+DEFAULT_TEMPLATES   = ['as2']
+
 ############################################
 # Launch the Application using Flash Player 8
 
@@ -11,7 +20,7 @@ task :default => [:run]
 
 AsProject::FlashPlayer.new(:run) do |t|
   t.version = 8
-  t.swf = 'bin/<%= project_name %>.swf'
+  t.swf = BIN_DIR + '/<%= project_name %>.swf'
 end
 
 ############################################
@@ -21,16 +30,16 @@ task :test => [:compile_tests]
 
 AsProject::FlashPlayer.new(:test) do |t|
   t.version = 8
-  t.swf = 'bin/<%= project_name %>Runner.swf'
+  t.swf = BIN_DIR + '/<%= project_name %>Runner.swf'
 end
 
 ############################################
 # Compile your library using SWFMill
 
 AsProject::SWFMill.new(:compile_skin) do |t|
-  t.input = 'assets/img/skins/default'
-  t.template = 'assets/img/skins/SWFMillTemplate.erb'
-  t.output = 'bin/<%= project_name %>Skin.swf'
+  t.input = SKIN_DIR + '/default'
+  t.template = SKIN_DIR + '/SWFMillTemplate.erb'
+  t.output = BIN_DIR + '/<%= project_name %>Skin.swf'
 end
 
 ############################################
@@ -43,9 +52,9 @@ AsProject::MTASC.new(:compile_main) do |t|
   t.main = true
   t.version = 8
   t.frame = 2
-  t.swf = 'bin/<%= project_name %>Skin.swf'
-  t.out = 'bin/<%= project_name %>.swf'
-  t.cp << 'src'
+  t.swf = BIN_DIR + '/<%= project_name %>Skin.swf'
+  t.out = BIN_DIR + '/<%= project_name %>.swf'
+  t.cp << SRC_DIR
 end
 
 ############################################
@@ -56,11 +65,11 @@ AsProject::MTASC.new(:compile_tests) do |t|
   t.version = 8
   t.frame = 2
   t.main = true
-  t.swf = 'bin/<%= project_name %>Skin.swf'
-  t.out = 'bin/<%= project_name %>Runner.swf'
-  t.cp << 'src'
-  t.cp << 'test'
-  t.cp << 'lib/asunit'
+  t.swf = BIN_DIR + '/<%= project_name %>Skin.swf'
+  t.out = BIN_DIR + '/<%= project_name %>Runner.swf'
+  t.cp << SRC_DIR
+  t.cp << TEST_DIR
+  t.cp << LIB_DIR + '/asunit'
 end
 
 ############################################

data/templates/asproject/as3/project/assets/img/skins/DefaultSkin.as

@@ -0,0 +1,7 @@
+
+package skins {
+	public class DefaultSkin {
+		[Embed(source="Default/PatternPark.jpg")]
+		public static var PatternPark:Class;
+	}
+}

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

@@ -2,6 +2,15 @@
 require 'rubygems'
 require 'asproject'
 
+# NOTE: The asclass tools will load this file
+# and use these constants...
+SRC_DIR             = 'src'
+TEST_DIR            = 'test'
+LIB_DIR             = 'lib'
+BIN_DIR             = 'bin'
+SKIN_DIR            = 'assets/img'
+DEFAULT_TEMPLATES   = ['as3']
+
 ############################################
 # Launch the Application using Flash Player 9
 
@@ -11,7 +20,7 @@ task :default => :run
 
 AsProject::FlashPlayer.new(:run) do |t|
   t.version = 9
-  t.swf = 'bin/<%= project_name %>Application.swf'
+  t.swf = BIN_DIR + '/<%= project_name %>Application.swf'
 end
 
 ############################################
@@ -22,7 +31,7 @@ task :test => [:compile_tests]
 
 AsProject::FlashPlayer.new(:test) do |t|
   t.version = 9
-  t.swf = 'bin/<%= project_name %>Runner.swf'
+  t.swf = BIN_DIR + '/<%= project_name %>Runner.swf'
 end
 
 ############################################
@@ -32,8 +41,9 @@ AsProject::MXMLC.new(:compile_main) do |t|
   t.default_background_color = '#FFFFFF'
   t.default_frame_rate = 24
   t.default_size = "600 400"
-  t.input = 'src/<%= project_name %>.as'
-  t.output = 'bin/<%= project_name %>Application.swf'
+  t.input = SRC_DIR + '/<%= project_name %>.as'
+  t.output = BIN_DIR + '/<%= project_name %>Application.swf'
+  t.source_path = SKIN_DIR
   t.warnings = true
 end
 
@@ -44,11 +54,11 @@ AsProject::MXMLC.new(:compile_tests) do |t|
   t.default_background_color = '#FFFFFF'
   t.default_frame_rate = 24
   t.default_size = "800 450"
-  t.input = 'test/<%= project_name %>Runner.as'
-  t.output = 'bin/<%= project_name %>Runner.swf'
+  t.input = SRC_DIR + '/<%= project_name %>Runner.as'
+  t.output = BIN_DIR + '/<%= project_name %>Runner.swf'
   t.warnings = true
-  t.source_path << 'src'
-  t.source_path << 'assets/img/skins'
-#  t.source_path << 'lib/asunit'
-  t.source_path << 'test'
+  t.source_path << SRC_DIR
+  t.source_path << LIB_DIR + '/asunit'
+  t.source_path << TEST_DIR
+  t.source_path << SKIN_DIR
 end

data/templates/asproject/as3/project/src/AsProject.as

@@ -1,9 +1,12 @@
 package {
 	import flash.display.Sprite;
+	import skins.DefaultSkin;
 	
 	public class <%=project_name%> extends Sprite {
 
 		public function <%=project_name%>() {
+			addChild(new DefaultSkin.PatternPark());
+			trace("<%=project_name%> instantiated!");
 		}
 	}
 }

data/templates/asproject/fb2as/project/.crap_file

@@ -0,0 +1,10 @@
+
+This file has been created because I can't figure out how to bundle
+Empty directories in the gem package.
+
+If you know how to do this, please contact me...
+
+Thanks,
+
+lbayes@patternpark.com
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: asproject
 version: !ruby/object:Gem::Version 
-  version: 0.1.84
-date: 2007-03-24 00:00:00 -07:00
+  version: 0.1.89
+date: 2007-03-25 00:00:00 -07:00
 summary: AsProject is a tool set that simplifies the process of beginning and growing a new ActionScript project.
 require_paths: 
 - lib
@@ -45,6 +45,7 @@ files:
 - bin/asclass
 - bin/asproject
 - bin/fcshs
+- bin/fcshs_test
 - lib/asclass.rb
 - lib/asclass_arguments.rb
 - lib/asproject
@@ -120,11 +121,17 @@ files:
 - templates/asproject/as3/art
 - templates/asproject/as3/doc
 - templates/asproject/as3/project
+- templates/asproject/as3/project/assets
 - templates/asproject/as3/project/bin
 - templates/asproject/as3/project/lib
 - templates/asproject/as3/project/rakefile.rb
 - templates/asproject/as3/project/src
 - templates/asproject/as3/project/test
+- templates/asproject/as3/project/assets/img
+- templates/asproject/as3/project/assets/img/skins
+- templates/asproject/as3/project/assets/img/skins/Default
+- templates/asproject/as3/project/assets/img/skins/DefaultSkin.as
+- templates/asproject/as3/project/assets/img/skins/Default/PatternPark.jpg
 - templates/asproject/as3/project/src/AsProject.as
 - templates/asproject/as3/project/src/AsProjectRunner.as
 - templates/asproject/asunit2/project
@@ -270,6 +277,7 @@ files:
 - templates/asproject/as3/project/lib/.crap_file
 - templates/asproject/as3/project/test/.crap_file
 - templates/asproject/fb2as/project/.actionScriptProperties
+- templates/asproject/fb2as/project/.crap_file
 - templates/asproject/fb2as/project/.project
 - templates/asproject/fb2as/project/.settings
 - templates/asproject/fdt/project/.as2_classpath