bootswatch_rails 3.1.1.18 → 3.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3a9c23f41bdd82e2508421007ed2ff4c68e56c2
-  data.tar.gz: 459bb3beb51df32b7bd60ce0a3a722e537f8a25c
+  metadata.gz: 93448b3e196612198f23628c02c57e2ec6d4493e
+  data.tar.gz: 98ebfb9ecaa08f5319be489650df6ba47b80e0b6
 SHA512:
-  metadata.gz: 0ad3cf4e38f92147619b1c669dbed058426268282b07e57a66de3acbdbcb30385496a95510bc4e2e48bffc039d9ad55420bcc99e909979ce39833a7121dc842a
-  data.tar.gz: f98b4e619d82c612724bd2556154c60e3f944d9f44d8ae0bd33c0ef7ab53902c304a2e1f4b7472c2df7edf6807f21f23e6795e45f171326ddc3034d7a27616e3
+  metadata.gz: fb9d2231741e7e42125714b8777dcd7a1c3909e273f8388e4de7a018945d84bd8854b5daef5744aceb201a5ee610bf7cb9d614ce5e95f1da7dc78974b4537425
+  data.tar.gz: 4967b2ad8cab2ecd77349a4305ebe69282759016dc6941fb9c71d439c869269d40e5c382d631a7404a12a7f02eafd66b8ddc32ece7774494993b62288b80830f

data/generate.sh

@@ -7,10 +7,13 @@
 ######
 #################################################################################
 
-git submodule foreach git pull || exit 1
+# Exit on error 
+set -e                  
+
+git submodule foreach git pull
 
 _assets="vendor/assets"
-mkdir -p $_assets/stylesheets $_assets/fonts || exit 1
+mkdir -p $_assets/stylesheets $_assets/fonts
 
 _themes_css=""
 _themes_raw=""
@@ -20,12 +23,12 @@ for _file in $(ls -1 bootswatch/*/bootstrap.css) ; do
 	_src="bootswatch/$_file"
 	_dst="$_assets/stylesheets/$_theme.css"
 	rm -f /tmp/css.tmp
-	sed -e 's#\.\./fonts/#/assets/#g' $_src >/tmp/css.tmp || exit 1
+	sed -e 's#\.\./fonts/#/assets/#g' $_src >/tmp/css.tmp
 	if cmp -s /tmp/css.tmp $_dst ; then
 		rm -f /tmp/css.tmp
 	else
 		echo "copy: $_theme.css"
-		mv /tmp/css.tmp $_dst || exit 1
+		mv /tmp/css.tmp $_dst
 	fi
 	if [ -z "$_themes_css" ] ; then
 		_themes_css="$_theme.css"
@@ -42,26 +45,24 @@ done
 _engine="lib/bootswatch_rails/engine.rb"
 if [ -s $_engine ] ; then
 	rm -f /tmp/engine.tmp
-	sed -e "/assets.precompile/s/=.*/= %w($_themes_css)/" \
-			$_engine >/tmp/engine.tmp || exit 1
+	sed -e "/assets.precompile/s/=.*/= %w($_themes_css)/" $_engine >/tmp/engine.tmp
 	if cmp -s /tmp/engine.tmp $_engine ; then
 		rm -f /tmp/engine.tmp
 	else
 		echo "edit: $_engine"
-		mv /tmp/engine.tmp $_engine || exit 1
+		mv /tmp/engine.tmp $_engine
 	fi
 fi
 
 _version="lib/bootswatch_rails/version.rb"
 if [ -s $_version ] ; then
 	rm -f /tmp/version.tmp
-	sed -e "/THEMES/s/=.*/= [$_themes_raw]/" \
-			$_version >/tmp/version.tmp || exit 1
+	sed -e "/THEMES/s/=.*/= [$_themes_raw]/" $_version >/tmp/version.tmp
 	if cmp -s /tmp/version.tmp $_version ; then
 		rm -f /tmp/version.tmp
 	else
 		echo "edit: $_version"
-		mv /tmp/version.tmp $_version || exit 1
+		mv /tmp/version.tmp $_version
 	fi
 fi
 
@@ -71,7 +72,7 @@ for _file in bootswatch/fonts/*.* ; do
 	_dst="$_assets/fonts/$_file"
 	if ! cmp -s $_src $_dst ; then
 		echo "copy: $_file"
-		cp $_src $_dst || exit 1
+		cp $_src $_dst
 	fi
 done
 

data/lib/bootswatch_rails/version.rb

@@ -1,5 +1,5 @@
 module BootswatchRails
-  VERSION = "3.1.1.18"
+  VERSION = "3.2.0.1"
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :readable, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 1
 end

data/lib/generators/bootswatch_rails/bootsy/bootsy_generator.rb

@@ -36,7 +36,7 @@ module BootswatchRails
       def add_to_view
         file = "app/views/#{table_name}/_form.html.erb"
         columns.each do |column|
-          gsub_file file, /(input :#{column}) /, "\\1, as: :bootsy, rows: 12 "
+          gsub_file file, /(input :#{column}) /, "\\1, as: :bootsy, input_html: { rows: 10 } "
         end
       end