airake 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.2 2007-10-11
+
+* Fixed handling of spaces in name
+
 == 0.2.1 2007-10-10
 
 * Created browsair generator

data/Manifest.txt

@@ -28,6 +28,7 @@ lib/airake.rb
 lib/airake/commands/adl.rb
 lib/airake/commands/adt.rb
 lib/airake/commands/amxmlc.rb
+lib/airake/commands/base.rb
 lib/airake/core_ext/blank.rb
 lib/airake/daemonize.rb
 lib/airake/fcsh.rb

data/app_generators/airake/airake_generator.rb

@@ -1,13 +1,14 @@
 class AirakeGenerator < RubiGen::Base
   
-  attr_reader :app_name, :title, :url, :description
+  attr_reader :name, :app_name, :title, :url, :description
   
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty? || args.size < 1
-    @destination_root = File.expand_path(args.shift)
-    @app_name = File.basename(@destination_root).camelize
-    @title = @app_name
+    @name = args.shift
+    @destination_root = File.expand_path(@name)
+    @app_name = File.basename(@destination_root).gsub(/\s+/, "").camelize
+    @title = @name
     @url = "http://airake.rubyforge.org/resources.html"
     @description = "Put description here"
     extract_options

data/app_generators/browsair/browsair_generator.rb

@@ -1,14 +1,15 @@
 class BrowsairGenerator < RubiGen::Base
   
-  attr_reader :app_name, :url, :title, :description, :icon_src_path
+  attr_reader :name, :app_name, :url, :title, :description, :icon_src_path
   
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty? || args.size < 2
-    @destination_root = File.expand_path(args.shift)
-    @app_name = File.basename(@destination_root)
+    @name = args.shift
+    @destination_root = File.expand_path(@name)    
+    @app_name = File.basename(@destination_root).gsub(/\s+/, "")
     @url = args.shift    
-    @title = "#{@app_name} - #{@url}"    
+    @title = "#{@name} - #{@url}"    
     @description = "AIR Browser for #{@url}"    
     @icon_src_path = File.expand_path(args.shift) unless args.empty?
     extract_options

data/lib/airake/commands/adl.rb

@@ -2,7 +2,7 @@ module Airake
   
   module Commands
     
-    class Adl
+    class Adl < Airake::Commands::Base
       
       attr_reader :project, :path, :extra_opts
       
@@ -17,9 +17,9 @@ module Airake
         command = []
         command << @path
         command << @extra_opts
-        command << project.appxml_path
-        command << project.base_dir
-        command.compact.join(" ")
+        command << escape(project.appxml_path)
+        command << escape(project.base_dir)
+        process(command)
       end      
       
     end

data/lib/airake/commands/adt.rb

@@ -2,7 +2,7 @@ module Airake
   
   module Commands
     
-    class Adt
+    class Adt < Airake::Commands::Base
       
       attr_reader :project, :path, :certificate, :extra_opts, :assets
       
@@ -21,11 +21,11 @@ module Airake
         command << @extra_opts
         command << "-package"
         command << "-certificate #{@certificate}"        
-        command << project.relative_path(project.air_path)
-        command << project.relative_path(project.appxml_path)
-        command << project.relative_path(project.swf_path)
+        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.compact.join(" ")
+        process(command)
       end
       
       # Generate a certificate
@@ -46,9 +46,9 @@ module Airake
         command << "-o #{optionals[:o]}" if !optionals[:o].blank?
         command << "-c #{optionals[:c]}" if !optionals[:c].blank?
         command << key_type
-        command << pfx_file
+        command << escape(pfx_file)
         command << password
-        command.compact.join(" ")
+        process(command)
       end      
       
     end

data/lib/airake/commands/amxmlc.rb

@@ -2,7 +2,7 @@ module Airake
   
   module Commands
     
-    class Amxmlc 
+    class Amxmlc < Airake::Commands::Base
       
       attr_reader :project, :path, :extra_opts
       
@@ -16,24 +16,25 @@ module Airake
       def compile
         command = []
         command << @path
-        #command << "+configname=air"
         command << source_path_option
         command << library_path_option
-        command << "-output #{project.swf_path}"
+        command << "-output"
+        command << escape(project.swf_path)
         command << project.debug_option
         command << @extra_opts
         command << "-disable-incremental-optimizations=true"
-        command << "-- #{project.mxml_path}"
-        command.compact.join(" ")
+        command << "--"
+        command << escape(project.mxml_path)
+        process(command)
       end
       
     protected
       
       def source_path_option      
         # List of directories in lib/ for source_path +=
