sclemmer-robut 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c4da3e382334afd2a055fedbace27798fe5f692
-  data.tar.gz: 0512c9771139fc9c084bd78a7c4ad4ccfbf68afb
+  metadata.gz: c42b291bd9f0f5a60b3e31398f2a9b396c247b1c
+  data.tar.gz: 732a4875ef0aeb2405fe98ec96b06be4434831e9
 SHA512:
-  metadata.gz: 019eb92981b1a789d4ed91bec9bdbb94817ad0d7847d8c97c616d3347db0a110cef7cc6cd4a7ed675d546119ecd4e5a4a36b901cdc230e5114fda13b83adb972
-  data.tar.gz: f35d244057fb2bc44a7421ab0269b40c166cc7f0a3b78b11fd9fdd7c6476635b1da82b7b4f2d56fc6d60936d1be40029f66cce35688928f922f7c13ee30deec7
+  metadata.gz: f95b530fc7c66f77d65b3c711a24e3f781e9fd3f42a9036cf793d4d16f799646716ff739acfca021cb58e43d9ae595986663d48d1c9201d32574889a434e0b8e
+  data.tar.gz: 49bdd9fb6e499368502a661fb815c45c735bd9fe5692d54bc622b3e4460bb93ccb3b9a95a96eafe44bc1a3609c7e9fe0ae005c5c03e5b2dc3b9fb01e05a4e6a4

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 gem 'rake'
 
 group :test do
+  gem 'test-unit'
   gem 'simplecov'
   gem 'webmock'
   gem 'time-warp'

data/Gemfile.lock

@@ -1,49 +1,52 @@
 PATH
   remote: .
   specs:
-    sclemmer-robut (0.5.2)
+    sclemmer-robut (0.6.1)
       sinatra (~> 1.3)
-      xmpp4r (~> 0.5.0)
+      xmpp4r (~> 0.5.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.8)
     calc (1.0.0)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    docile (1.1.1)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    docile (1.1.5)
+    json (1.8.3)
     meme_generator (1.9)
       nokogiri (~> 1.4)
-    metaclass (0.0.1)
-    mini_portile (0.5.2)
-    minitest (5.5.0)
-    mocha (0.14.0)
+    metaclass (0.0.4)
+    mini_portile (0.6.2)
+    minitest (5.8.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    rack (1.5.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    power_assert (0.2.4)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.1.1)
-    safe_yaml (0.9.7)
-    simplecov (0.8.2)
+    rake (10.4.2)
+    safe_yaml (1.0.4)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.5)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
-    time-warp (1.0.13)
+      tilt (>= 1.3, < 3)
+    test-unit (3.1.3)
+      power_assert
+    tilt (2.0.1)
+    time-warp (1.0.15)
     twss-classifier (0.0.1)
-    webmock (1.16.1)
-      addressable (>= 2.2.7)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
     xmpp4r (0.5.6)
 
@@ -60,6 +63,10 @@ DEPENDENCIES
   rake
   sclemmer-robut!
   simplecov
+  test-unit
   time-warp
   twss-classifier
   webmock
+
+BUNDLED WITH
+   1.10.5

data/Rakefile

@@ -23,5 +23,4 @@ Rake::RDocTask.new do |rd|
   rd.main = "README.rdoc"
   rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
   rd.rdoc_dir = 'doc'
-end
-
+end

data/bin/robut

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'robut'
+begin
+  require 'robut'
+rescue LoadError
+  require 'bundler/setup'
+  require 'robut'
+end
 require 'ostruct'
 require 'logger'
 

data/lib/robut/connection.rb

@@ -68,6 +68,7 @@ class Robut::Connection
     self.store = self.config.store || Robut::Storage::HashStore # default to in-memory store only
     self.config.rooms ||= Array(self.config.room) # legacy support?
     self.config.enable_private_messaging = true if self.config.enable_private_messaging.nil?
+    self.config.port ||= 5222
 
     if self.config.logger
       Jabber.logger = self.config.logger
@@ -79,7 +80,7 @@ class Robut::Connection
   # enters an infinite loop. Any messages sent to the room will pass
   # through all the included plugins.
   def connect
-    client.connect
+    client.connect(config.host, config.port)
     client.auth(config.password)
     client.send(Jabber::Presence.new.set_type(:available))
 
@@ -94,6 +95,9 @@ class Robut::Connection
       Robut::PM.new(self, rooms)
     end
 
+    client.on_exception do
+      config.logger.error 'client.on_exception'
+    end
     trap_signals
     self
   end

data/lib/robut/plugin.rb

@@ -169,7 +169,7 @@ module Robut::Plugin
   def fake_message(time, sender_nick, msg)
     # TODO: ensure this connection is threadsafe
     plugins = Robut::Plugin.plugins.map { |p| p.new(reply_to, private_sender) }
-    reply_to.handle_message(plugins, time, sender_nick, msg, name)
+    reply_to.handle_message(plugins, time, sender_nick, msg)
   end
 
   # Accessor for the store instance

data/lib/robut/plugin/google_images.rb

@@ -6,7 +6,7 @@ class Robut::Plugin::GoogleImages
 
   desc "image <query> - responds with the first image from a Google Images search for <query>"
   match /^image (.*)/, :sent_to_me => true do |query|
-    image = Google::Search::Image.new(:query => query).first
+    image = Google::Search::Image.new(:query => query, :safe => :active).first
 
     if image
       reply image.uri

data/lib/robut/plugin/later.rb

@@ -35,7 +35,7 @@ class Robut::Plugin::Later
 
         sleep_time = count * scale_multiplier(scale)
 
-        if sleep_time >= 3600
+        if sleep_time >= 21_600
           reply "Too far into the future--ain't no body got (timeforthat)"
           return
         end

data/lib/robut/plugin/lunch.rb

@@ -7,7 +7,7 @@ class Robut::Plugin::Lunch
     [
       "lunch? / food? - #{nick} will suggest a place to go eat",
       "#{at_nick} lunch places - lists all the lunch places #{nick} knows about",
-      "#{at_nick} new lunch place <place> - tells #{nick} about a new place to eat",
+      "#{at_nick} (add|new) lunch place <place> - tells #{nick} about a new place to eat",
       "#{at_nick} remove lunch place <place> - tells #{nick} not to suggest <place> anymore"
     ]
   end
@@ -32,11 +32,11 @@ class Robut::Plugin::Lunch
         reply places.join(', ')
       end
     # @robut new lunch place Green Leaf
-    elsif phrase =~ /new lunch place (.*)/i && sent_to_me?(message)
+    elsif phrase =~ /(?:new|add) lunch place (.*)/i && sent_to_me?(message)
       place = $1
       new_place(place)
       reply "Ok, I'll add \"#{place}\" to the the list of lunch places"
-    # @robut remove luynch place Green Leaf
+    # @robut remove lunch place Green Leaf
     elsif phrase =~ /remove lunch place (.*)/i && sent_to_me?(message)
       place = $1
       remove_place(place)

data/lib/robut/version.rb

@@ -1,4 +1,4 @@
 module Robut # :nodoc:
   # Robut's version number.
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/unit/plugin/pick_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 require 'robut/plugin/pick'
-require 'mocha'
+require 'mocha/setup'
 
 class Robut::Plugin::PickTest < Test::Unit::TestCase
 
@@ -15,7 +15,7 @@ class Robut::Plugin::PickTest < Test::Unit::TestCase
     @plugin.handle(Time.now, "@john", "@robut pick a, b, c")
     assert_equal ["And the winner is... a"], @plugin.reply_to.replies
   end
-  
+
   def test_does_nothing_when_no_options_are_given
     @plugin.handle(Time.now, "@john", "@robut pick")
     assert @plugin.reply_to.replies.empty?
@@ -25,11 +25,11 @@ class Robut::Plugin::PickTest < Test::Unit::TestCase
     @plugin.handle(Time.now, "@john", "@robut pick a")
     assert_equal ["And the winner is... a"], @plugin.reply_to.replies
   end
-  
+
   def test_handles_spaces
     @plugin.stubs(:random).returns(1)
     @plugin.handle(Time.now, "@john", "@robut pick this is the first option, this is the second option, this is the third option")
     assert_equal ["And the winner is... this is the second option"], @plugin.reply_to.replies
   end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sclemmer-robut
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Justin Weiss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: robut
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A simple plugin-enabled HipChat bot