cpsn 0.5.2 → 0.6.0

data/README.mkd

@@ -29,7 +29,10 @@ can also pass '-o' to see your offline friends as well.
 Defining Groups
 ===============
 
-If you find yourself looking for the status of a few friends frequently, you can define groups of users in your settings.yml file. Groups go under the ':groups:' section in the settings.yml file, and are the name you want to call them and a list of user names.
+If you find yourself looking for the status of a few friends frequently, you
+can define groups of users in your settings.yml file. Groups go under the
+':groups:' section in the settings.yml file, and are the name you want to call
+them and a list of user names.
 
 For example:
     
@@ -39,4 +42,10 @@ For example:
 
     :groups:
      - mw2: [friend1, friend2, friend3]
-    
+
+You may also set a default group for cpsn to query instead of all friends when
+you run the command with no arguments (you can still access all friends with
+'cpsn all'):
+
+    :groups:
+     - default: mw2

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/bin/cpsn

@@ -20,7 +20,7 @@ $json_url = "http://profiles.us.playstation.com/playstation/psn/profile/get_game
 
 class Cpsn
 
-    attr_accessor :settings, :groups
+    attr_accessor :settings, :groups, :default_group
   
     def initialize(options)
         @log = Logger.new(STDERR)
@@ -28,6 +28,9 @@ class Cpsn
         if options[:debug]
             @log.level = Logger::DEBUG
         end
+       
+        # may be set in load_groups
+        @default_group = 'all'
 
         @settings = load_settings()
         @groups = load_groups(@settings)
@@ -53,6 +56,13 @@ class Cpsn
         for group in settings[:groups].value
             name = group.value.keys[0].value
             vals = group.value[group.value.keys[0]]
+
+            if name == 'default'
+                @default_group = vals.value
+                @log.debug("Found default group #{@default_group}")
+                next
+            end
+
             members = []
             mem_str = ""
             for user in vals.value do
@@ -99,6 +109,37 @@ class Cpsn
     end
 
     def get_friends()
+        begin
+            return _get_friends()
+        rescue WWW::Mechanize::ResponseCodeError => response
+            puts response
+            if response.response_code == '403'
+                cpsn.get_cookie(cpsn.settings[:username].value,
+                                cpsn.settings[:password].value)
+                retry
+            else
+                raise response
+            end
+        end
+    end
+
+    def get_friend_status(friend)
+        begin
+            return _get_friend_status(friend)
+        rescue WWW::Mechanize::ResponseCodeError => response
+            if response.response_code == '403'
+                cpsn.get_cookie(cpsn.settings[:username].value,
+                                cpsn.settings[:password].value)
+                retry
+            else
+                raise response
+            end
+        end
+    end
+
+    private
+
+    def _get_friends()
         @log.debug("Getting friends list")
         page = @agent.get($friend_url)
         divs = page.search("div.slotcontent")
@@ -113,7 +154,7 @@ class Cpsn
         return friends
     end 
 
-    def get_friend_status(friend)
+    def _get_friend_status(friend)
         @log.debug("Loading friend status for #{friend}")
         page = @agent.get($json_url + friend)
         data = JSON.parse(page.body)
@@ -177,38 +218,23 @@ optparse.parse!
 
 cpsn = Cpsn.new(options)
 
-if ARGV.length >= 1 and not ARGV.include? 'all'
-    friend_names = Set.new []
-    args = ARGV[0..-1]
-    for arg in args
-        if cpsn.groups.has_key? arg
-            friend_names.merge(cpsn.groups[arg])
-        else
-            friend_names.add(arg)
-        end
-    end
-else
-    begin
-        friend_names = cpsn.get_friends()
-    rescue WWW::Mechanize::ResponseCodeError => response
-        if response.response_code == '403'
-            cpsn.get_cookie(cpsn.settings[:username].value,
-                            cpsn.settings[:password].value)
-            retry
-        end
+if ARGV.length == 0
+    ARGV << cpsn.default_group
+end
+
+friend_names = Set.new []
+for arg in ARGV
+    if arg == 'all'
+        friend_names.merge(cpsn.get_friends)
+    elsif cpsn.groups.has_key? arg
+        friend_names.merge(cpsn.groups[arg])
+    else
+        friend_names.add(arg)
     end
 end
 
 for friend_name in friend_names
-    begin
-        friend = cpsn.get_friend_status(friend_name)
-    rescue WWW::Mechanize::ResponseCodeError => response
-        if response.response_code == '403'
-            cpsn.get_cookie(cpsn.settings[:username].value,
-                            cpsn.settings[:password].value)
-            retry
-        end
-    end
+    friend = cpsn.get_friend_status(friend_name)
 
     if friend
         if friend[:status] != "offline" or options[:offline]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cpsn
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - James Bowes