airake 0.1.4 → 0.1.5

data/History.txt

@@ -1,5 +1,10 @@
+== 0.1.5 2007-08-30
+* Fixed required include in Rakefile
+* Removing app_id as required argument
+* Refactored deployment.rake
+
 == 0.1.4 2007-08-30
-* Fixed minor bug with app_name being titleized
+* Fixed bug with app_name being titleized
 
 == 0.1.3 2007-08-29
 

data/README.txt

@@ -18,29 +18,29 @@ The project includes as3corelib and flexunit, and test scaffolding as well.
 
   Run: rake --tasks 
 
-  # Start FCSHD
-  rake start_fcshd
-
   # Compiling
-  rake compile 
+  rake air:compile 
 
   # Running air debug launcher (ADL)
-  rake adl 
+  rake air:adl 
+  
+  # Start FCSHD (for faster compilation)
+  rake air:start_fcshd
 
   # Stop FCSHD
-  rake stop_fcsh
+  rake air:stop_fcsh
 
   # Restart FCSHD
-  rake restart_fcshd
+  rake air:restart_fcshd
 
   # Running alternate MXML, (the following expects src/Test-app.xml descriptor file)
-  rake adl MXML=src/Test.mxml
+  rake air:adl MXML=src/Test.mxml
 
   # Run ADL with debug enabled
-  rake adl DEBUG=true
+  rake air:adl DEBUG=true
 
   # Testing
-  rake test
+  rake air:test
 
   # Package AIR file
-  rake package
+  rake air:package

data/app_generators/airake/airake_generator.rb

@@ -3,14 +3,12 @@ class AirakeGenerator < RubiGen::Base
   #default_options :author => nil
   
   attr_reader :app_name
-  attr_reader :app_id
   
   def initialize(runtime_args, runtime_options = {})
     super
-    usage if args.empty? || args.size < 2
+    usage if args.empty? || args.size < 1
     @destination_root = File.expand_path(args.shift)
     @app_name = File.basename(@destination_root).camelize
-    @app_id = args.shift
     extract_options
   end
 

data/app_generators/airake/templates/README

@@ -1,36 +1,46 @@
 == Setup
 
-Path to have access to adl and adt:
+To include mxmlc, adl and adt (from Flex Builder):
+  export PATH="/Applications/Adobe Flex Builder 3/sdks/moxie/bin:$PATH"
+  
+To include adl and adt (from Apollo SDK):
   export PATH="/Applications/ApolloSDK/bin:$PATH"
   
-Path to have access to mxmlc, etc. (flex compiler):
-  export PATH="/Applications/Adobe Flex Builder 3/sdks/moxie/bin:$PATH"
+== Creating an AIR project
+
+  airake path/to/MyProject com.company.MyProject
+  
+will build a project scaffold with application name of MyProject and application id (used for AIR descriptor) of com.company.MyProject
+
+The project includes as3corelib and flexunit, and test scaffolding as well.  
   
 == Tasks
 
-  # Start FCSHD
-  rake start_fcshd
+  Run: rake --tasks 
 
   # Compiling
-  rake compile 
+  rake air:compile 
 
   # Running air debug launcher (ADL)
-  rake adl 
+  rake air:adl 
+  
+  # Start FCSHD (for faster compilation)
+  rake air:start_fcshd
 
   # Stop FCSHD
-  rake stop_fcsh
+  rake air:stop_fcsh
 
   # Restart FCSHD
-  rake restart_fcshd
+  rake air:restart_fcshd
 
   # Running alternate MXML, (the following expects src/Test-app.xml descriptor file)
-  rake adl MXML=src/Test.mxml
+  rake air:adl MXML=src/Test.mxml
 
   # Run ADL with debug enabled
-  rake adl DEBUG=true
+  rake air:adl DEBUG=true
 
   # Testing
-  rake test
+  rake air:test
 
   # Package AIR file
-  rake package
+  rake air:package

data/app_generators/airake/templates/Rakefile

@@ -1,9 +1,10 @@
 require 'rubygems'
 require 'airake'
 require 'pathname'
-include PatternPark
 
 ENV["BASE_DIR"] ||= File.expand_path(File.dirname(__FILE__))
+
+# MXML options
 ENV["MXML"] ||= "src/<%= app_name %>.mxml"
 ENV["MXML_TEST"] ||= "test/Test.mxml"
 

data/app_generators/airake/templates/application.mxml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:WindowedApplication xmlns:mx="http://www.adobe.com/2006/mxml">  
 
-  <mx:HTML location="http://airake.rubyforge.org/" width="100%" height="100%"/>
+  <mx:HTML location="http://airake.rubyforge.org/resources.html" width="100%" height="100%"/>
 
 </mx:WindowedApplication>

data/app_generators/airake/templates/descriptor.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://ns.adobe.com/air/application/1.0.M4" appId="<%= app_id %>" version="0.0.1">
+<application xmlns="http://ns.adobe.com/air/application/1.0.M4" appId="com.company.App" version="0.0.1">
 
 <!-- 
     AIR Application Descriptor File: 

data/lib/airake/fcsh.rb

@@ -74,6 +74,12 @@ module PatternPark
       end_time = Time.now - start_time
       puts "[FCSH] Compilation complete in: #{end_time} seconds"
     end
-  end
-  
+    
+    def self.new_from_rake(env, default_ip = "127.0.0.1", default_port = 20569)
+      fcsh_ip = env["FCSH_IP"] || default_ip
+      fcsh_port = (env["FCSH_PORT"] || default_port).to_i
+      self.new(fcsh_ip, fcsh_port)
+    end
+    
+  end  
 end

data/lib/airake/fcshd.rb

@@ -98,6 +98,12 @@ module PatternPark
         cmd.index = @compile_commands.size
       end
     end
+    
+    def self.start_from_rake(env, default_ip = "127.0.0.1", default_port = 20569)
+      fcsh_ip = env["FCSH_IP"] || default_ip
+      fcsh_port = (env["FCSH_PORT"] || default_port).to_i
+      self.new(fcsh_ip, fcsh_port)
+    end
   end
 
   class FCSHProcess

data/lib/airake/project.rb

@@ -1,4 +1,5 @@
 module Airake 
+  # Project settings for AIR app
   class Project
   
     attr_reader :project_name, :mxmlc_path, :adt_path
@@ -6,7 +7,7 @@ module Airake
     attr_reader :mxml_path, :appxml_path, :air_path, :swf_path
     attr_reader :debug
   
-    def initialize(base_dir, mxml_path, env = [], options = {})
+    def initialize(base_dir, mxml_path, options = {})
       @mxmlc_path = "mxmlc"
       @adt_path = "adt"
 
@@ -26,22 +27,21 @@ module Airake
       @air_path = options[:air_path] || "#{@bin_dir}/#{project_name}.air"
       @swf_path = options[:swf_path] || "#{@bin_dir}/#{project_name}.swf"
     
-      @debug = env["DEBUG"] || options[:debug] || false
+      @debug = options[:debug] || false
     end
     
-    def lib_source_paths
-      Dir["#{@lib_dir}/*"].collect { |f| f if File.directory?(f) }.compact + [ @test_dir, @src_dir ]
+    def run_adt
+      run(adt_command)
     end
   
-    def source_path_option
-      @source_paths ||= lib_source_paths
-      @source_paths.empty? ? "" : "-source-path #{@source_paths.join(" ")}"
+    def run_mxmlc    
+      run(mxmlc_command)
     end
   
-    def debug_option
-      "-debug=#{@debug}" if @debug
+    def run_adl
+      run(adl_command)
     end
-  
+    
     def mxmlc_command
       "#{@mxmlc_path} +configname=air #{source_path_option} -library-path+=#{@lib_dir} -output #{@swf_path} #{debug_option} -disable-incremental-optimizations=true -- #{@mxml_path}"
     end
@@ -52,8 +52,31 @@ module Airake
   
     def adl_command
       "adl #{@appxml_path} #{@base_dir}"
+    end        
+    
+    # Create project from ENV (for rake tasks)
+    def self.new_from_rake(env, is_test = false)
+      base_dir = env["BASE_DIR"]
+      mxml = is_test ? env["MXML_TEST"] : env["MXML"]
+      options = { :debug => env["DEBUG"] }
+      self.new(base_dir, mxml, options)
+    end
+    
+  protected     
+        
+    def lib_source_paths
+      Dir["#{@lib_dir}/*"].collect { |f| f if File.directory?(f) }.compact + [ @test_dir, @src_dir ]
     end
   
