sproutcore 1.6.0.beta.3 → 1.6.0.rc.1

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,
+                         ['--languages', '-L']              => :string,
+                         ['--buildroot', '--target', '-t']  => :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/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

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'extlib', "~> 0.9.15"
   s.add_dependency 'erubis', "~> 2.6.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 'compass', '~> 0.11.1'
   s.add_dependency 'chunky_png', '~> 1.1.0'
 
   if is_jruby

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

@@ -271,9 +271,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

metadata

@@ -2,7 +2,7 @@
 name: sproutcore
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.6.0.beta.3
+  version: 1.6.0.rc.1
 platform: ruby
 authors: 
 - Strobe, Inc., Apple Inc. and contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -75,7 +75,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.24
+        version: 3.1.1
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.5
+        version: 0.11.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -249,12 +249,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
@@ -284,9 +284,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
@@ -304,11 +304,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
@@ -318,8 +318,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
@@ -555,6 +555,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
@@ -706,6 +708,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
@@ -983,10 +986,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
@@ -1102,6 +1102,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/animation.js
@@ -1146,6 +1147,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
@@ -1227,39 +1229,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/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/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/images/cap.png
-- lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/downbutton.png
-- lib/frameworks/sproutcore/frameworks/desktop/english.lproj/images/icons/shared.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/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/mixins/border.js
 - lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js
 - lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_group.js
@@ -1273,7 +1242,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
@@ -1300,6 +1268,70 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/render_delegates/toolbar.js
 - lib/frameworks/sproutcore/frameworks/desktop/render_delegates/well.js
 - lib/frameworks/sproutcore/frameworks/desktop/render_delegates/workspace.js
+- lib/frameworks/sproutcore/frameworks/desktop/resources/alert.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/disclosure.css
+- lib/frameworks/sproutcore/frameworks/desktop/resources/drag.css
+- lib/frameworks/sproutcore/frameworks/desktop/resources/icons.css
+- 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/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/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/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/system/drag.js
 - lib/frameworks/sproutcore/frameworks/desktop/system/key_bindings.js
 - lib/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js
@@ -1411,6 +1443,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
@@ -1680,25 +1713,6 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/core.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/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/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/ext/string.js
 - lib/frameworks/sproutcore/frameworks/foundation/fixtures/file_exists.json
 - lib/frameworks/sproutcore/frameworks/foundation/fixtures/malformed.json
@@ -1730,6 +1744,25 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/render_delegates/image.js
 - lib/frameworks/sproutcore/frameworks/foundation/render_delegates/label.js
 - lib/frameworks/sproutcore/frameworks/foundation/render_delegates/render_delegate.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/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/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/system/benchmark.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/chance.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/cookie.js
@@ -1939,8 +1972,14 @@ files:
 - lib/frameworks/sproutcore/frameworks/runtime/tests/system/set.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
@@ -1981,16 +2020,22 @@ files:
 - lib/frameworks/sproutcore/frameworks/table/views/table_header.js
 - lib/frameworks/sproutcore/frameworks/table/views/table_row.js
 - lib/frameworks/sproutcore/frameworks/testing/core.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/extras.js
+- 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/testing/utils.js
+- 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/license.js
 - lib/frameworks/sproutcore/README.md
@@ -2170,7 +2215,6 @@ files:
 - lib/frameworks/sproutcore/themes/ace/resources/toolbar/toolbar.png
 - lib/frameworks/sproutcore/themes/ace/resources/well/well.css
 - lib/frameworks/sproutcore/themes/ace/theme.js
-- lib/frameworks/sproutcore/themes/empty_theme/tests/mini_icons.rhtml
 - lib/frameworks/sproutcore/themes/empty_theme/theme.js
 - lib/frameworks/sproutcore/themes/iphone_theme/english.lproj/button.css
 - lib/frameworks/sproutcore/themes/iphone_theme/english.lproj/core.css