twbs_sass_rails 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b9c6e532fa011bee8a52a5c9a14e11ad8ff700
-  data.tar.gz: 3b8d3e490018336e40d0bc26b079faca09cef632
+  metadata.gz: 0a06def64c4b8cec2860e6f94c347adbf335d63d
+  data.tar.gz: 193a5cf149a45d1f6289dca49bc7ee04398b3df5
 SHA512:
-  metadata.gz: 88a62cfcd1a93dfd4d3281c9ba5d95594e5b60f82ad96de284d91b06c07ee6543c4a1e65d0b444193e495d648572d0e0c6cf88bf97c45e41a6282a7dc15a858c
-  data.tar.gz: 5ea6b0fb4ad94b7187660be390d3ef083ef1ef3d2be0732f5f7c40469926b493c35a1847a01970fbdabb22c89fbe05a7317244d7fdaa43a75132d490d622b473
+  metadata.gz: 983ef5953e0c0beecfa17879b2452ea7b357208785363a658d4d9f2ee75d01e2a69beee6784701dfb47b8fe559910d7f2ea0e4667f9d4e4778893485a17e07a3
+  data.tar.gz: 8b96f2e66ad511d4eeff0d331d5b951b4459a319f491426db280f7cf51781a397150bd01eb3e1461a6fcfe259d1b9c176987be7c9035cb86d341d8d592c43fd4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.7.0
+
+* bootstrap-sass 3.2.0
+* Fontawesome 4.1.0
+* Support for Rails 4.1.2 and 4.0.6
+
 ## 0.6.4
 
 * Added Gemfile.lock to .gitignore

data/Rakefile

@@ -46,15 +46,17 @@ SUBMODULES = {
 }
 
 SOURCE_FILES = {
-  bootstrap_stylesheets: File.expand_path('src/twbs/bootstrap-sass/vendor/assets/stylesheets/bootstrap/*.scss'),
-  bootstrap_javascripts: File.expand_path('src/twbs/bootstrap-sass/vendor/assets/javascripts/bootstrap/*.js'),
+  bootstrap_stylesheets: File.expand_path('src/twbs/bootstrap-sass/assets/stylesheets/bootstrap/*.scss'),
+  bootstrap_stylesheets_mixins: File.expand_path('src/twbs/bootstrap-sass/assets/stylesheets/bootstrap/mixins/*.scss'),
+  bootstrap_javascripts: File.expand_path('src/twbs/bootstrap-sass/assets/javascripts/bootstrap/*.js'),
   fontawesome_stylesheets: File.expand_path('src/FortAwesome/Font-Awesome/scss/*.scss'),
-  glyphicons_fonts: File.expand_path('src/twbs/bootstrap-sass/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.*'),
+  glyphicons_fonts: File.expand_path('src/twbs/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.*'),
   fontawesome_fonts: File.expand_path('src/FortAwesome/Font-Awesome/fonts/fontawesome-webfont.*'),
 }
 
 DESTINATION_FOLDERS = {
   bootstrap_stylesheets: File.expand_path('vendor/assets/stylesheets/twbs/bootstrap'),
+  bootstrap_stylesheets_mixins: File.expand_path('vendor/assets/stylesheets/twbs/bootstrap/mixins'),
   bootstrap_javascripts: File.expand_path('vendor/assets/javascripts/twbs/bootstrap'),
   fontawesome_stylesheets: File.expand_path('vendor/assets/stylesheets/fontawesome'),
   glyphicons_fonts: File.expand_path('app/assets/fonts'),
@@ -88,6 +90,9 @@ namespace :update do
     puts 'Adding respond.js...'
     FileUtils.cp File.expand_path('src/scottjehl/Respond/src/respond.js'), File.expand_path('vendor/assets/javascripts/respond.js')
 
+    puts 'Importing bootstrap-sprockets.js'
+    FileUtils.cp File.expand_path('src/twbs/bootstrap-sass/assets/javascripts/bootstrap-sprockets.js'), File.expand_path('vendor/assets/javascripts/twbs/bootstrap.js')
+
     puts 'Updating font paths...'
     update_fontawesome_paths
     update_glyphicons_paths
@@ -114,6 +119,7 @@ end
 
 def copy_source_files_to_destination_folders
   SOURCE_FILES.each do |k, v|
+    FileUtils.mkdir_p DESTINATION_FOLDERS[k] unless File.directory?(DESTINATION_FOLDERS[k])
     FileUtils.cp Dir.glob(v), DESTINATION_FOLDERS[k]
   end
 end
@@ -132,6 +138,7 @@ def update_glyphicons_paths
   file_name = "#{DESTINATION_FOLDERS[:bootstrap_stylesheets]}/_glyphicons.scss"
   text = File.read(file_name)
   text.gsub! /url\(if.*\#\{\$icon-font-name\}\.(.*)\)\)(.*)/, "font-url('\#{$icon-font-name}.\\1)\\2"
+  text.gsub! /\/\/= depend_on.*\n/, ''
   File.open(file_name, 'w') { |file| file.puts text }
 end