Permalink
Browse files

Tons of improvements. Parity with current ember gem

  • Loading branch information...
1 parent 2789315 commit 5603f65b25ffce6320b755572ff5ed4eeac733d4 @devinus committed Mar 30, 2012
Showing with 2,990 additions and 410 deletions.
  1. +9 −1 Assetfile
  2. +15 −10 Gemfile
  3. +16 −5 Gemfile.lock
  4. +3 −0 Guardfile
  5. +1 −1 LICENSE
  6. +8 −8 README.md
  7. +29 −0 Rakefile
  8. +872 −378 app/css/bootstrap.css
  9. +1 −1 app/lib/core.js
  10. +1 −1 app/lib/ext.js
  11. +2 −2 app/lib/main.js
  12. +1 −1 app/lib/state_manager.js
  13. +2 −2 app/lib/states/start.js
  14. +5 −0 app/tests/ember-skeleton_tests.js
  15. +42 −0 tests/index.html
  16. +232 −0 tests/qunit/qunit.css
  17. +1,659 −0 tests/qunit/qunit.js
  18. +92 −0 tests/qunit/run-qunit.js
View
@@ -100,6 +100,14 @@ input 'app' do
concat 'app.js'
end
+ match 'tests/**/*.js' do
+ filter LoaderFilter,
+ :module_id_generator => proc { |input|
+ input.path.sub(/^lib\//, "#{APPNAME}/").sub(/\.js$/, '')
+ }
+ concat 'app-tests.js'
+ end
+
match 'css/**/*.css' do
if ENV['RAKEP_MODE'] == 'production'
yui_css
@@ -122,4 +130,4 @@ input 'app' do
end
end
-# vim: filetype=ruby
+# vim: filetype=ruby
View
@@ -1,14 +1,19 @@
-source "http://rubygems.org"
+source :rubygems
-gem "rack"
-gem "rack-rewrite"
-# gem "rack-streaming-proxy"
+gem 'colored'
-gem "sass"
-gem "compass"
+gem 'guard'
+gem 'guard-rake'
-gem "uglifier"
-gem "yui-compressor"
+gem 'rack'
+gem 'rack-rewrite'
+# gem 'rack-streaming-proxy'
-gem "rake-pipeline", :git => "https://github.com/livingsocial/rake-pipeline.git"
-gem "rake-pipeline-web-filters", :git => "https://github.com/wycats/rake-pipeline-web-filters.git"
+gem 'sass'
+gem 'compass'
+
+gem 'uglifier'
+gem 'yui-compressor'
+
+gem 'rake-pipeline', :git => 'https://github.com/livingsocial/rake-pipeline.git'
+gem 'rake-pipeline-web-filters', :git => 'https://github.com/wycats/rake-pipeline-web-filters.git'
View
@@ -1,14 +1,14 @@
GIT
remote: https://github.com/livingsocial/rake-pipeline.git
- revision: f71caeb1406dafd6af5ab8453db8c5ac53947c92
+ revision: b70ca6cad7655e58d13031f3e24df7dfc74f9030
specs:
rake-pipeline (0.6.0)
rake (~> 0.9.0)
thor
GIT
remote: https://github.com/wycats/rake-pipeline-web-filters.git
- revision: e58b9d055de666f6ca972151c125ccfb997c1b1c
+ revision: ba0b8a00356b4c854930a8e849b5629d51ffd70f
specs:
rake-pipeline-web-filters (0.6.0)
rack
@@ -22,21 +22,29 @@ GEM
open4
Platform (0.4.0)
chunky_png (1.2.5)
- compass (0.11.7)
+ colored (1.2)
+ compass (0.12.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
execjs (1.3.0)
multi_json (~> 1.0)
+ ffi (1.0.11)
fssm (0.2.8.1)
- multi_json (1.1.0)
+ guard (1.0.1)
+ ffi (>= 0.5.0)
+ thor (~> 0.14.6)
+ guard-rake (0.0.5)
+ guard
+ rake
+ multi_json (1.2.0)
open4 (1.3.0)
rack (1.4.1)
rack-rewrite (1.2.1)
rake (0.9.2.2)
sass (3.1.15)
thor (0.14.6)
- uglifier (1.2.3)
+ uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
yui-compressor (0.9.6)
@@ -46,7 +54,10 @@ PLATFORMS
ruby
DEPENDENCIES
+ colored
compass
+ guard
+ guard-rake
rack
rack-rewrite
rake-pipeline!
View
@@ -0,0 +1,3 @@
+guard :rake, :task => :test do
+ watch(%r{^app/.+\.js$})
+end
View
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Interline Vacations, Inc.
+Copyright (c) Your Name Here
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
View
@@ -17,14 +17,14 @@ App Structure
├── Gemfile - Package dependencies for rakep/rack
├── Gemfile.lock - Here be dragons: don't touch, always include
├── app - App specific code
- │   ├── css - App CSS or SCSS (.scss)
- │   ├── lib - App code, *modularized during build*
- │   ├── modules - Module code, *already modularized*
- │   ├── plugins - Plugins (e.g. jquery.jsonrpc.js)
- │   │ └── loader.js - JS module loader
- │   ├── static - Static files, never touched, copied over during build
- │   ├── templates - Handlebars templates, *modularized during build*
- │   └── vendor - Vendor code, *modularized during build*
+ │ ├── css - App CSS or SCSS (.scss)
+ │ ├── lib - App code, *modularized during build*
+ │ ├── modules - Module code, *already modularized*
+ │ ├── plugins - Plugins (e.g. jquery.jsonrpc.js)
+ │ │ └── loader.js - JS module loader
+ │ ├── static - Static files, never touched, copied over during build
+ │ ├── templates - Handlebars templates, *modularized during build*
+ │ └── vendor - Vendor code, *modularized during build*
├── assets - Built out asset files, minified in production
│ ├── app.css - Built out app CSS/SCSS
│ ├── loader.js - Built out JS module loader
View
@@ -0,0 +1,29 @@
+APPNAME = 'ember-skeleton'
+
+require 'colored'
+require 'rake-pipeline'
+
+desc "Build #{APPNAME}"
+task :build do
+ Rake::Pipeline::Project.new('Assetfile').invoke
+end
+
+desc "Run tests with PhantomJS"
+task :test => :build do
+ unless system("which phantomjs > /dev/null 2>&1")
+ abort "PhantomJS is not installed. Download from http://phantomjs.org/"
+ end
+
+ cmd = "phantomjs tests/qunit/run-qunit.js \"file://#{File.dirname(__FILE__)}/tests/index.html\""
+
+ # Run the tests
+ puts "Running #{APPNAME} tests"
+ success = system(cmd)
+
+ if success
+ puts "Tests Passed".green
+ else
+ puts "Tests Failed".red
+ exit(1)
+ end
+end
Oops, something went wrong.

0 comments on commit 5603f65

Please sign in to comment.