airake 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.7 2007-10-24
+
+* survived revolutionhealth layoffs
+* removed -disable-incremental-optimizations=true; legacy flag.. use extra opts if you still need it
+* added command for acompc (Component compiler)
+* refactored commands (decoupled commands from project)
+
 == 0.2.6 2007-10-17
 
 * fixed compile with fcsh (mxmlc)

data/Manifest.txt

@@ -28,6 +28,7 @@ bin/browsair
 config/hoe.rb
 config/requirements.rb
 lib/airake.rb
+lib/airake/commands/acompc.rb
 lib/airake/commands/adl.rb
 lib/airake/commands/adt.rb
 lib/airake/commands/amxmlc.rb
@@ -40,7 +41,6 @@ lib/airake/project.rb
 lib/airake/runner.rb
 lib/airake/tasks.rb
 lib/airake/tasks/air.rake
-lib/airake/tasks/deployment.rake
 lib/airake/tasks/fcsh.rake
 lib/airake/version.rb
 script/destroy

data/Rakefile

@@ -1,4 +1,7 @@
 require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+Dir['tasks/**/*.rake'].each { |rake| load rake }
+
+# Load airake (why not?)
+require 'lib/airake'

data/app_generators/shared/Rakefile

@@ -11,5 +11,11 @@ ENV["BASE_DIR"] ||= File.expand_path(File.dirname(__FILE__))
 ENV["MXML"] ||= "src/<%= app_name %>.mxml"
 ENV["MXML_TEST"] ||= "test/Test.mxml"
 
-# Assets to package
-ENV["ASSETS"] ||= "src/assets"
+# Assets to package, can be multiple items, e.g. "src/assets/app_icons src/assets/tray_icons"
+ENV["ASSETS"] ||= "src/assets"
+
+# Aliases
+task :test => [ "air:test" ] do; end
+task :compile => [ "air:compile" ] do; end
+task :package => [ "air:package" ] do; end
+task :adl => [ "air:adl" ] do; end

data/lib/airake/commands/acompc.rb

@@ -0,0 +1,57 @@
+module Airake #:nodoc:
+  
+  module Commands #:nodoc:
+    
+    # ACOMPC (Air component compiler)
+    #
+    # http://livedocs.adobe.com/labs/flex3/html/help.html?content=CommandLineTools_3.html
+    class Acompc < Base
+      
+      attr_reader :path, :extra_opts, :source_path, :include_packages, :output_path
+      
+      # Initialize command
+      #
+      # options:: :acompc_path, :acompc_extra_opts, :source_path, :include_packages, :output_path
+      #
+      # :include_packages:
+      #   com.airake.utils will include all classes from Dir["com/airake/utils/**/*.as"]
+      def initialize(options = {})
+        @path = options[:acompc_path] || "acompc"
+        @extra_opts = options[:acompc_extra_opts]
+        with_options(options, { :source_path => "src" })
+        
+        raise "No output path specified" unless output_path
+      end
+      
+      def include_classes_option
+        classes = []
+        paths = []
+        include_packages.each do |include_package|
+          path = File.join(source_path, include_package.gsub(".", "/")) + "/**/*.as"
+          paths << path
+          Dir[path].each do |file|
+            classes << include_package + "." + File.basename(file).gsub(".as", "")
+          end
+        end
+        raise "No classes found at:\n\t#{paths.join("\n\t")}" if classes.empty?
+        classes.join(" ")
+      end
+            
+      # Get the acompc compile command
+      def compile
+        command = []
+        command << path
+        command << "-source-path"
+        command << source_path
+        command << "-include-classes"
+        command << include_classes_option
+        command << "-output"
+        command << output_path        
+        process(command)
+      end
+            
+    end
+    
+  end
+  
+end

data/lib/airake/commands/adl.rb

@@ -1,28 +1,28 @@
-module Airake
+module Airake #:nodoc:
   
-  module Commands
+  module Commands #:nodoc:
     
     # ADL (Adobe Debug Lancher)
     #
     # http://livedocs.adobe.com/labs/air/1/devappsflex/help.html?content=CommandLineTools_4.html#1031914
     class Adl < Base
       
