wod 0.0.1 → 0.0.2

data/CHANGELOG

@@ -0,0 +1,5 @@
+== 0.0.2
+* Added support for accounts belonging to multiple teams
+
+== 0.0.1
+* Initial version

data/lib/wod.rb

@@ -1,5 +1,11 @@
 module Wod
   class InvalidCredentials < RuntimeError; end
+  class NoTeamSelected < RuntimeError
+    attr_reader :teams
+    def initialize(teams)
+      @teams = teams
+    end
+  end
 end
 
 require 'wod/client'

data/lib/wod/client.rb

@@ -14,6 +14,10 @@ module Wod
       (page.title =~ /sign in/i) == nil && (page.search("span").find {|s| s.text == "Log in"}) == nil
     end
     
+    def team_selection_page?
+      (page.title =~ /select.*team/i)
+    end
+    
     def search arg
       @page.search arg
     end
@@ -22,15 +26,18 @@ module Wod
       @page.form arg
     end
   end
+  
 
   class Client
     include Wod::Helpers
   
     attr_reader :name
+    attr_accessor :team
   
-    def initialize username, password
+    def initialize username, password, team
       @username = username
       @password = password
+      @team = team
     end
   
     def cookies_file
@@ -47,21 +54,41 @@ module Wod
       @agent ||= create_agent
     end
     
+    def login_at page
+      puts "Creating session"
+      
+      login_page = page.page.links.find { |l| l.text == 'Log in'}.click
+
+      f = login_page.form("appleConnectForm")
+      f.theAccountName = @username
+      f.theAccountPW = @password
+      f.submit
+    end
+    
+    def select_team_at page
+      raise NoTeamSelected.new(page.search("select[name='memberDisplayId'] option").map{|o| {:name => o.text, :value => o[:value]} }) unless self.team
+      f = page.page.form("saveTeamSelection")
+      select_list = f.fields.first
+      select_list.value = self.team
+      
+      DevCenterPage.new f.click_button f.button_with(:value => /continue/i)
+    end
+    
     def login_and_reopen url
       page = DevCenterPage.new agent.get("https://developer.apple.com/devcenter/ios/index.action")
 
       unless page.logged_in?
-        puts "Creating session"
-        login_page = page.page.links.find { |l| l.text == 'Log in'}.click
-
-        f = login_page.form("appleConnectForm")
-        f.theAccountName = @username
-        f.theAccountPW = @password
-        f.submit
+        login_at page
+        page = DevCenterPage.new agent.get url
+      end
+      
+      if page.team_selection_page?
+        select_team_at page
+        page = DevCenterPage.new agent.get url
       end
       
-      page = DevCenterPage.new agent.get url
       raise InvalidCredentials unless page.logged_in?
+      raise NoTeamSelected.new(page.search("select[name='memberDisplayId'] option").map{|o| {:name => o.text, :value => o[:value]} }) if page.team_selection_page?
       agent.cookie_jar.save_as cookies_file
       page
     end
@@ -74,7 +101,7 @@ module Wod
     
     def logged_in?
       page = get "https://developer.apple.com/devcenter/ios/index.action"
-      page.logged_in?
+      page.logged_in? && !page.team_selection_page?
     end
   
   end

data/lib/wod/command.rb

@@ -23,8 +23,10 @@ module Wod
         else
           error "Authentication failure"
         end
+      rescue Wod::NoTeamSelected
+        STDERR.puts "No team selected"
+        run command, args, retries + 1
       end
-      
     end
     
     def self.run_internal(command, args, wod=nil)

data/lib/wod/commands/auth.rb

@@ -5,7 +5,7 @@ module Wod::Command
     attr_accessor :credentials
     
     def client
-      @client = Wod::Client.new(user, password)
+      @client = Wod::Client.new(user, password, team)
     end
         
     # just a stub; will raise if not authenticated
@@ -18,13 +18,20 @@ module Wod::Command
     end
     
     def user
-      get_credentials
-      @credentials[0]
+      credential 0
     end
     
     def password
+      credential 1
+    end
+    
+    def team
+      credential 2
+    end
+    
+    def credential index
       get_credentials
-      @credentials[1]
+      @credentials && @credentials.size > index ? @credentials[index] : nil
     end
     
     def credentials_file
@@ -83,6 +90,16 @@ module Wod::Command
         puts "Authentication failed."
         return if retry_login?
         exit 1
+      rescue ::Wod::NoTeamSelected => e
+        teams = e.teams
+        puts "This account belongs to the following teams:"
+        puts teams.map.with_index{|t, i| "#{i+1}. #{t[:name]}"}.join("\n")
+        STDOUT << "Select team [1]: "
+        selection = gets.strip
+        selection = "1" if selection.empty? || selection.to_i == 0
+        client.team = @credentials[2] = teams[selection.to_i-1][:value]
+        write_credentials
+        # check
       end
     end
     

data/lib/wod/commands/help.rb

@@ -49,6 +49,9 @@ module Wod::Command
     end
     
     def usage
+      puts "wod v#{Wod::VERSION}"
+      puts
+      
       longest_command_length = self.class.groups.map do |group|
         group.map { |g| g.first.length }
       end.flatten.max

data/lib/wod/commands/version.rb

@@ -1,7 +1,7 @@
 module Wod::Command
   class Version < Base
     def index
-      puts Wod::Client.gem_version_string
+      puts "wod v#{Wod::VERSION}"
     end
   end
 end

data/lib/wod/version.rb

@@ -1,3 +1,3 @@
 module Wod
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: wod
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dave Newman
@@ -35,6 +35,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG
 - Gemfile
 - README.md
 - Rakefile