airake 0.4.3 → 0.4.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.4 2008-06-25
+
+* Can use to compile flash swfs
+
 === 0.4.3 2008-03-01
 
 * Fix test env

data/Manifest.txt

@@ -47,6 +47,8 @@ lib/airake/daemonize.rb
 lib/airake/fcsh.rb
 lib/airake/fcshd.rb
 lib/airake/project.rb
+lib/airake/projects/air.rb
+lib/airake/projects/flash.rb
 lib/airake/runner.rb
 lib/airake/tasks.rb
 lib/airake/tasks/air.rake

data/lib/airake.rb

@@ -16,6 +16,8 @@ require 'airake/commands/adl'
 require 'airake/commands/adt'
 require 'airake/commands/asdoc'
 require 'airake/project'
+require 'airake/projects/air'
+require 'airake/projects/flash'
 require 'airake/runner'
 require 'rake'
 require 'airake/tasks'

data/lib/airake/commands/mxmlc.rb

@@ -5,7 +5,7 @@ module Airake #:nodoc:
     # MXMLC (MXML compiler)
     class Mxmlc < Base
       
-      attr_reader :mxmlc_path, :mxmlc_extra_opts, :swf_path, :mxml_path, :lib_dir, :src_dirs, :debug
+      attr_reader :mxmlc_path, :mxmlc_extra_opts, :swf_path, :target_file, :lib_dir, :src_dirs, :debug
       attr_reader :config_name
       
       # Create MXMLC command.
@@ -13,14 +13,14 @@ module Airake #:nodoc:
       # ==== Options
       # +mxmlc_path+:: Path to flex compiler, defaults to 'mxmlc'
       # +swf_path+:: Path to generated swf (required)
-      # +mxml_path+:: Path to mxml (required)
+      # +target_file+:: Path to target file (.mxml file) (required)
       # +lib_dir+:: Path to lib directory. Will load swc files from here or source directories
       # +src_dirs+:: Path to source directories (required)
       # +config_name+:: Config name, like 'air'
       # +mxmlc_extra_opts+:: Extra options to pass to compiler
       #
       def initialize(options = {})
-        assert_required(options, [ :swf_path, :mxml_path, :src_dirs ])
+        assert_required(options, [ :swf_path, :target_file, :src_dirs ])
         
         default_mxmlc_path = options[:config_name].blank? ? "mxmlc" : "mxmlc +configname=#{options[:config_name]}"
         
@@ -42,7 +42,7 @@ module Airake #:nodoc:
         command << escape(@swf_path)
         command << "-debug=#{@debug}" unless @debug.nil?        
         command << "--"
-        command << escape(@mxml_path)
+        command << escape(@target_file)
         process(command)
       end
       

data/lib/airake/project.rb

@@ -1,12 +1,8 @@
 module Airake
 
-  # Project for AIR application
-  #
   class Project
   
-    attr_reader :base_dir, :src_dirs, :lib_dir
-    attr_reader :mxml_path, :appxml_path, :air_path, :swf_path
-    attr_reader :debug, :assets, :certificate
+    attr_reader :env, :base_dir, :src_dirs, :lib_dir, :swf_path, :debug
     
     # Create project.
     #
@@ -14,33 +10,24 @@ module Airake
     # +env+: Environment, such as development, test, production. Defaults to ENV["AIRAKE_ENV"].
     # +base_dir+: Base (project) directory. Defaults to ENV["AIRAKE_ROOT"]
     # +options+: If nil, options are loaded from airake.yml in root. (All paths relative to base directory)
-    # - +mxml_path+: Path to the ProjectName.mxml
-    # - +appxml_path+: Path to application descriptor
     # - +src_dirs+: Paths to source
     # - +lib_dir+: Path to lib directory
-    # - +air_path+: Path to AIR file
     # - +swf_path+: Path to SWF file
     # - +debug+: "true" or "false"
-    # - +assets+: Path to assets
-    # - +certificate+: Path to certificate
     # 
     # ==== More options:
     # * mxmlc_path
-    # * adt_path
-    # * adl_path
     # * asdoc_path
     # * mxmlc_extra_opts
