Merge pull request #10 from nwwatson/master

Fixed Issue #9 Error when executing rake assets:precompile:all RAILS_ENV=production

README.rdoc

@@ -2,7 +2,7 @@
 
 Bootstrapped is a gem that helps you quickly integrate Twitter's Bootstrap in to your project to enable you to build user interfaces rapidly. 
 
-Bootstrapped also contains generators based off of Ryan Bates's nifty-generators https://github.com/ryanb/nifty-generators/ to help you rapidly scaffold. Unlike generators nifty-generators, Bootstrapped generators do not support HAML.
+Bootstrapped also contains generators based off of Ryan Bates's nifty-generators https://github.com/ryanb/nifty-generators/ to help you rapidly scaffold. Unlike generators nifty-generators.
 
 == Setup
 
@@ -70,6 +70,13 @@ If you are having a problem with Bootstrapped, first look at the FAQs above. If
 
 http://github.com/entropillc/bootstrapped/issues
 
+== Change Log
+
+=== Version 1.0.1
+
+  * Added HAML support in scaffolding
+  * Fixed assets:precompile issue preventing LESS to be compiled for production deployment.
+
 == License
 
 Copyright 2011 Entropi Software, LLC.

bootstrapped.gemspec

@@ -4,7 +4,7 @@ require "bootstrapped/version"
 
 Gem::Specification.new do |s|
   s.name        = "bootstrapped"
-  s.version     ='1.0.0'
+  s.version     ='1.0.1'
   s.authors     = ["Nicholas Watson"]
   s.email       = ["nwwatson@gmail.com"]
   s.homepage    = "http://github.com/entropillc/bootstrapped"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency             'railties',   '>= 3.1'
   s.add_dependency             'actionpack', '>= 3.1'
-  s.add_dependency             'less-rails' unless RUBY_PLATFORM == 'java'  
+  s.add_dependency             'less-rails', '~> 2.1.6' unless RUBY_PLATFORM == 'java'  
   s.add_development_dependency 'rails', '>= 3.1'
   s.add_development_dependency 'rspec-rails', '~> 2.6.1'
   s.add_development_dependency 'mocha', '~> 0.9.12'

lib/bootstrapped.rb

@@ -1,8 +1,6 @@
 unless RUBY_PLATFORM.eql?('java')
-  require 'less'
   require 'less-rails'
 end
 
 require 'bootstrapped/version'
 require 'bootstrapped/engine'
-

lib/bootstrapped/engine.rb

@@ -2,11 +2,12 @@
 
 module Bootstrapped
   class Engine < ::Rails::Engine
-    unless RUBY_PLATFORM.eql?('java')
-      initializer 'bootstrapped.setup', 
+    # If using JRUBY, don't load less configuration
+    unless RUBY_PLATFORM.eql?('java')    
+      initializer 'twitter-bootstrap-rails.setup', 
         :after => 'less-rails.after.load_config_initializers', 
         :group => :all do |app|
-          app.config.less.paths << File.join(config.root, 'vendor', 'less')
+          app.config.less.paths << File.join(config.root, 'vendor', 'less',)
       end
     end
   end

lib/bootstrapped/version.rb

@@ -1,3 +1,3 @@
 module Bootstrapped
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end