Merge lp:~mfisch/ubuntu-desktop-accomplishments/install-on-arm into lp:ubuntu-desktop-accomplishments

[Matt Fischer]

Adds an accomplishment for installing on ARM.
Fixes a bunch of problems with the Mahjongg accomplishments
Adds some tests

[Matt Fischer (mfisch)]

Also if the id field is no longer user per my email, I'll add that to this change set.

[Rafał Cieślak (rafalcieslak256)]

Hey Matt, thanks for these fixes and new accom.

I am mostly fine with all these changes, here are few notes:
 * I doubt we need tests for local accomplishments. They only make sense for global ones, as they can be verified for given extra-information; the tests you have added to this branch are not going to be any helpful, using <email address hidden> does not make me get installed-on-arm trophy ;)
 * The last step in installed-on-arm descrioption ("join #ubuntu-arm and participate in community") is more like a tip then a step to me, it's not required to receive this trophy, so putting that in tips field might make a bit more sense.

Apart from that, this MP is great.

=== modified file 'Changelog'
--- Changelog	2012-10-22 23:03:17 +0000
+++ Changelog	2012-11-16 05:10:23 +0000
@@ -20,5 +20,8 @@
 
    [Matt Fischer]
       * Added a new accomplishment: Upgraded Ubuntu
+      * Added a new accomplishment: Installed on ARM
+	  * Fixed a bug in the Mahjongg scripts, make them check for mahjongg
+	  files before trying to read them: LP: #1079508
 
 -------------------------------------------------------------------------

=== added file 'accomplishments/ubuntu-desktop/en/general/installed-on-arm.accomplishment'
--- accomplishments/ubuntu-desktop/en/general/installed-on-arm.accomplishment	1970-01-01 00:00:00 +0000
+++ accomplishments/ubuntu-desktop/en/general/installed-on-arm.accomplishment	2012-11-16 05:10:23 +0000
@@ -0,0 +1,17 @@
+[accomplishment]
+title=Installed Ubuntu on ARM
+description=You have installed Ubuntu on a system with an ARM processor
+collection=ubuntu-desktop
+category=General
+needs-signing=false
+icon=arm.png
+summary = Ubuntu supports several different CPU architectures. ARM processors are found inside many mobile devices where low-power usage is a key feature, but ARM processors are also beginning to be used in servers as well. Ubuntu is now supported on many of the implentations of ARM. When you install Ubuntu on your ARM based device, and then file bugs or fix bugs, you can help improve Ubuntu on ARM.
+steps: Review the <a href="https://wiki.ubuntu.com/ARM">Ubuntu ARM wikipage</a> to see what platforms and releases are supported.
+    Download an image.
+    Install Ubuntu on a system that has an ARM processor in it.
+    Join #ubuntu-arm to participate in the Ubuntu on ARM community.
+pitfalls: Ubuntu is not supported on every ARM platform or device, check the Ububtu ARM wikipage or ask on #ubuntu-arm if you are not sure what is supported.
+links: https://wiki.ubuntu.com/ARM
+    http://www.ubuntu.com/download/desktop/alternative-downloads
+help = #ubuntu-arm on Freenode
+author = Matt Fischer <[e-mail]>

=== modified file 'accomplishments/ubuntu-desktop/en/general/upgraded-ubuntu.accomplishment'
--- accomplishments/ubuntu-desktop/en/general/upgraded-ubuntu.accomplishment	2012-10-22 23:04:40 +0000
+++ accomplishments/ubuntu-desktop/en/general/upgraded-ubuntu.accomplishment	2012-11-16 05:10:23 +0000
@@ -1,7 +1,7 @@
 [accomplishment]
 title=Upgraded Ubuntu
 description=You have upgraded an installed copy of Ubuntu
-collection=ubuntu-community
+collection=ubuntu-desktop
 category=General
 needs-signing=false
 icon=default.png

=== added file 'accomplishments/ubuntu-desktop/trophyimages/arm.png'
Binary files accomplishments/ubuntu-desktop/trophyimages/arm.png	1970-01-01 00:00:00 +0000 and accomplishments/ubuntu-desktop/trophyimages/arm.png	2012-11-16 05:10:23 +0000 differ
=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-bridges.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-bridges.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-bridges.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,19 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.bridges.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg bridges level
-	sys.exit(0)
-else:
-	#user has not completed mahjongg bridges level
-	sys.exit(1)
+
+try:
+    filePath = '/var/games/mahjongg.bridges.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg bridges level
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg bridges level
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-cloud.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-cloud.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-cloud.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,18 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.cloud.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg cloud level
-	sys.exit(0)
-else:
-	#user has not completed mahjongg cloud level
-	sys.exit(1)
+try:
+    filePath = '/var/games/mahjongg.cloud.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg cloud level
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg cloud level
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-confounding.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-confounding.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-confounding.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,18 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.confounding.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg confounding cross level
-	sys.exit(0)
-else:
-	#user has not completed mahjongg confounding cross level
-	sys.exit(1)
+try:
+    filePath = '/var/games/mahjongg.confounding.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg confounding cross level
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg confounding cross level
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-difficult.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-difficult.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-difficult.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,18 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.difficult.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg on difficult
-	sys.exit(0)
-else:
-	#user has not completed mahjongg on difficult
-	sys.exit(1)
+try:
+    filePath = '/var/games/mahjongg.difficult.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg on difficult
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg on difficult
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-dragon.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-dragon.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-dragon.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,18 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.dragon.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg dragon level
-	sys.exit(0)
-else:
-	#user has not completed mahjongg dragon level
-	sys.exit(1)
+try:
+    filePath = '/var/games/mahjongg.dragon.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg dragon level
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg dragon level
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-easy.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-easy.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-easy.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,18 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.easy.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg on easy
-	sys.exit(0)
-else:
-	#user has not completed mahjongg on easy
-	sys.exit(1)
+try:
+    filePath = '/var/games/mahjongg.easy.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg on easy
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg on easy
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-master.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-master.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-master.py	2012-11-16 05:10:23 +0000
@@ -1,65 +1,90 @@
 #!/usr/bin/python
 import sys, os
-runningTotal = 0
-
-#bridges
-filePath = '/var/games/mahjongg.bridges.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-#cloud
-filePath = '/var/games/mahjongg.cloud.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-#confounding
-filePath = '/var/games/mahjongg.confounding.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-#difficult
-filePath = '/var/games/mahjongg.difficult.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-#dragon
-filePath = '/var/games/mahjongg.dragon.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-#easy
-filePath = '/var/games/mahjongg.easy.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-#pyramid
-filePath = '/var/games/mahjongg.pyramid.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-#tic-tac-toe
-filePath = '/var/games/mahjongg.tictactoe.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-#ziggurat
-filePath = '/var/games/mahjongg.ziggurat.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	runningTotal = runningTotal +1
-
-# 9 levels exist, therefore if running total is less than 9 then all levels have not been completed
-if runningTotal < 9 :
-	#user has not completed all mahjongg levels
-	sys.exit(1)
-else:
-	#user has completed all mahjongg levels
-	sys.exit(0)
+try:
+    runningTotal = 0
+
+    #bridges
+    filePath = '/var/games/mahjongg.bridges.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    #cloud
+    filePath = '/var/games/mahjongg.cloud.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    #confounding
+    filePath = '/var/games/mahjongg.confounding.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    #difficult
+    filePath = '/var/games/mahjongg.difficult.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    #dragon
+    filePath = '/var/games/mahjongg.dragon.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    #easy
+    filePath = '/var/games/mahjongg.easy.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    #pyramid
+    filePath = '/var/games/mahjongg.pyramid.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    #tic-tac-toe
+    filePath = '/var/games/mahjongg.tictactoe.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    #ziggurat
+    filePath = '/var/games/mahjongg.ziggurat.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        runningTotal = runningTotal +1
+
+    # 9 levels exist, therefore if running total is less than 9 then all
+    # levels have not been completed
+    if runningTotal < 9 :
+        #user has not completed all mahjongg levels
+        sys.exit(1)
+    else:
+        #user has completed all mahjongg levels
+        sys.exit(0)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-pyramid.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-pyramid.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-pyramid.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,18 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.pyramid.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg pyramid level
-	sys.exit(0)
-else:
-	#user has not completed mahjongg pyramid level
-	sys.exit(1)
+try:
+    filePath = '/var/games/mahjongg.pyramid.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg pyramid level
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg pyramid level
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-tictactoe.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-tictactoe.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-tictactoe.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,18 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.tictactoe.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg tic-tac-toe level
-	sys.exit(0)
-else:
-	#user has not completed mahjongg tic-tac-toe level
-	sys.exit(1)
+try:
+    filePath = '/var/games/mahjongg.tictactoe.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg tic-tac-toe level
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg tic-tac-toe level
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/gaming/mahjongg-ziggurat.py'
--- scripts/ubuntu-desktop/gaming/mahjongg-ziggurat.py	2012-06-05 19:43:54 +0000
+++ scripts/ubuntu-desktop/gaming/mahjongg-ziggurat.py	2012-11-16 05:10:23 +0000
@@ -1,10 +1,18 @@
 #!/usr/bin/python
 import sys, os
