Skip to content

Commit

Permalink
Upgrade packages, fix reported bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Devin Torres committed Jun 7, 2012
1 parent c2b29d8 commit 2881be4
Show file tree
Hide file tree
Showing 19 changed files with 16,011 additions and 11,241 deletions.
1 change: 0 additions & 1 deletion Assetfile
Expand Up @@ -67,7 +67,6 @@ input 'app' do
vendor/jquery.js vendor/jquery.js
vendor/ember.js vendor/ember.js
vendor/ember-data.js vendor/ember-data.js
vendor/sproutcore-routing.js
], 'app.js' ], 'app.js'
end end


Expand Down
29 changes: 19 additions & 10 deletions Gemfile.lock
@@ -1,14 +1,14 @@
GIT GIT
remote: https://github.com/livingsocial/rake-pipeline.git remote: https://github.com/livingsocial/rake-pipeline.git
revision: b70ca6cad7655e58d13031f3e24df7dfc74f9030 revision: 543f4322fe70facee9572d29ddabf7f090dad68a
specs: specs:
rake-pipeline (0.6.0) rake-pipeline (0.6.0)
rake (~> 0.9.0) rake (~> 0.9.0)
thor thor


GIT GIT
remote: https://github.com/wycats/rake-pipeline-web-filters.git remote: https://github.com/wycats/rake-pipeline-web-filters.git
revision: ba0b8a00356b4c854930a8e849b5629d51ffd70f revision: 81a22fb0808dfdeab8ed92d5d8c898ad198b9938
specs: specs:
rake-pipeline-web-filters (0.6.0) rake-pipeline-web-filters (0.6.0)
rack rack
Expand All @@ -27,23 +27,32 @@ GEM
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
sass (~> 3.1) sass (~> 3.1)
execjs (1.3.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
ffi (1.0.11) ffi (1.0.11)
fssm (0.2.8.1) fssm (0.2.9)
guard (1.0.1) guard (1.1.1)
ffi (>= 0.5.0) listen (>= 0.4.2)
thor (~> 0.14.6) thor (>= 0.14.6)
guard-rake (0.0.5) guard-rake (0.0.5)
guard guard
rake rake
multi_json (1.2.0) listen (0.4.3)
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
multi_json (1.3.6)
open4 (1.3.0) open4 (1.3.0)
rack (1.4.1) rack (1.4.1)
rack-rewrite (1.2.1) rack-rewrite (1.2.1)
rake (0.9.2.2) rake (0.9.2.2)
sass (3.1.15) rb-fchange (0.0.5)
thor (0.14.6) ffi
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
sass (3.1.19)
thor (0.15.2)
uglifier (1.2.4) uglifier (1.2.4)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
Expand Down
28 changes: 26 additions & 2 deletions README.md
Expand Up @@ -24,11 +24,35 @@ App Structure
│ │ └── loader.js - JS module loader │ │ └── loader.js - JS module loader
│ ├── static - Static files, never touched, copied over during build │ ├── static - Static files, never touched, copied over during build
│ ├── templates - Handlebars templates, *modularized during build* │ ├── templates - Handlebars templates, *modularized during build*
│ ├── tests - QUnit application tests
│ └── vendor - Vendor code, *modularized during build* │ └── vendor - Vendor code, *modularized during build*
├── assets - Built out asset files, minified in production ├── assets - Built out asset files, minified in production
│ ├── app.css - Built out app CSS/SCSS │ ├── app.css - Built out app CSS/SCSS
│ ├── loader.js - Built out JS module loader │ ├── app.js - Built out app JS
│ └── app.js - Built out app JS │ └── loader.js - Built out JS module loader
├── config.ru - Rack development web server configuration ├── config.ru - Rack development web server configuration
├── index.html - The app entry point ├── index.html - The app entry point
├── tests - QUnit testing files
│ ├── index.html - The testing entry point
│ ├── qunit - Testing support files
│ └── run-tests.js - The PhantomJS QUnit test runner
└── tmp - Temporary build files used by rakep └── tmp - Temporary build files used by rakep

Testing
-------

You can test the app by invoking:

$ bundle exec rake test

This executes the tests by using [PhantomJS](http://www.phantomjs.org/),
which you need to have installed.

Or you can run the tests via:

$ bundle exec rackup
$ open http://localhost:9292/tests/index.html

If you want to continuously run the tests every time a file changes, invoke:

$ bundle exec guard
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -14,7 +14,7 @@ task :test => :build do
abort "PhantomJS is not installed. Download from http://phantomjs.org/" abort "PhantomJS is not installed. Download from http://phantomjs.org/"
end end


cmd = "phantomjs tests/qunit/run-qunit.js \"file://#{File.dirname(__FILE__)}/tests/index.html\"" cmd = "phantomjs tests/run-tests.js \"file://#{File.dirname(__FILE__)}/tests/index.html\""


# Run the tests # Run the tests
puts "Running #{APPNAME} tests" puts "Running #{APPNAME} tests"
Expand Down

0 comments on commit 2881be4

Please sign in to comment.