sproutcore 1.6.0.beta.3-java → 1.6.0-java

data/lib/sproutcore/tools.rb

@@ -32,17 +32,17 @@ module SC
 
     # All sproutcore tools can take some standard options.  These are
     # processed automatically when the tool is loaded
-    class_option "project",      :type => :string
-    class_option "mode",         :type => :string
-    class_option "logfile",      :type => :string
-    class_option "build",        :type => :string
-    class_option "build-targets",:type => :string
-    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
-    class_option "environment",  :type => :string #deprecated
+    class_option "project",           :type => :string
+    class_option "mode",              :type => :string
+    class_option "logfile",           :type => :string
+    class_option "build",             :type => :string, :aliases => "-b"
+    class_option "build-targets",     :type => :string
+    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
+    class_option "environment",       :type => :string #deprecated
 
     default_task :banner
 

data/lib/sproutcore/tools/build.rb

@@ -18,6 +18,8 @@ module SC
     method_options(MANIFEST_OPTIONS)
     method_option :entries, :type => :string
     method_option :clean,   :type => :boolean, :aliases => "-c"
+    # This is defined in MANIFEST_OPTIONS but I add the aliases here only since we use target elsewhere
+    method_option :buildroot, :type => :string, :aliases => %w(--target -t)
     def build(*targets)
       t1 = Time.now
       SC.logger.info  'Starting build process...'

data/lib/sproutcore/tools/docs.rb

@@ -10,44 +10,9 @@ require "sproutcore/tools/manifest"
 
 module SC
   class Tools
-
     desc "docs [TARGET..]", "Generates JSDoc's for specified targets."
-    method_options(:entries  => :string,
-                   :clean    => true,
-                   :language => :string,
-                   :template => :string,
-                   ['--include-required', '-r'] => false)
-    def docs(*targets)
-
-      SC.env.build_prefix   = options.buildroot if options.buildroot
-      SC.env.clean          = options.clean
-      SC.env.build_required = options['include-required']
-      SC.env.language       = options.language
-      SC.env.template_name  = options.template
-
-      # Find all the targets
-      targets = find_targets(*targets)
-      targets.each do |target|
-        project_root = target.project.project_root
-        build_root = project_root / 'tmp' / 'docs' / target.target_name.to_s
-
-        if [:framework, :app].include?(target.target_type)
-          if SC.env.clean
-            SC.logger.info "Cleaning #{build_root}"
-            FileUtils.rm_r(build_root) if File.directory?(build_root)
-          end
-
-          target.build_docs!(:build_root => build_root,
-            :language => SC.env.language,
-            :required => true, #SC.env.build_required,
-            :template => SC.env.template_name,
-            :logger   => SC.logger)
-        else
-          SC.logger.info "#{target.target_name} is not of type framework or app. Skipping."
-          SC.logger.info "#{target.target_name} is of type #{target.target_type}."
-
-        end # if [:framework, :app]
-      end # targets.each
+    def docs
+      puts "Doc generation is no longer bundled with SproutCore. Please install the sc-docs tool instead."
     end # def docs
   end # class Tools
 end # module SC

data/lib/sproutcore/tools/init.rb

@@ -14,17 +14,11 @@ module SC
     def init(project_name, app_name=nil)
 
       # Generate the project
-      if (options[:template])
-        project_gen = SC.builtin_project.generator_for 'html_project',
-          :arguments => ['project', project_name],
-          :dry_run   => options['dry-run'],
-          :force     => options[:force]
-      else
-        project_gen = SC.builtin_project.generator_for 'project',
-          :arguments => ['project', project_name],
-          :dry_run   => options['dry-run'],
-          :force     => options[:force]
-      end
+      project_type = options[:template] ? 'html_project' : 'project'
+      project_gen = SC.builtin_project.generator_for project_type,
+        :arguments => ['project', project_name],
+        :dry_run   => options['dry-run'],
+        :force     => options[:force]
 
       project_gen.prepare!.build!
 
@@ -35,17 +29,11 @@ module SC
       # And get the app generator and run it
       project = SC::Project.load project_root, :parent => SC.builtin_project
 
-      if (options[:template])
-        generator = project.generator_for 'html_app',
-          :arguments => ['app', app_name],
-          :dry_run   => options['dry-run'],
-          :force     => options[:force]
-      else
-        generator = project.generator_for 'app',
-          :arguments => ['app', app_name],
-          :dry_run   => options['dry-run'],
-          :force     => options[:force]
-      end
+      app_type = options[:template] ? 'html_app' : 'app'
+      generator = project.generator_for app_type,
+        :arguments => ['app', app_name],
+        :dry_run   => options['dry-run'],
+        :force     => options[:force]
       generator.prepare!.build!
 
       project_gen.log_file(project_gen.source_root / 'INIT')

data/lib/sproutcore/tools/manifest.rb

@@ -9,15 +9,15 @@ module SC
   class Tools
 
     # Standard manifest options.  Used by build tool as well.
-    MANIFEST_OPTIONS = { :languages     => :string,
-                         :symlink       => false,
-                         :buildroot     => :string,
-                         :stageroot     => :string,
-                         :format        => :string,
-                         :output        => :string,
-                         :all           => false,
-                         ['--build-numbers', '-B'] => :string,
-                         ['--include-required', '-r'] => false }
+    MANIFEST_OPTIONS = { :symlink           => false,
+                         :stageroot         => :string,
+                         :format            => :string,
+                         :output            => :string,
+                         :all               => false,
+                         :buildroot         => :string,
+                         ['--languages', '-L']              => :string,
+                         ['--build-numbers', '-B']          => :string,
+                         ['--include-required', '-r']       => false }
 
     desc "manifest [TARGET..]", "Generates a manifest for the specified targets"
     method_options(MANIFEST_OPTIONS.merge(
@@ -39,19 +39,8 @@ module SC
       end
 
       # Get allowed keys
-      only_keys = nil
-      if options[:only]
-        only_keys = (options[:only] || '').to_s.split(',')
-        only_keys.map! { |k| k.to_sym }
-        only_keys = nil if only_keys.size == 0
-      end
-
-      except_keys = nil
-      if options[:except]
-        except_keys = (options[:except] || '').to_s.split(',')
-        except_keys.map! { |k| k.to_sym }
-        except_keys = nil if except_keys.size == 0
-      end
+      only_keys   = Tools.get_allowed_keys(options[:only])
+      except_keys = Tools.get_allowed_keys(options[:except])
 
       # call core method to actually build the manifests...
       manifests = build_manifests(*targets)
@@ -81,5 +70,15 @@ module SC
 
     end
 
+    private
+    def self.get_allowed_keys(keys)
+      if keys
+        result = (keys || '').to_s.split(',')
+        result.map!(&:strip).map!(&:to_sym)
+        result = nil if result.size == 0
+        result
+      end
+    end
+
   end
 end

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

@@ -147,7 +147,7 @@ describe "manifest:prepare_build_tasks:combine" do
   # javascript.js support
   #
 
-  describe "whem CONFIG.combine_javascript = true" do
+  describe "when CONFIG.combine_javascript = true" do
 
     before do
       @config.combine_javascript = true
@@ -208,6 +208,26 @@ describe "manifest:prepare_build_tasks:combine" do
         filenames.should eql(expected)
       end
 
+      it "orders entries with APP_NAME.js before other entries" do
+        @target = @project.target_for :template_style
+        @buildfile = @target.buildfile
+        @config = @target.config
+        @manifest = @target.manifest_for(:language => :en)
+        @target.prepare! # make sure its ready for the manifest...
+
+        run_task
+        entry = @manifest.entry_for('javascript.js')
+
+        # get the expected set of ordered entries...based on contents of
+        # project...
+        expected = %w(source/template_style.js source/a.js)
+
+        entry.ordered_entries.should_not be_nil
+        filenames = entry.ordered_entries.map { |e| e.filename }
+        filenames.should eql(expected)
+
+      end
+
       it "will override default order respecting ENTRY.required" do
 
         @target = @project.target_for :with_requires

data/spec/buildtasks/target_spec.rb

@@ -180,6 +180,15 @@ describe "namespace :target" do
       @target.build_root.should eql(expected)
     end
 
+    it "should allow absolute build_prefix" do
+      @target.config.url_prefix = 'static'
+      @target.config.build_prefix = '/tmp/sc-app'
+
+      run_task
+
+      @target.build_root.should == "/tmp/sc-app/static/sproutcore"
+    end
+
     it "should collapse an empty url_prefix" do
       @target.config.url_prefix = ''
       @target.config.build_prefix = 'tmp/build'

data/spec/fixtures/builder_tests/apps/handlebars_test/Buildfile

@@ -0,0 +1 @@
+config :handlebars_test, :required => 'sproutcore/core_foundation'

data/spec/fixtures/builder_tests/apps/handlebars_test/{template.handlebars → templates/template.handlebars}

@@ -2,4 +2,6 @@ Pour {{unfortunate}} {{souls}}
 
 Yes ma'am
 
+<img src="{{sc_static("icons/image.png")}}" />
+
 INCEPTION ><>

data/spec/fixtures/real_world/frameworks/sproutcore/Buildfile

@@ -21,6 +21,6 @@ config :desktop,
 config :mobile,
   :required => %w(costello foundation application data_store)
 
-%w(uploader docs test_runner).each do |target_name|
+%w(uploader test_runner).each do |target_name|
   config target_name, :required => :sproutcore
 end

data/spec/lib/builders/handlebars_spec.rb

@@ -7,6 +7,9 @@ describe SC::Builder::Handlebars do
 
   before do
     std_before :handlebars_test
+
+    # add fake image entry for sc_static tests..
+    @manifest.add_entry 'icons/image.png'
   end
 
   after do
@@ -20,10 +23,13 @@ describe SC::Builder::Handlebars do
   end
 
   it "converts Handlebars to JavaScript" do
-    lines = run_builder 'template.handlebars'
-    lines.each do |line|
-      line.should =~ /SC\.TEMPLATES/
-    end
+    lines = run_builder 'templates/template.handlebars'
+    lines[0].should =~ /SC\.TEMPLATES\["template"\] =/
+  end
+
+  it "handles sc_static" do
+    lines = run_builder 'templates/template.handlebars'
+    lines[0].should include('<img src=\\"/static/handlebars_test/en/current/icons/image.png?0\\" />')
   end
 
 end

data/spec/lib/buildfile_commands/build_task_spec.rb

@@ -9,7 +9,7 @@ describe SC::Buildfile::Commands, 'build_task' do
     b.task_defined?(:task1).should_not be_nil
   end
 
-  it "should add a new task with class BuilTask" do
+  it "should add a new task with class BuildTask" do
     b = SC::Buildfile.define do
       build_task :task1
     end

data/spec/lib/tools/manifest_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe SC::Tools do
+  describe "utils" do
+    it "retrieves allowed keys using get_allowed_keys" do
+      SC::Tools.class_eval do
+        get_allowed_keys('a,b    ,  c,d').should == [:a,:b,:c,:d]
+      end
+    end
+  end
+end

data/sproutcore.gemspec

@@ -16,15 +16,16 @@ Gem::Specification.new do |s|
   s.platform = 'java'        if is_jruby
   s.platform = 'x86-mingw32' if is_mingw
 
-  s.add_dependency 'rack', '~> 1.2.1'
+  s.add_dependency 'rack', '~> 1.2'
   s.add_dependency 'json_pure', "~> 1.4.6"
   s.add_dependency 'extlib', "~> 0.9.15"
-  s.add_dependency 'erubis', "~> 2.6.6"
+  s.add_dependency 'erubis', "~> 2.6"
   s.add_dependency 'thor', '~> 0.14.3'
-  s.add_dependency 'haml', '~> 3.0.24'
+  s.add_dependency 'haml', '~> 3.1.1'
 
-  s.add_dependency 'compass', '~> 0.10.5'
-  s.add_dependency 'chunky_png', '~> 1.1.0'
+  s.add_dependency 'compass', '~> 0.11.1'
+  
+  s.add_dependency 'em-http-request', '~> 0.3.0'
 
   if is_jruby
     s.add_dependency 'mongrel', '~> 1.1.5'
@@ -37,7 +38,7 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency 'gemcutter', "~> 0.6.0"
-  s.add_development_dependency 'rspec', "~> 2.4.0"
+  s.add_development_dependency 'rspec', "~> 2.5.0"
   s.add_development_dependency 'rake'
 
   # Optional features, used in tests
@@ -50,7 +51,7 @@ Gem::Specification.new do |s|
 
 
   s.rubyforge_project = "sproutcore"
-  s.extra_rdoc_files  = %w[History.txt README.txt]
+  s.extra_rdoc_files  = %w[History.rdoc README.rdoc]
 
   s.files        = `git ls-files`.split("\n")
   s.files       += Dir[".htaccess", "lib/frameworks/sproutcore/**/*"]

data/vendor/chance/lib/chance/instance.rb

@@ -10,8 +10,6 @@ require 'chance/instance/spriting'
 require 'chance/instance/data_url'
 require 'chance/instance/javascript'
 
-require 'digest/md5'
-
 
 Compass.discover_extensions!
 Compass.configure_sass_plugin!
@@ -271,9 +269,11 @@ module Chance
       return if file[:included] === @@generation
 
       requires = file[:requires]
+      file[:included] = @@generation
+
       requires.each {|r| _include_file(@mapped_files[r]) } unless requires.nil?
 
-      file[:included] = @@generation
+
 
       @file_list.push(file)
     end
@@ -307,12 +307,11 @@ module Chance
         parser.parse
         file[:parsed_css] = parser.css
 
-        # We use an md5 hash here because on Windows, the full path includes the
-        # drive name. Since a colon is not valid in a file name, we need to remove
-        # it. Since this is very temporary anyway, using an md5 hash isn't a
-        # problem. This has been confirmed with Alex. -- Peter W.
-        path_hash = Digest::MD5.hexdigest(file[:path])
-        tmp_path = "./tmp/chance/#{path_hash}.scss"
+        # Remove any non-letter characters that could cause a problem in filenames,
+        # i.e. colons in drive names on Windows
+        # Also removing leading slashes
+        cleaned_path = file[:path].gsub(/[^\w\/_-]+/,'_').sub(/^\//,'')
+        tmp_path = "./tmp/chance/#{cleaned_path}.scss"
 
         FileUtils.mkdir_p(File.dirname(tmp_path))
 

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
     - 1
     - 6
     - 0
-    - beta
-    - 3
-  version: 1.6.0.beta.3
+  version: 1.6.0
 platform: java
 authors: 
   - Strobe, Inc., Apple Inc. and contributors
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -07:00
+date: 2011-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -29,8 +27,7 @@ dependencies:
             segments: 
               - 1
               - 2
-              - 1
-            version: 1.2.1
+            version: "1.2"
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -71,8 +68,7 @@ dependencies:
             segments: 
               - 2
               - 6
-              - 6
-            version: 2.6.6
+            version: "2.6"
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
@@ -98,9 +94,9 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 3
-              - 0
-              - 24
-            version: 3.0.24
+              - 1
+              - 1
+            version: 3.1.1
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
@@ -112,23 +108,23 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 0
-              - 10
-              - 5
-            version: 0.10.5
+              - 11
+              - 1
+            version: 0.11.1
     type: :runtime
     version_requirements: *id007
   - !ruby/object:Gem::Dependency 
-    name: chunky_png
+    name: em-http-request
     prerelease: false
     requirement: &id008 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             segments: 
-              - 1
-              - 1
               - 0
-            version: 1.1.0
+              - 3
+              - 0
+            version: 0.3.0
     type: :runtime
     version_requirements: *id008
   - !ruby/object:Gem::Dependency 
@@ -168,9 +164,9 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 2
-              - 4
+              - 5
               - 0
-            version: 2.4.0
+            version: 2.5.0
     type: :development
     version_requirements: *id011
   - !ruby/object:Gem::Dependency 
@@ -241,17 +237,17 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-  - History.txt
-  - README.txt
+  - History.rdoc
+  - README.rdoc
 files: 
   - .mailmap
   - .rspec
   - CHANGELOG
   - Gemfile
-  - History.txt
-  - README.txt
+  - History.rdoc
+  - README.rdoc
   - Rakefile
-  - Todo.txt
+  - Todo.rdoc
   - VERSION.yml
   - bin/sc-build
   - bin/sc-build-number
@@ -271,25 +267,6 @@ files:
   - lib/buildtasks/manifest.rake
   - lib/buildtasks/render.rake
   - lib/buildtasks/target.rake
-  - lib/doc_templates/jsdoc/allclasses.tmpl
-  - lib/doc_templates/jsdoc/allfiles.tmpl
-  - lib/doc_templates/jsdoc/class.tmpl
-  - lib/doc_templates/jsdoc/index.tmpl
-  - lib/doc_templates/jsdoc/publish.js
-  - lib/doc_templates/jsdoc/static/default.css
-  - lib/doc_templates/jsdoc/static/header.html
-  - lib/doc_templates/jsdoc/static/index.html
-  - lib/doc_templates/jsdoc/symbol.tmpl
-  - lib/doc_templates/sproutcore/allclasses.tmpl
-  - lib/doc_templates/sproutcore/allfiles.tmpl
-  - lib/doc_templates/sproutcore/class.tmpl
-  - lib/doc_templates/sproutcore/classes-json.tmpl
-  - lib/doc_templates/sproutcore/index.tmpl
-  - lib/doc_templates/sproutcore/publish.js
-  - lib/doc_templates/sproutcore/static/default.css
-  - lib/doc_templates/sproutcore/static/header.html
-  - lib/doc_templates/sproutcore/static/index.html
-  - lib/doc_templates/sproutcore/symbol.tmpl
   - lib/gen/Buildfile
   - lib/gen/app/Buildfile
   - lib/gen/app/README
@@ -303,12 +280,12 @@ files:
   - lib/gen/controller/Buildfile
   - lib/gen/controller/README
   - lib/gen/controller/USAGE
-  - lib/gen/controller/templates/controllers/@filename@.js
-  - lib/gen/controller/templates/tests/controllers/@filename@.js
+  - lib/gen/controller/templates/controllers/@filename@_controller.js
+  - lib/gen/controller/templates/tests/controllers/@filename@_test.js
   - lib/gen/data-source/Buildfile
   - lib/gen/data-source/README
   - lib/gen/data-source/USAGE
-  - lib/gen/data-source/templates/data_sources/@filename@.js
+  - lib/gen/data-source/templates/data_sources/@filename@_data_source.js
   - lib/gen/design/Buildfile
   - lib/gen/design/README
   - lib/gen/design/USAGE
@@ -338,9 +315,9 @@ files:
   - lib/gen/model/Buildfile
   - lib/gen/model/README
   - lib/gen/model/USAGE
-  - lib/gen/model/templates/fixtures/@filename@.js
-  - lib/gen/model/templates/models/@filename@.js
-  - lib/gen/model/templates/tests/models/@filename@.js
+  - lib/gen/model/templates/fixtures/@filename@_fixtures.js
+  - lib/gen/model/templates/models/@filename@_model.js
+  - lib/gen/model/templates/tests/models/@filename@_test.js
   - lib/gen/page/Buildfile
   - lib/gen/page/README
   - lib/gen/page/USAGE
@@ -358,11 +335,11 @@ files:
   - lib/gen/responder/Buildfile
   - lib/gen/responder/README
   - lib/gen/responder/USAGE
-  - lib/gen/responder/templates/states/@filename@.js
+  - lib/gen/responder/templates/states/@filename@_state.js
   - lib/gen/test/Buildfile
   - lib/gen/test/README
   - lib/gen/test/USAGE
-  - lib/gen/test/templates/tests/@filename@.js
+  - lib/gen/test/templates/tests/@filename@_test.js
   - lib/gen/theme/Buildfile
   - lib/gen/theme/README
   - lib/gen/theme/USAGE
@@ -372,8 +349,8 @@ files:
   - lib/gen/view/Buildfile
   - lib/gen/view/README
   - lib/gen/view/USAGE
-  - lib/gen/view/templates/tests/views/@filename@.js
-  - lib/gen/view/templates/views/@filename@.js
+  - lib/gen/view/templates/tests/views/@filename@_test.js
+  - lib/gen/view/templates/views/@filename@_view.js
   - lib/sproutcore.rb
   - lib/sproutcore/builders.rb
   - lib/sproutcore/builders/base.rb
@@ -423,7 +400,6 @@ files:
   - lib/sproutcore/rack.rb
   - lib/sproutcore/rack/builder.rb
   - lib/sproutcore/rack/dev.rb
-  - lib/sproutcore/rack/docs.rb
   - lib/sproutcore/rack/filesystem.rb
   - lib/sproutcore/rack/proxy.rb
   - lib/sproutcore/rack/service.rb
@@ -480,7 +456,8 @@ files:
   - spec/fixtures/builder_tests/apps/combine_test/english.lproj/a.css
   - spec/fixtures/builder_tests/apps/combine_test/english.lproj/b.css
   - spec/fixtures/builder_tests/apps/combine_test/english.lproj/c.css
-  - spec/fixtures/builder_tests/apps/handlebars_test/template.handlebars
+  - spec/fixtures/builder_tests/apps/handlebars_test/Buildfile
+  - spec/fixtures/builder_tests/apps/handlebars_test/templates/template.handlebars
   - spec/fixtures/builder_tests/apps/html_test/english.lproj/bar1_sample.rhtml
   - spec/fixtures/builder_tests/apps/html_test/english.lproj/erb_sample.html.erb
   - spec/fixtures/builder_tests/apps/html_test/english.lproj/icons/image.png
@@ -609,6 +586,8 @@ files:
   - spec/fixtures/ordered_entries/apps/no_requires/resources/main_page.js
   - spec/fixtures/ordered_entries/apps/no_requires/t.js
   - spec/fixtures/ordered_entries/apps/no_requires/utils.js
+  - spec/fixtures/ordered_entries/apps/template_style/a.js
+  - spec/fixtures/ordered_entries/apps/template_style/template_style.js
   - spec/fixtures/ordered_entries/apps/with_requires/a.js
   - spec/fixtures/ordered_entries/apps/with_requires/b.js
   - spec/fixtures/ordered_entries/apps/with_requires/c.js
@@ -640,7 +619,6 @@ files:
   - spec/fixtures/real_world/frameworks/shared/PLACEHOLDER
   - spec/fixtures/real_world/frameworks/sproutcore/Buildfile
   - spec/fixtures/real_world/frameworks/sproutcore/README
-  - spec/fixtures/real_world/frameworks/sproutcore/apps/docs/PLACEHOLDER
   - spec/fixtures/real_world/frameworks/sproutcore/apps/test_runner/PLACEHOLDER
   - spec/fixtures/real_world/frameworks/sproutcore/core.js
   - spec/fixtures/real_world/frameworks/sproutcore/debug/debug-resource.html
@@ -760,6 +738,7 @@ files:
   - spec/lib/models/target/target_for_spec.rb
   - spec/lib/tools/build_number_spec.rb
   - spec/lib/tools/gen_spec.rb
+  - spec/lib/tools/manifest_spec.rb
   - spec/lib/tools/tools_spec.rb
   - spec/spec.opts
   - spec/spec_helper.rb
@@ -787,141 +766,6 @@ files:
   - vendor/chance/test/case/test2.css
   - vendor/chance/tests/parser/basic/input/test.css
   - vendor/chance/tests/parser/basic/output/test.parsed.css
-  - vendor/jsdoc/README.txt
-  - vendor/jsdoc/app/frame.js
-  - vendor/jsdoc/app/frame/Chain.js
-  - vendor/jsdoc/app/frame/Dumper.js
-  - vendor/jsdoc/app/frame/Hash.js
-  - vendor/jsdoc/app/frame/Link.js
-  - vendor/jsdoc/app/frame/Namespace.js
-  - vendor/jsdoc/app/frame/Opt.js
-  - vendor/jsdoc/app/frame/Reflection.js
-  - vendor/jsdoc/app/frame/String.js
-  - vendor/jsdoc/app/frame/Testrun.js
-  - vendor/jsdoc/app/handlers/FOODOC.js
-  - vendor/jsdoc/app/handlers/XMLDOC.js
-  - vendor/jsdoc/app/handlers/XMLDOC/DomReader.js
-  - vendor/jsdoc/app/handlers/XMLDOC/XMLDoc.js
-  - vendor/jsdoc/app/handlers/XMLDOC/XMLParse.js
-  - vendor/jsdoc/app/lib/JSDOC.js
-  - vendor/jsdoc/app/lib/JSDOC/DocComment.js
-  - vendor/jsdoc/app/lib/JSDOC/DocTag.js
-  - vendor/jsdoc/app/lib/JSDOC/JsDoc.js
-  - vendor/jsdoc/app/lib/JSDOC/JsPlate.js
-  - vendor/jsdoc/app/lib/JSDOC/Lang.js
-  - vendor/jsdoc/app/lib/JSDOC/Parser.js
-  - vendor/jsdoc/app/lib/JSDOC/PluginManager.js
-  - vendor/jsdoc/app/lib/JSDOC/Symbol.js
-  - vendor/jsdoc/app/lib/JSDOC/SymbolSet.js
-  - vendor/jsdoc/app/lib/JSDOC/TextStream.js
-  - vendor/jsdoc/app/lib/JSDOC/Token.js
-  - vendor/jsdoc/app/lib/JSDOC/TokenReader.js
-  - vendor/jsdoc/app/lib/JSDOC/TokenStream.js
-  - vendor/jsdoc/app/lib/JSDOC/Util.js
-  - vendor/jsdoc/app/lib/JSDOC/Walker.js
-  - vendor/jsdoc/app/main.js
-  - vendor/jsdoc/app/plugins/commentSrcJson.js
-  - vendor/jsdoc/app/plugins/frameworkPrototype.js
-  - vendor/jsdoc/app/plugins/functionCall.js
-  - vendor/jsdoc/app/plugins/publishSrcHilite.js
-  - vendor/jsdoc/app/plugins/sproutcoreTags.js
-  - vendor/jsdoc/app/plugins/symbolLink.js
-  - vendor/jsdoc/app/plugins/tagParamConfig.js
-  - vendor/jsdoc/app/plugins/tagSynonyms.js
-  - vendor/jsdoc/app/run.js
-  - vendor/jsdoc/app/t/TestDoc.js
-  - vendor/jsdoc/app/t/runner.js
-  - vendor/jsdoc/app/test.js
-  - vendor/jsdoc/app/test/addon.js
-  - vendor/jsdoc/app/test/anon_inner.js
-  - vendor/jsdoc/app/test/augments.js
-  - vendor/jsdoc/app/test/augments2.js
-  - vendor/jsdoc/app/test/borrows.js
-  - vendor/jsdoc/app/test/borrows2.js
-  - vendor/jsdoc/app/test/config.js
-  - vendor/jsdoc/app/test/constructs.js
-  - vendor/jsdoc/app/test/encoding.js
-  - vendor/jsdoc/app/test/encoding_other.js
-  - vendor/jsdoc/app/test/functions_anon.js
-  - vendor/jsdoc/app/test/functions_nested.js
-  - vendor/jsdoc/app/test/global.js
-  - vendor/jsdoc/app/test/globals.js
-  - vendor/jsdoc/app/test/ignore.js
-  - vendor/jsdoc/app/test/inner.js
-  - vendor/jsdoc/app/test/jsdoc_test.js
-  - vendor/jsdoc/app/test/lend.js
-  - vendor/jsdoc/app/test/memberof.js
-  - vendor/jsdoc/app/test/memberof_constructor.js
-  - vendor/jsdoc/app/test/name.js
-  - vendor/jsdoc/app/test/namespace_nested.js
-  - vendor/jsdoc/app/test/nocode.js
-  - vendor/jsdoc/app/test/oblit_anon.js
-  - vendor/jsdoc/app/test/overview.js
-  - vendor/jsdoc/app/test/param_inline.js
-  - vendor/jsdoc/app/test/params_optional.js
-  - vendor/jsdoc/app/test/prototype.js
-  - vendor/jsdoc/app/test/prototype_nested.js
-  - vendor/jsdoc/app/test/prototype_oblit.js
-  - vendor/jsdoc/app/test/prototype_oblit_constructor.js
-  - vendor/jsdoc/app/test/public.js
-  - vendor/jsdoc/app/test/shared.js
-  - vendor/jsdoc/app/test/shared2.js
-  - vendor/jsdoc/app/test/shortcuts.js
-  - vendor/jsdoc/app/test/static_this.js
-  - vendor/jsdoc/app/test/synonyms.js
-  - vendor/jsdoc/app/test/tosource.js
-  - vendor/jsdoc/app/test/variable_redefine.js
-  - vendor/jsdoc/changes.txt
-  - vendor/jsdoc/conf/sample.conf
-  - vendor/jsdoc/java/build.xml
-  - vendor/jsdoc/java/build_1.4.xml
-  - vendor/jsdoc/java/classes/js.jar
-  - vendor/jsdoc/java/src/JsDebugRun.java
-  - vendor/jsdoc/java/src/JsRun.java
-  - vendor/jsdoc/jsdebug.jar
-  - vendor/jsdoc/jsrun.jar
-  - vendor/jsdoc/t/TestDoc.js
-  - vendor/jsdoc/t/runner.js
-  - vendor/jsdoc/test.js
-  - vendor/jsdoc/test/addon.js
-  - vendor/jsdoc/test/anon_inner.js
-  - vendor/jsdoc/test/augments.js
-  - vendor/jsdoc/test/augments2.js
-  - vendor/jsdoc/test/borrows.js
-  - vendor/jsdoc/test/borrows2.js
-  - vendor/jsdoc/test/config.js
-  - vendor/jsdoc/test/constructs.js
-  - vendor/jsdoc/test/encoding.js
-  - vendor/jsdoc/test/encoding_other.js
-  - vendor/jsdoc/test/functions_anon.js
-  - vendor/jsdoc/test/functions_nested.js
-  - vendor/jsdoc/test/global.js
-  - vendor/jsdoc/test/globals.js
-  - vendor/jsdoc/test/ignore.js
-  - vendor/jsdoc/test/inner.js
-  - vendor/jsdoc/test/jsdoc_test.js
-  - vendor/jsdoc/test/lend.js
-  - vendor/jsdoc/test/memberof.js
-  - vendor/jsdoc/test/memberof_constructor.js
-  - vendor/jsdoc/test/name.js
-  - vendor/jsdoc/test/namespace_nested.js
-  - vendor/jsdoc/test/nocode.js
-  - vendor/jsdoc/test/oblit_anon.js
-  - vendor/jsdoc/test/overview.js
-  - vendor/jsdoc/test/param_inline.js
-  - vendor/jsdoc/test/params_optional.js
-  - vendor/jsdoc/test/prototype.js
-  - vendor/jsdoc/test/prototype_nested.js
-  - vendor/jsdoc/test/prototype_oblit.js
-  - vendor/jsdoc/test/prototype_oblit_constructor.js
-  - vendor/jsdoc/test/public.js
-  - vendor/jsdoc/test/shared.js
-  - vendor/jsdoc/test/shared2.js
-  - vendor/jsdoc/test/shortcuts.js
-  - vendor/jsdoc/test/static_this.js
-  - vendor/jsdoc/test/synonyms.js
-  - vendor/jsdoc/test/tosource.js
-  - vendor/jsdoc/test/variable_redefine.js
   - vendor/sproutcore/lib/htmlcompressor-0.9.3.jar
   - vendor/sproutcore/lib/yuicompressor-2.4.6.jar
   - lib/frameworks/sproutcore/Buildfile
@@ -936,6 +780,7 @@ files:
   - lib/frameworks/sproutcore/apps/test_controls/controllers/buttons.js
   - lib/frameworks/sproutcore/apps/test_controls/controllers/categories.js
   - lib/frameworks/sproutcore/apps/test_controls/controllers/category.js
+  - lib/frameworks/sproutcore/apps/test_controls/controllers/select.js
   - lib/frameworks/sproutcore/apps/test_controls/controllers/split.js
   - lib/frameworks/sproutcore/apps/test_controls/resources/buttons_page.js
   - lib/frameworks/sproutcore/apps/test_controls/resources/checkboxes_page.js
@@ -1070,10 +915,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/core_foundation/panes/visibility.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/protocols/observable_protocol.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/protocols/sparse_array_delegate.js
-  - lib/frameworks/sproutcore/frameworks/core_foundation/resources/core.css
-  - lib/frameworks/sproutcore/frameworks/core_foundation/resources/view.css
   - lib/frameworks/sproutcore/frameworks/core_foundation/system/application.js
-  - lib/frameworks/sproutcore/frameworks/core_foundation/system/bindable_span.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/system/browser.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/system/builder.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/system/core_query.js
@@ -1100,6 +942,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/null_case.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/selection_support.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/single_case.js
+  - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/content_destroyed.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/empty_case.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/multiple_case.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_case.js
@@ -1189,6 +1032,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/updateLayerLocation.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/view.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/viewDidResize.js
+  - lib/frameworks/sproutcore/frameworks/core_foundation/views/bindable_span.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/views/template.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/views/template_collection.js
   - lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js
@@ -1218,6 +1062,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/datastore/debug/standard_setup.js
   - lib/frameworks/sproutcore/frameworks/datastore/fixtures/author_fixtures.js
   - lib/frameworks/sproutcore/frameworks/datastore/fixtures/sample.js
+  - lib/frameworks/sproutcore/frameworks/datastore/mixins/relationship_support.js
   - lib/frameworks/sproutcore/frameworks/datastore/models/child_attribute.js
   - lib/frameworks/sproutcore/frameworks/datastore/models/child_record.js
   - lib/frameworks/sproutcore/frameworks/datastore/models/children_attribute.js
@@ -1233,6 +1078,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js
   - lib/frameworks/sproutcore/frameworks/datastore/system/store.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/data_sources/cascade.js
+  - lib/frameworks/sproutcore/frameworks/datastore/tests/data_sources/data_source.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/data_sources/fixtures.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/integration/contact_model.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/integration/cyclical_relationship.js
@@ -1287,6 +1133,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/cancelRecord.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/commitChangesFromNestedStore.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/commitRecord.js
+  - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/connectDataSource.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/core_methods.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/createRecord.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/dataHashDidChange.js
@@ -1298,6 +1145,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/loadRecord.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/loadRecords.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushChanges.js
+  - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushRelationships.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readDataHash.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readEditableDataHash.js
   - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/recordDidChange.js
@@ -1314,39 +1162,6 @@ files:
   - lib/frameworks/sproutcore/frameworks/debug/invoke_once_last_debugging.js
   - lib/frameworks/sproutcore/frameworks/desktop/core.js
   - lib/frameworks/sproutcore/frameworks/desktop/debug/drag.js
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/alert.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/disclosure.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/drag.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/icons.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/list_item.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/menu.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/menu_item_view.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/modal.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/panel.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/picker.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/progress.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/radio.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/segmented.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/separator.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/slider.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/split.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/split_divider.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/strings.js
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/tab.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/toolbar.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/touch-scroller.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/well.css
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/debug/a_sample_image.jpg
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/debug/apple-logo1.jpeg
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/debug/iframe.html
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/cap.png
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/downbutton.png
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/thumb-bottom.png
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/thumb-center.png
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/thumb-top.png
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/track.png
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/upbutton.png
-  - lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/icons/shared.png
   - lib/frameworks/sproutcore/frameworks/desktop/mixins/border.js
   - lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js
   - lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_group.js
@@ -1360,7 +1175,6 @@ files:
   - lib/frameworks/sproutcore/frameworks/desktop/panes/palette.js
   - lib/frameworks/sproutcore/frameworks/desktop/panes/panel.js
   - lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js
-  - lib/frameworks/sproutcore/frameworks/desktop/panes/select_button.js
   - lib/frameworks/sproutcore/frameworks/desktop/panes/sheet.js
   - lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_data_source.js
   - lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_source.js
@@ -1387,6 +1201,70 @@ files:
   - lib/frameworks/sproutcore/frameworks/desktop/render_delegates/well.js
   - lib/frameworks/sproutcore/frameworks/desktop/render_delegates/workspace.js
   - lib/frameworks/sproutcore/frameworks/desktop/render_delegates/helpers/slicing.js
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/alert.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/disclosure.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/drag.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/icons.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/list_item.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/menu.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/menu_item_view.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/modal.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/panel.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/picker.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/progress.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/radio.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/segmented.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/separator.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/slider.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/split.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/split_divider.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/tab.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/toolbar.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/touch-scroller.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/well.css
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/debug/a_sample_image.jpg
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/debug/apple-logo1.jpeg
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/debug/iframe.html
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/cap.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/downbutton.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/thumb-bottom.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/thumb-center.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/thumb-top.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/track.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/upbutton.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-alert-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-alert-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-alert-48.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-bookmark-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-bookmark-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-cancel-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-document-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-document-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-down-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-error-48.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-favorite-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-favorite-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-folder-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-folder-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-group-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-group-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-help-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-help-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-info-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-info-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-info-48.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-left-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-options-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-options-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-redo-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-right-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-tools-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-trash-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-trash-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-undo-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-up-24.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-user-16.png
+  - lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-user-24.png
   - lib/frameworks/sproutcore/frameworks/desktop/system/drag.js
   - lib/frameworks/sproutcore/frameworks/desktop/system/key_bindings.js
   - lib/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js
@@ -1498,6 +1376,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/desktop/views/segment.js
   - lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js
   - lib/frameworks/sproutcore/frameworks/desktop/views/select.js
+  - lib/frameworks/sproutcore/frameworks/desktop/views/select_button.js
   - lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js
   - lib/frameworks/sproutcore/frameworks/desktop/views/separator.js
   - lib/frameworks/sproutcore/frameworks/desktop/views/slider.js
@@ -1731,19 +1610,14 @@ files:
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/device_motion/device.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/device_motion/platform.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/device_motion/README.md
-  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/english.lproj/default_styles.css
-  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/english.lproj/strings.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/mixins/edit_mode.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/mixins/emptiness.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/render_delegates/form.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/render_delegates/form_row.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/mixins/edit_mode.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/mixins/emptiness.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/views/form.js
-  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/views/form_checkbox_field.js
-  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/views/form_field.js
-  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/views/form_label.js
-  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/views/form_radio_field.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/views/form_row.js
-  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/tests/views/form_text_field.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form_row.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/README.md
@@ -1751,6 +1625,19 @@ files:
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/many.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/simple.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/single.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu_item.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/mixins/select_view_menu.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/render_delegates/select_button.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/ext/menu_resizing.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/mixins/select_view_menu/bindings.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/mixins/select_view_menu/check_selected.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/popup_button/menu_setup.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/popup_button/show_menu.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/menu_width.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/selected_item.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/popup_button.js
+  - lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/select.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_child.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_thumb.js
   - lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/render_delegates/split.js
@@ -1769,25 +1656,6 @@ files:
   - lib/frameworks/sproutcore/frameworks/foundation/controllers/tree.js
   - lib/frameworks/sproutcore/frameworks/foundation/debug/control_test_pane.js
   - lib/frameworks/sproutcore/frameworks/foundation/delegates/inline_text_field.js
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/benchmark.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/blank.gif
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/bootstrap.rhtml
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/button_view.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/checkbox_view.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/inline_editor.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/label.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/radio_view.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/static_layout.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/text_field.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/debug/control-test-pane.css
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/favicon.ico
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/sproutcore-logo.png
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/sproutcore-startup-landscape.jpg
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/sproutcore-startup-landscape.png
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/sproutcore-startup-portrait.jpg
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/sproutcore-startup-portrait.png
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/sproutcore-startup.png
-  - lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/sproutcore.png
   - lib/frameworks/sproutcore/frameworks/foundation/ext/string.js
   - lib/frameworks/sproutcore/frameworks/foundation/fixtures/file_exists.json
   - lib/frameworks/sproutcore/frameworks/foundation/fixtures/malformed.json
@@ -1818,6 +1686,25 @@ files:
   - lib/frameworks/sproutcore/frameworks/foundation/render_delegates/label.js
   - lib/frameworks/sproutcore/frameworks/foundation/render_delegates/render_delegate.js
   - lib/frameworks/sproutcore/frameworks/foundation/render_delegates/helpers/sizing.js
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/benchmark.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/blank.gif
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/bootstrap.rhtml
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/button_view.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/checkbox_view.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/inline_editor.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/label.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/radio_view.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/static_layout.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/debug/control-test-pane.css
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/images/favicon.ico
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/images/sproutcore-logo.png
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/images/sproutcore-startup-landscape.jpg
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/images/sproutcore-startup-landscape.png
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/images/sproutcore-startup-portrait.jpg
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/images/sproutcore-startup-portrait.png
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/images/sproutcore-startup.png
+  - lib/frameworks/sproutcore/frameworks/foundation/resources/images/sproutcore.png
   - lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js
   - lib/frameworks/sproutcore/frameworks/foundation/system/chance.js
   - lib/frameworks/sproutcore/frameworks/foundation/system/cookie.js
@@ -1848,6 +1735,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_value_support/content.js
   - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/control/displayProperties.js
   - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/editable/ui.js
+  - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/flowed_layout/tests.js
   - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/beginEditing.js
   - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/commitEditing.js
   - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/discardEditing.js
@@ -1932,6 +1820,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/runtime/README
   - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array.js
   - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/base.js
+  - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/flatten.js
   - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/indexOf.js
   - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/insertAt.js
   - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/objectAt.js
@@ -1981,6 +1870,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/runtime/tests/core/keys.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/core/makeArray.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/core/objectForPropertyPath.js
+  - lib/frameworks/sproutcore/frameworks/runtime/tests/core/requiredObjectForPropertyPath.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/core/tupleForPropertyPath.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array_observers.js
@@ -1993,7 +1883,7 @@ files:
   - lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/observersForKey.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/propertyChanges.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/registerDependentKeys.js
-  - lib/frameworks/sproutcore/frameworks/runtime/tests/private/observer_queue/isObservingSuspended.js
+  - lib/frameworks/sproutcore/frameworks/runtime/tests/private/observer_queue.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/system/binding.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/system/error.js
   - lib/frameworks/sproutcore/frameworks/runtime/tests/system/json.js
@@ -2026,8 +1916,14 @@ files:
   - lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/update.js
   - lib/frameworks/sproutcore/frameworks/statechart/core.js
   - lib/frameworks/sproutcore/frameworks/statechart/debug/monitor.js
+  - lib/frameworks/sproutcore/frameworks/statechart/debug/sequence_matcher.js
+  - lib/frameworks/sproutcore/frameworks/statechart/ext/function.js
+  - lib/frameworks/sproutcore/frameworks/statechart/system/async.js
+  - lib/frameworks/sproutcore/frameworks/statechart/system/empty_state.js
+  - lib/frameworks/sproutcore/frameworks/statechart/system/history_state.js
   - lib/frameworks/sproutcore/frameworks/statechart/system/state.js
   - lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js
+  - lib/frameworks/sproutcore/frameworks/statechart/tests/debug/sequence_matcher.js
   - lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/advanced/respond_to_event.js
   - lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/advanced/without_concurrent_states.js
   - lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/basic/with_concurrent_states.js
@@ -2070,14 +1966,21 @@ files:
   - lib/frameworks/sproutcore/frameworks/testing/core.js
   - lib/frameworks/sproutcore/frameworks/testing/extras.js
   - lib/frameworks/sproutcore/frameworks/testing/utils.js
-  - lib/frameworks/sproutcore/frameworks/testing/english.lproj/additions.css
-  - lib/frameworks/sproutcore/frameworks/testing/english.lproj/runner.css
-  - lib/frameworks/sproutcore/frameworks/testing/english.lproj/testsuite.css
+  - lib/frameworks/sproutcore/frameworks/testing/resources/additions.css
+  - lib/frameworks/sproutcore/frameworks/testing/resources/runner.css
+  - lib/frameworks/sproutcore/frameworks/testing/resources/testsuite.css
   - lib/frameworks/sproutcore/frameworks/testing/system/dump.js
   - lib/frameworks/sproutcore/frameworks/testing/system/equiv.js
   - lib/frameworks/sproutcore/frameworks/testing/system/plan.js
   - lib/frameworks/sproutcore/frameworks/testing/system/runner.js
   - lib/frameworks/sproutcore/frameworks/testing/system/suite.js
+  - lib/frameworks/sproutcore/frameworks/testing/tests/spy_on.js
+  - lib/frameworks/sproutcore/frameworks/testing/tests/stub_method.js
+  - lib/frameworks/sproutcore/frameworks/yuireset/resources/base.css
+  - lib/frameworks/sproutcore/frameworks/yuireset/resources/core.css
+  - lib/frameworks/sproutcore/frameworks/yuireset/resources/fonts.css
+  - lib/frameworks/sproutcore/frameworks/yuireset/resources/reset.css
+  - lib/frameworks/sproutcore/frameworks/yuireset/resources/view.css
   - lib/frameworks/sproutcore/lib/index.rhtml
   - lib/frameworks/sproutcore/themes/ace/theme.js
   - lib/frameworks/sproutcore/themes/ace/designs/dark.png
@@ -2298,6 +2201,7 @@ files:
   - lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure_closed_active.png
   - lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure_open.png
   - lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure_open_active.png
+  - lib/frameworks/sproutcore/themes/ace/resources/form/form.css
   - lib/frameworks/sproutcore/themes/ace/resources/imagebutton/ace/imagebutton.css
   - lib/frameworks/sproutcore/themes/ace/resources/master-detail/master-detail.css
   - lib/frameworks/sproutcore/themes/ace/resources/menu/checkmark.png
@@ -2382,7 +2286,6 @@ files:
   - lib/frameworks/sproutcore/themes/ace/resources/toolbar/toolbar.png
   - lib/frameworks/sproutcore/themes/ace/resources/well/well.css
   - lib/frameworks/sproutcore/themes/empty_theme/theme.js
-  - lib/frameworks/sproutcore/themes/empty_theme/tests/mini_icons.rhtml
   - lib/frameworks/sproutcore/themes/iphone_theme/english.lproj/button.css
   - lib/frameworks/sproutcore/themes/iphone_theme/english.lproj/core.css
   - lib/frameworks/sproutcore/themes/iphone_theme/english.lproj/strings.js
@@ -2549,13 +2452,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-          - 1
-          - 3
-          - 1
-        version: 1.3.1
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: sproutcore