fix 3.2

razum2um · Jun 24, 2015 · 1755ff1 · 1755ff1
1 parent f335125
commit 1755ff1
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 36 deletions.
diff --git a/Appraisals b/Appraisals
@@ -1,20 +1,28 @@
 appraise 'rails-32' do
   gem 'rails', '~> 3.2.21'
+  gem 'sprockets', '~> 2.2.2.backport2', github: 'razum2um/sprockets-2.2.2.backport', branch: 'master'
+  gem 'sass-rails', github: 'razum2um/sass-rails', branch: 'backport'
   eval ::File.read('Gemfile')
 end
 
 appraise 'rails-40' do
   gem 'rails', '~> 4.0.13'
+  gem 'sprockets'
+  gem 'sass-rails'
   eval ::File.read('Gemfile')
 end
 
 appraise 'rails-41' do
   gem 'rails', '~> 4.1.9'
+  gem 'sprockets'
+  gem 'sass-rails'
   eval ::File.read('Gemfile')
 end
 
 appraise 'rails-42' do
   gem 'rails', '~> 4.2.0'
+  gem 'sprockets'
+  gem 'sass-rails'
   eval ::File.read('Gemfile')
 end
 
diff --git a/Gemfile b/Gemfile
@@ -24,9 +24,7 @@ group :development do
   # build template static
   # run `rake assets:precompile`
   # to get bundled application.(js|css)
-  gem 'sprockets'
   gem 'uglifier'
-  gem 'sass-rails'
   gem 'coffee-rails'
   gem 'bootstrap-sass', '~> 3.3.3'
   gem 'jquery-rails'

diff --git a/gemfiles/rails_32.gemfile b/gemfiles/rails_32.gemfile
@@ -3,18 +3,18 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 3.2.21"
+gem "sprockets", "~> 2.2.2.backport2", :github => "razum2um/sprockets-2.2.2.backport", :branch => "master"
+gem "sass-rails", :github => "razum2um/sass-rails", :branch => "backport"
 
 group :development do
   gem "fuubar"
   gem "fuubar-cucumber"
   gem "selenium-webdriver"
   gem "highline"
   gem "appraisal"
-  gem "sprockets"
   gem "uglifier"
-  gem "sass-rails"
   gem "coffee-rails"
-  gem "bootstrap-sass", "~> 3.3.3"
+  gem "bootstrap-sass"
   gem "jquery-rails"
   gem "remotipart"
   gem "launchy"

diff --git a/gemfiles/rails_40.gemfile b/gemfiles/rails_40.gemfile
@@ -3,18 +3,18 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.0.13"
+gem "sprockets"
+gem "sass-rails"
 
 group :development do
   gem "fuubar"
   gem "fuubar-cucumber"
   gem "selenium-webdriver"
   gem "highline"
   gem "appraisal"
-  gem "sprockets"
   gem "uglifier"
-  gem "sass-rails"
   gem "coffee-rails"
-  gem "bootstrap-sass", "~> 3.3.3"
+  gem "bootstrap-sass"
   gem "jquery-rails"
   gem "remotipart"
   gem "launchy"

diff --git a/gemfiles/rails_41.gemfile b/gemfiles/rails_41.gemfile
@@ -3,18 +3,18 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1.9"
+gem "sprockets"
+gem "sass-rails"
 
 group :development do
   gem "fuubar"
   gem "fuubar-cucumber"
   gem "selenium-webdriver"
   gem "highline"
   gem "appraisal"
-  gem "sprockets"
   gem "uglifier"
-  gem "sass-rails"
   gem "coffee-rails"
-  gem "bootstrap-sass", "~> 3.3.3"
+  gem "bootstrap-sass"
   gem "jquery-rails"
   gem "remotipart"
   gem "launchy"

diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile
@@ -3,18 +3,18 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
+gem "sprockets"
+gem "sass-rails"
 
 group :development do
   gem "fuubar"
   gem "fuubar-cucumber"
   gem "selenium-webdriver"
   gem "highline"
   gem "appraisal"
-  gem "sprockets"
   gem "uglifier"
-  gem "sass-rails"
   gem "coffee-rails"
-  gem "bootstrap-sass", "~> 3.3.3"
+  gem "bootstrap-sass"
   gem "jquery-rails"
   gem "remotipart"
   gem "launchy"

diff --git a/lib/lurker/templates/public/application.css b/lib/lurker/templates/public/application.css
diff --git a/lib/lurker/templates/public/application.js b/lib/lurker/templates/public/application.js
diff --git a/lib/lurker/templates/stylesheets/application.scss b/lib/lurker/templates/stylesheets/application.scss
@@ -1,4 +1,3 @@
-@import 'bootstrap-sprockets';
 @import 'bootstrap';
 @import 'docs';
 @import 'github';

diff --git a/tasks/build.rake b/tasks/build.rake
@@ -39,23 +39,22 @@ namespace :assets do
 
     %w[jquery-rails bootstrap-sass remotipart lurker].each do |gem|
       gem_path = Pathname.new(Bundler.rubygems.find_name(gem).first.full_gem_path)
-      %w[javascripts stylesheets].each do |prefix|
+      %w[javascripts stylesheets fonts].each do |prefix|
         %w[assets vendor/assets lib/lurker/templates].each do |interfix|
           path = gem_path.join(interfix, prefix).to_s
           sprockets.append_path(path) if File.exists? path
         end
       end
     end
 
-    sprockets.js_compressor  = :uglify unless ENV['TRAVIS']
-    sprockets.css_compressor  = :scss
+    unless ENV['TRAVIS']
+      sprockets.js_compressor  = :uglify
+      sprockets.css_compressor  = :scss
+    end
 
-    puts "sprockets.paths = #{sprockets.paths}"
-    puts 
-    system "find /home/travis/build/razum2um/lurker/gemfiles/vendor/bundle/ruby/1.9.1/gems/bootstrap-sass-3.3.5"
     BUNDLES.each do |bundle|
       begin
-        assets = sprockets.find_asset(bundle, bundle: false)
+        assets = sprockets.find_asset(bundle)
         realname = (assets.pathname.basename.to_s.split(".").take_while { |s| !s.match /^(js|css|scss)$/ } + [$~.to_s]).join(".").gsub(/\.scss$/, '.css')
         assets.write_to(BUILD_DIR.join(realname))
       end