Merge branch 'sproutcore-routes'

Conflicts:
	assets/javascripts/app/templates/repositories/list.hbs
	assets/javascripts/app/views.coffee
	public/javascripts/application.js

AssetFile

@@ -3,6 +3,9 @@
 # http://blog.nulayer.com/post/23294069876/building-simple-javascript-libraries-with-rake-pipeline?15bb0420
 
 require 'rake-pipeline-web-filters'
+require 'compass'
+
+Compass.configuration.images_path = 'assets/images'
 
 output 'public/javascripts'
 input 'assets/javascripts' do
@@ -15,12 +18,14 @@ input 'assets/javascripts' do
       vendor/ember-data.js
       vendor/ansiparse.js
       vendor/i18n.js
+      vendor/facebox.js
       vendor/jquery.timeago.js
+      vendor/sc-routes.js
     )
     concat files, 'vendor.js'
   end
 
-  match '{app,config,lib}/**/*.coffee' do
+  match '{app,config,data,lib}/**/*.coffee' do
     coffee_script
   end
 
@@ -33,16 +38,12 @@ input 'assets/javascripts' do
     concat 'app/templates.js'
   end
 
-  match 'mocks.js' do
+  match '{app,config,data,lib}/**/*.js' do
-    concat 'mocks.js'
-  end
-
-  match '{app,config,lib}/**/*.js' do
     minispade(
       string: true,
       rewrite_requires: true,
       module_id_generator: proc { |input|
-        input.path.sub(%r(^(app|config|lib)/), '').sub(/\.js$/, '')
+        input.path.sub(%r(^(app|lib)/), '').sub(/\.js$/, '')
       }
     )
     concat 'application.js'
@@ -69,20 +70,29 @@ end
 
 output 'public/stylesheets'
 input 'assets/stylesheets' do
-  match '**/*.scss' do
+  match '**/*.{scss,sass}' do
-    filter(Rake::Pipeline::Web::Filters::TiltFilter) do |input|
+    # filter(Rake::Pipeline::Web::Filters::TiltFilter) do |input|
-      input.sub /\.scss$/, 'css'
+    #     input.sub /\.scss$/, '.css'
-    end
+    #   end
+    filter Rake::Pipeline::Web::Filters::SassFilter
   end
 
   match '**/*.css' do
+    concat 'application.css'
+  end
+end
+
+output 'public/images'
+input 'assets/images' do
+  match '**/*' do
+    copy
+  end
+end
+
+output 'public'
+input 'assets/static' do
+  match '**/*' do
     copy
   end
 end
 
-# output 'public'
-# input 'assets', 'index.html.erb' do
-#   filter(Rake::Pipeline::Web::Filters::TiltFilter) do |input|
-#     input.sub /\\.erb$/, ''
-#   end
-# end

Gemfile

@@ -8,6 +8,7 @@ group :assets do
   gem 'rake-pipeline-web-filters', github: 'wycats/rake-pipeline-web-filters'
 
   gem 'coffee-script'
+  gem 'compass'
   gem 'tilt'
   gem 'guard'
 end

Gemfile.lock

@@ -17,13 +17,19 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
+    chunky_png (1.2.5)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
     ffi (1.0.11)
+    fssm (0.2.9)
     guard (1.1.1)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
@@ -43,6 +49,7 @@ GEM
     rb-fsevent (0.9.1)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
+    sass (3.1.19)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -59,6 +66,7 @@ PLATFORMS
 
 DEPENDENCIES
   coffee-script
+  compass
   guard
   rake-pipeline!
   rake-pipeline-web-filters!