wod 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 0.0.3
+* An unhandled error now causes wod to save the last page for inspection
+
 == 0.0.2
 * Added support for accounts belonging to multiple teams
 

data/bin/wod

@@ -4,8 +4,15 @@ $:.unshift File.join File.dirname(__FILE__), '../lib'
 
 require "wod"
 
-args = ARGV.dup
-ARGV.clear
+args = []
+options = []
+
+ARGV.each do |a|
+  a =~ /^-/ ? options << a : args << a
+end
+
 command = args.shift.strip rescue 'help'
 
+ARGV.clear
+
 Wod::Command.run command, args

data/lib/wod.rb

@@ -1,11 +1,5 @@
 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

@@ -31,13 +31,14 @@ module Wod
   class Client
     include Wod::Helpers
   
-    attr_reader :name
-    attr_accessor :team
+    def self.last_page
+      @@last_page
+    end
   
-    def initialize username, password, team
-      @username = username
-      @password = password
-      @team = team
+    attr_reader :collect_login_deets, :collect_team_selection
+    def initialize options
+      @collect_login_deets = options[:collect_login_deets]
+      @collect_team_selection = options[:collect_team_selection]
     end
   
     def cookies_file
@@ -55,23 +56,25 @@ module Wod
     end
     
     def login_at page
-      puts "Creating session"
-      
       login_page = page.page.links.find { |l| l.text == 'Log in'}.click
 
+      username, password = collect_login_deets.call
+
       f = login_page.form("appleConnectForm")
-      f.theAccountName = @username
-      f.theAccountPW = @password
+      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
+      f = page.form "saveTeamSelection"
+      select_list = f.field('memberDisplayId')
+      teams = select_list.options.map(&:text)
       
-      DevCenterPage.new f.click_button f.button_with(:value => /continue/i)
+      selected_team = collect_team_selection.call(teams)
+      select_list.option_with(:text => selected_team).select
+      
+      f.click_button f.button_with(:value => /continue/i)
     end
     
     def login_and_reopen url
@@ -88,7 +91,6 @@ module Wod
       end
       
       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
@@ -96,7 +98,7 @@ module Wod
     def get url
       page = DevCenterPage.new agent.get(url)
       page = login_and_reopen(url) unless page.logged_in?
-      page
+      @@last_page = page
     end
     
     def logged_in?

data/lib/wod/command.rb

@@ -23,9 +23,14 @@ module Wod
         else
           error "Authentication failure"
         end
-      rescue Wod::NoTeamSelected
-        STDERR.puts "No team selected"
-        run command, args, retries + 1
+      rescue Exception => e
+        File.open(last_page_file, 'w') do |f|
+          f.chmod(0600)
+          f.puts Client.last_page.page.send(:html_body)
+        end
+        puts "Error: Last page saved to #{last_page_file}"
+
+        raise e
       end
     end
     

data/lib/wod/commands/auth.rb

@@ -5,7 +5,8 @@ module Wod::Command
     attr_accessor :credentials
     
     def client
-      @client = Wod::Client.new(user, password, team)
+      @client = Wod::Client.new :collect_login_deets => lambda { [user, password] },
+                                :collect_team_selection => lambda { |team_names| team || collect_team_selection(team_names) }
     end
         
     # just a stub; will raise if not authenticated
@@ -90,19 +91,22 @@ 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
     
+    def collect_team_selection team_names
+      puts "This account belongs to the following teams:"
+      team_names.each.with_index do |team, i|
+        puts "#{i+1}. #{team}"
+      end
+      print "Select team (1): "
+      selection = ask
+      selection = "1" if selection.empty? || selection.to_i == 0
+      @credentials[2] = team_names[selection.to_i-1]
+      write_credentials
+      @credentials[2]
+    end
+    
     def retry_login?
       @login_attempts ||= 0
       @login_attempts += 1
@@ -111,10 +115,10 @@ module Wod::Command
     
    def write_credentials
       FileUtils.mkdir_p(File.dirname(credentials_file))
-      f = File.open(credentials_file, 'w')
-      f.chmod(0600)
-      f.puts self.credentials
-      f.close
+      File.open(credentials_file, 'w') do |f|
+        f.chmod(0600)
+        f.puts self.credentials
+      end
       set_credentials_permissions
     end
     

data/lib/wod/helpers.rb

@@ -3,6 +3,14 @@ module Wod
     def home_directory
       ENV['HOME']
     end
+    
+    def wod_directory
+      File.join home_directory, ".wod"
+    end
+    
+    def last_page_file
+      File.join wod_directory, "last_page.html"
+    end
         
     def error(msg)
       STDERR.puts(msg)

data/lib/wod/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: wod
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dave Newman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +11:00
+date: 2011-04-02 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency