Skip to content
This repository
Browse code

Merge branch 'master' into interactor/pry

  • Loading branch information...
commit 3f20602a8db1fbce8866c3ce6bf2c8b7e7b3bead 2 parents 2837fbd + f578c71
Michael Kessler authored
5  CHANGELOG.md
Source Rendered
... ...
@@ -1,5 +1,6 @@
1  
-# Master
  1
+## 1.3.3 - 20 September, 2012
2 2
 
  3
+- Add Guard application icon to GNTP notifier. ([@netzpirat][])
3 4
 - [#324][] Allow Terminal Notifier title to be customizable. ([@mattgreen][])
4 5
 
5 6
 ## 1.3.2 - 15 August, 2012
@@ -667,4 +668,4 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
667 668
 [@waldo]: https://github.com/waldo
668 669
 [@wereHamster]: https://github.com/wereHamster
669 670
 [@yannlugrin]: https://github.com/yannlugrin
670  
-[@zonque]: https://github.com/zonque
  671
+[@zonque]: https://github.com/zonque
40  CONTRIBUTING.md
Source Rendered
... ...
@@ -0,0 +1,40 @@
  1
+Contribute to Guard
  2
+===================
  3
+
  4
+File an issue
  5
+-------------
  6
+
  7
+You can report bugs and feature requests to [GitHub Issues](https://github.com/guard/guard/issues).
  8
+
  9
+**Please don't ask question in the issue tracker**, instead ask them in our
  10
+[Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
  11
+
  12
+Try to figure out where the issue belongs to: Is it an issue with Guard itself or with a Guard plugin you're
  13
+using?
  14
+
  15
+When you file a bug, please try to follow these simple rules if applicable:
  16
+
  17
+* Make sure you run Guard with `bundle exec` first.
  18
+* Add debug information to the issue by running Guard with the `--debug` option.
  19
+* Add your `Guardfile` and `Gemfile` to the issue.
  20
+* Make sure that the issue is reproducible with your description.
  21
+
  22
+**It's most likely that your bug gets resolved faster if you provide as much information as possible!**
  23
+
  24
+Development
  25
+-----------
  26
+
  27
+* Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/guard/master/frames).
  28
+* Source hosted at [GitHub](https://github.com/guard/guard).
  29
+
  30
+Pull requests are very welcome! Please try to follow these simple rules if applicable:
  31
+
  32
+* Please create a topic branch for every separate change you make.
  33
+* Make sure your patches are well tested. All specs run with `rake spec:portability` must pass.
  34
+* Update the [Yard](http://yardoc.org/) documentation.
  35
+* Update the [README](https://github.com/guard/guard/blob/master/README.md).
  36
+* Update the [CHANGELOG](https://github.com/guard/guard/blob/master/CHANGELOG.md) for noteworthy changes.
  37
+* Please **do not change** the version number.
  38
+
  39
+For questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
  40
+`#guard` (irc.freenode.net).
46  README.md
Source Rendered
@@ -69,31 +69,8 @@ the time, try the [Rubygems Bundler](https://github.com/mpapis/rubygems-bundler)
69 69
 You can configure Guard to make use of the following system notification libraries, but it's strongly recommended
70 70
 to use either Ruby GNTP, Libnotify or Notifu:
71 71
 
72  
-#### Growl
73  
-
74  
-* Runs on Mac OS X
75  
-* Supports all [Growl](http://growl.info/) versions
76  
-
77  
-The [growl](https://rubygems.org/gems/growl) gem is compatible with all versions of Growl and uses a command line tool
78  
-[growlnotify](http://growl.info/extras.php#growlnotify) that must be separately downloaded and installed. The version of
79  
-the command line tool must match your Growl version. The `growl` gem does **not** support multiple notification
80  
-channels.
81  
-
82  
-You have to download the installer for `growlnotify` from the [Growl download section](http://growl.info/downloads).
83  
-
84  
-To use `growl` you have to add it to your `Gemfile` and run bundler:
85  
-
86  
-```ruby
87  
-group :development do
88  
-  gem 'growl'
89  
-end
90  
-```
91  
-
92 72
 #### Ruby GNTP
93 73
 
94  
-**There's currently a bug in Growl that prevents displaying the icons through GNTP, see
95  
-[issue #231](https://github.com/guard/guard/issues/231). Use the growl gem until fixed.**
96  
-
97 74
 * Runs on Mac OS X, Linux and Windows
98 75
 * Supports [Growl](http://growl.info/) version >= 1.3, [Growl for Linux](http://mattn.github.com/growl-for-linux/),
99 76
   [Growl for Windows](http://www.growlforwindows.com/gfw/default.aspx) and
@@ -101,7 +78,8 @@ end
101 78
 
102 79
 The [ruby_gntp](https://rubygems.org/gems/ruby_gntp) gem sends system notifications over the network with the
103 80
 [Growl Notification Transport Protocol](http://www.growlforwindows.com/gfw/help/gntp.aspx) and supports local and
104  
-remote notifications.
  81
+remote notifications. To have the images be displayed, you have to use `127.0.0.1` instead of `localhost` in your GTNP
  82
+configuration.
105 83
 
106 84
 Guard supports multiple notification channels for customizing each notification type. For Growl on Mac OS X you need
107 85
 to have at least version 1.3 installed.
@@ -114,6 +92,26 @@ group :development do
114 92
 end
115 93
 ```
116 94
 
  95
+#### Growl
  96
+
  97
+* Runs on Mac OS X
  98
+* Supports all [Growl](http://growl.info/) versions
  99
+
  100
+The [growl](https://rubygems.org/gems/growl) gem is compatible with all versions of Growl and uses a command line tool
  101
+[growlnotify](http://growl.info/extras.php#growlnotify) that must be separately downloaded and installed. The version of
  102
+the command line tool must match your Growl version. The `growl` gem does **not** support multiple notification
  103
+channels.
  104
+
  105
+You have to download the installer for `growlnotify` from the [Growl download section](http://growl.info/downloads).
  106
+
  107
+To use `growl` you have to add it to your `Gemfile` and run bundler:
  108
+
  109
+```ruby
  110
+group :development do
  111
+  gem 'growl'
  112
+end
  113
+```
  114
+
117 115
 #### Libnotify
118 116
 
119 117
 * Runs on Linux, FreeBSD, OpenBSD and Solaris
BIN  images/guard.png
17  lib/guard/notifiers/gntp.rb
@@ -32,7 +32,7 @@ module GNTP
32 32
       # Default options for the ruby gtnp gem
33 33
       DEFAULTS = {
34 34
         :sticky   => false,
35  
-        :host     => 'localhost',
  35
+        :host     => '127.0.0.1',
36 36
         :password => '',
37 37
         :port     => 23053
38 38
       }
@@ -91,12 +91,15 @@ def notify(type, title, message, image, options = { })
91 91
         gntp = ::GNTP.new('Guard', options.delete(:host), options.delete(:password), options.delete(:port))
92 92
 
93 93
         unless registered?
94  
-          gntp.register(:notifications => [
95  
-              { :name => 'notify', :enabled => true },
96  
-              { :name => 'failed', :enabled => true },
97  
-              { :name => 'pending', :enabled => true },
98  
-              { :name => 'success', :enabled => true }
99  
-          ])
  94
+          gntp.register({
  95
+              :app_icon => File.expand_path(File.join(__FILE__, '..', '..', '..', '..', 'images', 'guard.png')),
  96
+              :notifications => [
  97
+                  { :name => 'notify', :enabled => true },
  98
+                  { :name => 'failed', :enabled => true },
  99
+                  { :name => 'pending', :enabled => true },
  100
+                  { :name => 'success', :enabled => true }
  101
+              ]
  102
+          })
100 103
 
101 104
           registered!
102 105
         end
2  lib/guard/version.rb
... ...
@@ -1,4 +1,4 @@
1 1
 module Guard
2 2
   # The current gem version of Guard
3  
-  VERSION = '1.3.2'
  3
+  VERSION = '1.3.3'
4 4
 end
2  spec/guard/notifiers/gntp_spec.rb
@@ -58,7 +58,7 @@ def self.notify(options) end
58 58
     end
59 59
 
60 60
     it 'opens GNTP as Guard application' do
61  
-      ::GNTP.should_receive(:new).with('Guard', 'localhost', '', 23053)
  61
+      ::GNTP.should_receive(:new).with('Guard', '127.0.0.1', '', 23053)
62 62
       subject.notify('success', 'Welcome', 'Welcome to Guard', '/tmp/welcome.png', { })
63 63
     end
64 64
 

0 notes on commit 3f20602

Please sign in to comment.
Something went wrong with that request. Please try again.