Changeset 24

Timestamp:

07/13/06 23:53:09 (2 years ago)

Author:

tim

Message:

working on backend stuff -- not done, just switching computers

Location:

trunk

Files:

• config/environment.rb (modified) (1 diff)
• jobs/alchemy_test.py (added)
• jobs/screenshots.rb (modified) (5 diffs)
• jobs/twill_scripts.py (moved) (moved from trunk/jobs/instance_tester.py) (5 diffs)

trunk/config/environment.rb

@@ -55 +55 @@
 MONGREL_START="mongrel_rails start -a 127.0.0.1 -p 3002 -d -P log/mongrel.pid -c "
 MONGREL_STOP="mongrel_rails stop -c "
-INSTANCE_TESTER="python jobs/instance_tester.py"
+INSTANCE_TESTER="python jobs/twill_scripts.py"

trunk/jobs/screenshots.rb

@@ -20 +20 @@
 
 def shoot(version, theme)
-  puts "click #{version}, #{theme}"
+  puts "click #{version.name}, #{theme.name}"
   dir_name = "#{STATIC_PATH}images/#{version.name}/#{theme.name}"
   unless File.exists?(dir_name)
     system "mkdir -p #{dir_name}"
   end
+  system "python jobs/twill_scripts.py -t #{theme.name}"
   system "webkit2png.py http://localhost:3003 --clipwidth=256 --clipheight=256 -s 0.32 -D #{dir_name} -o preview"
 end
@@ -31 +32 @@
   vp = version_path(version)
   # system "cd #{vp}; rake migrate"
+  puts "#{MONGREL_START} #{vp}"
   system "#{MONGREL_START} #{vp}"
+  sleep 3
 end
 
@@ -37 +40 @@
   vp = version_path(version)
   system "#{MONGREL_STOP} #{vp}"
+  sleep 3
 end
 
@@ -87 +91 @@
 
 versions.each do |v|
-  #start_mongrel v
+  start_mongrel v
   
   themes.each do |t|
@@ -97 +101 @@
   end
   
-  #stop_mongrel v
+  stop_mongrel v
 end

trunk/jobs/twill_scripts.py

@@ -4 +4 @@
 # $LastChangedDate$
 
+from optparse import OptionParser
 import twill
 import re
@@ -19 +20 @@
 
 browser = twill.browser.TwillBrowser()
-browser.go(instance_url)
 
 def switch_to_theme(name):
@@ -30 +30 @@
             print "hmm, something else must be wrong"
 
+def create_account():
+    print "Creating an account"
+    browser.go(account_signup_page)
+    account_form = browser.get_form("1")
+    account_form['user[login]'] = username
+    account_form['user[name]'] = displayname
+    account_form['user[password]'] = password
+    account_form['user[password_confirmation]'] = password
+    browser.submit(None)
+    
 def login():
-    def create_account():
-        print "Creating an account"
-        browser.go(account_signup_page)
-        account_form = browser.get_form("1")
-        account_form['user[login]'] = username
-        account_form['user[name]'] = displayname
-        account_form['user[password]'] = password
-        account_form['user[password_confirmation]'] = password
-        browser.submit(None)
-
     browser.go(account_login_page)
     print browser.get_url()
@@ -50 +50 @@
     login_form["user_password"] = password
     browser.submit("login")
+    #print browser.get_html()
 
 def test_all_themes():
@@ -88 +89 @@
 
 if __name__ == "__main__":
-    switch_to_theme("peaks")
+    parser = OptionParser()
+    parser.add_option("-t", "--switch-theme", dest="theme_name",
+                      help="switch theme NAME", metavar="NAME")
+
+    (options, args) = parser.parse_args()
+
+    browser.go(instance_url)
+
+    if options.theme_name != None:
+        switch_to_theme(options.theme_name)
+    else:
+        test_all_themes()