-    # * adt_extra_opts
-    # * adl_extra_opts
     # * asdoc_extra_opts
     #     
     def initialize(env = nil, base_dir = nil, options = nil)            
-
-      env = ENV["AIRAKE_ENV"] if env.nil?      
+      @env = env
+      @env = ENV["AIRAKE_ENV"] if @env.nil?      
       base_dir = ENV["AIRAKE_ROOT"] if base_dir.nil?
       raise "Need to specify an AIRAKE_ROOT (project root)" if base_dir.blank?
       
-      #puts "Using environment: #{env}" if ENV["DEBUG"]
+      @base_dir = base_dir      
       
       if options.nil?
         conf_path = File.join(base_dir, "airake.yml")
@@ -58,62 +45,26 @@ module Airake
         env_options = options[env]
         options = options.merge(env_options) if env_options
         options.symbolize_keys!
-        #puts "Options: #{options.to_yaml}" if ENV["DEBUG"]
       end
       
-      @base_dir = base_dir
-      
-      @mxml_path = File.join(base_dir, options[:mxml_path])      
-      @appxml_path = File.join(base_dir, options[:appxml_path])
-      
-      @src_dirs = options[:src_dirs].collect { |src_dir| File.join(base_dir, src_dir) }      
-      @lib_dir = File.join(base_dir, options[:lib_dir]) if options[:lib_dir]
-      
-      # Dest package files
-      @air_path = File.join(base_dir, options[:air_path])      
-      @swf_path = File.join(base_dir, options[:swf_path])      
-    
-      # Debug options
-      @debug = options[:debug]
-      
-      with_keyed_options([ :assets, :certificate, :mxmlc_path, :adt_path, :adl_path, :asdoc_path, 
-        :mxmlc_extra_opts, :adt_extra_opts, :adl_extra_opts, :asdoc_extra_opts ], options)
-        
-      ensure_exists([ @mxml_path, @appxml_path, *@src_dirs ])
-    end
-        
-    # Flex compiler command (under AIR) for this project
-    def amxmlc
-      mxmlc({ :config_name => "air" })
+      load(options)
+            
+      ensure_exists([ *@src_dirs ])
     end
     
-    # Flex compiler command for this project
-    def mxmlc(options = {})
-      options = options.merge({ :swf_path => @swf_path, :mxml_path => @mxml_path, :lib_dir => @lib_dir, 
-        :src_dirs => @src_dirs, :debug => @debug, :mxmlc_extra_opts => @mxmlc_extra_opts, 
-        :mxmlc_path => @mxmlc_path })
-                
-      Airake::Commands::Mxmlc.new(options)
-    end
-    
-    # ADL command for this project
-    def adl
-      options = { :appxml_path => @appxml_path, :base_dir => @base_dir, :adl_extra_opts => @adl_extra_opts,
-        :adl_path => @adl_path }
-      Airake::Commands::Adl.new(options)
-    end
-    
-    # ADT command for this project
-    def adt
-      options = { :air_path => @air_path, :appxml_path => @appxml_path, :swf_path => @swf_path, 
-        :base_dir => @base_dir, :assets => @assets, :cert => @certificate, :adt_extra_opts => @adt_extra_opts,
-        :adt_path => @adt_path }
-      Airake::Commands::Adt.new(options)
+    # Load options
+    def load(options = {})
+      @src_dirs = []      
+      @src_dirs = options[:src_dirs].collect { |src_dir| File.join(base_dir, src_dir) } if options[:src_dirs]
+        
+      @lib_dir = File.join(base_dir, options[:lib_dir]) if options[:lib_dir]      
+      @swf_path = File.join(base_dir, options[:swf_path])      
+      
+      with_keyed_options([ :debug ], options)      
     end
     
     # AS docs
     def asdoc
-      src_dirs = [ @src_dir ]
       options = { :lib_dir => @lib_dir, :src_dirs => @src_dirs, :asdoc_extra_opts => @asdoc_extra_opts,
         :asdoc_path => @asdoc_path }        
       Airake::Commands::Asdoc.new(options)
@@ -121,10 +72,7 @@ module Airake
     
     # Remove files
     def clean
-      paths = [ swf_path, air_path ]
-      paths.each do |path|
-        FileUtils.rm(path, :verbose => true) if File.exist?(path)
-      end
+      FileUtils.rm(@swf_path, :verbose => true) if File.exist?(@swf_path)
     end
 
   protected

data/lib/airake/projects/air.rb

@@ -0,0 +1,78 @@
+module Airake
+  
+  module Projects
+        
+    # Project for AIR application
+    class Air < Airake::Project
+      
+      attr_reader :mxml_path, :appxml_path, :air_path
+      attr_reader :assets, :certificate          
+      
+      # Load options
+      #
+      # +options+: If nil, options are loaded from airake.yml in root. (All paths relative to base directory)      
+      # - +air_path+: Path to AIR file
+      # - +mxml_path+: Path to the ProjectName.mxml
+      # - +appxml_path+: Path to application descriptor    
+      # - +assets+: Path to assets
+      # - +certificate+: Path to certificate      
+      #
+      # ==== More options
+      # * adt_path
+      # * adl_path    
+      # * adt_extra_opts
+      # * adl_extra_opts
+      #            
+      def load(options = {})
+        super(options)
+        
+        @air_path = File.join(base_dir, options[:air_path])      
+        @mxml_path = File.join(base_dir, options[:mxml_path])      
+        @appxml_path = File.join(base_dir, options[:appxml_path])
+        
+        with_keyed_options([ :assets, :certificate, :mxmlc_path, :adt_path, :adl_path, :asdoc_path, 
+          :mxmlc_extra_opts, :adt_extra_opts, :adl_extra_opts, :asdoc_extra_opts ], options)
+
+        ensure_exists([ @mxml_path, @appxml_path ])
+      end      
+      
+      # Flex compiler command (under AIR) for this project
+      def amxmlc
+        mxmlc({ :config_name => "air" })
+      end
+      
+      # Flex compiler command for this project
+      def mxmlc(options = {})
+        options = options.merge({ :swf_path => @swf_path, :target_file => @mxml_path, :lib_dir => @lib_dir, 
+          :src_dirs => @src_dirs, :debug => @debug, :mxmlc_extra_opts => @mxmlc_extra_opts, 
+          :mxmlc_path => @mxmlc_path })
+
+        Airake::Commands::Mxmlc.new(options)
+      end
+
+      # ADL command for this project
+      def adl
+        options = { :appxml_path => @appxml_path, :base_dir => @base_dir, :adl_extra_opts => @adl_extra_opts,
+          :adl_path => @adl_path }
+        Airake::Commands::Adl.new(options)
+      end
+
+      # ADT command for this project
+      def adt
+        options = { :air_path => @air_path, :appxml_path => @appxml_path, :swf_path => @swf_path, 
+          :base_dir => @base_dir, :assets => @assets, :cert => @certificate, :adt_extra_opts => @adt_extra_opts,
+          :adt_path => @adt_path }
+        Airake::Commands::Adt.new(options)
+      end
+      
+      def clean
+        paths = [ @swf_path, @air_path ]
+        paths.each do |path|
+          FileUtils.rm(path, :verbose => true) if File.exist?(path)
+        end
+      end
+    end
+    
+  end
+  
+end

data/lib/airake/projects/flash.rb

@@ -0,0 +1,34 @@
+module Airake
+  
+  module Projects
+    
+    # Project for Flash
+    class Flash < Airake::Project
+      
+      attr_reader :target_file
+
+      # Load options
+      #
+      # +options+: If nil, options are loaded from airake.yml in root. (All paths relative to base directory)      
+      # - +target_file+: Path to target file
+      #
+      def load(options = {})
+        super(options)
+        with_keyed_options([ :target_file ], options)
+        ensure_exists([ @target_file ])
+      end
+      
+      # Flex compiler command for this project
+      def mxmlc(options = {})
+        options = options.merge({ :swf_path => @swf_path, :target_file => @target_file, :lib_dir => @lib_dir, 
+          :src_dirs => @src_dirs, :debug => @debug, :mxmlc_extra_opts => @mxmlc_extra_opts, 
+          :mxmlc_path => @mxmlc_path })
+
+        Airake::Commands::Mxmlc.new(options)
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/airake/tasks/air.rake

