sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/sproutcore/builders/module.rb

@@ -0,0 +1,72 @@
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2009 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
+
+require "sproutcore/builders/base"
+
+module SC
+
+  # Builds a module_info.js file which MUST be run *before* the framework is
+  # loaded by the application or framework doing the loading.
+  class Builder::ModuleInfo < Builder::Base
+
+    def build(dst_path)
+      begin
+        require 'erubis'
+      rescue
+        raise "Cannot render module_info.js because erubis is not installed. Try running 'sudo gem install erubis' and try again."
+      end
+
+      eruby = Erubis::Eruby.new <<-EOT
+        ;(function() {
+          var target_name = '<%= @target_name %>' ;
+          if (!SC.MODULE_INFO) throw "SC.MODULE_INFO is not defined!" ;
+          if (SC.MODULE_INFO[target_name]) return ; <%# not an error... %>
+
+          <%# first time, so add a Hash with this target's module_info %>
+          SC.MODULE_INFO[target_name] = {
+            dependencies:[<%= @dependencies.join(',') %>],
+            styles:[<%= @styles.join(',') %>],
+            scriptURL:'<%= @script %>',
+            stringURL:'<%= @string %>'<% if @prefetched %>,
+            isPrefetched: YES
+            <% end %>
+          }
+        })();
+      EOT
+
+      output = ""
+
+      entry.targets.each do |t|
+        next unless t[:target_type] == :module
+
+        manifest = t.manifest_for(entry.manifest.variation)
+
+        script_entry = manifest.find_entry('javascript.js')
+        next if not script_entry
+        script_url = script_entry.cacheable_url
+
+        string_entry = manifest.find_entry('javascript-strings.js')
+        next if not string_entry
+        string_url = string_entry.cacheable_url
+
+        module_info = t.module_info({ :debug => entry[:debug], :test => entry[:test], :theme => entry[:theme], :variation => entry[:variation] })
+
+        output << eruby.evaluate({
+          :target_name => t[:target_name].to_s.sub(/^\//,''),
+          :dependencies    => module_info[:requires].map{ |t| "'#{t[:target_name].to_s.sub(/^\//,'')}'" },
+          :styles      => module_info[:css_urls].map{ |url| "'#{url}'" },
+          :script      => script_url,
+          :string      => string_url,
+          :prefetched  => t[:prefetched]
+        })
+      end
+      writelines dst_path, [output]
+    end
+
+  end
+
+end

data/lib/sproutcore/builders/string_wrapper.rb

@@ -0,0 +1,43 @@
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
+
+require "sproutcore/builders/base"
+require 'json'
+
+module SC
+
+  # If a target is a prefetched module, this builder will take the contents of its packed file
+  # and wrap it in strings.
+  class Builder::StringWrapper < Builder::Base
+
+    def build(dst_path)
+      entries = entry[:source_entries]
+
+      entries.each do |entry|
+        src_path = entry.stage![:staging_path]
+        return if not File.exist? src_path
+
+        # Normalize the target name by removing any initial forward slash
+        target = entry.target
+        target_name = target[:target_name].to_s.sub(/^\//,'')
+
+        # Set the source property of the module's SC.MODULE_INFO hash to the
+        # JSON-escaped contents of the file.
+        output = "SC.MODULE_INFO['#{target_name}'].source = "
+
+        content = readlines(src_path)
+        output += content.join.to_json
+
+        output += ";"
+
+        writeline dst_path, output
+      end
+    end
+
+  end
+
+end

data/lib/sproutcore/helpers/entry_sorter.rb

@@ -28,8 +28,7 @@ module SC
     # the top.  If you don't specify any filenames, then the entries will be
     # sorted alphabetically except for requires.
     #
-    # When bundle_info.js is present, it will always be sorted first.
-    # When bundle_loaded.js is present, it will always be sorted last.
+    # When module_info.js is present, it will always be sorted first.
     class EntrySorter
 
       def self.sort(entries, preferred_filenames = [])
@@ -43,7 +42,7 @@ module SC
       attr_reader :preferred_filenames
 
       def sort(entries)
-        bundleInfoEntry = []
+        moduleInfoEntry = []
         bundleLoadedEntry = []
 
         all_entries = {}
@@ -55,11 +54,8 @@ module SC
 
         # first remove bundle entries which MUST be first or last
         entries = entries.select do |entry|
-          if entry.normalized_filename == 'bundle_info.js'
-            bundleInfoEntry = [entry]
-            false
-          elsif entry.normalized_filename == 'bundle_loaded.js'
-            bundleLoadedEntry = [entry]
+          if entry.normalized_filename == 'module_info.js'
+            moduleInfoEntry = [entry]
             false
           else
             true
@@ -91,7 +87,7 @@ module SC
           add_entry_to_set(cur, ret, seen, entries, all_entries)
         end
 
-        return bundleInfoEntry + ret + bundleLoadedEntry
+        return moduleInfoEntry + ret
       end
 
       protected

data/lib/sproutcore/helpers/static_helper.rb

@@ -39,6 +39,9 @@ module SC
         urls = []
         combine_stylesheets = t.config[:combine_stylesheets]
         combined_entries(t, opts, 'stylesheet.css', 'stylesheet-packed.css') do |cur_target, cur_entry|
+
+          $to_minify << cur_entry[:build_path]
+
           # include either the entry URL or URL of ordered entries
           # depending on setup
           if combine_stylesheets
@@ -90,8 +93,11 @@ module SC
         # collect urls from entries
         urls = []
         combine_javascript = t.config[:combine_javascript]
+      
         combined_entries(t, opts, 'javascript.js', 'javascript-packed.js') do |cur_target, cur_entry|
 
+          $to_minify << cur_entry[:build_path]
+          
           # include either the entry URL or URL of ordered entries
           # depending on setup
           if cur_target.config[:combine_javascript]
@@ -109,9 +115,9 @@ module SC
           %(  <script type="text/javascript" src="#{url}"></script>)
         end
 
-        # Add preferred language definition...
-        urls << %(<script type="text/javascript">String.preferredLanguage = "#{language}";</script>)
-
+         # Add preferred language definition, before other scripts...
+        urls.insert(0, %(<script type="text/javascript">String.preferredLanguage = "#{language}";</script>))
+          
         urls.join("\n")
       end
 
@@ -340,11 +346,12 @@ module SC
         targets = expand_required_targets(t)
 
         if t.config[:use_packed] && packed_entry_name # must pass to activate
-          packed, unpacked = SC::Helpers::PackedOptimizer.optimize(targets)
-          unpacked << t # always use unpacked for main target
+          packed = []
+          unpacked = []
+          packed << t 
         else
           packed = []
-          unpacked = targets + [t] # always use unpacked
+          unpacked = targets + [t]
         end
 
         # deal with packed targets...
@@ -370,9 +377,6 @@ module SC
           yield(t, entry)
         end
       end
-
-
     end
-
   end
 end

data/lib/sproutcore/models/manifest_entry.rb

@@ -126,10 +126,10 @@ module SC
     # The owner target
     def target; @target ||= manifest.target; end
 
-    # dynamic_required targets, only applicable to bundle_info entries
+    # deferred_modules targets, only applicable to module_info entries
     def targets; self[:targets]; end
 
-    # variation for dynamic_required targets, only applicable to bundle_info
+    # variation for deferred_modules targets, only applicable to module_info
     # entries
     def variation; self[:variation]; end
 

data/lib/sproutcore/models/target.rb

@@ -197,7 +197,7 @@ module SC
     end
 
     # Returns all of the targets dynamically required by this target.  This
-    # will use the "dynamic_required" config, resolving the target names using
+    # will use the "deferred_modules" config, resolving the target names using
     # target_for().
     #
     # You may pass some additional options in which will select the set
@@ -210,8 +210,7 @@ module SC
     # === Returns
     #  Array of Targets
     #
-    def dynamic_required_targets(opts={})
-
+    def modules(opts={})
       # compute cache key for these options
       key = [:debug, :test, :theme].map do |k|
         opts[k] ? k : nil
@@ -222,13 +221,27 @@ module SC
       ret = (@dynamic_targets ||= {})[key]
       return ret unless ret.nil?
 
+      # Get the list of targets that should be treated as prefetched modules
+      # from the Buildfile
+      prefetched_modules = config[:prefetched_modules]
+      if prefetched_modules
+        # Go through each module and mark it as prefetched.
+        # This way, we can later distinguish between deferred and prefetched
+        # modules when generating the module_info.js file.
+        prefetched_modules.each do |m|
+          target = target_for(m)
+          target[:prefetched] = true
+        end
+      end
+
       # else compute return value, respecting options
-      ret = [config[:dynamic_required]]
-      if opts[:debug] && config[:debug_dynamic_required]
-        ret << config[:debug_dynamic_required]
+      ret = [config[:deferred_modules], config[:prefetched_modules]]
+
+      if opts[:debug] && config[:debug_deferred_modules]
+        ret << config[:debug_deferred_modules]
       end
-      if opts[:test] && config[:test_dynamic_required]
-        ret << config[:test_dynamic_required]
+      if opts[:test] && config[:test_deferred_modules]
+        ret << config[:test_deferred_modules]
       end
       if opts[:theme] && self.loads_theme? && config[:theme]
         # verify theme is a theme target type - note that if no matching
@@ -482,9 +495,9 @@ module SC
     # NOTE: If the target is pre-loaded, an empty HashStruct is returned. The
     # target_name must still be added, but we'll never use the actual contents
     # and don't need to waste bandwidth downloading it.
-    def bundle_info(opts ={})
+    def module_info(opts ={})
       if self[:target_type] == :app
-        raise "bundle_info called on an app target"
+        raise "module_info called on an app target"
       else
         requires = required_targets(opts) # only go one-level deep!
 
@@ -503,7 +516,8 @@ module SC
         # sort entries...
         css_entries = {}
         javascript_entries = {}
-         manifest_for(opts[:variation]).build!.entries.each do |entry|
+
+        manifest_for(opts[:variation]).build!.entries.each do |entry|
           if entry[:resource].nil?
             entry[:resource] = ''
           end

data/lib/sproutcore/rack/dev.rb

@@ -30,7 +30,7 @@ module SC
         when '/sc/targets.json' # returns description of targets
           return [200, {}, get_targets_json]
 
-        when '/sc/greenhouse-config.json' #returns json of all valid design objects
+        when '/sc/greenhouseconf.json' #returns json of all valid design objects
           return [200, {}, get_greenhouse_configs(env)]
         else
           return [404, {}, "not found"]
@@ -63,7 +63,7 @@ module SC
         app_target = @project.target_for(app) 
         ret = []
         if(app_target)
-          path = app_target.source_root + "/design/greenhouse.config"
+          path = app_target.source_root + "/.greenhouseconf"
           json = File.exists?(path) ? JSON.parse(File.read(path)) : {}
           json[:path] = path.gsub(root_dir, "")
           json[:name] = app_target.target_name
@@ -71,7 +71,7 @@ module SC
           ret << json
 
           app_target.expand_required_targets.each do |target|
-            path = target.source_root + "/design/greenhouse.config"
+            path = target.source_root + "/.greenhouseconf"
             json = File.exists?(path) ? JSON.parse(File.read(path)) : {}
             if(path.include?(root_dir))
               json[:path] = path.gsub(root_dir, "")

data/lib/sproutcore/tools.rb

@@ -36,6 +36,10 @@ module SC
     class_option "mode",         :type => :string
     class_option "logfile",      :type => :string
     class_option "build",        :type => :string
+    class_option "build-targets",:type => :string
+    class_option "no-chance",    :type => :boolean
+    class_option "yui-minification",     :type => :boolean
+    class_option "dont-minify",     :type => :boolean
     class_option "verbose",      :type => :boolean, :aliases => "-v"
     class_option "very-verbose", :type => :boolean, :aliases => "-V"
     class_option "library",      :type => :string #deprecated
@@ -48,6 +52,9 @@ module SC
       super
       prepare_logger!
       prepare_mode!
+      yui_minification!
+      dont_minify!
+      prepare_app!
       prepare_build_numbers!
     end
 
@@ -109,6 +116,28 @@ module SC
         build_mode = (options[:mode] || options[:environment] || preferred_mode).to_s.downcase.to_sym
         SC.build_mode = build_mode
       end
+      
+      def prepare_app!
+        if options[:'build-targets']
+          SC.env[:build_targets] = options[:'build-targets'].split(',')
+        else
+          SC.env[:build_targets] = ''
+        end
+
+        if options[:'no-chance']
+          SC.env[:no_chance] = true
+        else
+          SC.env[:no_chance] = false
+        end
+      end
+      
+      def yui_minification!
+        SC.env[:yui_minification] = options[:'yui-minification']
+      end
+      
+      def dont_minify!
+        SC.env[:dont_minify] = options[:'dont-minify']
+      end
 
       # Configure the current build numbers.  Handles the --build option.
       def prepare_build_numbers!
@@ -190,7 +219,8 @@ module SC
 
         # Filter out any empty target names.  Sometimes this happens when
         # processing arguments.
-        targets.reject! { |x| x.nil? || x.size == 0 }
+        
+        targets.reject! { |x| x.nil? || x.size == 0}
 
         # If targets are specified, find the targets project or parents...
         if targets.size > 0
@@ -219,6 +249,7 @@ module SC
           end
         end
 
+        
         # If include required was specified, merge in all required bundles as
         # well.
         if options[:'include-required']
@@ -230,8 +261,26 @@ module SC
 
           targets = targets.flatten.uniq.compact
         end
+        
+        appnames = SC.env[:build_targets]
+        tar = []
+        
+        # if it has the appname argument only build the target with the appname        
+        if appnames.size > 0 
+          targets.each do |target|
+            appnames.each do |appname|
+              if target.target_name.to_s.eql? '/'+appname
+                tar << target
+              end
+            end
+          end
+        else
+          tar = targets
+        end
+        
 
-        return targets
+        
+        return tar
       end
 
       # Wraps around find_targets but raises an exception if no target is

data/lib/sproutcore/tools/build.rb

@@ -20,6 +20,8 @@ module SC
     method_option :entries, :type => :string
     method_option :clean,   :type => :boolean, :aliases => "-c"
     def build(*targets)
+      t1 = Time.now
+      SC.logger.info  'Starting build process...'
       # Copy some key props to the env
       SC.env.build_prefix   = options.buildroot if options.buildroot
       SC.env.staging_prefix = options.stageroot if options.stageroot
@@ -85,22 +87,48 @@ module SC
           SC::Helpers::HTML5Manifest.new.build(entry)
         end
       end
-
-      if $to_minify.length > 0
-        filecompress = "java -jar \"" + SC.yui_jar + "\" --charset utf-8 --line-break 80 \"" + $to_minify * '" "' + "\" 2>&1"
-        SC.logger.info  'Compressing with YUI...'
-
+      $to_minify.uniq!
+      if $to_minify.length > 0 and !SC.env[:dont_minify]
+        yui_root = File.expand_path("../../../../vendor/sproutcore", __FILE__)
+        jar_path = File.join(yui_root, 'SCCompiler.jar')
+        if SC.env[:yui_minification]
+          filecompress = "java -Xmx256m -jar \"" + jar_path + "\" -yuionly \"" + $to_minify * "\" \"" + "\" 2>&1"
+        else
+          filecompress = "java -Xmx256m -jar \"" + jar_path + "\" \"" + $to_minify * "\" \"" + "\" 2>&1"
+        end
+        SC.logger.info  'Minifying...'
+        SC.logger.info  filecompress
+        
         output = `#{filecompress}`      # It'd be nice to just read STDERR, but
                                         # I can't find a reasonable, commonly-
                                         # installed, works-on-all-OSes solution.
         SC.logger.info output
         if $?.exitstatus != 0
           SC.logger.fatal(output)
-          SC.logger.fatal("!!!!YUI compressor failed, please check that your js code is valid")
-          SC.logger.fatal("!!!!Failed compressing ... "+ $to_minify.join(','))
+          SC.logger.fatal("!!!!Minifying failed, please check that your js code is valid")
+          SC.logger.fatal("!!!!Failed compiling ... "+ $to_minify.join(','))
           exit(1)
         end
+
+        paths = $to_minify.join(',')
+        paths = paths.gsub("javascript-packed.js","javascript.js")
+        paths = paths.gsub("stylesheet-packed.css","stylesheet.css")
+        puts "Removing unnecessary files..."
+        paths_array = paths.split(",")
+        paths_array.each do |entry|
+          # We won't have tests unless :load_tests => true in Buildfile in which case we want to keep them
+          next if entry.include?("index.html") || entry.include?("tests")
+          if File.exist?(entry)
+            puts "Deleting "+entry
+            File.delete(entry)
+          end
+        end
       end
+      t2 = Time.now
+      seconds = t2-t1
+      minutes = seconds/60
+      seconds = seconds%60
+      puts 'Build time '+minutes.floor.to_s+ ' minutes '+seconds.floor.to_s+' secs'
     end
   end
 end