-      attr_reader :project, :path, :extra_opts
+      attr_reader :project, :path, :extra_opts, :appxml_path, :root_dir
       
-      # options:: :adl_path, adl_extra_opts
-      def initialize(project, options = {})
-        @project = project
+      # options:: :adl_path, adl_extra_opts, :appxml_path, :root_dir
+      def initialize(options = {})
         @path = options[:adl_path] || "adl"
         @extra_opts = options[:adl_extra_opts]
+        with_options(options)
       end
-                  
+      
       # Get the ADL launch command
       def launch
         command = []
-        command << @path
-        command << @extra_opts
-        command << escape(project.appxml_path)
-        command << escape(project.base_dir)
+        command << path
+        command << extra_opts
+        command << escape(appxml_path)
+        command << escape(root_dir)
         process(command)
       end      
       

data/lib/airake/commands/adt.rb

@@ -1,34 +1,34 @@
-module Airake
+module Airake #:nodoc:
   
-  module Commands
+  module Commands #:nodoc:
     
     # ADT (Adobe Developer Tool)
     #
     # http://livedocs.adobe.com/labs/air/1/devappsflex/help.html?content=CommandLineTools_5.html
     class Adt < Base
       
-      attr_reader :project, :path, :certificate, :extra_opts, :assets
+      attr_reader :path, :certificate, :extra_opts, :assets, :air_path, :appxml_path, :swf_path, :base_dir
       
-      # options:: :adt_path, :certificate, :adt_extra_opts, :assets
-      def initialize(project, options = {})
-        @project = project
+      # options:: :adt_path, :certificate, :adt_extra_opts, :assets, :air_path, :appxml_path, :swf_path, :base_dir
+      def initialize(options = {})
         @path = options[:adt_path] || "adt"
-        @certificate = options[:certificate]
         @extra_opts = options[:adt_extra_opts]
-        @assets = options[:assets]
+        with_options(options)
       end
             
       # Get the ADT package command
       def package
+        raise ArgumentError, "Must specify :base_dir" unless base_dir
+        
         command = []
-        command << @path
-        command << @extra_opts
+        command << path
+        command << extra_opts
         command << "-package"
-        command << "-certificate #{@certificate}"        
-        command << escape(project.relative_path(project.air_path))
-        command << escape(project.relative_path(project.appxml_path))
-        command << escape(project.relative_path(project.swf_path))
-        command << @assets
+        command << "-certificate #{certificate}" unless certificate.blank?
+        command << escape(relative_path(air_path, base_dir))
+        command << escape(relative_path(appxml_path, base_dir))
+        command << escape(relative_path(swf_path, base_dir))
+        command << assets
         process(command)
       end
       
@@ -38,17 +38,17 @@ module Airake
       # pfx_file:: Output certificate path
       # key_type:: 1024-RSA, 2048-RSA
       # password:: Password
-      # optionals:: :ou, :o, :c
+      # optionals:: :org_unit, :org, :country
       #
       # Example result: adt -certificate -cn ADigitalID 1024-RSA SigningCert.pfx 39#wnetx3tl
-      def certificate(cn, pfx_file, key_type, password, optionals = {})
+      def generate_certificate(common_name, pfx_file, key_type, password, optionals = {})
         command = []
-        command << @path
+        command << path
         command << "-certificate"
-        command << "-cn #{cn}"
-        command << "-ou #{optionals[:ou]}" if !optionals[:ou].blank?
-        command << "-o #{optionals[:o]}" if !optionals[:o].blank?
-        command << "-c #{optionals[:c]}" if !optionals[:c].blank?
+        command << "-cn #{common_name}"
+        command << "-ou #{optionals[:org_unit]}" if !optionals[:org_unit].blank?
+        command << "-o #{optionals[:org]}" if !optionals[:org].blank?
+        command << "-c #{optionals[:country]}" if !optionals[:country].blank?
         command << key_type
         command << escape(pfx_file)
         command << password

data/lib/airake/commands/amxmlc.rb

@@ -1,34 +1,34 @@
-module Airake
+module Airake #:nodoc:
   
-  module Commands
+  module Commands #:nodoc:
     
     # AMXMLC (AIR MXML compiler)
     #
     # http://livedocs.adobe.com/labs/air/1/devappsflex/help.html?content=CommandLineTools_2.html#1032546
     class Amxmlc < Base
       
-      attr_reader :project, :path, :extra_opts
+      attr_reader :path, :extra_opts, :swf_path, :mxml_path, :lib_dir, :src_dir, :test_dir, :debug_option
       
-      # options:: :amxmlc_path, :amxmlc_extra_opts
-      def initialize(project, options = {})
-        @project = project
+      # options:: :amxmlc_path, :amxmlc_extra_opts, :swf_path, :mxml_path, :lib_dir, :src_dir, :test_dir, :debug_option
+      def initialize(options = {})
         @path = options[:amxmlc_path] || "mxmlc +configname=air"
         @extra_opts = options[:amxmlc_extra_opts]
+        with_options(options)        
       end
             
       # Get the amxmlc compile command
       def compile
         command = []
-        command << @path
+        command << path
         command << source_path_option
         command << library_path_option
         command << "-output"
-        command << escape(project.swf_path)
-        command << project.debug_option
-        command << @extra_opts
-        command << "-disable-incremental-optimizations=true"
+        command << escape(swf_path)
+        command << debug_option
+        command << extra_opts      
+        #command << "-disable-incremental-optimizations=true"  
         command << "--"
-        command << escape(project.mxml_path)
+        command << escape(mxml_path)
         process(command)
       end
       
@@ -36,9 +36,9 @@ module Airake
       
       def source_path_option      
         # List of directories in lib/ for source_path +=
-        lib_source_paths = Dir["#{project.lib_dir}/*"].collect { |f| escape(f) if File.directory?(f) }.compact       
-        lib_source_paths << escape(project.test_dir) if File.directory?(project.test_dir)
-        lib_source_paths << escape(project.src_dir) if File.directory?(project.src_dir)
+        lib_source_paths = Dir["#{lib_dir}/*"].collect { |f| escape(f) if File.directory?(f) }.compact       
+        lib_source_paths << escape(test_dir) if test_dir and File.directory?(test_dir)
+        lib_source_paths << escape(src_dir) if src_dir and File.directory?(src_dir)
 
         source_paths ||= lib_source_paths
         source_paths.empty? ? "" : "-source-path #{source_paths.join(" ")}"
@@ -46,7 +46,7 @@ module Airake
 
       def library_path_option
         library_paths = []      
-        library_paths << escape(project.lib_dir) if File.directory?(project.lib_dir)
+        library_paths << escape(lib_dir) if lib_dir and File.directory?(lib_dir)
         library_paths.empty? ? "" : "-library-path+=#{library_paths.join(" ")}"
       end
       

data/lib/airake/commands/base.rb

@@ -1,7 +1,10 @@
-module Airake
+require 'pathname'
+
+module Airake #:nodoc:
   
-  module Commands
+  module Commands #:nodoc:
     
+    # Base command 
     class Base 
       
       # Process command options array
@@ -14,6 +17,22 @@ module Airake
         command.to_s.gsub(" ", "\\ ")
       end
       
+      # Get relative path
+      def relative_path(path, from)
+        Pathname.new(path).relative_path_from(Pathname.new(from))
+      end      
+      
+      def with_options(options, defaults = {}) 
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
+        
+        defaults.each do |key, value|
+          existing = instance_variable_get("@#{key}")
+          instance_variable_set("@#{key}", value) unless existing
+        end
+      end
+      
     end
     
   end

data/lib/airake/fcshd.rb

@@ -64,7 +64,6 @@ module PatternPark
     def execute(io, path, command)
       io.puts "[FCSHD] #{path}"
       io.puts "[FCSHD] #{command}"
-      #io.puts "#{command} at #{Dir.pwd} and #{path}"
       begin
         fcsh = get_fcsh(io, path)
       rescue => e
@@ -74,7 +73,7 @@ module PatternPark
 
       cmd = @compile_commands[command]
       msg = command
-      if(!cmd.nil? && cmd.path == path)
+      if (!cmd.nil? && cmd.path == path)
         msg = "compile #{cmd.index}"
       end
       
@@ -134,11 +133,11 @@ module PatternPark
       while(!r.eof?)
         char = r.getc.chr
         line += char
-        if(line == '(fcsh)')
+        if (line == '(fcsh)')
           response += "[PROMPT] #{line}"
           break
         end
-        if(char == "\n")
+        if (char == "\n")
           response += "[FCSH] #{line}"
           line = ''
         end
@@ -152,16 +151,7 @@ module PatternPark
     attr_accessor :index, :path, :command
     
     def initialize(command, path)
-      @command = command
-      @path = path
+      @command, @path = command, path
     end
   end
 end
-
-if(__FILE__ == $0)
-  # Send in ip and port
-  ip = ARGV.shift
-  port = ARGV.shift
-  puts "[Starting FCSHD]"
-  PatternPark::FCSHD.new(ip, port)
-end

data/lib/airake/project.rb

@@ -1,6 +1,5 @@
-require 'pathname'
+module Airake #:nodoc
 
-module Airake 
   # Project settings for AIR app
   class Project
   
@@ -44,19 +43,23 @@ module Airake
       @debug = options[:debug].is_a?(TrueClass) || options[:debug] == "true"      
     end
     
-    # Flex compiler command
+    # Flex compiler command for this project
     def amxmlc
-      Airake::Commands::Amxmlc.new(self, @options)
+      options = @options.merge({ :swf_path => swf_path, :mxml_path => mxml_path, :lib_dir => lib_dir, 
+        :src_dir => src_dir, :test_dir => test_dir, :debug_option => debug_option })      
+      Airake::Commands::Amxmlc.new(options)
     end
     
-    # ADL command
+    # ADL command for this project
     def adl
-      Airake::Commands::Adl.new(self, @options)
+      options = @options.merge({ :appxml_path => appxml_path, :root_dir => base_dir })
+      Airake::Commands::Adl.new(options)
     end
     
-    # ADT command
+    # ADT command for this project
     def adt
-      Airake::Commands::Adt.new(self, @options)
+      options = @options.merge({ :air_path => air_path, :appxml_path => appxml_path, :swf_path => swf_path, :base_dir => base_dir })
+      Airake::Commands::Adt.new(options)
     end
         
     # Create project using parameters from rake ENV
@@ -81,12 +84,7 @@ module Airake
     def debug_option
       "-debug=#{@debug}" if @debug
     end    
-  
-    # Get relative path from base (project) directory
-    def relative_path(path)
-      Pathname.new(path).relative_path_from(Pathname.new(@base_dir))
-    end
-  
+    
   end
   
 end

data/lib/airake/runner.rb

@@ -1,26 +1,15 @@
-module Airake
+module Airake #:nodoc:
   
+  # Runs commands
   class Runner
     
     class << self 
-      # Handle system command failure
-      def fail(cmd, error_status)
-        # fail_message = <<-EOS
-        # 
-        #   The '#{cmd.split.first}' command failed to run. This could be because this executable isn't in the path.
-        # 
-        #   To include mxmlc and fcsh:
-        #     export PATH="/path_to/flex3sdk_b2_100107/bin:$PATH"
-        #   
-        #   To include adl and adt (from AIR SDK):
-        #     export PATH="/path_to/air_sdk/bin:$PATH"
-        # 
-        # EOS
-        # puts fail_message if error_status != 256 && error_status != 4096
-        raise "[#{error_status}] Failed to run command: #{cmd}"
-      end
 
-      # Run the command using system(..)
+      def fail(cmd, process_status)
+        raise "[exited=#{process_status.exitstatus}, pid=#{process_status.pid}] Failed to run command: #{cmd}"
+      end
+      
+      # Run the command
       def run(command, method, *args)
         cmd = command.send(method, *args)
         

data/lib/airake/tasks/air.rake

@@ -52,18 +52,18 @@ namespace :air do
 
     print "Organization name (optional; e.g ducktyper.com): "
     input = STDIN.gets.chomp!
-    optionals[:o] = "\"#{input}\"" unless input.blank?    
+    optionals[:org] = "\"#{input}\"" unless input.blank?    
 
     print "Organization unit (optional; e.g QE): "
-    optionals[:ou] = STDIN.gets.chomp!
+    optionals[:org_unit] = STDIN.gets.chomp!
 
     print "Country (optional; e.g. US): "
-    optionals[:c] = STDIN.gets.chomp!
+    optionals[:country] = STDIN.gets.chomp!
 
     print "Password: "
     password = STDIN.gets.chomp!
 
-    Airake::Runner.run(project.adt, :certificate, cn, pfx_file, key_type, password, optionals)
+    Airake::Runner.run(project.adt, :generate_certificate, cn, pfx_file, key_type, password, optionals)
   end
   
   # Check certificate configuration for package task
@@ -96,6 +96,42 @@ namespace :air do
     Airake::Runner.run(project.adl, :launch)
   end
   
+  desc "Compile component"
+  task :acompc do
+    source_path = ENV["SOURCE"]
+    output_path = ENV["OUTPUT"]
+    packages = ENV["PACKAGES"]
+    
+    if source_path.blank? and output_path.blank? and packages.blank?
+      puts <<-EOS
+        You can run without input by specifying the environment variables, e.g.:
+        
+          rake air:acompc SOURCE=src/ OUTPUT=Foo.swc PACKAGES="com.foo.utils com.bar.baz"
+      
+      EOS
+    end
+    
+    if source_path.blank?      
+      print "Source path [src]: "
+      source_path = STDIN.gets.chomp!
+      source_path = "src" if source_path.blank?
+    end
+
+    if output_path.blank?
+      print "Output path (e.g. Foo.swc): "
+      output_path = STDIN.gets.chomp!
+      raise "Invalid output path" if output_path.blank?
+    end
+
+    if packages.blank?
+      print "Packages (e.g. com.airake.utils com.airake.foo): "
+      packages = STDIN.gets.chomp!
+      raise "Invalid packages" if packages.blank?
+    end
+    
+    Airake::Runner.run(Airake::Commands::Acompc.new(:source_path => source_path, :include_packages => packages.split(" "), :output_path => output_path), :compile)
+  end
+  
   desc "Clean"
   task :clean do 
     project = Airake::Project.new_from_rake(ENV)

data/lib/airake/version.rb

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

data/lib/airake.rb

@@ -4,6 +4,7 @@ require 'airake/daemonize'
 require 'airake/fcsh'
 require 'airake/fcshd'
 require 'airake/commands/base'
+require 'airake/commands/acompc'
 require 'airake/commands/amxmlc'
 require 'airake/commands/adl'
 require 'airake/commands/adt'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: airake
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
-date: 2007-10-17 00:00:00 -04:00
+  version: 0.2.7
+date: 2007-11-04 00:00:00 -04:00
 summary: Tasks and generators for Adobe AIR apps
 require_paths: 
 - lib
@@ -59,6 +59,7 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/airake.rb
+- lib/airake/commands/acompc.rb
 - lib/airake/commands/adl.rb
 - lib/airake/commands/adt.rb
 - lib/airake/commands/amxmlc.rb
@@ -71,7 +72,6 @@ files:
 - lib/airake/runner.rb
 - lib/airake/tasks.rb
 - lib/airake/tasks/air.rake
-- lib/airake/tasks/deployment.rake
 - lib/airake/tasks/fcsh.rake
 - lib/airake/version.rb
 - script/destroy

data/lib/airake/tasks/deployment.rake

@@ -1,27 +0,0 @@
-# Deprecated; see fsch.rake
-
-namespace :air do
-    
-  task :start_fcshd do  
-    puts "Starting FCSHD..."
-    PatternPark::FCSHD.start_from_rake(ENV)
-  end
-    
-  task :fcshd => :start_fcshd # Alias
-
-  task :stop_fcshd do
-    begin
-      fcsh = PatternPark::FCSH.new_from_rake(ENV)
-      fcsh.stop
-    rescue
-      puts "Could not stop FCSHD"
-    end
-  end
-
-  task :restart_fcshd => [ :stop_fcshd, :sleep, :start_fcshd ]
-  
-  task :sleep do
-    sleep 2
-  end
-  
-end