twitter-bootswatch-rails 2.3.2.3 → 2.3.2.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTNhNWViYjE4MDc3Mzk1MjY5NmI4OTYxZDU1Mzc3NDI3YWI2NzE0Mw==
+  data.tar.gz: !binary |-
+    NDE0NGQzZDA5MzAzMmIwNjk2ZGZiYzJhYWQyMjhmODVkOWEzMTZmNg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZGQyZjZiZjNhMjNlZTA2MzBmN2UxMDE1NmViNTMxNTdkM2M2MTE4NDQ4YjQ4
+    YjVlNjE1ZTVlMTY2MjJjYjlhZjczZWMwNWU4OWNhODA0NWYxMDBmYmZkYmQ4
+    Y2U5YWQ3OWU2MTVhZDA1ZTE0ZDU2Nzg1NjgyMTU4ODA3YTBmODI=
+  data.tar.gz: !binary |-
+    YmU3ZjEyMjY0MDA4NjI2OTQ5ZjYxZjJjNmJhYTNiMjkwNWZhNGYzYTI4ZTc0
+    ZDM1NTAwZjVlMDA4NDYyNDM4ZjhkYWU1MGFkMDFjNjU4OGQ4NGI2Y2MwNWI3
+    M2FhZjhhMjg2Y2IyY2RhNGRiMTY1YTg5MGQzYWY1YjdjYTliMzg=

data/lib/generators/bootswatch/install/install_generator.rb

@@ -5,6 +5,8 @@ module Bootswatch
   module Generators
     class InstallGenerator < ::Rails::Generators::NamedBase
 
+      DEFAULT_RAILS_APP_JS_FILE='app/assets/javascripts/application.js'
+      DEFAULT_RAILS_APP_CSS_FILE='app/assets/stylesheets/application.css'
       DEFAULT_THEME_NAME='bootswatch'
 
       argument :name, type: :string, default: DEFAULT_THEME_NAME,
@@ -25,28 +27,38 @@ module Bootswatch
         "#{use_default_theme_name? ? 'bootstrap'.capitalize : theme_name.capitalize}"
       end
 
+      def remove_require_tree_directives
+        if File.exist?(DEFAULT_RAILS_APP_JS_FILE)
+          gsub_file DEFAULT_RAILS_APP_JS_FILE, /\/\/=\s*require_tree\s*\./, ''
+        end
+
+        if File.exist?(DEFAULT_RAILS_APP_CSS_FILE)
+          gsub_file DEFAULT_RAILS_APP_CSS_FILE, /=\s*require_tree\s*\./, ''
+        end
+      end
+
       def add_assets
 
         if use_default_theme_name?
-          if File.exist?('app/assets/javascripts/application.js')
-            unless File.read('app/assets/javascripts/application.js').include?(theme_name)
-              insert_into_file "app/assets/javascripts/application.js",
-                             "//= require #{theme_name}/loader\n",
+          if File.exist?(DEFAULT_RAILS_APP_JS_FILE)
+            unless File.read(DEFAULT_RAILS_APP_JS_FILE).include?(theme_name)
+              insert_into_file DEFAULT_RAILS_APP_JS_FILE,
+                             "//= require #{theme_name}/loader\n//= require #{theme_name}/bootswatch\n",
                              :after => "jquery_ujs\n"
             end
           else
-            template 'application.js.tt', 'app/assets/stylesheets/application.js', {theme_name: theme_name, theme_info: theme_info}
+            template 'application.js.tt', DEFAULT_RAILS_APP_JS_FILE, {theme_name: theme_name, theme_info: theme_info}
           end
 
-          if File.exist?('app/assets/stylesheets/application.css')
-            unless File.read('app/assets/stylesheets/application.css').include?(theme_name)
-              insert_into_file "app/assets/stylesheets/application.css",
-                             " *= require #{theme_name}/loader\n",
+          if File.exist?(DEFAULT_RAILS_APP_CSS_FILE)
+            unless File.read(DEFAULT_RAILS_APP_CSS_FILE).include?(theme_name)
+              insert_into_file DEFAULT_RAILS_APP_CSS_FILE,
+                             " *= require #{theme_name}/loader\n *= require #{theme_name}/bootswatch\n",
                              :after => "require_self\n"
             end
 
           else
-            template 'application.css.tt', 'app/assets/stylesheets/application.css', {theme_name: theme_name, theme_info: theme_info}
+            template 'application.css.tt', DEFAULT_RAILS_APP_CSS_FILE, {theme_name: theme_name, theme_info: theme_info}
           end
         else
           template 'application.js.tt', "app/assets/javascripts/#{theme_name}.js", {theme_name: theme_name, theme_info: theme_info}
@@ -62,7 +74,7 @@ module Bootswatch
 
         template 'loader.coffee.tt', File.join(javascripts_dest_path,'loader.coffee'), {theme_name: theme_name, theme_info: theme_info}
 
-        template 'bootswatch.coffee.tt', File.join(javascripts_dest_path,'bootswatch.coffee'), {theme_name: theme_name, theme_info: theme_info}
+        template 'bootswatch.js.coffee.tt', File.join(javascripts_dest_path,'bootswatch.js.coffee'), {theme_name: theme_name, theme_info: theme_info}
 
       end
 
@@ -79,7 +91,7 @@ module Bootswatch
 
         template 'mixins.less.tt', File.join(stylesheets_dest_path,'mixins.less'), {theme_name: theme_name, theme_info: theme_info}
 
-        template 'bootswatch.less.tt', File.join(stylesheets_dest_path,'bootswatch.less'), {theme_name: theme_name, theme_info: theme_info}
+        template 'bootswatch.css.less.tt', File.join(stylesheets_dest_path,'bootswatch.css.less'), {theme_name: theme_name, theme_info: theme_info}
 
         template 'base.less.tt', File.join(stylesheets_dest_path,'base.less'), {theme_name: theme_name, theme_info: theme_info}
 

data/lib/generators/bootswatch/install/templates/application.css.tt

@@ -2,4 +2,5 @@
  * Bootswatch
  *= require_self
  *= require <%= config[:theme_name] %>/loader
+ *= require <%= config[:theme_name] %>/bootswatch
 */

data/lib/generators/bootswatch/install/templates/application.js.tt

@@ -2,4 +2,5 @@
 // Bootswatch
 //= require jquery
 //= require jquery_ujs
-//= require <%= config[:theme_name] %>/loader
+//= require <%= config[:theme_name] %>/loader
+//= require <%= config[:theme_name] %>/bootswatch

data/lib/generators/bootswatch/install/templates/{bootswatch.less.tt → bootswatch.css.less.tt}

@@ -1,7 +1,7 @@
-@import "base";
+@import "<%= config[:theme_name] %>/base";
 // <%= config[:theme_info] %>
 // Bootswatch
-// bootswatch.less
+// bootswatch.css.less
 
 //body {
 //	padding-top: 10px;

data/lib/generators/bootswatch/install/templates/{bootswatch.coffee.tt → bootswatch.js.coffee.tt}

@@ -1,6 +1,6 @@
 # <%= config[:theme_info] %>
 # Bootswatch
-# bootswatch.coffee
+# bootswatch.js.coffee
 # http://coffeescriptcookbook.com/chapters/syntax/embedding_javascript
 
 #jQuery ->

data/lib/generators/bootswatch/install/templates/loader.coffee.tt

@@ -20,6 +20,4 @@ bootstrap-affix]
 
 js_files.each do |js_file|
 %>#= require twitter/bootstrap/<%= js_file %>
-<% end %>
-
-#= require <%= config[:theme_name] %>/bootswatch
+<% end %>

data/lib/generators/bootswatch/install/templates/loader.css.less.tt

@@ -17,6 +17,4 @@ end
 end
 %>
 
-// @import "twitter/bootstrap/responsive";
-
-@import "<%= config[:theme_name] %>/bootswatch";
+// @import "twitter/bootstrap/responsive";

data/lib/twitter/bootswatch/rails/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   module Bootswatch
     module Rails
-      VERSION = '2.3.2.3'
+      VERSION = '2.3.2.4'
     end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootswatch-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.2.3
-  prerelease: 
+  version: 2.3.2.4
 platform: ruby
 authors:
 - Scott V. Rosenthal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: less-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -108,8 +97,8 @@ files:
 - lib/generators/bootswatch/install/templates/application.js.tt
 - lib/generators/bootswatch/install/templates/base.less.tt
 - lib/generators/bootswatch/install/templates/bootstrap.less
-- lib/generators/bootswatch/install/templates/bootswatch.coffee.tt
-- lib/generators/bootswatch/install/templates/bootswatch.less.tt
+- lib/generators/bootswatch/install/templates/bootswatch.css.less.tt
+- lib/generators/bootswatch/install/templates/bootswatch.js.coffee.tt
 - lib/generators/bootswatch/install/templates/loader.coffee.tt
 - lib/generators/bootswatch/install/templates/loader.css.less.tt
 - lib/generators/bootswatch/install/templates/mixins.less.tt
@@ -198,6 +187,7 @@ homepage: https://github.com/scottvrosenthal/twitter-bootswatch-rails
 licenses:
 - MIT
 - GPL-2
+metadata: {}
 post_install_message: ! "Important: You may need to add a javascript runtime to your
   Gemfile in order for bootstrap's LESS files to compile to CSS. \n\n**********************************************\n\nExecJS
   supports these runtimes:\n\ntherubyracer - Google V8 embedded within Ruby\n\ntherubyrhino
@@ -206,28 +196,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3139436027548453459
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3139436027548453459
 requirements: []
 rubyforge_project: twitter-bootswatch-rails
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Twitter Bootstrap CSS toolkit for Rails 3.1+ Asset Pipeline with less-rails
   (no fluff - core only)
 test_files: []