sproutcore 1.0.1003 → 1.0.1008

data/lib/sproutcore/tools.rb

@@ -5,7 +5,7 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(SC::LIBPATH, 'thor', 'lib', 'thor'))
+require 'thor'
 
 module SC
 
@@ -25,314 +25,323 @@ module SC
   #
   class Tools < ::Thor
 
-    ################################################
-    ## EXCEPTIONS
-    ##
-    
-    # Raise this type of exception when a fatal error occurs because the
-    # user did not pass the correct options.  This will be caught and 
-    # displayed at the top level before exiting.  Note that if you raise 
-    # an exception of some other type, then a backtrace may be displayed as 
-    # well (Which is not preferred)
-    class FatalException < Exception
-    end
-    
-    # Helper method.  Call this when an acception occurs that is fatal due to
-    # a problem with the user.
-    def fatal!(description)
-      raise FatalException, description
-    end
-    
-    # Helper method.  Call this when you want to log an info message.  Logs to
-    # the standard logger.
-    def info(description)
-      SC.logger.info(description)
+    def self.invoke(task_name)
+      start([task_name.to_s] + ARGV)
     end
-    
-    # Helper method.  Call this when you want to log a debug message.
-    def debug(description)
-      SC.logger.debug(description)
-    end
-    
-    # Log this when you need to issue a warning.
-    def warn(description)
-      SC.logger.warn(description)
-    end
-     
-    
-    ################################################
-    ## GLOBAL OPTIONS 
-    ##
+
     
     # All sproutcore tools can take some standard options.  These are 
     # processed automatically when the tool is loaded
-    method_options({ '--project'        => :optional,
-                     '--library'        => :optional, # deprecated
-                     '--mode'           => :optional,
-                     '--environment'    => :optional, # deprecated
-                     '--logfile'        => :optional,
-                     '--build'          => :optional,
+    method_options({ '--project'        => :string,
+                     '--library'        => :string, # deprecated
+                     '--mode'           => :string,
+                     '--environment'    => :string, # deprecated
+                     '--logfile'        => :string,
+                     '--build'          => :string,
                      ['--verbose', '-v']      => false,
                      ['--very-verbose', '-V'] => false })
     def initialize(options, *args)
       super
     end
+
+    no_tasks do 
+
+      ################################################
+      ## EXCEPTIONS
+      ##
     
-    # This is the core entry method used to run every tool.  Extend this
-    # method with any standard preprocessing you want all tools to do before
-    # they do their specific thing.
-    def invoke(*args)
-      prepare_logger!
-      prepare_mode!
-      prepare_build_numbers!
-      super
-    end
+      # Raise this type of exception when a fatal error occurs because the
+      # user did not pass the correct options.  This will be caught and 
+      # displayed at the top level before exiting.  Note that if you raise 
+      # an exception of some other type, then a backtrace may be displayed as 
+      # well (Which is not preferred)
+      class FatalException < Exception
+      end
+    
+      # Helper method.  Call this when an acception occurs that is fatal due 
+      # to a problem with the user.
+      def fatal!(description)
+        raise FatalException, description
+      end
+    
+      # Helper method.  Call this when you want to log an info message.  Logs 
+      # to the standard logger.
+      def info(description)
+        SC.logger.info(description)
+      end
+    
+      # Helper method.  Call this when you want to log a debug message.
+      def debug(description)
+        SC.logger.debug(description)
+      end
+    
+      # Log this when you need to issue a warning.
+      def warn(description)
+        SC.logger.warn(description)
+      end
+    
+      ################################################
+      ## GLOBAL OPTIONS 
+      ##
+    
+      # This is the core entry method used to run every tool.  Extend this
+      # method with any standard preprocessing you want all tools to do before
+      # they do their specific thing.
+      def invoke(*args)
+        prepare_logger!
+        prepare_mode!
+        prepare_build_numbers!
+        super
+      end
       
-    # Make the options hash a HashStruct so that we can access each variable
-    # as a method
-    def options; @tool_options ||= HashStruct.new(super); end
+      # Make the options hash a HashStruct so that we can access each variable
+      # as a method
+      def options; @tool_options ||= HashStruct.new(super); end
     
-    # Configure the expected log level and log target.  Handles the --verbose,
-    # --very-verbose and --logfile options
-    def prepare_logger!
-      SC.env.log_level = options['very-verbose'] ? :debug : (options.verbose ? :info : :warn)
-      SC.env.logfile = File.expand_path(options.logfile) if options.logfile
-    end
+      # Configure the expected log level and log target.  Handles the 
+      # --verbose, --very-verbose and --logfile options
+      def prepare_logger!
+        SC.env.log_level = options['very-verbose'] ? :debug : (options.verbose ? :info : :warn)
+        SC.env.logfile = File.expand_path(options.logfile) if options.logfile
+      end
 
-    # Configure the current build mode.  Handles the --mode and --environment
-    # options.  (--environment is provided for backwards compatibility)
-    def prepare_mode!(preferred_mode = 'production')
-      build_mode = (options.mode || options.environment || preferred_mode).to_s.downcase.to_sym
-      SC.build_mode = build_mode
-    end
+      # Configure the current build mode.  Handles the --mode and 
+      # --environment options.  (--environment is provided for backwards 
+      # compatibility)
+      def prepare_mode!(preferred_mode = 'production')
+        build_mode = (options.mode || options.environment || preferred_mode).to_s.downcase.to_sym
+        SC.build_mode = build_mode
+      end
 
-    # Configure the current build numbers.  Handles the --build option.
-    def prepare_build_numbers!
-      return if (numbers = options.build).nil?
-      numbers = numbers.split(',').map { |n| n.split(':') }
-      if numbers.size==1 && numbers.first.size==1
-        SC.env.build_number = numbers.first.first
-      else
-        hash = {}
-        numbers.each do |pair|
-          key = pair[0]
-          key = "/#{key}" if !(key =~ /^\//)
-          hash[key.to_sym] = pair[1]
+      # Configure the current build numbers.  Handles the --build option.
+      def prepare_build_numbers!
+        return unless (numbers = options.build)
+        numbers = numbers.split(',').map { |n| n.split(':') }
+        if numbers.size==1 && numbers.first.size==1
+          SC.env.build_number = numbers.first.first
+        else
+          hash = {}
+          numbers.each do |pair|
+            key = pair[0]
+            key = "/#{key}" if !(key =~ /^\//)
+            hash[key.to_sym] = pair[1]
+          end
         end
       end
-    end
 
-    ################################################
-    ## HELPER METHODS 
-    ##
+      ################################################
+      ## HELPER METHODS 
+      ##
     
-    # Set the current project.  This is used mostly for unit testing.
-    def project=(a_project)
-      @project = a_project
-    end
+      # Set the current project.  This is used mostly for unit testing.
+      def project=(a_project)
+        @project = a_project
+      end
     
-    # The current project.  This is discovered based on the passed --project
-    # option or based on the current working directory.  If no project can be
-    # found, this method will always return null.
-    def project
-      return @project if @discovered_project # cache - @project may be nil
-      @discovered_project = true
+      # The current project.  This is discovered based on the passed --project
+      # option or based on the current working directory.  If no project can 
+      # be found, this method will always return null.
+      def project
+        return @project if @discovered_project # cache - @project may be nil
+        @discovered_project = true
 
-      ret = nil
-      project_path = options.project || options.library
+        ret = nil
+        project_path = options.project || options.library
 
-      # if no project_path is named explicitly, attempt to autodiscover from
-      # working dir.  If none is found, just set project to nil
-      if project_path.nil?
-        debug "No project path specified.  Searching for projects in #{Dir.pwd}"
-        ret = SC::Project.load_nearest_project Dir.pwd, :parent => SC.builtin_project
+        # if no project_path is named explicitly, attempt to autodiscover from
+        # working dir.  If none is found, just set project to nil
+        unless project_path
+          debug "No project path specified.  Searching for projects in #{Dir.pwd}"
+          ret = SC::Project.load_nearest_project Dir.pwd, :parent => SC.builtin_project
         
-      # if project path is specified, look there.  If no project is found 
-      # die with a fatal exception.
-      else
-        debug "Project path specified at #{project_path}"
-        ret = SC::Project.load File.expand_path(project_path), :parent => SC.builtin_project
-        if ret.nil?
-          fatal! "Could not load project at #{project_path}"
+        # if project path is specified, look there.  If no project is found 
+        # die with a fatal exception.
+        else
+          debug "Project path specified at #{project_path}"
+          ret = SC::Project.load File.expand_path(project_path), :parent => SC.builtin_project
+          if ret.nil?
+            fatal! "Could not load project at #{project_path}"
+          end
         end
-      end
       
-      info "Loaded project at: #{ret.project_root}" unless ret.nil?
-      @project = ret
-    end
+        info "Loaded project at: #{ret.project_root}" unless ret.nil?
+        @project = ret
+      end
        
-    # Attempts to discover the current project.  If no project can be found
-    # throws a fatal exception.  Use this method at the top of your tool 
-    # method if you require a project to run.
-    def requires_project!
-      ret = project
-      if ret.nil?
-        fatal!("You do not appear to be inside of a project.  Try changing to your project directory or make sure your project as a Buildfile or sc-config")
+      # Attempts to discover the current project.  If no project can be found
+      # throws a fatal exception.  Use this method at the top of your tool 
+      # method if you require a project to run.
+      def requires_project!
+        ret = project
+        if ret.nil?
+          fatal!("You do not appear to be inside of a project.  Try changing to your project directory or make sure your project as a Buildfile or sc-config")
+        end
+        return ret 
       end
-      return ret 
-    end
       
-    # Find one or more targets with the passed target names in the current 
-    # project.  Requires a project to function.
-    def find_targets(*targets)
+      # Find one or more targets with the passed target names in the current 
+      # project.  Requires a project to function.
+      def find_targets(*targets)
       
-      debug "finding targets with names: '#{targets * "','"}'"
-      requires_project!
+        debug "finding targets with names: '#{targets * "','"}'"
+        requires_project!
       
-      # Filter out any empty target names.  Sometimes this happens when 
-      # processing arguments.
-      targets.reject! { |x| x.nil? || x.size == 0 }
+        # Filter out any empty target names.  Sometimes this happens when 
+        # processing arguments.
+        targets.reject! { |x| x.nil? || x.size == 0 }
       
-      # If targets are specified, find the targets project or parents...
-      if targets.size > 0
-        targets = targets.map do |target_name|
-          begin
-            ret = project.target_for(target_name)
-          rescue Exception => e
-            SC.logger.fatal("Exception when searching for target #{target_name}.  Perhaps your Buildfile is configured wrong?")
-            raise e
-          end
+        # If targets are specified, find the targets project or parents...
+        if targets.size > 0
+          targets = targets.map do |target_name|
+            begin
+              ret = project.target_for(target_name)
+            rescue Exception => e
+              SC.logger.fatal("Exception when searching for target #{target_name}.  Perhaps your Buildfile is configured wrong?")
+              raise e
+            end
           
-          if ret.nil?
-            fatal! "No target named #{target_name} could be found in PROJECT:#{project.project_root}"
-          else
-            debug "Found target '#{target_name}' at PROJECT:#{ret.source_root.sub(/^#{project.project_root}\//,'')}"
+            if ret.nil?
+              fatal! "No target named #{target_name} could be found in PROJECT:#{project.project_root}"
+            else
+              debug "Found target '#{target_name}' at PROJECT:#{ret.source_root.sub(/^#{project.project_root}\//,'')}"
+            end
+            ret
           end
-          ret
-        end
         
-      # IF no targets are specified, then just get all targets in project.
-      # If --all option was specified, include those that do not autobuild
-      else
-        targets = project.targets.values
-        unless options.all?
-          targets.reject! { |t| !t.config.autobuild? }
-        end
-      end 
+        # IF no targets are specified, then just get all targets in project.
+        # If --all option was specified, include those that do not autobuild
+        else
+          targets = project.targets.values
+          unless options.all?
+            targets.reject! { |t| !t.config.autobuild? }
+          end
+        end 
 
-      # If include required was specified, merge in all required bundles as 
-      # well.
-      if options['include-required']
-        targets.each do |target| 
-          targets += target.expand_required_targets :theme => true,
-           :debug => target.config.load_debug,
-           :tests => target.config.load_tests
-        end
+        # If include required was specified, merge in all required bundles as 
+        # well.
+        if options['include-required']
+          targets.each do |target| 
+            targets += target.expand_required_targets :theme => true,
+             :debug => target.config.load_debug,
+             :tests => target.config.load_tests
+          end
         
-        targets = targets.flatten.uniq.compact
-      end
+          targets = targets.flatten.uniq.compact
+        end
       
-      return targets
-    end
-
-    # Wraps around find_targets but raises an exception if no target is 
-    # specified.
-    def requires_targets!(*target_names)
-      if target_names.size == 0
-        fatal! "You must specify a target with this command" 
+        return targets
       end
 
-      targets = find_targets(*target_names)
-      if targets.size == 0
-        fatal! "No targets matching #{target_names * ","} were found."
-      end
+      # Wraps around find_targets but raises an exception if no target is 
+      # specified.
+      def requires_targets!(*target_names)
+        if target_names.size == 0
+          fatal! "You must specify a target with this command" 
+        end
+
+        targets = find_targets(*target_names)
+        if targets.size == 0
+          fatal! "No targets matching #{target_names * ","} were found."
+        end
       
-      targets
-    end
+        targets
+      end
     
-    # Requires exactly one target.
-    def requires_target!(*targets)
-      requires_targets!(*targets).first
-    end
+      # Requires exactly one target.
+      def requires_target!(*targets)
+        requires_targets!(*targets).first
+      end
     
-    # Discovers the languages requested by the user for a build.  Uses the
-    # --languages command line option or disovers in targets.
-    def find_languages(*targets)
-      # Use passed languages.  If none are specified, merge installed 
-      # languages for all app targets.
-      if (languages = options.languages).nil?
-        languages = targets.map { |t| t.installed_languages }
-      else
-        languages = languages.split(',').map { |l| l.to_sym }
+      # Discovers the languages requested by the user for a build.  Uses the
+      # --languages command line option or disovers in targets.
+      def find_languages(*targets)
+        # Use passed languages.  If none are specified, merge installed 
+        # languages for all app targets.
+        unless (languages = options.languages)
+          languages = targets.map { |t| t.installed_languages }
+        else
+          languages = languages.split(',').map { |l| l.to_sym }
+        end
+        languages.flatten.uniq.compact
       end
-      languages.flatten.uniq.compact
-    end
     
-    # Discovers build numbers requested for the build and sets them in the
-    # in the env if needed.
-    def find_build_numbers(*targets)
-      if options['build-numbers']
-        numbers = {}
-        options['build-numbers'].split(',').each do |pair|
-          pair = pair.split(':')
-          if pair.length < 2
-            fatal! "Could not parse build numbers! #{options['build-numbers']}"
+      # Discovers build numbers requested for the build and sets them in the
+      # in the env if needed.
+      def find_build_numbers(*targets)
+        if options['build-numbers']
+          numbers = {}
+          options['build-numbers'].split(',').each do |pair|
+            pair = pair.split(':')
+            if pair.length < 2
+              fatal! "Could not parse build numbers! #{options['build-numbers']}"
+            end
+            numbers["/#{pair[0]}"] = pair[1]
           end
-          numbers["/#{pair[0]}"] = pair[1]
+          SC.env.build_numbers = numbers
+          SC.logger.info "Using build numbers: #{numbers.map { |k,v| "#{k}: #{v}" }.join(',')}"
         end
-        SC.env.build_numbers = numbers
-        SC.logger.info "Using build numbers: #{numbers.map { |k,v| "#{k}: #{v}" }.join(',')}"
       end
-    end
     
-    # Core method to process command line options and then build a manifest.
-    # Shared by sc-manifest, sc-build and sc-docs commands.
-    def build_manifests(*targets)
+      # Core method to process command line options and then build a manifest.
+      # Shared by sc-manifest, sc-build and sc-docs commands.
+      def build_manifests(*targets)
       
-      # setup build numbers
-      find_build_numbers(*targets)
+        # setup build numbers
+        find_build_numbers(*targets)
       
-      requires_project! # get project
-      targets = find_targets(*targets) # get targets
-      languages = find_languages(*targets) # get languages
+        requires_project! # get project
+        targets = find_targets(*targets) # get targets
+        languages = find_languages(*targets) # get languages
 
-      # log output
-      SC.logger.info "Building targets: #{targets.map { |t| t.target_name } * ","}"
-      SC.logger.info "Building languages: #{ languages * "," }"
+        # log output
+        SC.logger.info "Building targets: #{targets.map { |t| t.target_name } * ","}"
+        SC.logger.info "Building languages: #{ languages * "," }"
       
-      # Now fetch the manifests to build.  One per target/language
-      manifests = targets.map do |target|
-        languages.map { |l| target.manifest_for :language => l }
-      end
-      manifests.flatten!
+        # Now fetch the manifests to build.  One per target/language
+        manifests = targets.map do |target|
+          languages.map { |l| target.manifest_for :language => l }
+        end
+        manifests.flatten!
       
-      # Build'em
-      manifests.each do |manifest| 
-        SC.logger.info "Building manifest for: #{manifest.target.target_name}:#{manifest.language}"
-        manifest.build!
-      end
+        # Build'em
+        manifests.each do |manifest| 
+          SC.logger.info "Building manifest for: #{manifest.target.target_name}:#{manifest.language}"
+          manifest.build!
+        end
       
-      return manifests
-    end
+        return manifests
+      end
     
-    # Logs the contents of the passed file path to the logger
-    def log_file(path)
-      if !File.exists?(path) 
-        warn "Could not display #{File.basename(path)} at #{File.dirname(path)} because it does not exist."
+      # Logs the contents of the passed file path to the logger
+      def log_file(path)
+        if !File.exists?(path) 
+          warn "Could not display #{File.basename(path)} at #{File.dirname(path)} because it does not exist."
+        end
+        file_text = File.read(path)
+        SC.logger << file_text
+        SC.logger << "\n"
       end
-      file_text = File.read(path)
-      SC.logger << file_text
-      SC.logger << "\n"
-    end
       
-    ################################################
-    ## MAIN ENTRYPOINT
-    ##
+      ################################################
+      ## MAIN ENTRYPOINT
+      ##
     
-    # Fix start so that it treats command-name like command_name
-    def self.start(args = ARGV)
-      # manually check for verbose in case we don't get far enough in regular
-      # processing to actually set the verbose mode.
-      is_verbose = %w(-v -V --verbose --very-verbose).any? { |x| args.include?(x) }
-      begin
-        super(args)
-      rescue Exception => e
-        SC.logger.fatal(e)
-        if is_verbose && !e.kind_of?(FatalException)
-          SC.logger.fatal("BACKTRACE:\n#{e.backtrace.join("\n")}\n")
+      # Fix start so that it treats command-name like command_name
+      def self.start(args = ARGV)
+        # manually check for verbose in case we don't get far enough in 
+        # regular processing to actually set the verbose mode.
+        is_verbose = %w(-v -V --verbose --very-verbose).any? { |x| args.include?(x) }
+        begin
+          super(args)
+        rescue Exception => e
+          SC.logger.fatal(e)
+          if is_verbose && !e.kind_of?(FatalException)
+            SC.logger.fatal("BACKTRACE:\n#{e.backtrace.join("\n")}\n")
+          end
         end
       end
-    end
+      
+    end # no_tasks
     
   end
   

data/lib/sproutcore.rb

@@ -9,17 +9,25 @@ require 'logger'
 require 'extlib'
 require 'yaml'
 
+# Ruby 1.8 Compatibility
 if (RUBY_VERSION.match(/1\.8/))
   $KCODE = 'u'
   require 'jcode'
   class String ; def valid_encoding? ; true ; end ; end
 end
 
+# Ruby 1.9 Compatibility
+if (RUBY_VERSION.match(/1\.9/))
+  # Fix for Rack Ruby 1.9 incompatibility. This makes 404s render again.
+  class String 
+    alias each each_line unless ''.respond_to?(:each) 
+  end
+end
+
 # Makes code more readable
 YES = true
 NO = false
 
-
 module SproutCore
 
   # :stopdoc:

data/spec/buildtasks/manifest/prepare_build_tasks/combine_spec.rb

@@ -180,7 +180,7 @@ describe "manifest:prepare_build_tasks:combine" do
         @project = fixture_project :ordered_entries
       end
       
-      it "orders entries as lproj/strings -> core -> utils -> others alphabetically without requires" do
+      it "orders entries as lproj/strings -> core -> utils -> others alphabetically without requires -> resources/*_page.js -> main.js}" do
         
         @target = @project.target_for :no_requires
         @buildfile = @target.buildfile
@@ -193,7 +193,7 @@ describe "manifest:prepare_build_tasks:combine" do
 
         # get the expected set of ordered entries...based on contents of 
         # project...
-        expected = %w(bundle_info.js source/lproj/strings.js source/core.js source/utils.js source/1.js source/a.js source/a/a.js source/a/b.js source/B.js source/b/a.js source/c.js)
+        expected = %w(bundle_info.js source/lproj/strings.js source/core.js source/utils.js source/1.js source/a.js source/a/a.js source/a/b.js source/B.js source/b/a.js source/c.js source/t.js source/resources/main_page.js source/main.js)
 
         entry.ordered_entries.should_not be_nil
         filenames = entry.ordered_entries.map { |e| e.filename }

data/spec/fixtures/ordered_entries/apps/no_requires/main.js

@@ -0,0 +1 @@
+// main.js

data/spec/fixtures/ordered_entries/apps/no_requires/resources/main_page.js

@@ -0,0 +1 @@
+// main_page.js

data/spec/fixtures/ordered_entries/apps/no_requires/t.js

@@ -0,0 +1 @@
+// t.js