sproutcore 0.9.13 → 0.9.14

data/History.txt

@@ -1,4 +1,23 @@
 
+== 0.9.14
+
+* The long form of sc-build -e is not --environment. It was misspelled.  (Thanks zoowar)
+
+* Fixed README for new apps to use the correct sc-build command.  (Thanks Spencer Ho!) 
+
+* Added sc-install, sc-update, and sc-remove.  These utilities work with 
+  github to automatically install and update plugin JavaScript libraries.
+  
+* [FIX] Removed warning about NO_BODY_METHOD
+
+* Upgraded to a newer version of JSDoc that can provide a much more accurate description of the inline documentation for SproutCore.
+
+* sc_super() now works automatically and does not require you to pass this.
+
+* sc-server now autodetects Merb.root.  This means that you can start sc-server from any directory inside of your project and it will do the right thing.
+
+== 0.9.13
+
 * Fixed critical bug that prevented sc-build from correctly compiling stylesheets and javascript.
 
 == 0.9.12

data/Manifest.txt

@@ -4,7 +4,12 @@ app_generators/sproutcore/templates/sc-config
 app_generators/sproutcore/USAGE
 bin/sc-build
 bin/sc-gen
+bin/sc-ide
+bin/sc-init
+bin/sc-install
+bin/sc-remove
 bin/sc-server
+bin/sc-update
 bin/sproutcore
 clients/sc_docs/controllers/docs.js
 clients/sc_docs/core.js
@@ -43,11 +48,6 @@ clients/sc_test_runner/models/test.js
 clients/sc_test_runner/README
 clients/sc_test_runner/views/runner_frame.js
 clients/sc_test_runner/views/test_label.js
-clients/view_builder/core.js
-clients/view_builder/english.lproj/body.css
-clients/view_builder/english.lproj/body.rhtml
-clients/view_builder/english.lproj/strings.js
-clients/view_builder/main.js
 config/hoe.rb
 config/requirements.rb
 frameworks/prototype/HISTORY
@@ -222,36 +222,113 @@ frameworks/sproutcore/views/tab.js
 frameworks/sproutcore/views/toolbar.js
 frameworks/sproutcore/views/view.js
 History.txt
-jsdoc/app/DocFile.js
-jsdoc/app/Doclet.js
-jsdoc/app/DocTag.js
-jsdoc/app/Dumper.js
-jsdoc/app/js.jar
-jsdoc/app/JsDoc.js
-jsdoc/app/JsHilite.js
-jsdoc/app/JsIO.js
-jsdoc/app/JsParse.js
-jsdoc/app/JsPlate.js
-jsdoc/app/JsTestrun.js
-jsdoc/app/JsToke.js
+jsdoc/app/frame/Chain.js
+jsdoc/app/frame/Dumper.js
+jsdoc/app/frame/Hash.js
+jsdoc/app/frame/Link.js
+jsdoc/app/frame/Namespace.js
+jsdoc/app/frame/Opt.js
+jsdoc/app/frame/Reflection.js
+jsdoc/app/frame/String.js
+jsdoc/app/frame/Testrun.js
+jsdoc/app/frame.js
+jsdoc/app/handlers/FOODOC.js
+jsdoc/app/handlers/XMLDOC/DomReader.js
+jsdoc/app/handlers/XMLDOC/XMLDoc.js
+jsdoc/app/handlers/XMLDOC/XMLParse.js
+jsdoc/app/handlers/XMLDOC.js
+jsdoc/app/lib/JSDOC/DocComment.js
+jsdoc/app/lib/JSDOC/DocTag.js
+jsdoc/app/lib/JSDOC/JsDoc.js
+jsdoc/app/lib/JSDOC/JsPlate.js
+jsdoc/app/lib/JSDOC/Lang.js
+jsdoc/app/lib/JSDOC/Parser.js
+jsdoc/app/lib/JSDOC/PluginManager.js
+jsdoc/app/lib/JSDOC/Symbol.js
+jsdoc/app/lib/JSDOC/SymbolSet.js
+jsdoc/app/lib/JSDOC/TextStream.js
+jsdoc/app/lib/JSDOC/Token.js
+jsdoc/app/lib/JSDOC/TokenReader.js
+jsdoc/app/lib/JSDOC/TokenStream.js
+jsdoc/app/lib/JSDOC/Util.js
+jsdoc/app/lib/JSDOC/Walker.js
+jsdoc/app/lib/JSDOC.js
+jsdoc/app/main.js
+jsdoc/app/plugins/commentSrcJson.js
+jsdoc/app/plugins/frameworkPrototype.js
+jsdoc/app/plugins/functionCall.js
+jsdoc/app/plugins/publishSrcHilite.js
+jsdoc/app/plugins/sproutcoreTags.js
+jsdoc/app/plugins/symbolLink.js
+jsdoc/app/plugins/tagParamConfig.js
+jsdoc/app/plugins/tagSynonyms.js
 jsdoc/app/run.js
