authenticate with SASL

AWS -> freenode now requires this needed to upgrade Cinch in order to get sasl capabilities
SeleniumHQ · Apr 6, 2017 · 579144a · 579144a
1 parent 21a2072
commit 579144a
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 15 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 ruby "2.0.0"
 
-gem "cinch", "~> 1.0"
+gem "cinch", ">= 2.0"
 gem "rspec", ">= 2.5.0"
 gem "rest-client"
 gem "nokogiri"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
     bcrypt (3.1.11)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    cinch (1.1.3)
+    cinch (2.3.3)
     coderay (1.0.9)
     data_mapper (1.2.0)
       dm-aggregates (~> 1.2.0)
@@ -98,7 +98,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cinch (~> 1.0)
+  cinch (>= 2.0)
   data_mapper
   dm-ar-finders
   dm-postgres-adapter
@@ -114,4 +114,4 @@ RUBY VERSION
    ruby 2.0.0p648
 
 BUNDLED WITH
-   1.12.5
+   1.13.6
diff --git a/bin/selbot2.rb b/bin/selbot2.rb
@@ -8,6 +8,8 @@
     c.server = "chat.freenode.net"
     c.nick   = "selbot2"
     c.channels = Selbot2::CHANNELS
+    c.sasl.username = "selbot2"
+    c.sasl.password = ENV['IRC_PASSWORD']
     c.plugins.plugins = [
       Selbot2::Issues,
       Selbot2::Revisions,
@@ -207,3 +209,4 @@
   end
 
 }.start
+
diff --git a/lib/selbot2/ci.rb b/lib/selbot2/ci.rb
@@ -7,7 +7,7 @@ class CI
 
     JENKINS = 'http://ci.seleniumhq.org:8080'.freeze
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /ci\s?([\w|-]*)/
 
     def execute(m, repo)

diff --git a/lib/selbot2/commits.rb b/lib/selbot2/commits.rb
@@ -7,7 +7,7 @@ class Commits
     MAX_REVS = 10
     HELPS << [":last [num]", "show last num revisions (default = 1)"]
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /last( \d+)?/
 
     def initialize(*args)

diff --git a/lib/selbot2/google.rb b/lib/selbot2/google.rb
@@ -5,7 +5,7 @@ module Selbot2
   class Google
     include Cinch::Plugin
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /(?:g|google) (.+)/
 
 

diff --git a/lib/selbot2/newissue.rb b/lib/selbot2/newissue.rb
@@ -14,7 +14,7 @@ class NewIssue
     GHOST = 'https://goo.gl/6GNq89'.freeze
     HTMLUNIT = 'https://goo.gl/iXUl9F'.freeze
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /newissue\s?(\w*)/
 
     def execute(m, webdriver)

diff --git a/lib/selbot2/notes.rb b/lib/selbot2/notes.rb
@@ -8,7 +8,7 @@ class Notes
 
     listen_to :message, :join
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /note (.+?) (.+)/
 
     def execute(message, receiver, note)

diff --git a/lib/selbot2/seen.rb b/lib/selbot2/seen.rb
@@ -6,7 +6,7 @@ class Seen
     HELPS << [':seen <nick>', 'show when <nick> was last seen']
 
     listen_to :channel, :join, :part, :quit, :nick
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /seen (.+)/
 
     def listen(m)

diff --git a/lib/selbot2/seleniumhq.rb b/lib/selbot2/seleniumhq.rb
@@ -7,7 +7,7 @@ class SeleniumHQ
 
     HELPS << [":sehq", "search SeleniumHQ"]
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /sehq (.+)/
 
     def execute(message, query)

diff --git a/lib/selbot2/twitter.rb b/lib/selbot2/twitter.rb
@@ -7,7 +7,7 @@ class Twitter
 
     HELPS << [":fset", "post to twitter an F*SeTips, sorry committers only."]
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /fset (.+)/
 
     COMMITTERS = [

diff --git a/lib/selbot2/whobrokeit.rb b/lib/selbot2/whobrokeit.rb
@@ -4,7 +4,7 @@ class WhoBrokeIt
 
     HELPS << [':whobrokeit', 'Announces who broke it, along with the commit']
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /whobrokeit/
 
     def execute(m)

diff --git a/lib/selbot2/wiki.rb b/lib/selbot2/wiki.rb
@@ -4,7 +4,7 @@ class Wiki
 
     HELPS << [":wiki", "search the wiki"]
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /wiki ((?:\w*\s?){0,3})[\\|$]?/
 
     def execute(message, query)

diff --git a/lib/selbot2/youtube.rb b/lib/selbot2/youtube.rb
@@ -6,7 +6,7 @@ class Youtube
 
     HELPS << [":yt", "search YouTube"]
 
-    prefix Selbot2::PREFIX
+    self.prefix = Selbot2::PREFIX
     match /(?:yt|youtube) (.+)/
 
     def initialize(*args)