@@ -3,7 +3,7 @@ namespace :air do
   desc "Compile"
   task :compile => :clean do
     begin
-      project = Airake::Project.new
+      project = Airake::Projects::Air.new
       fcsh = PatternPark::FCSH.new_from_rake(ENV)
       fcsh.execute([ project.base_dir, project.amxmlc.compile ])      
     rescue PatternPark::FCSHConnectError => e
@@ -17,7 +17,7 @@ namespace :air do
     ENV["AIRAKE_ENV"] = "test"
     Rake::Task["air:clean"].invoke
     
-    test_project = Airake::Project.new
+    test_project = Airake::Projects::Air.new
     Airake::Runner.run(test_project.amxmlc, :compile)
     Airake::Runner.run(test_project.adl, :launch)
   end
@@ -28,7 +28,7 @@ namespace :air do
     pfx_file = ENV["CERTIFICATE"]
     
     unless pfx_file
-      project = Airake::Project.new    
+      project = Airake::Projects::Air.new    
       pfx_file = project.certificate
     end
     
@@ -47,7 +47,7 @@ namespace :air do
     
     puts "Will generate a certificate file at: #{pfx_file}"
     
-    project = Airake::Project.new
+    project = Airake::Projects::Air.new
     optionals = {}
 
     print "Specify common name (e.g. SelfSign, ADigitalID) [SelfSign]: "
@@ -79,7 +79,7 @@ namespace :air do
     pfx_file = ENV["CERTIFICATE"]
     
     unless pfx_file
-      project = Airake::Project.new    
+      project = Airake::Projects::Air.new    
       pfx_file = project.certificate
     end
     
@@ -109,7 +109,7 @@ namespace :air do
     
   desc "Package only"
   task :package_only do
-    project = Airake::Project.new
+    project = Airake::Projects::Air.new
     Airake::Runner.run(project.adt, :package)
   end
   
@@ -122,7 +122,7 @@ namespace :air do
   
   desc "Launch ADL only"
   task :adl_only do 
-    project = Airake::Project.new
+    project = Airake::Projects::Air.new
     Airake::Runner.run(project.adl, :launch)
   end
   
@@ -164,13 +164,13 @@ namespace :air do
   
   desc "Docs"
   task :docs do
-    project = Airake::Project.new
+    project = Airake::Projects::Air.new
     Airake::Runner.run(project.asdoc, :generate)
   end
   
   desc "Clean"
   task :clean do 
-    project = Airake::Project.new
+    project = Airake::Projects::Air.new
     project.clean
   end
   

data/lib/airake/tasks/flash.rake

@@ -3,23 +3,15 @@ namespace :flash do
   desc "Compile (on flash)"
   task :compile => :clean do
     begin
-      project = Airake::Project.new_from_rake(ENV)
+      project = Airake::Projects::Flash.new      
       Airake::Runner.run(project.mxmlc, :compile)
     end
   end
   
   desc "Clean"
   task :clean do 
-    project = Airake::Project.new_from_rake(ENV)
-    paths = project.to_clean
-    
-    # Test 
-    test_project = Airake::Project.new_from_rake(ENV, :test)
-    paths += project.to_clean
-    
-    paths.each do |path|
-      FileUtils.rm(path, :verbose => true) if File.exist?(path)
-    end
+    project = Airake::Projects::Flash.new
+    project.clean
   end
   
   desc "Run"

data/lib/airake/version.rb

@@ -2,7 +2,7 @@ module Airake #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: airake
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ""
 authors: 
 - Gabriel Handford, Min Kim
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-23 00:00:00 -04:00
+date: 2008-06-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,8 @@ files:
 - lib/airake/fcsh.rb
 - lib/airake/fcshd.rb
 - lib/airake/project.rb
+- lib/airake/projects/air.rb
+- lib/airake/projects/flash.rb
 - lib/airake/runner.rb
 - lib/airake/tasks.rb
 - lib/airake/tasks/air.rake