cpsn 0.1.2 → 0.2.0

data/TODO

@@ -1,3 +1,3 @@
-save cookie jar so subsequent runs don't need to login
-read username/pass from a config file
 be able to define groups of users in the config file, and query them
+show any status for what map ppl are in etc (like in modern warfare 2)
+logging with --verbose option

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/cpsn

@@ -3,23 +3,23 @@
 require 'rubygems'
 require 'mechanize'
 require 'json'
-
-$username = ARGV[0]
-$password = ARGV[1]
+require 'yaml'
+require 'optparse'
 
 $login_url = "https://store.playstation.com/external/index.vm?returnURL=https%3a%2f%2fsecureus.playstation.com%2fRegistration%2fPSNL%2fSignInFrame.aspx"
 $friend_url = "http://profiles.us.playstation.com/playstation/psn/profile/friends"
 $json_url = "http://profiles.us.playstation.com/playstation/psn/profile/get_gamer_summary_data?id="
 
-def get_agent()
-    agent = WWW::Mechanize.new
-    agent.user_agent_alias = 'Mac FireFox'
-    agent.redirect_ok = true
- 
+def load_settings()
+    settings = YAML::parse_file(File.expand_path("~/.cpsn/settings.yml"))
+    return settings
+end
+
+def get_cookie(agent, username, password)
     page = agent.get($login_url)
     login_form = page.forms.first
-    login_form.loginName = $username
-    login_form.password = $password
+    login_form.loginName = username
+    login_form.password = password
     page = agent.submit(login_form)
     link = page.links.first
 
@@ -29,7 +29,21 @@ def get_agent()
     end
 
     page = link.click
-   
+  
+    agent.cookie_jar.save_as File.expand_path("~/.cpsn/cookies.yml")
+end
+
+def get_agent(username, password)
+    agent = WWW::Mechanize.new
+    agent.user_agent_alias = 'Mac FireFox'
+    agent.redirect_ok = true
+
+    if File.exist? File.expand_path("~/.cpsn/cookies.yml")
+        agent.cookie_jar.load File.expand_path("~/.cpsn/cookies.yml")
+        return agent
+    end
+
+    get_cookie(agent, username, password)
     return agent
 end
 
@@ -66,19 +80,55 @@ def get_friend_status(agent, friend)
     return friend
 end
 
-agent = get_agent()
+options = {}
+optparse = OptionParser.new do |opts|
+    options[:offline] = false
+    opts.on('-o', '--offline', 'Show offline contacts') do
+        options[:offline] = true
+    end
 
-if ARGV.length >= 3
-    friend_names = ARGV[2..-1]
+    opts.on(nil, '--version', 'Display version information') do
+        gem_dir = File.join(File.dirname(__FILE__), '..')
+        File.open(File.join(gem_dir, 'VERSION')) do |version_file|
+            print version_file.read
+        end
+        exit
+    end
+
+    opts.on('-h', '--help', 'Show help') do 
+        puts opts
+        exit
+    end
+end
+
+optparse.parse!
+
+settings = load_settings()
+agent = get_agent(settings[:username].value, settings[:password].value)
+
+if ARGV.length >= 1
+    friend_names = ARGV[0..-1]
 else
-    friend_names = get_friends(agent)
+    begin
+        friend_names = get_friends(agent)
+    rescue WWW::Mechanize::ResponseCodeError
+        get_cookie(agent, settings[:username].value, settings[:password].value)
+        retry
+    end
 end
 
 for friend_name in friend_names
-    friend = get_friend_status(agent, friend_name)
+    begin
+        friend = get_friend_status(agent, friend_name)
+    rescue WWW::Mechanize::ResponseCodeError
+        get_cookie(agent, settings[:username].value, settings[:password].value)
+        retry
+    end
 
     if friend
-        puts friend[:status] + "\t" + friend[:name] + "\t" + friend[:playing]
+        if friend[:status] != "offline" or options[:offline]
+            puts friend[:status] + "\t" + friend[:name] + "\t" + friend[:playing]
+        end
     else
         puts "Error: no access to " + friend_name
     end

metadata

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