cpsn 0.7.0 → 0.8.0

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gem.authors = ["James Bowes"]
     gem.add_dependency "mechanize", ">= 0.9.3"
     gem.add_dependency "json", ">= 1.1.7"
+    gem.add_dependency "highline"
     # there's nothing in lib, so ignore it to quelch warnings during install
     gem.require_paths = ["bin"]
     gem.extra_rdoc_files = ""

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/bin/cpsn

@@ -12,11 +12,15 @@ require 'yaml'
 require 'optparse'
 require 'logger'
 require 'set'
+require 'highline/import'
 
 $login_url = "https://store.playstation.com/external/index.vm?returnURL=http://us.playstation.com/uwps/PSNTicketRetrievalGenericServlet"
 $friend_url = "http://us.playstation.com/playstation/psn/profile/friends?id="
 
 
+class NotLoggedInError < Exception
+end
+
 class Cpsn
 
     attr_accessor :settings, :groups, :default_group
@@ -34,13 +38,16 @@ class Cpsn
         @settings = load_settings()
         @groups = load_groups(@settings)
 
-        get_agent(@settings[:username].value, @settings[:password].value,
-                  options[:cookie])
+        get_agent(options[:cookie])
     end
 
     def load_settings()
         @log.debug("Loading settings")
-        settings = YAML::parse_file(File.expand_path("~/.cpsn/settings.yml"))
+        begin
+            settings = YAML::parse_file(File.expand_path("~/.cpsn/settings.yml"))
+        rescue
+            settings = {}.to_yaml
+        end
         return settings
     end
    
@@ -82,9 +89,29 @@ class Cpsn
     end
 
 
-    def get_cookie(username, password)
+    def get_username
+        ask("username: ")
+    end
+
+    def get_password
+        ask("password: ") {|q| q.echo = false}
+    end
+
+    def get_cookie
         @log.debug("Signing in for new cookie")
 
+        if @settings[:username].nil?
+            username = get_username
+        else
+            username = @settings[:username].value
+        end
+        
+        if @settings[:password].nil?
+            password = get_password
+        else
+            password = @settings[:password].value
+        end
+
         @agent.redirect_ok = false
         page = @agent.get($login_url)
         login_form = page.forms.first
@@ -111,13 +138,17 @@ class Cpsn
         # this sets the sessionid cookie and others, which we need.
         @agent.get("http://us.playstation.com/uwps/HandleIFrameRequests?sessionId=" + sessionId)
 
+        if not File.directory? File.expand_path("~/.cpsn")
+            Dir::mkdir File.expand_path("~/.cpsn")
+        end
+
         @agent.cookie_jar.save_as File.expand_path("~/.cpsn/cookies.yml")
 
 
         @agent.redirect_ok = true
     end
 
-    def get_agent(username, password, force_cookie)
+    def get_agent(force_cookie)
         @log.debug("Creating new user agent")
         @agent = Mechanize.new
         @agent.user_agent_alias = 'Mac FireFox'
@@ -126,7 +157,7 @@ class Cpsn
         if File.exist? File.expand_path("~/.cpsn/cookies.yml") and not force_cookie
             @agent.cookie_jar.load File.expand_path("~/.cpsn/cookies.yml")
         else
-            get_cookie(username, password)
+            get_cookie
         end
     end
 
@@ -135,13 +166,16 @@ class Cpsn
             return _get_friends()
         rescue Mechanize::ResponseCodeError => response
             if response.response_code == '403'
-                get_cookie(@settings[:username].value,
-                           @settings[:password].value)
+                get_cookie
                 retry
             else
                 raise response
             end
+        rescue NotLoggedInError
+            get_cookie
+            retry
         end
+
     end
 
     def get_friend_status(friend)
@@ -149,8 +183,7 @@ class Cpsn
             return _get_friend_status(friend)
         rescue Mechanize::ResponseCodeError => response
             if response.response_code == '403'
-                get_cookie(@settings[:username].value,
-                           @settings[:password].value)
+                get_cookie
                 retry
             else
                 raise response
@@ -170,6 +203,10 @@ class Cpsn
 
         divs = page.search("div.slotcontent")
 
+        if divs.length == 0
+            raise NotLoggedInError
+        end
+
         friends = []
         for div in divs
             friend = div.attributes["id"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cpsn
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - James Bowes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 Z
+date: 2011-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
@@ -49,6 +49,20 @@ dependencies:
         version: 1.1.7
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: "\n        Query PSN friend status from the CLI. Shows useful information like the\n        game being played, and what mode or map your friend is playing\n        (if available).\n    "
 email: jbowes@repl.ca
 executables: