sproutcore 1.0.1046 → 1.0.1049.pre.1

data/lib/sproutcore/buildfile/build_task.rb

@@ -5,7 +5,7 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'task'))
+require "sproutcore/buildfile/task"
 
 module SC
 
@@ -20,14 +20,14 @@ module SC
       dst_mtime = File.mtime(DST_PATH)
       SRC_PATHS.each do |path|
         next if path.nil? # skip incase of bad src paths...
-        
+
         timestamp = File.exist?(path) ? File.mtime(path) : EARLY
         ret = ret || (dst_mtime < timestamp)
         break if ret
       end
-      return ret 
+      return ret
     end
-    
+
   end
 end
-  
+

data/lib/sproutcore/buildfile/buildfile_dsl.rb

@@ -8,7 +8,14 @@
 module SC
 
   class Buildfile
-    
+
+    # This class allows us to memoize common computations
+    class Config < HashStruct
+      def target_names
+        @target_names ||= self[:target_types].keys
+      end
+    end
+
     # Describe the domain-specific-language helpers supported by buildfiles.
     # This is included as a mixin for the buildfile.
     module Commands
@@ -23,7 +30,7 @@ module SC
       def task(*args, &block)
         define_task(::SC::Buildfile::Task, *args, &block)
       end
-      
+
       # Replace an existing task instead of enhancing it.
       #
       # Example:
@@ -40,7 +47,7 @@ module SC
           raise e
         end
       end
-      
+
       # Define a build task.  A build task will not run if the destination
       # file is newer than the source files.
       #
@@ -48,9 +55,9 @@ module SC
         define_task(::SC::Buildfile::BuildTask, *args, &block)
       end
 
-      # Import the partial Rakefiles +fn+.  Imported files are loaded _after_ 
-      # the current file is completely loaded.  This allows the import statement 
-      # to appear anywhere in the importing file, and yet allowing the imported 
+      # Import the partial Rakefiles +fn+.  Imported files are loaded _after_
+      # the current file is completely loaded.  This allows the import statement
+      # to appear anywhere in the importing file, and yet allowing the imported
       # files to depend on objects defined in the importing file.
       #
       # A common use of the import statement is to include files containing
@@ -61,14 +68,14 @@ module SC
       #
       def import(*args)
         base_path = current_path.nil? ? nil : File.dirname(current_path)
-        args.each do |fn| 
+        args.each do |fn|
           fn = File.expand_path(fn, base_path)
           add_import(fn)
         end
       end
-    
+
       # Create a new rake namespace and use it for evaluating the given block.
-      # Returns a NameSpace object that can be used to lookup tasks defined in 
+      # Returns a NameSpace object that can be used to lookup tasks defined in
       # the namespace.
       #
       # E.g.
@@ -108,7 +115,7 @@ module SC
 
       # Scope any config statements inside the passed block to the named mode.
       # Normally if you call a config statement outside of a mode block, it will
-      # scope to all modes. 
+      # scope to all modes.
       #
       # Example:
       # mode :debug do
@@ -132,7 +139,7 @@ module SC
       #  end
       #
       def config(config_name, opts = {}, &block)
-        opts = ::SC::HashStruct.new(opts)
+        opts = ::SC::Buildfile::Config.new(opts)
         yield(opts) if block_given?
         add_config config_name, opts
         return self
@@ -146,17 +153,17 @@ module SC
       def proxy(proxy_path, opts={})
         add_proxy proxy_path, opts
       end
-      
+
       # Register info about this buildfile as a project
       def project(name=nil, type=nil)
         self.project_name = name.nil? ? :default : name.to_sym
         self.project_type = type.nil? ? :default : type.to_sym
         self.project!
       end
-      
+
     end
-    
+
     include Commands
   end
-  
+
 end

data/lib/sproutcore/buildfile/cloneable.rb

@@ -6,7 +6,7 @@
 # ===========================================================================
 
 module SC
-  
+
   # Mixing for creating easily cloned objects.  Borrowed from Rake 0.8.3
   module Cloneable
 
@@ -29,6 +29,6 @@ module SC
       sibling
     end
   end
-  
-  
+
+
 end

data/lib/sproutcore/buildfile/early_time.rb

@@ -9,7 +9,7 @@ require 'singleton'
 require 'time'
 
 module SC
-  
+
   # EarlyTime is a fake timestamp that occurs _before_ any other time value.
   # Borrowed from Rake 0.8.3
   class EarlyTime < Time
@@ -27,4 +27,4 @@ module SC
 
   EARLY = EarlyTime.instance
 
-end  
+end

data/lib/sproutcore/buildfile/invocation_chain.rb

@@ -6,7 +6,7 @@
 # ===========================================================================
 
 module SC
