From 4c6ebac094d5f06452bcc74fe75e7c1e2c4f99f2 Mon Sep 17 00:00:00 2001 From: Dotan Nahum Date: Fri, 24 Feb 2012 06:28:31 -0600 Subject: [PATCH] removing version clash --- guard-sprockets.gemspec | 3 +-- lib/guard/sprockets.rb | 3 +-- lib/guard/sprockets/version.rb | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/guard-sprockets.gemspec b/guard-sprockets.gemspec index 60aaa37..5e2eb05 100644 --- a/guard-sprockets.gemspec +++ b/guard-sprockets.gemspec @@ -1,10 +1,9 @@ # -*- encoding: utf-8 -*- $:.push File.expand_path("../lib", __FILE__) -require 'guard/sprockets/version' Gem::Specification.new do |s| s.name = "guard-sprockets" - s.version = Guard::Sprockets::VERSION + s.version = "0.2.0" s.platform = Gem::Platform::RUBY s.authors = ["Aaron Cruz", 'Kematzy'] s.email = ["aaron@aaroncruz.com", "kematzy at gmail"] diff --git a/lib/guard/sprockets.rb b/lib/guard/sprockets.rb index b458c0e..2d537b2 100644 --- a/lib/guard/sprockets.rb +++ b/lib/guard/sprockets.rb @@ -3,7 +3,6 @@ require 'erb' require 'sprockets' - module Guard class Sprockets < Guard def initialize(watchers=[], options={}) @@ -17,7 +16,7 @@ def initialize(watchers=[], options={}) @asset_paths.each do |p| @sprockets_env.append_path p end - + if options.delete(:minify) begin require 'uglifier' diff --git a/lib/guard/sprockets/version.rb b/lib/guard/sprockets/version.rb index 90e1f46..cead86c 100644 --- a/lib/guard/sprockets/version.rb +++ b/lib/guard/sprockets/version.rb @@ -1,4 +1,5 @@ -# encoding: utf-8 +#encoding: utf-8 + module Guard module Sprockets VERSION = '0.2.0'