flex-sdk 0.5.1 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/flex-sdk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flex-sdk}
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Hoskin", "Rasheed Abdul-Aziz"]
-  s.date = %q{2010-11-09}
+  s.date = %q{2010-11-11}
   s.description = %q{Flex SDK Gem for redistribution to build servers and other developers. Also provides a simple DSL for calling Mxmlc and Compc from Thor tasks}
   s.email = %q{jonathan.hoskin@visfleet.com}
   s.executables = ["flex-sdk-copylocale", "flex-sdk-path", "flex-sdk-prime"]

data/lib/flex_compiler.rb

@@ -31,11 +31,14 @@ module FlexCompiler
 
   def compc(opts="")
     command = "#{Shell.escape File.join(sdk_dir,"bin","compc")} #{opts.to_s}"
+    puts command
     `#{command}`
   end
 
-  def mxmlc
-    puts ("mxmlc")
+  def mxmlc(target,opts="")
+    command = "#{Shell.escape File.join(sdk_dir,"bin","mxmlc")} #{opts.to_s} -- #{target}"
+    puts command
+    `#{command}`
   end
 
   def sdk_dir

data/lib/opt_builder.rb

@@ -3,13 +3,39 @@ require 'shell'
 
 class OptBuilder
   
-    @@single_opts = []
-    @@collection_opts = []
-  
+    class_attribute :single_opts
+    class_attribute :collection_opts
+    self.single_opts = []    
+    self.collection_opts = []
+    
+    def self.inherited(sub)
+      sub.single_opts = []    
+      sub.collection_opts = []
+    end
+
+    def self.map_with_single_opts(&block)
+      result = self.single_opts.map do |config|
+        yield config
+      end
+      
+      result += self.superclass.map_with_single_opts(&block) if (self.superclass.respond_to? :map_with_single_opts)
+      result
+    end
+
+    def self.map_with_collection_opts(&block)
+      result = self.collection_opts.map do |config|
+        yield config
+      end
+      
+      result += self.superclass.map_with_collection_opts(&block) if (self.superclass.respond_to? :map_with_single_opts)
+      result        
+    end
+
+    
     def self.single(sym,opts={})
       attr_writer sym
-
-      @@single_opts << { 
+      
+      self.single_opts << { 
         :sym => sym, 
         :alias_for => opts[:alias_for] || sym.to_s.dasherize 
       }
@@ -18,14 +44,13 @@ class OptBuilder
         define_method sym do
           self.send(:instance_variable_get,"@#{sym.to_s}") || opts[:default]
         end
-
       end
     end  
 
     def self.collection(sym,opts={})
       attr_writer sym
 
-      @@collection_opts << { 
+      self.collection_opts << {
         :sym => sym, 
         :force_restart => opts[:force_restart], 
         :alias_for => opts[:alias_for] || sym.to_s.dasherize 
@@ -42,17 +67,8 @@ class OptBuilder
     end  
 
     def value_as_option_value(value)
-      # todo:
-      #   Escape strings for command line
-      #   leave numbers alone
-      #   booleans?
-      #   
-      #   arrays, treat each element as a value then join with spaces
-      
-      
-        return value_array_as_option_value(value) if value.is_a? Array
-      
-        Shell.escape value
+      return value_array_as_option_value(value) if value.is_a? Array
+      Shell.escape value
     end
     
     def value_array_as_option_value(value_array)
@@ -64,23 +80,23 @@ class OptBuilder
     end
 
     def to_s
-      opts = @@single_opts.map do |hash|
-        sym = hash[:sym]
-        "-#{hash[:alias_for]}=#{value_as_option_value(send(sym))}" unless send(sym).nil?
+      opts = self.class.map_with_single_opts do |config|
+        sym = config[:sym]
+        "-#{config[:alias_for]}=#{value_as_option_value(send(sym))}" unless send(sym).nil?
       end
 
-      collections = @@collection_opts.each do |hash|
+      opts += self.class.map_with_collection_opts do |hash|
         sym = hash[:sym];
         restart = hash[:force_restart]
         add_char = ""
-        opts += send(sym).map do |value|
+        send(sym).map do |value|
           add_char = "+" unless restart
           restart = false if restart
-          "-#{hash[:alias_for]}#{add_char}=#{value_as_option_value(value)}"
+          "-#{hash[:alias_for]}#{add_char}=#{value_as_option_value(value)}" unless send(sym).nil?
         end
       end
       
-      opts.reject{ |item| item.nil? }.join " "
+      opts.flatten.reject{ |item| item.nil? }.join " "
     end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flex-sdk
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jonathan Hoskin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +13:00
+date: 2010-11-11 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency