bump guard-compat dep to 1.0

guard · Dec 7, 2014 · da95c5e · da95c5e
1 parent d7ecbcb
commit da95c5e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/guard-bundler.gemspec b/guard-bundler.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
 
   s.add_dependency 'guard',   '~> 2.2'
-  s.add_dependency 'guard-compat',   '~> 0.2'
+  s.add_dependency 'guard-compat',   '~> 1.0'
   s.add_dependency 'bundler', '~> 1.0'
 
   s.files        = Dir.glob('{lib}/**/*') + %w[LICENSE README.md]

diff --git a/lib/guard/bundler.rb b/lib/guard/bundler.rb
@@ -39,15 +39,15 @@ def refresh_bundle
       duration = Time.now - start_at
       case result
       when :bundle_already_up_to_date
-        ::Guard::UI.info 'Bundle already up-to-date', reset: true
+        Guard::Compat::UI.info 'Bundle already up-to-date', reset: true
       when :bundle_installed_using_local_gems
-        ::Guard::UI.info 'Bundle installed using local gems', reset: true
+        Guard::Compat::UI.info 'Bundle installed using local gems', reset: true
         Notifier.notify 'bundle_check_install', nil
       when :bundle_installed
-        ::Guard::UI.info 'Bundle installed', reset: true
+        Guard::Compat::UI.info 'Bundle installed', reset: true
         Notifier.notify true, duration
       else
-        ::Guard::UI.info "Bundle can't be installed -- Please check manually", reset: true
+        Guard::Compat::UI.info "Bundle can't be installed -- Please check manually", reset: true
         Notifier.notify false, nil
       end
       result
@@ -67,7 +67,7 @@ def bundle_check
     end
 
     def bundle_install
-      ::Guard::UI.info 'Bundling...', reset: true
+      Guard::Compat::UI.info 'Bundling...', reset: true
       ::Bundler.with_clean_env do
         system("bundle install#{" #{options[:cli]}" if options[:cli]}")
       end

diff --git a/lib/guard/bundler/notifier.rb b/lib/guard/bundler/notifier.rb
@@ -18,18 +18,14 @@ def self.guard_message(result, duration)
 
       # failed | success
       def self.guard_image(result)
-        icon = if result
-          :success
-        else
-          :failed
-        end
+        result ?  :success : :failed
       end
 
       def self.notify(result, duration)
         message = guard_message(result, duration)
         image   = guard_image(result)
 
-        ::Guard::Notifier.notify(message, title: 'bundle install', image: image)
+        Guard::Compat::UI.notify(message, title: 'bundle install', image: image)
       end
 
     end

diff --git a/spec/guard/bundler/notifier_spec.rb b/spec/guard/bundler/notifier_spec.rb
@@ -22,7 +22,7 @@
   end
 
   it 'should call Guard::Notifier' do
-    expect(::Guard::Notifier).to receive(:notify).with(
+    expect(Guard::Compat::UI).to receive(:notify).with(
       "Bundle has been installed\nin 10.1 seconds.",
       title: 'bundle install',
       image: :success

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -35,8 +35,8 @@
   Kernel.srand config.seed
 
   config.before(:each) do
-    allow(Guard::Notifier).to receive(:notify)
-    allow(Guard::UI).to receive(:info)
+    allow(Guard::Compat::UI).to receive(:notify)
+    allow(Guard::Compat::UI).to receive(:info)
     @fixture_path = Pathname.new(File.expand_path('../fixtures/', __FILE__))
   end
 end