-  
+
   # InvocationChain tracks the chain of task invocations to detect
   # circular dependencies.  Borrowed from Rake 0.8.3
   class InvocationChain
@@ -22,7 +22,7 @@ module SC
     def already_invoked?(task)
       (task == @value) || @tail.already_invoked?(task)
     end
-    
+
     def append(value)
       if member?(value)
         raise "Circular dependency detected: #{to_s} => #{value}"
@@ -61,4 +61,4 @@ module SC
 
   end # class InvocationChain
 
-end
+end

data/lib/sproutcore/buildfile/namespace.rb

@@ -6,7 +6,7 @@
 # ===========================================================================
 
 module SC
-  
+
   # The NameSpace class will lookup task names in the the scope
   # defined by a +namespace+ command.  Borrowed from Rake 0.8.3
   #
@@ -29,5 +29,5 @@ module SC
       @task_manager.tasks
     end
   end # NameSpace
-  
-end
+
+end

data/lib/sproutcore/buildfile/string_ext.rb

@@ -32,6 +32,10 @@ end # module Module
 #
 class String
   rake_extension("ext") do
+    def replace_ext(newext)
+      sub(%r(([^/\\]\.)[^./\\]*$)) { $1 + newext }
+    end
+
     # Replace the file extension with +newext+.  If there is no extenson on
     # the string, append the new extension to the end.  If the new extension
     # is not given, or is the empty string, remove any existing extension.
@@ -74,7 +78,7 @@ class String
       File.join(partial_dirs)
     end
     protected :pathmap_partial
-      
+
     # Preform the pathmap replacement operations on the given path. The
     # patterns take the form 'pat1,rep1;pat2,rep2...'.
     def pathmap_replace(patterns, &block)

data/lib/sproutcore/buildfile/task.rb

@@ -6,8 +6,8 @@
 # ===========================================================================
 
 module SC
-  
-  # Buildfile tasks are rake tasks with a few extras added to support 
+
+  # Buildfile tasks are rake tasks with a few extras added to support
   # unique buildfile constraints.  Much of this source code is borrowed from
   # Rake 0.8.3
   #
@@ -33,17 +33,17 @@ module SC
     # Array of nested namespaces names used for task lookup by this task.
     attr_reader :scope
 
-    # The number of times this task has been invoked.  Use to ensure that 
+    # The number of times this task has been invoked.  Use to ensure that
     # the task was invoked during some call chain...
     attr_reader :invoke_count
-    
-    # The number of times the task was actually executed.  This may differ 
+
+    # The number of times the task was actually executed.  This may differ
     # from the invoke_count if the task was invoked but was not needed.
     attr_reader :execute_count
-    
+
     # Various options you can set on the task to control log level, etc.
     attr_reader :task_options
-    
+
     # Return task name
     def to_s
       name
@@ -64,7 +64,7 @@ module SC
       @sources.first if defined?(@sources)
     end
 
-    IGNORE = %w(@lock @application)
+    IGNORE = %w(@application)
     def dup(app=nil)
       app = application if app.nil?
       sibling = self.class.new(name, app)
@@ -75,7 +75,7 @@ module SC
       sibling.taint if tainted?
       sibling
     end
-    
+
     # Create a task named +task_name+ with no actions or prerequisites. Use
     # +enhance+ to add actions and prerequisites.
     def initialize(task_name, app)
@@ -84,7 +84,6 @@ module SC
       @actions = []
       @full_comment = nil
       @comment = nil
-      @lock = Monitor.new
       @application = app
       @scope = app.current_scope
       @arg_names = nil
@@ -143,62 +142,65 @@ module SC
     end
 
     # Invoke the task if it is needed.  Prerequites are invoked first.
-    def invoke(*args)
-      task_args = TaskArguments.new(arg_names, args)
+    def invoke(hash)
+      task_args = hash
+      task_args = TaskArguments.with_hash(hash) #TaskArguments.new(arg_names, args)
       invoke_with_call_chain(task_args, InvocationChain::EMPTY)
     end
 
     def self.log_indent
       @task_indent ||= ''
     end
-    
+
     def self.indent_logs
       @task_indent = (@task_indent || '') + '  '
     end
-    
+
     def self.outdent_logs
       @task_indent = (@task_indent || '')[0..-3]
     end
-    
+
     # Same as invoke, but explicitly pass a call chain to detect
     # circular dependencies.
     def invoke_with_call_chain(task_args, invocation_chain) # :nodoc:
       unless invocation_chain.already_invoked?(self)
         invocation_chain = InvocationChain.append(self, invocation_chain)
-        @lock.synchronize do
-          
-          indent = self.class.indent_logs
-          
-          # Use logging options to decide what to output
-          # one of :env, :name, :none
-          log_opt = task_options[:log] || :none
-          if [:name, :env].include?(log_opt)
-            SC.logger.debug "#{indent}invoke ~ #{name} #{format_trace_flags}"
-          end
-          
-          if log_opt == :env
-            TASK_ENV.each do |key, value|
-              next if %w(config task_env).include?(key.to_s.downcase)
-              SC.logger.debug "#{indent}  #{key} = #{value.inspect}"
-            end
+
+        indent = self.class.indent_logs
+
+        # Use logging options to decide what to output
+        # one of :env, :name, :none
+        log_opt = task_options[:log] || :none
+        if [:name, :env].include?(log_opt)
+          SC.logger.debug "#{indent}invoke ~ #{name} #{format_trace_flags}"
+        end
+
+        if log_opt == :env
+          TASK_ENV.each do |key, value|
+            next if %w(config task_env).include?(key.to_s.downcase)
+            SC.logger.debug "#{indent}  #{key} = #{value.inspect}"
           end
-          
-          t_start = Time.now.to_f * 1000
-          
-          invocation_chain = invoke_prerequisites(task_args, invocation_chain)
-          @invoke_count += 1
-          execute(task_args) if needed?
-          
+        end
+
+        debug = SC.logger.debug?
+
+        t_start = Time.now.to_f * 1000 if debug
+
+        invocation_chain = invoke_prerequisites(task_args, invocation_chain)
+        @invoke_count += 1
+        execute(task_args) if needed?
+
+        if debug
           t_end = Time.now.to_f * 1000
           t_diff = t_end - t_start
-          
+
           # ignore short tasks
           if t_diff > 10
             SC.logger.debug "#{indent}long task ~ #{name}: #{t_diff.to_i} msec"
           end
-          self.class.outdent_logs
-          
         end
+        self.class.outdent_logs
+
       end
       return invocation_chain
     end
@@ -225,10 +227,9 @@ module SC
 
     # Execute the actions associated with this task.
     def execute(args=nil)
-      
       @execute_count += 1
       args ||= EMPTY_TASK_ARGS
-      return if SC.env.dryrun
+      return if SC.env[:dryrun]
 
       @actions.each do |act|
         case act.arity
@@ -238,7 +239,7 @@ module SC
           act.call(self, args)
         end
       end
-      
+
     end
 
     # Is this task needed?
@@ -265,7 +266,7 @@ module SC
       return if !task_options
       @task_options = task_options
     end
-    
+
     # Writing to the comment attribute is the same as adding a description.
     def comment=(description)
       add_description(description)
@@ -315,18 +316,18 @@ module SC
     end
 
     class <<self
-      
+
       # Apply the scope to the task name according to the rules for
       # this kind of task.  Generic tasks will accept the scope as
       # part of the name.
       def scope_name(scope, task_name)
         (scope + [task_name]).join(':')
       end
-      
+
     end
 
   end
 
 end
 
-    
+

data/lib/sproutcore/buildfile/task_arguments.rb

@@ -6,7 +6,7 @@
 # ===========================================================================
 
 module SC
-  
+
   # TaskAguments manage the arguments passed to a task.  Borrowed from Rake
   # 0.8.3
   #
@@ -15,13 +15,33 @@ module SC
 
     attr_reader :names
 
+    # for compatibility with normal TaskArguments
+    def self.new(keys, values, parent = nil)
+      args = super()
+      args.setup_with_arrays(keys, values, parent)
+      args
+    end
+
+    def self.with_hash(hash)
+      args = allocate
+      args.setup_with_hash(hash)
+      args
+    end
+
+    def setup_with_hash(hash)
+      @names  = hash.keys
+      @parent = nil
+      @hash   = hash
+    end
+
     # Create a TaskArgument object with a list of named arguments
     # (given by :names) and a set of associated values (given by
     # :values).  :parent is the parent argument object.
-    def initialize(names, values, parent=nil)
-      @names = names
+    def setup_with_arrays(keys, values, parent=nil)
+      @names  = keys
       @parent = parent
-      @hash = {}
+      @hash   = {}
+
       names.each_with_index { |name, i|
         @hash[name.to_sym] = values[i] unless values[i].nil?
       }
@@ -36,7 +56,7 @@ module SC
 
     # Find an argument value by name or index.
     def [](index)
-      lookup(index.to_sym)
+      lookup(index)
     end
 
     # Specify a hash of default values for task arguments. Use the
@@ -65,9 +85,9 @@ module SC
     def inspect
       to_s
     end
-    
+
     protected
-    
+
     def lookup(name)
       if @hash.has_key?(name)
         @hash[name]
@@ -82,5 +102,5 @@ module SC
   end
 
   EMPTY_TASK_ARGS = TaskArguments.new([], [])
-  
+
 end