-jsdoc/app/Symbol.js
-jsdoc/app/Transformer.js
-jsdoc/app/Util.js
-jsdoc/plugins/min.js
-jsdoc/plugins/strip.js
+jsdoc/changes.txt
+jsdoc/conf/sample.conf
+jsdoc/java/build.xml
+jsdoc/java/build_1.4.xml
+jsdoc/java/classes/js.jar
+jsdoc/java/src/JsDebugRun.java
+jsdoc/java/src/JsRun.java
+jsdoc/jsdebug.jar
+jsdoc/jsrun.jar
 jsdoc/README.txt
+jsdoc/t/runner.js
+jsdoc/t/TestDoc.js
+jsdoc/templates/sproutcore/allclasses.tmpl
+jsdoc/templates/sproutcore/allfiles.tmpl
 jsdoc/templates/sproutcore/class.tmpl
-jsdoc/templates/sproutcore/default.css
-jsdoc/templates/sproutcore/index.html
 jsdoc/templates/sproutcore/index.tmpl
-jsdoc/templates/sproutcore/prototype.js
 jsdoc/templates/sproutcore/publish.js
-jsdoc/templates/sproutcore/splash.html
+jsdoc/templates/sproutcore/static/default.css
+jsdoc/templates/sproutcore/static/header.html
+jsdoc/templates/sproutcore/static/index.html
+jsdoc/templates/sproutcore/symbol.tmpl
+jsdoc/test/addon.js
+jsdoc/test/anon_inner.js
+jsdoc/test/augments.js
+jsdoc/test/augments2.js
+jsdoc/test/borrows.js
+jsdoc/test/borrows2.js
+jsdoc/test/config.js
+jsdoc/test/constructs.js
+jsdoc/test/encoding.js
+jsdoc/test/encoding_other.js
+jsdoc/test/functions_anon.js
+jsdoc/test/functions_nested.js
+jsdoc/test/global.js
+jsdoc/test/globals.js
+jsdoc/test/ignore.js
+jsdoc/test/inner.js
+jsdoc/test/jsdoc_test.js
+jsdoc/test/lend.js
+jsdoc/test/memberof.js
+jsdoc/test/memberof_constructor.js
+jsdoc/test/name.js
+jsdoc/test/namespace_nested.js
+jsdoc/test/nocode.js
+jsdoc/test/oblit_anon.js
+jsdoc/test/overview.js
+jsdoc/test/param_inline.js
+jsdoc/test/params_optional.js
+jsdoc/test/prototype.js
+jsdoc/test/prototype_nested.js
+jsdoc/test/prototype_oblit.js
+jsdoc/test/prototype_oblit_constructor.js
+jsdoc/test/public.js
+jsdoc/test/shared.js
+jsdoc/test/shared2.js
+jsdoc/test/shortcuts.js
+jsdoc/test/static_this.js
+jsdoc/test/synonyms.js
+jsdoc/test/tosource.js
+jsdoc/test/variable_redefine.js
+jsdoc/test.js
 lib/sproutcore/build_tools/html_builder.rb
 lib/sproutcore/build_tools/resource_builder.rb
 lib/sproutcore/build_tools.rb
 lib/sproutcore/bundle.rb
+lib/sproutcore/bundle_installer.rb
 lib/sproutcore/bundle_manifest.rb
 lib/sproutcore/generator_helper.rb
 lib/sproutcore/helpers/capture_helper.rb

data/app_generators/sproutcore/templates/README

@@ -74,7 +74,7 @@ that is optimized for serving static content.
 If you want real speed, do a static build of your content and serve it through
 lighttpd or apache.  Do the static build, just run:
 
-sc-build all
+sc-build
 
 This will place a directory in tmp/build that contains all of your resources
 pre-compiled and ready for static serving.

data/bin/sc-build

@@ -56,7 +56,7 @@ opts = OptionParser.new do |opts|
   opts.separator 'If no flags are given, sc-build will try to build all of the bundles in the current directory'
   opts.separator '*'*80
 
-  opts.on("-e", "--enviroment=MODE", "Set the build mode for the system.  Normally you want to build in production mode (which is the default if you do not include this option), but you can use this switch to build in development mode for testing.") do |opt_build_mode|
+  opts.on("-e", "--environment=MODE", "Set the build mode for the system.  Normally you want to build in production mode (which is the default if you do not include this option), but you can use this switch to build in development mode for testing.") do |opt_build_mode|
     build_mode = opt_build_mode.to_s.downcase.to_sym
   end
 

data/bin/sc-ide

@@ -0,0 +1,278 @@
+#!/usr/bin/env ruby
+
+# USE THE REDBULL IDE
+# This script will set up, update, and run RedBull for you.  Usage:
+#
+# sc-ide                  run RedBull on port 4040
+# sc-ide init             set up RedBull in the current directory
+# sc-ide update           update RedBull to the latest version
+# sc-ide update --tag=45  update RedBull to tagged release 'r45'
+# sc-ide update --edge    update RedBull to the current HEAD of the master repository (might be unstable)
+# sc-ide run --port=5000  run RedBull on port 5000, it will be accessible in your browser
+# sc-ide version          list the versions of the various RedBull components
+# sc-ide license          display RedBull's licensing info
+#
+# Note: sc-ide update can also be invoked from inside RedBull, so you should be able to do everything using
+# sc-ide init, followed by sc-ide run (and then be done with the command line).
+
+APP_ROOT = File.expand_path(Dir.pwd)
+
+# Set String encoding to Unicode
+$KCODE = 'u'
+
+# Require SproutCore
+require 'rubygems'
+require 'rubigen'
+require 'sproutcore'
+require 'optparse'
+
+############################################################
+## Define Helper Methods
+##
+
+def check_git
+  git_version =  `git --version`.chomp!
+  SC.logger.debug git_version
+  unless git_version
+    SC.logger.fatal "You must have git installed to use the SproutCore IDE (aka RedBull)."
+    exit(1)
+  end
+end
+
+############################################################
+## Process Options
+##
+
+# Setup defaults
+verb_name = ARGV.shift if (ARGV.size > 0 && ARGV[0][0..0] != '-')
+verb_name ||= "run"
+git_tag = -1
+port = '4040'
+verbose = false
+clean = false
+edge = false
+
+opts = OptionParser.new do |opts|
+  opts.version = SproutCore::VERSION::STRING
+
+  opts.banner = <<-EOT
+RedBull Helper Script (RedBull is the experimental SproutCore IDE)
+==================================================================
+Usage: sc-ide {verb} {options}
+
+Verbs:
+  init      - uses git to set up a full sc-ide environment pulled from --edge or the value of --tag
+  install   - synonym for init
+  update    - uses git to update your sc-ide repositories to --edge or the value of --tag
+  run       - (DEFAULT) starts RedBull on port 4040 or --port
+  server    - synonym for run
+  version   - list the installed versions of the various RedBull components
+  status    - synonym for version
+  license   - show the RedBull license and copyright notice
+  help      - show this text
+  remove    - remove RedBull from the working directory
+  uninstall - synonym for remove
+==================================================================
+EOT
+
+  opts.on("-t", "--tag=TAG", "Specify a particular tagged release of RedBull to check out. Example: --tag=r71.") do |opt_tag|
+    git_tag = opt_tag
+    if git_tag.match(/r?(\d\d?\d?)/)
+      git_tag = $1.to_i
+    else
+      SC.logger.fatal "Invalid tag: #{git_tag}. Should match /r?\\d\\d?\\d?/."
+      exit(1)
+    end
+  end
+
+  opts.on("-e", "--edge", "If set, sc-ide init and update will use HEAD. Note: HEAD is not guaranteed to be stable. Use a tagged release if you're unsure (the default).") do |opt_edge|
+    edge = !!opt_edge
+  end
+
+  opts.on("-v", "--[no-]verbose", "If set, extra debug output will be displayed.") do |opt_verbose|
+    verbose = !!opt_verbose
+  end
+
+  opts.on("-c", "--[no-]clean", "If set, sc-ide will flush the contents of ./ide/public prior to running.") do |opt_clean|
+    clean = !!opt_clean
+  end
+
+  opts.on("-p", "--port=PORT", "If set, sc-ide will run on this port. Otherwise, it will run on port 4040.") do |opt_port|
+    port = opt_port
+  end
+
+end
+opts.parse!
+
+############################################################
+## SETUP ENVIRONMENT
+##
+
+# Configure logger
+SC.logger.level = (verbose) ? Logger::DEBUG : Logger::INFO
+SC.logger.progname = $0
+
+check_git
+
+SC.logger.debug "verb_name = #{verb_name}"
+SC.logger.debug "git_tag = #{git_tag}"
+SC.logger.debug "port = #{port}"
+SC.logger.debug "verbose = #{verbose}"
+SC.logger.debug "clean = #{clean}"
+SC.logger.debug "edge = #{edge}"
+
+############################################################
+## CLEAN IF NECESSARY
+##
+
+if clean
+  SC.logger.info("~ Cleaning ./ide/public")
+  FileUtils.rm_rf(File.join(APP_ROOT,'ide/public'))
+end
+
+############################################################
+## EXECUTE THE VERB
+##
+
+def update_to_tag( git_tag, show_current = false, use_edge = false )
+  # get the latest tagged release and make that the "active" branch for all repositories
+  ['ide', 'ide/frameworks/sproutcore', 'ide/clients/red_bull'].each do |rep|
+    revision = -1
+    for tag in `cd #{rep}; git tag`.split(/\n/)
+      if tag.match(/r(\d\d?\d?)/)
+        if $1.to_i > revision
+          revision = $1.to_i
+        end
+      end
+    end
+    
+    if git_tag >= 0
+      if revision < git_tag
+        SC.logger.info "WARNING: Tag r#{git_tag} is greater than the latest revision of #{rep} (r#{revision})." unless use_edge
+      else
+        revision = git_tag
+      end
+    end
+    
+    # SC.logger.info "#{rep} is currently at #{`cd #{rep}; git describe --tags`.chomp!}" if show_current
+    unless use_edge
+      SC.logger.info "Setting #{rep} to r#{revision}."
+      `cd #{rep}; git checkout -q r#{revision}`
+    else
+      SC.logger.info "Setting #{rep} to HEAD."
+      if rep != "ide/clients/red_bull"
+        `cd #{rep}; git checkout -q remotes/origin/redbull`
+      else
+        `cd #{rep}; git checkout -q master`
+      end
+    end
+  end
+end
+
+if verb_name == 'init' or verb_name == 'install'
+  if File.exist?(File.join(APP_ROOT, 'ide'))
+    SC.logger.fatal "RedBull appears to have already been initialized. Exiting..."
+    exit(1)
+  else
+    SC.logger.info "Initializing the current directory with a full RedBull installation. (This may take some time.)\n"
+    
+    # clone the get repositories and run sc-init if necessary
+    SC.logger.info `git clone git://github.com/onitunes/sproutcore-buildtools.git ide`.chomp!
+    SC.logger.info `cd ide/frameworks; rm -R prototype; git clone git://github.com/onitunes/sproutcore-prototype.git prototype`.chomp!
+    SC.logger.info `cd ide/frameworks; rm -R sproutcore; git clone git://github.com/onitunes/sproutcore.git sproutcore`.chomp!
+    SC.logger.info `cd ide/clients; git clone git://github.com/onitunes/sproutcore-ide.git red_bull`.chomp!
+    unless File.exists?(File.join(APP_ROOT, 'sc-config')) or File.exists?(File.join(APP_ROOT, 'sc-config.rb'))
+      SC.logger.info "Initializing default SproutCore workspace with sc-init."
+      SC.logger.debug `sc-init`.chomp!
+      # `cd clients; rm -R *` # remove the "default" client sc-init created
+    end
+    
+    update_to_tag(git_tag)
+    
+    SC.logger.info "\nPlease run sc-ide to start using RedBull."
+  end
+elsif verb_name == 'update'
+  unless File.exist?(File.join(APP_ROOT, 'ide'))
+    SC.logger.fatal "RedBull does not appear to be installed. Use `sc-ide init` to install. Exiting..."
+    exit(1)
+  end
+
+  if git_tag >= 0
+    SC.logger.info "Updating the current directory to the r#{git_tag} RedBull release."
+  elsif edge
+    SC.logger.info "Updating the current directory with the edge RedBull release."
+  else
+    SC.logger.info "Updating the current directory with the latest tagged RedBull release."
+  end
+  SC.logger.info ''
+  SC.logger.debug `cd ide/; git fetch`.chomp!
+  SC.logger.debug `cd ide/frameworks/sproutcore; git fetch`.chomp!
+  SC.logger.debug `cd ide/clients/red_bull; git fetch`.chomp!
+
+  unless edge
+    update_to_tag(git_tag, true)
+  else
+    update_to_tag(git_tag, true, true)
+  end
+elsif verb_name == 'run' or verb_name == 'server'
+  unless File.exist?(File.join(APP_ROOT, 'ide'))
+    SC.logger.fatal "RedBull does not appear to be installed. Use `sc-ide init` to install. Exiting..."
+    exit(1)
+  end
+  SC.logger.info "Starting up RedBull on port #{port}."
+  SC.logger.info "To begin using RedBull, open your browser and load: http://localhost:#{port}"
+  SC.logger.info "Use ^C to quit."
+  Dir.chdir(File.join(APP_ROOT, 'ide'))
+  exec "bin/sc-server -p #{port}"
+elsif verb_name == 'version' or verb_name == 'status'
+  unless File.exist?(File.join(APP_ROOT, 'ide'))
+    SC.logger.fatal "RedBull does not appear to be installed. Use `sc-ide init` to install. Exiting..."
+    exit(1)
+  end
+
+  ['ide', 'ide/frameworks/sproutcore', 'ide/clients/red_bull'].each do |rep|
+    SC.logger.info "#{rep}: #{`cd #{rep}; git describe --tags`.chomp!}"
+  end
+elsif verb_name == 'license'
+  SC.logger.info <<-EOL
+==============================================================================
+The SproutCore IDE (code name: RedBull)
+
+Copyright (c) 2008 by Erich Atlas Ocean.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+==============================================================================
+EOL
+elsif verb_name == 'remove' or verb_name == 'uninstall'
+  unless File.exist?(File.join(APP_ROOT, 'ide'))
+    SC.logger.fatal "RedBull does not appear to be installed. Exiting..."
+    exit(1)
+  else
+    SC.logger.info("Removing RedBull...")
+    FileUtils.rm_rf(File.join(APP_ROOT,'ide'))
+    SC.logger.info("Done.")
+  end
+elsif verb_name == 'help'
+  SC.logger.info opts.help
+else
+  SC.logger.fatal "Unknown verb: #{verb_name}.\n"
+  SC.logger.info opts.help
+  exit(1)
+end

data/bin/sc-init

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+# Creates a new SproutCore Project/Library
+# You can use this command in one of two ways:
+#
+# sc-init 
+#  - This will create a new project library within the current working dir
+#
+# sc-init project-name
+#  - This will create a new directory and create the project library there.
+
+# Set String encoding to Unicode
+$KCODE = 'u'
+
+APP_ROOT = File.expand_path(Dir.pwd)
+SC_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+$:.unshift File.join(SC_ROOT,'lib') ;
+
+require 'rubygems'
+require 'rubigen'
+require 'sproutcore'
+
+if %w(-v --version).include? ARGV.first
+  require 'sproutcore/version'
+  puts "#{File.basename($0)} #{SproutCore::VERSION::STRING}"
+  exit(0)
+end
+
+# Handle default case...
+ARGV.unshift('.') if ARGV.size == 0
+ 
+require 'rubigen/scripts/generate'
+source = RubiGen::PathSource.new(:application,
+  File.join(File.dirname(__FILE__), "../app_generators"))
+RubiGen::Base.reset_sources
+RubiGen::Base.append_sources source
+RubiGen::Base.use_component_sources! [:sc, :app]
+RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'sproutcore')

data/bin/sc-install

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+
+# INSTALLS A SPROUTCORE BUNDLE
+# This script will attempt to download and install framework and application
+# bundles from github.
+#
+# Usage:
+# sc-install owner-projectname
+# 
+# You can also choose a different install URL:
+# sc-install owner-projectname --source=sproutit/sproutcore-samples
+#
+# You can select an install method.  (git is preferred and the default)
+# sc-install owner-projectname --method=zip
+
+
+APP_ROOT = File.expand_path(Dir.pwd)
+SC_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+$:.unshift File.join(SC_ROOT,'lib') ;
+
+# Set String encoding to Unicode
+$KCODE = 'u'
+
+# Require SproutCore
+require 'rubygems'
+require 'rubigen'
+require 'sproutcore'
+require 'optparse'
+
+############################################################
+## Define Helper Methods
+##
+
+
+############################################################
+## Process Options
+##
+
+# Process options
+bundle_name = ARGV.shift if (ARGV.size > 0 && ARGV[0][0..0] != '-')
+options = { :verbose => false, :library_root => APP_ROOT }
+
+opts = OptionParser.new do |opts|
+  opts.version = SproutCore::VERSION::STRING
+
+  opts.banner = "Usage: sc-install {bundle-name} {options}"
+  opts.define_head "Remotely install JavaScript bundles from Github and other sources"
+  opts.separator ''
+  opts.separator '*'*80
+  opts.separator 'If no flags are given, sc-install will attempt to install the named bundle from'
+  opts.separator 'github into the local project.'
+  opts.separator '*'*80
+
+  SC::BundleInstaller.configure_tool_options(opts, options)
+
+end
+
+begin
+  opts.parse!
+rescue Exception => e
+  puts opts
+  puts e
+  exit(1)
+end
+
+############################################################
+## SETUP ENVIRONMENT
+##
+
+# Configure logger
+SC.logger.level = (options[:verbose]) ? Logger::DEBUG : Logger::INFO
+SC.logger.progname = $0
+SC.logger.info("sc-install v#{SproutCore::VERSION::STRING}")
+
+# Confirm various safety settings
+SC.logger.info(" ~ Verbose logging enabled") if options[:verbose]
+SC.logger.info(" ~ Dry run mode - no change will be made") if options[:dry_run] 
+
+# Load Library
+library = SC.library_for(options[:library_root])
+
+############################################################
+## PERFORM THE INSTALL
+##
+
+if bundle_name.nil?
+  puts opts
+  SC.logger.fatal("A bundle name is required.")
+  exit(1)
+end
+
+library.install_bundle(bundle_name, options)
+SC.logger.debug("")
+
+
+