-filePath = '/var/games/mahjongg.ziggurat.scores'
-fileSize = os.path.getsize(filePath)
-if fileSize > 0:
-	#user has completed mahjongg ziggurat level
-	sys.exit(0)
-else:
-	#user has not completed mahjongg ziggurat level
-	sys.exit(1)
+try:
+    filePath = '/var/games/mahjongg.ziggurat.scores'
+    if not os.path.exists(filePath):
+        sys.exit(1)
+    fileSize = os.path.getsize(filePath)
+    if fileSize > 0:
+        #user has completed mahjongg ziggurat level
+        sys.exit(0)
+    else:
+        #user has not completed mahjongg ziggurat level
+        sys.exit(1)
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== added file 'scripts/ubuntu-desktop/general/installed-on-arm.py'
--- scripts/ubuntu-desktop/general/installed-on-arm.py	1970-01-01 00:00:00 +0000
+++ scripts/ubuntu-desktop/general/installed-on-arm.py	2012-11-16 05:10:23 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+import traceback, sys
+import subprocess
+
+try:
+    # get architecture
+    out = subprocess.check_output(['uname', '-i'],
+        universal_newlines=True)
+
+    if out.startswith("arm"):
+        sys.exit(0)
+    else:
+        sys.exit(1)
+
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)

=== modified file 'scripts/ubuntu-desktop/general/upgraded-ubuntu.py'
--- scripts/ubuntu-desktop/general/upgraded-ubuntu.py	2012-10-22 23:03:17 +0000
+++ scripts/ubuntu-desktop/general/upgraded-ubuntu.py	2012-11-16 05:10:23 +0000
@@ -1,17 +1,14 @@
 #!/usr/bin/python
 import traceback, sys
-
-from accomplishments.daemon import dbusapi
-# Add scripts/lib/ to the PYTHONPATH
 import os
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'lib')))
 import subprocess
 
 try:
-    api = dbusapi.Accomplishments()
-
     # get install media release version
     f = open('/var/log/installer/media-info','r')
+    if not f:
+        sys.exit(1)
+
     media_info = f.read()
     release_info = media_info.split()
     install_release = release_info[1]

=== added directory 'tests/ubuntu-desktop'
=== added directory 'tests/ubuntu-desktop/general'
=== added file 'tests/ubuntu-desktop/general/install-on-arm'
--- tests/ubuntu-desktop/general/install-on-arm	1970-01-01 00:00:00 +0000
+++ tests/ubuntu-desktop/general/install-on-arm	2012-11-16 05:10:23 +0000
@@ -0,0 +1,5 @@
+[success]
+launchpad-email = [e-mail]
+
+[failure]
+launchpad-email = [e-mail]

=== added file 'tests/ubuntu-desktop/general/upgraded-ubuntu'
--- tests/ubuntu-desktop/general/upgraded-ubuntu	1970-01-01 00:00:00 +0000
+++ tests/ubuntu-desktop/general/upgraded-ubuntu	2012-11-16 05:10:23 +0000
@@ -0,0 +1,5 @@
+[success]
+launchpad-email = [e-mail]
+
+[failure]
+launchpad-email = [e-mail]