+    def source_path_option
+      @source_paths ||= lib_source_paths
+      @source_paths.empty? ? "" : "-source-path #{@source_paths.join(" ")}"
+    end
+  
+    def debug_option
+      "-debug=#{@debug}" if @debug
+    end    
+  
     def relative_path(path)
       Pathname.new(path).relative_path_from(Pathname.new(@base_dir))
     end
@@ -79,17 +102,5 @@ module Airake
       system cmd or fail(cmd, $?)
     end
   
-    def run_adt
-      run(adt_command)
-    end
-  
-    def run_mxmlc    
-      run(mxmlc_command)
-    end
-  
-    def run_adl
-      run(adl_command)
-    end
-  
   end
 end

data/lib/airake/tasks/deployment.rake

@@ -1,15 +1,10 @@
 namespace :air do
-  
-  task :settings do
-    ENV["FCSH_IP"] ||= "127.0.0.1"
-    ENV["FCSH_PORT"] ||= "20569"
-  end
-  
+    
   desc "Compile"
-  task :compile => :settings do
+  task :compile do
     begin
-      project = Airake::Project.new(ENV["BASE_DIR"], ENV["MXML"], ENV)
-      fcsh = FCSH.new(ENV["FCSH_IP"], ENV["FCSH_PORT"].to_i)
+      project = Airake::Project.new_from_rake(ENV)
+      fcsh = PatternPark::FCSH.new_from_rake(ENV)
       fcsh.execute([ project.base_dir, project.mxmlc_command ])      
     rescue FCSHConnectError => e
       puts "Cannot connect to FCSHD (start by running: rake air:fcshd); Continuing compilation..."
@@ -18,44 +13,47 @@ namespace :air do
   end
 
   desc "Test"
-  task :test => :settings do
-    test_project = Airake::Project.new(ENV["BASE_DIR"], ENV["MXML_TEST"], ENV)
+  task :test do
+    test_project = Airake::Project.new_from_rake(ENV, true)
     test_project.run_mxmlc
     test_project.run_adl
   end
 
   desc "Package"
   task :package => :compile do
-    project = Airake::Project.new(ENV["BASE_DIR"], ENV["MXML"], ENV)
+    project = Airake::Project.new_from_rake(ENV)
     project.run_adt
   end
 
   desc "Apollo Debug Luncher"
   task :adl => :compile do
-    project = Airake::Project.new(ENV["BASE_DIR"], ENV["MXML"], ENV)
+    project = Airake::Project.new_from_rake(ENV)
     project.run_adl
   end
 
   desc "Start the FCSHD process (or use air:fcshd)"
-  task :start_fcshd => :settings do  
-    puts "Starting FCSHD @ #{ENV["FCSH_IP"]}:#{ENV["FCSH_PORT"].to_i}"
-    FCSHD.new(ENV["FCSH_IP"], ENV["FCSH_PORT"].to_i)
+  task :start_fcshd do  
+    puts "Starting FCSHD..."
+    PatternPark::FCSHD.start_from_rake(ENV)
   end
+    
+  task :fcshd => :start_fcshd # Alias
 
   desc "Stop the FCSHD process"
-  task :stop_fcshd => :settings do
-    fcsh = FCSH.new(ENV["FCSH_IP"], ENV["FCSH_PORT"].to_i)
-    fcsh.stop
+  task :stop_fcshd do
+    begin
+      fcsh = PatternPark::FCSH.new_from_rake(ENV)
+      fcsh.stop
+    rescue
+      puts "Could not stop FCSHD"
+    end
   end
 
   desc "Restart the FCSHD process"
-  task :restart_fcsh => :settings do
-    Rake::Task[:stop_fcshd].invoke rescue puts "Could not stop FCSHD"
-    sleep 1
-    Rake::Task[:start_fcshd].invoke
+  task :restart_fcshd => [ :stop_fcshd, :sleep, :start_fcshd ]
+  
+  task :sleep do
+    sleep 2
   end
-
-  # Aliases
-  task :fcshd => :start_fcshd
   
 end

data/lib/airake/version.rb

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

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: airake
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 date: 2007-08-30 00:00:00 -04:00
 summary: Adobe AIR tasks
 require_paths: