cpsn 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bin/cpsn

@@ -25,8 +25,8 @@ end
 def load_groups(settings)
     $log.debug("Loading groups")
     groups = {}
-    
-    if not settings.value.has_key?(:groups)
+
+    if not settings[:groups]
         return groups
     end
 
@@ -65,13 +65,13 @@ def get_cookie(agent, username, password)
     agent.cookie_jar.save_as File.expand_path("~/.cpsn/cookies.yml")
 end
 
-def get_agent(username, password)
+def get_agent(username, password, force_cookie)
     $log.debug("Creating new user agent")
     agent = WWW::Mechanize.new
     agent.user_agent_alias = 'Mac FireFox'
     agent.redirect_ok = true
 
-    if File.exist? File.expand_path("~/.cpsn/cookies.yml")
+    if File.exist? File.expand_path("~/.cpsn/cookies.yml") and not force_cookie
         agent.cookie_jar.load File.expand_path("~/.cpsn/cookies.yml")
         return agent
     end
@@ -132,6 +132,10 @@ optparse = OptionParser.new do |opts|
         $log.level = Logger::DEBUG
     end
 
+    options[:cookie] = false
+    opts.on('-c', '--cookie', 'Force cookie expiration') do
+        options[:cookie] = true
+    end
 
     opts.on(nil, '--version', 'Display version information') do
         gem_dir = File.join(File.dirname(__FILE__), '..')
@@ -151,7 +155,8 @@ optparse.parse!
 
 settings = load_settings()
 groups = load_groups(settings)
-agent = get_agent(settings[:username].value, settings[:password].value)
+agent = get_agent(settings[:username].value, settings[:password].value,
+                  options[:cookie])
 
 if ARGV.length >= 1
     friend_names = Set.new []
@@ -166,18 +171,24 @@ if ARGV.length >= 1
 else
     begin
         friend_names = get_friends(agent)
-    rescue WWW::Mechanize::ResponseCodeError
-        get_cookie(agent, settings[:username].value, settings[:password].value)
-        retry
+    rescue WWW::Mechanize::ResponseCodeError => response
+        if response.response_code == 404
+            get_cookie(agent, settings[:username].value,
+                       settings[:password].value)
+            retry
+        end
     end
 end
 
 for friend_name in friend_names
     begin
         friend = get_friend_status(agent, friend_name)
-    rescue WWW::Mechanize::ResponseCodeError
-        get_cookie(agent, settings[:username].value, settings[:password].value)
-        retry
+    rescue WWW::Mechanize::ResponseCodeError => response
+        if response.response_code == 404
+            get_cookie(agent, settings[:username].value,
+                       settings[:password].value)
+            retry
+        end
     end
 
     if friend

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cpsn
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - James Bowes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -05:00
+date: 2009-11-19 00:00:00 -05:00
 default_executable: cpsn
 dependencies: 
 - !ruby/object:Gem::Dependency