-        lib_source_paths = Dir["#{project.lib_dir}/*"].collect { |f| f if File.directory?(f) }.compact       
-        lib_source_paths << project.test_dir if File.directory?(project.test_dir)
-        lib_source_paths << project.src_dir if File.directory?(project.src_dir)
+        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)
 
         source_paths ||= lib_source_paths
         source_paths.empty? ? "" : "-source-path #{source_paths.join(" ")}"
@@ -41,7 +42,7 @@ module Airake
 
       def library_path_option
         library_paths = []      
-        library_paths << project.lib_dir if File.directory?(project.lib_dir)
+        library_paths << escape(project.lib_dir) if File.directory?(project.lib_dir)
         library_paths.empty? ? "" : "-library-path+=#{library_paths.join(" ")}"
       end
       

data/lib/airake/commands/base.rb

@@ -0,0 +1,21 @@
+module Airake
+  
+  module Commands
+    
+    class Base 
+      
+      # Process command options array
+      def process(command)
+        command.compact.join(" ")
+      end
+      
+      # Escape any spacing
+      def escape(command)
+        command.to_s.gsub(" ", "\\ ")
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/airake/project.rb

@@ -4,7 +4,6 @@ module Airake
   # Project settings for AIR app
   class Project
   
-    attr_reader :project_name
     attr_reader :base_dir, :bin_dir, :src_dir, :lib_dir, :test_dir
     attr_reader :mxml_path, :appxml_path, :air_path, :swf_path
     attr_reader :debug
@@ -21,19 +20,20 @@ module Airake
     # mxml_path: Path to the project.mxml (relative)
     # options:: Override default paths, commands, extra opts, etc; See Options class var
     def initialize(base_dir, mxml_path, options = {})
+      raise ArgumentError, "Invalid MXML path: #{mxml_path}" if mxml_path.blank?
+      
+      mxml_dir = File.expand_path(File.dirname(mxml_path))
+      project_name = File.basename(mxml_path, ".mxml")
+      
       @base_dir = base_dir
-      @mxml_path = mxml_path
+      @mxml_path = File.join(mxml_dir, "#{project_name}.mxml")
       @options = options
       
-      raise ArgumentError, "Invalid MXML path: #{mxml_path}" if mxml_path.blank?
-
       @bin_dir = options[:bin_dir] || File.join(base_dir, "bin")
       @src_dir = options[:src_dir] || File.join(base_dir, "src")
       @lib_dir = options[:lib_dir] || File.join(base_dir, "lib")
-      @test_dir = options[:test_dir] || File.join(base_dir, "test")
+      @test_dir = options[:test_dir] || File.join(base_dir, "test")                  
       
-      @project_name = File.basename(@mxml_path, ".mxml")      
-      mxml_dir = File.expand_path(File.dirname(@mxml_path))
       @appxml_path = options[:appxml_path] || File.join(mxml_dir, "#{project_name}-app.xml")
       
       # Dest package files

data/lib/airake/tasks/air.rake

@@ -30,7 +30,11 @@ namespace :air do
     end  
     
     if File.exist?(pfx_file)
-      raise "Certificate file exists at '#{pfx_file}'. If you want to generate a new certificate, please delete it first."
+      raise <<-EOS
+        Certificate file exists at '#{pfx_file}'. If you want to generate a new certificate, please delete it first.
+        You can override the setting in the Rakefile, e.g.: rake air:certificate CERTIFICATE=path.pfx
+      EOS
+                    
     end
     
     puts "Will generate a certificate file at: #{pfx_file}"

data/lib/airake/version.rb

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

data/lib/airake.rb

@@ -3,6 +3,7 @@ $:.unshift File.dirname(__FILE__)
 require 'airake/daemonize'
 require 'airake/fcsh'
 require 'airake/fcshd'
+require 'airake/commands/base'
 require 'airake/commands/amxmlc'
 require 'airake/commands/adl'
 require 'airake/commands/adt'

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: airake
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 date: 2007-10-11 00:00:00 -04:00
 summary: Adobe AIR generators and tasks
 require_paths: 
@@ -59,6 +59,7 @@ files:
 - lib/airake/commands/adl.rb
 - lib/airake/commands/adt.rb
 - lib/airake/commands/amxmlc.rb
+- lib/airake/commands/base.rb
 - lib/airake/core_ext/blank.rb
 - lib/airake/daemonize.rb
 - lib/airake/fcsh.rb