less-rails-bootstrap 3.0.2 → 3.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzBkMGEyODJjZWJhNjM1MmI3ZDJkYmUwM2NiM2ZkNGZkY2Y2Zjg0OA==
+    OTU1Y2UxM2QxZjc1YTY0ZDg1NWFjZjIxMGIxN2Y4YzJlNDI0YzU5MQ==
   data.tar.gz: !binary |-
-    ZDU0MTk2ZTM4YTI4NTQ2NDUwZTUwZjg3MDRkOTc0NjM5ZDg5OGRkZA==
+    Zjg4MWQxMmJjOWIyNTg3OWU4N2UyMWExMTBlOTVmNjRiZmNmMTg4Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDE1M2JkYTNmYWE4YTI1NTY3YmE2MmFmYzg4ZmRmYmQ3MDQ0MTUwZWM4ZDA4
-    ZDdkYzE2M2U3YTY1ZmE2NmEwNjY5OThiZmE4NTk0NTU2MjAyNWMzZjQxMWQw
-    OGJlNjU5ODgyZTRkZWJhZTgwZmY5OWVhM2YzYWRkMmZiZDA1NjU=
+    ZGRiMDFhYjBiMDBhYzAzMmU1ZTIzNzU2MTA5ZjYwNjEyNmIzNzBlNmQ1YTVl
+    MmQyZTVjM2E0YzhhN2NhNzkzMTJkOTU5MTg1YWVkYmEwMDllMTNjN2Y1NWVh
+    ZDdjMzMyZTM3Yzg1YTdmYWQxZTFhZTEwNjQwOGYyYjFkMmI3MTc=
   data.tar.gz: !binary |-
-    NzQ2ODk5MWY3ZGUwMWY3ZjhmOGQ0OTU2ZDEwYjUyYmVkZjYyNGFlZDNjNGQz
-    NDIzNDRiZDQ0NmE2YWIwM2QwODAzYTg3NDkwYjFjMDVhMGZjOWM1ODYzYmU2
-    NTNjODg1YTEzY2VmNjZiOWM4ODJkZjYzNzgyYTNjMzNjOTdmYzU=
+    ZTY4MTZiMzIxNTcyODM1MDcyMzAxZWIzN2Y2OWI4YjgyNmYwNDAyNDJkZDMx
+    N2EyZmE3ZjI5NGFkN2I2MDUxYjVhOTQ5MTk4YmRiMzFiZWRiMzFkYzFhZTlm
+    NGU5ZDQxMzcwNzI1YmZmNTRkNWU3MTJmOWNjZTgzNDk2MTI4MjA=

data/.gitignore

@@ -1,8 +1,11 @@
 *.gem
 .bundle
-Gemfile.lock
+*.lock
 pkg/*
+*.log
 test/dummy_app/log/*
+test/dummy_app/tmp/*
 tmp/*
-.DS_Store
 twitter/
+gemfiles/*.gemfile
+test/dummy_app/tmp/

data/.travis.yml

@@ -1,6 +1,13 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
+before_install:
+  - gem install bundler
+  - bundle --version
+install:
+  - bundle install
+before_script:
+  - bundle exec rake appraisal:setup
+script:
+  - bundle exec rake appraisal test

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails31" do
+  gem "rails", "~> 3.1.0"
+end unless RUBY_VERSION == '2.0.0'
+
+appraise "rails32" do
+  gem "rails", "~> 3.2.13"
+end
+
+appraise "rails40" do
+  gem "rails", "~> 4.0.0"
+end

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+# 3.0.3 - unreleased
+
+* Update to less-rails 2.4.2 or higher. Fix initializers for 2.4.2 too.
+* Remove Rails 3.1 with Ruby 2.0 build support. Sprockets will not work!
+
 # 3.0.2 - 2013-09-01
 
 * Cross platform update script.

data/CONTRIBUTING.md

@@ -3,7 +3,12 @@
 Here are the steps to update the version of twitter bootstrap used.
 
 * Clone this repository.
-* Run the `./scripts/update_bootstrap.sh` script with bootstrap repo
-version tag argument. For example `./scripts/update_bootstrap.sh v3.0.0`.
-* RUN THE TESTS!
-* Send pull request.
+* Run the `./scripts/update_bootstrap.sh` script with bootstrap repo version tag argument. For example `./scripts/update_bootstrap.sh v3.0.0`.
+* Make your changes
+* Run the tests by doing:
+
+```
+$ bundle install
+$ bundle exec rake appraisal:setup
+$ bundle exec rake appraisal test
+```

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem "appraisal"
+
 gem "therubyracer", ">= 0.10.1", :require => nil, :platforms => :ruby
 gem "therubyrhino", ">= 1.73.2", :require => nil, :platforms => :jruby
 

data/README.md

@@ -85,16 +85,26 @@ Or include plugins individually.
 This gem will directly track the semantic versioning of the Twitter Bootstrap project. Our major and minor versions will always match to theirs, though we may have tiny patch level releases specific to this gem.
 
 
-## Testing
+## Contributing
 
-Simple! Just clone the repo, then run `bundle install` and `bundle exec rake`. The tests will begin to run. We also use Travis CI to run our tests. The current build status is:
+This gem is fully tested from Rails 3.1 to 4. We run our tests on [Travis CI](http://travis-ci.org/metaskills/less-rails-boostrap) in both Ruby 1.9, 2.0, and jRuby 1.9 mode. If you detect a problem, open up a github issue or fork the repo and help out. After you fork or clone the repository, the following commands will get you up and running on the test suite. 
 
-We also have a test rails project setup using all the examples documented above. If you make a github issue and complain about something, I will likely forward you to this project.
+```shell
+$ bundle install
+$ bundle exec rake appraisal:setup
+$ bundle exec rake appraisal test
+```
+
+We use the [appraisal](https://github.com/thoughtbot/appraisal) gem from Thoughtbot to help us generate the individual gemfiles for each Rails version and to run the tests locally against each generated Gemfile. The `rake appraisal test` command actually runs our test suite against all Rails versions in our `Appraisal` file. If you want to run the tests for a specific Rails version, use `rake -T` for a list. For example, the following command will run the tests for Rails 3.2 only.
+
+```shell
+$ bundle exec rake appraisal:rails32 test
+```
 
-[https://github.com/metaskills/less-rails-bootstrap-test](https://github.com/metaskills/less-rails-bootstrap-test)
+Our current build status is:
+[![Build Status](https://secure.travis-ci.org/metaskills/minitest-spec-rails.png)](http://travis-ci.org/metaskills/less-rails-bootstrap) read more in our [CONTRIBUTING](https://github.com/metaskills/less-rails-bootstrap/blob/master/CONTRIBUTING.md) file.
 
 
-## [Contributing](https://github.com/metaskills/less-rails-bootstrap/blob/master/CONTRIBUTING.md)
 
 ## License
 

data/Rakefile

@@ -1,14 +1,21 @@
 require 'bundler'
 require 'rake/testtask'
+require 'appraisal'
 
 Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new do |t|
   t.libs = ['lib','test']
-  t.test_files = Dir.glob("test/**/*_spec.rb").sort
+  t.test_files = Dir.glob(["test/**/*_{spec,test}.rb"]).sort
   t.verbose = true
 end
 
 task :default => [:test]
 task :spec => [:test]
 
+desc "Setup Appraisal."
+task 'appraisal:setup' do
+  Rake::Task['appraisal:cleanup'].invoke
+  Rake::Task['appraisal:gemfiles'].invoke
+  Rake::Task['appraisal:install'].invoke
+end

data/less-rails-bootstrap.gemspec

@@ -10,12 +10,13 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'http://github.com/metaskills/less-rails-bootstrap'
   gem.summary       = 'CSS toolkit from Twitter For Rails 3.1 Asset Pipeline'
   gem.description   = 'CSS toolkit from Twitter For Rails 3.1 Asset Pipeline. Best one of all!'
+  gem.license       = 'MIT'
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
-  gem.add_runtime_dependency     'less-rails', '~> 2.3.1'
-  gem.add_development_dependency 'minitest'
+  gem.add_runtime_dependency     'less-rails', '~> 2.4.2'
+  gem.add_development_dependency 'minitest', '~> 4.0'
   gem.add_development_dependency 'guard-minitest'
-  gem.add_development_dependency 'rails',  '~> 3.1'
+  gem.add_development_dependency 'rails',  ['>= 3.1', '< 4.1']
 end

data/lib/less/rails/bootstrap/engine.rb

@@ -5,7 +5,7 @@ module Less
     module Bootstrap
       class Engine < ::Rails::Engine
         
-        initializer 'less-rails-bootstrap.setup', :after => 'less-rails.after.load_config_initializers', :group => :all do |app|
+        initializer 'less-rails-bootstrap.setup', :after => 'less-rails.before.load_config_initializers', :group => :all do |app|
           app.config.less.paths << File.join(config.root, 'app', 'frameworks')
         end
         

data/lib/less/rails/bootstrap/version.rb

@@ -1,7 +1,7 @@
 module Less
   module Rails
     module Bootstrap
-      VERSION = "3.0.2"
+      VERSION = "3.0.3"
     end
   end
 end

data/test/cases/generators/custom_bootstrap_generator_test.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'rails/generators/test_case'
+require 'generators/less_rails_bootstrap/custom_bootstrap/custom_bootstrap_generator'
+
+class CustomBootstrapGeneratorTest < Rails::Generators::TestCase
+  tests LessRailsBootstrap::Generators::CustomBootstrapGenerator
+
+  destination Rails.root.join('tmp/generators')
+  setup :prepare_destination
+
+  def setup
+    run_generator
+  end
+
+  test "content of custom_bootstrap.less was changed" do
+    md5 = Digest::MD5.file(destination_root.join("app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less")).hexdigest
+    assert_equal '1f5b67b27608c7c5db14ad0b9c6cacbb', md5,
+      'Looks like content of custom_bootstrap.less was changed. Please, investigate the reason of this and fix test if these changes is appropriate.'
+  end
+
+  test "custom_bootstrap.less is generated" do
+    assert_file(destination_root.join("app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less"), /@import/)
+  end
+
+  test "variables.less is generated" do
+    assert_file("app/assets/stylesheets/custom_bootstrap/variables.less",
+      "// Use this file to override Twitter Bootstrap variables or define own variables.\n")
+  end
+
+  test "mixins.less is generated" do
+    assert_file("app/assets/stylesheets/custom_bootstrap/mixins.less",
+      "// Use this file to override Twitter Bootstrap mixins or define own mixins.\n")
+  end
+end

data/test/cases/usage_css_spec.rb

@@ -40,7 +40,7 @@ class UsageCssSpec < Less::Rails::Bootstrap::Spec
 
     it 'will render bootstrap variables' do
       link_color_line = line_for_framework_css('framework-linkColor')
-      link_color_line.must_include 'color:#428bca;'
+      link_color_line.must_include 'color:#428bca'
     end
 
   end

data/test/cases/usage_js_spec.rb

@@ -20,7 +20,7 @@ class UsageJsSpec < Less::Rails::Bootstrap::Spec
     
   end
   
-  describe 'individual.css.less' do
+  describe 'individual.js' do
     
     let(:individual_js) { dummy_asset('individual.js') }
     

data/test/dummy_app/init.rb

@@ -11,9 +11,10 @@ module Dummy
     config.active_support.deprecation = :stderr
     config.cache_store = :memory_store
     config.consider_all_requests_local = true
+    config.eager_load = false
     
-    config.assets.enabled = true
-    config.assets.cache_store = config.cache_store
+    config.assets.enabled = true if ::Rails::VERSION::MAJOR < 4
+    config.assets.cache_store = [:file_store, "#{config.root}/tmp/cache/assets/"]
     
   end
 end

data/test/spec_helper.rb

@@ -1,54 +1,76 @@
-require 'rubygems'
-require 'bundler'
-Bundler.require
+require 'bundler' ; Bundler.require :development, :test
 require 'less-rails-bootstrap'
 require 'minitest/autorun'
-require 'minitest/spec'
 require 'dummy_app/init'
+require 'fileutils'
 
 module Less
   module Rails
     module Bootstrap
       class Spec < MiniTest::Spec
+        
+        include FileUtils
+        
+        class << self
+          
+          def dummy_app
+            Dummy::Application
+          end
 
+          def dummy_tmp
+            "#{dummy_app.root}/tmp"
+          end
+          
+        end
+        
         before do
+          prepare_cache_dir
+          reset_config_options
           reset_caches
         end
-
-
-        private
-
-        def dummy_app
-          Dummy::Application
-        end
+        
+        protected
+        
+        delegate :dummy_app, :dummy_tmp, :to => :'self.class'
 
         def dummy_config
           dummy_app.config
         end
-
+        
         def dummy_assets
           dummy_app.assets
         end
-
+        
         def dummy_asset(name)
           dummy_assets[name].to_s.strip
         end
-
+        
+        def reset_config_options
+          dummy_config.less.compress = false
+        end
+        
         def reset_caches
-          dummy_assets.version = SecureRandom.hex(32)
-          dummy_assets.cache.clear
+          version = SecureRandom.hex(32)
+          dummy_config.assets.version = version
+          dummy_assets.version = version
+          cache = dummy_assets.cache
+          cache.respond_to?(:clear) ? cache.clear : rm_r("#{dummy_tmp}/cache/assets")
         end
         
+        def prepare_cache_dir
+          mkdir_p "#{dummy_tmp}/cache/assets"
+        end
+
         def project_root
           File.expand_path File.join(File.dirname(__FILE__), '..')
         end
-        
+
         def project_app_twitter_bootstrap
           File.join project_root, 'app', 'frameworks'
         end
-
+        
       end
-    end
+    end    
   end
 end
 

metadata

@@ -1,40 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: less-rails-bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.2
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.2
   type: :runtime
   prerelease: false
   name: less-rails
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   name: minitest
@@ -55,14 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :development
   prerelease: false
   name: rails
@@ -75,6 +81,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -147,6 +154,7 @@ files:
 - lib/less/rails/bootstrap/version.rb
 - scripts/update_bootstrap.sh
 - test/cases/engine_spec.rb
+- test/cases/generators/custom_bootstrap_generator_test.rb
 - test/cases/usage_css_spec.rb
 - test/cases/usage_js_spec.rb
 - test/dummy_app/app/assets/javascripts/application.js
@@ -158,7 +166,8 @@ files:
 - test/dummy_app/init.rb
 - test/spec_helper.rb
 homepage: http://github.com/metaskills/less-rails-bootstrap
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -182,6 +191,7 @@ specification_version: 4
 summary: CSS toolkit from Twitter For Rails 3.1 Asset Pipeline
 test_files:
 - test/cases/engine_spec.rb
+- test/cases/generators/custom_bootstrap_generator_test.rb
 - test/cases/usage_css_spec.rb
 - test/cases/usage_js_spec.rb
 - test/dummy_app/app/assets/javascripts/application.js