guard-shotgun 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d126e8ee210944ba24296943a76dd584da6dbd4e
-  data.tar.gz: e69decc7e4b43d9cb6eb97ee7cdb2939923f1f29
+  metadata.gz: 768372ae0e0beea64f279eeb4a905817ed43c6bd
+  data.tar.gz: 7c770228573a6f6123d5348bca3c91bc51fb07bc
 SHA512:
-  metadata.gz: 14a93627a3ec082efa06630de14191806b1e12aa3add2829f0480b688e574e5b75f3034391e9a3124705a63d196746f30ed3c4564d5f4661b687640d239af07e
-  data.tar.gz: e07f1eefedd465e3930677debf7d0d62071df731236a66f1e16dcc62249f170e3baf74a21a9a1d90a96335de8f4febe578072c1e0353472a88b20076d3ded197
+  metadata.gz: d29a66b72dd75355c57fd6d9f531849974822a9e91684b877d515843b533107777368a1dc6c4020db15530046b054b5c23ce4ca7510788636474096b7dddb9c2
+  data.tar.gz: 44151f39dba72b73a1acbd834fc0b06474cfb6d64d65b0e868128b3129f36c8a659be26bf568ebb5747522f1dc9de781bde09794c37d381e163d8e93e03e1003

data/Gemfile.lock

@@ -1,30 +1,37 @@
 PATH
   remote: .
   specs:
-    guard-shotgun (0.3.1)
+    guard-shotgun (0.4.0)
       ffi
-      guard (~> 1.0)
+      guard (~> 2.0)
       spoon
 
 GEM
   remote: https://rubygems.org/
   specs:
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
     ffi (1.9.3)
     formatador (0.2.5)
-    guard (1.8.3)
+    guard (2.5.1)
       formatador (>= 0.2.4)
-      listen (~> 1.3)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    listen (1.3.1)
+      listen (~> 2.6)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    listen (2.7.1)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     lumberjack (1.0.9)
     method_source (0.8.2)
+    nio4r (1.0.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -33,8 +40,6 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
-      ffi (>= 0.5.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -51,6 +56,7 @@ GEM
     spoon (0.0.4)
       ffi
     thor (0.19.1)
+    timers (1.1.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -85,6 +85,15 @@ This way, you can check it's working correctly. You can play with the `spec/dumm
 
 ## History
 
+#### 0.4.0
+
+* Merged PR with the changes to make it compatible with Guard 2. Thanks to
+@jnv!
+
+#### 0.3.1
+
+* Merged PR fixing issue with Spoon
+
 #### 0.3.0
 
 * Adding dependency on Guard ~> 1.0

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/guard-shotgun.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.required_ruby_version = '>= 1.9'
 
-  gem.add_dependency 'guard', "~> 1.0"
+  gem.add_dependency 'guard', '~> 2.0'
   gem.add_dependency 'ffi'
   gem.add_dependency 'spoon'
 

data/lib/guard/shotgun.rb

@@ -1,19 +1,19 @@
 require 'guard'
-require 'guard/guard'
+require 'guard/plugin'
 require 'spoon'
 require 'socket'
 require 'timeout'
 
 module Guard
-  class Shotgun < Guard
+  class Shotgun < Plugin
     VALID_ARGS = %w{server host port env daemonize pid option}
 
-    require File.expand_path('../shotgun/notifier', __FILE__)
+    require 'guard/shotgun/notifier'
     attr_accessor :pid
 
     STARTUP_TIMEOUT = 10 # seconds
 
-    def initialize(watchers=[], options={})
+    def initialize(options={})
       super
       @options = {
         host: 'localhost',

data/lib/guard/shotgun/notifier.rb

@@ -1,7 +1,17 @@
 module Guard
-  class Shotgun
+  class Shotgun < Plugin
     class Notifier
 
+      def self.notify(result)
+        message = guard_message(result)
+        options = {
+          title: 'guard-shotgun',
+          image: guard_image(result)
+        }
+
+        ::Guard::Notifier.notify(message, options)
+      end
+
       def self.guard_message(result)
         case result
         when 'up'
@@ -23,12 +33,6 @@ module Guard
         end
       end
 
-      def self.notify(result)
-        message = guard_message(result)
-        image   = guard_image(result)
-
-        ::Guard::Notifier.notify(message, :title => 'guard-shotgun', :image => image)
-      end
     end
   end
 end

data/lib/guard/shotgun/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module ShotgunVersion
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/spec/dummy_app/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem 'sinatra', :require => "sinatra/base"
 
 group :development, :test do
-  gem 'guard', '~> 1'
+  gem 'guard', '~> 2.0'
 
   # Requirements for the manually inserted guard-shotgun
   gem 'spoon'

data/spec/dummy_app/Gemfile.lock

@@ -1,21 +1,28 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     coderay (1.1.0)
     ffi (1.9.3)
     formatador (0.2.5)
-    guard (1.8.3)
+    guard (2.5.1)
       formatador (>= 0.2.4)
-      listen (~> 1.3)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    listen (1.3.1)
+      listen (~> 2.6)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    listen (2.7.1)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     lumberjack (1.0.9)
     method_source (0.8.2)
+    nio4r (1.0.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -26,8 +33,6 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
-      ffi (>= 0.5.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -37,12 +42,13 @@ GEM
       ffi
     thor (0.19.1)
     tilt (1.4.1)
+    timers (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ffi
-  guard (~> 1)
+  guard (~> 2.0)
   sinatra
   spoon

data/spec/dummy_app/Guardfile

@@ -1,5 +1,6 @@
-require File.expand_path('../../../lib/guard/shotgun', __FILE__)
+$LOAD_PATH << File.expand_path('../../lib', __dir__)
+require 'guard/shotgun'
 
 guard 'shotgun' do
   watch(%r{^(app|assets|lib|config)/(.)*.(rb|css|js|haml)})
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-shotgun
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - romain@softr.li
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement