potato 0.0.12 → 0.0.13

data/lib/potato/damn/events.rb

@@ -6,7 +6,12 @@ module Potato
       # @param [DAmn::Packet] pkt
       # @return [void]
       def on_login pkt
-        @user.logged_in = true
+        if pkt.ok?
+          @user.logged_in = true
+        else
+          @user.notice "Login failure: #{pkt.error}"
+          @user.close
+        end
       end
       
       # @param [DAmn::Packet] pkt

data/lib/potato/damn/token.rb

@@ -15,6 +15,19 @@ module Potato
         end.join("&")
       end
       
+      def wait_for_internet
+        begin
+          s = TCPSocket.new("google.com", 80)
+          s.close
+        rescue Errno::ECONNREFUSED
+          return true
+        rescue SocketError
+          sleep 10
+          retry
+        end
+        return true
+      end
+      
       # Gets an authtoken.
       # @param [String] username
       # @param [String] password
@@ -46,6 +59,10 @@ module Potato
         rescue Errno::ECONNRESET
           warn "Connection reset by peer when attempting to retrieve authtoken."
           nil
+        rescue SocketError
+          warn "Lost internet connection. Waiting for availability."
+          wait_for_internet
+          retry
         end
       end
     end

data/lib/potato/irc/client.rb

@@ -360,6 +360,11 @@ Type /pass yourpassword to authenticate.
         debug str
       end
       
+      def close
+        @client.quit
+        @socket.close
+      end
+      
       # Sends debug messages
       # @param [Array] strs all messages to send
       # @return [void]

data/lib/potato/irc/events.rb

@@ -72,25 +72,15 @@ module Potato
       # @return [void]
       def on_pass pkt
         notice "Attempting to retrieve authtoken."
-        begin
-          tok = Timeout::timeout(30) {
-            Potato::DAmn::Token.get(@config.nick, pkt.args[0])
-          }
-        rescue Timeout::Error
-          notice "dAmn server is down. Try again later."
-          @client.quit
-          @socket.close
-          return
-        end
+        tok = Potato::DAmn::Token.get(@config.nick, pkt.args[0])
         if tok.nil?
           notice "Unable to retrieve an authtoken (server didn't respond)."
-          @client.quit
-          @socket.close
+          close
           return
         elsif tok.empty?
           notice "Wrong password or username. (no authtoken retrieved)"
         else
-          notice "You have successfully logged in."
+          notice "Authtoken retrieved successfully."
           @logged_in = true
           @config.token = tok
           @client.connect_with(@config.nick, @config.token)
@@ -130,8 +120,7 @@ module Potato
       # @param [IRC::Packet] pkt
       # @return [void]
       def on_quit pkt
-        @client.quit
-        @socket.close
+        close
       end
     end
   end

data/lib/potato/irc/server.rb

@@ -63,7 +63,12 @@ module Potato
               end
               @connections = {}
             end
-            debug pkt.raw, :damn
+            unless pkt.nil?
+              debug pkt.raw, :damn
+            else
+              cl.notice "Lost connection to dAmn (server closed connection)."
+              cl.socket.close
+            end
             client = @connections.values.find{|x|x.client.server == action}.client
             client.send("on_#{pkt.cmd}".to_sym, pkt) if client.respond_to?("on_#{pkt.cmd}".to_sym)
           else

data/lib/potato/version.rb

@@ -1,4 +1,4 @@
 module Potato
   # Current version of Potato.
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,28 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: potato
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.13
   prerelease: 
-  version: 0.0.12
 platform: ruby
-authors: 
+authors:
 - Joel Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-26 00:00:00 Z
+date: 2011-04-27 00:00:00.000000000 -04:00
+default_executable: 
 dependencies: []
-
-description: Potato is an IRC server that communicates with the deviantART Message Network and allows you to treat it like a regular IRC server, with support for user modes, kicks/bans, /whois-ing, etc.
-email: 
+description: Potato is an IRC server that communicates with the deviantART Message
+  Network and allows you to treat it like a regular IRC server, with support for user
+  modes, kicks/bans, /whois-ing, etc.
+email:
 - holla@joeldt.net
-executables: 
+executables:
 - potato
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .yardopts
 - README.md
@@ -41,33 +40,29 @@ files:
 - lib/potato/irc/user.rb
 - lib/potato/version.rb
 - potato.gemspec
-homepage: ""
+has_rdoc: true
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: potato
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A dAmn <=> IRC proxy.
 test_files: []
-
-has_rdoc: