From 23612f435941b9520a1f546dd262a301e62f7a81 Mon Sep 17 00:00:00 2001
From: utahta <pokusa112@gmail.com>
Date: Sun, 24 Oct 2010 22:08:06 +0900
Subject: [PATCH] Bug fixed: switch and off command. added update command.

---
 README.rst    |  6 ++++++
 pythonbrew    | 32 +++++++++++++++++++++++++++++---
 pythonbrew.py | 32 +++++++++++++++++++++++++++++---
 3 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index 3c1da7d..4039e58 100644
--- a/README.rst
+++ b/README.rst
@@ -60,6 +60,9 @@ Remove stale source folders and archives::
 
   pythonbrew clean
 
+Upgrades pythonbrew to the latest version::
+  pythonbrew update
+
 Disable pythonbrew::
 
   pythonbrew off
@@ -101,6 +104,9 @@ uninstall Python-<version>
 clean
   Remove stale source folders and archives.
 
+update
+  Upgrades pythonbrew to the latest version.
+
 off
   Disable pythonbrew.
 
diff --git a/pythonbrew b/pythonbrew
index b6825a0..452940a 100755
--- a/pythonbrew
+++ b/pythonbrew
@@ -20,6 +20,7 @@ else:
     ROOT = "%s/python/pythonbrew" % os.environ["HOME"]
 PYTHONDLSITE = "http://www.python.org/ftp/python/%s/%s"
 DISTRIBUTE_SETUP_DLSITE = "http://python-distribute.org/distribute_setup.py"
+PYTHONBREW_DLSITE = "http://github.com/utahta/pythonbrew/raw/master/pythonbrew"
 
 PATH_PYTHONS = "%s/pythons" % ROOT
 PATH_BUILD = "%s/build" % ROOT
@@ -97,6 +98,7 @@ def unlink(path):
     try:
         os.unlink(path)
     except OSError, (e, es):
+        print es
         if errno.ENOENT != e:
             raise
         
@@ -108,13 +110,12 @@ def rm_r(path):
         unlink(path)
 
 def off():
-    unlink("%s/current" % PATH_PYTHONS)
     for root, dirs, files in os.walk(PATH_BIN):
         for f in files:
             if f == "pythonbrew":
                 continue
-            unlink("%s%s" % (root, f))
-        break
+            unlink("%s/%s" % (root, f))
+    unlink("%s/current" % PATH_PYTHONS)
 
 #----------------------------------------------------
 # classes
@@ -629,6 +630,30 @@ class CleanCommand(Command):
         for dir in os.listdir(root):
             rm_r("%s/%s" % (root, dir))
 
+class UpdateCommand(Command):
+    name = "update"
+    usage = "%prog"
+    summary = "Upgrades pythonbrew to the latest version"
+    
+    def run_command(self, options, args):
+        download_url = PYTHONBREW_DLSITE
+        basename = os.path.basename(download_url)
+        download_path = "%s/%s" % (PATH_DISTS, basename)
+        
+        try:
+            d = Downloader()
+            d.download(basename, download_url, download_path)
+        except:
+            print "Failed to download. `%s`" % download_url
+            sys.exit(1)
+        
+        try:
+            s = Subprocess(shell=True, cwd=PATH_DISTS)
+            s.check_call("%s %s install" % (sys.executable, download_path))
+        except:
+            print "Failed to install. `%s`" % (download_path)
+            sys.exit(1)        
+
 class Pythonbrew(object):
     def run(self):
         options, args = parser.parse_args(sys.argv[1:])
@@ -647,6 +672,7 @@ class Pythonbrew(object):
         add_command(SearchCommand())
         add_command(UninstallCommand())
         add_command(CleanCommand())
+        add_command(UpdateCommand())
         
         command = args[0].lower()
         if command not in command_dict:
diff --git a/pythonbrew.py b/pythonbrew.py
index b6825a0..452940a 100755
--- a/pythonbrew.py
+++ b/pythonbrew.py
@@ -20,6 +20,7 @@ else:
     ROOT = "%s/python/pythonbrew" % os.environ["HOME"]
 PYTHONDLSITE = "http://www.python.org/ftp/python/%s/%s"
 DISTRIBUTE_SETUP_DLSITE = "http://python-distribute.org/distribute_setup.py"
+PYTHONBREW_DLSITE = "http://github.com/utahta/pythonbrew/raw/master/pythonbrew"
 
 PATH_PYTHONS = "%s/pythons" % ROOT
 PATH_BUILD = "%s/build" % ROOT
@@ -97,6 +98,7 @@ def unlink(path):
     try:
         os.unlink(path)
     except OSError, (e, es):
+        print es
         if errno.ENOENT != e:
             raise
         
@@ -108,13 +110,12 @@ def rm_r(path):
         unlink(path)
 
 def off():
-    unlink("%s/current" % PATH_PYTHONS)
     for root, dirs, files in os.walk(PATH_BIN):
         for f in files:
             if f == "pythonbrew":
                 continue
-            unlink("%s%s" % (root, f))
-        break
+            unlink("%s/%s" % (root, f))
+    unlink("%s/current" % PATH_PYTHONS)
 
 #----------------------------------------------------
 # classes
@@ -629,6 +630,30 @@ class CleanCommand(Command):
         for dir in os.listdir(root):
             rm_r("%s/%s" % (root, dir))
 
+class UpdateCommand(Command):
+    name = "update"
+    usage = "%prog"
+    summary = "Upgrades pythonbrew to the latest version"
+    
+    def run_command(self, options, args):
+        download_url = PYTHONBREW_DLSITE
+        basename = os.path.basename(download_url)
+        download_path = "%s/%s" % (PATH_DISTS, basename)
+        
+        try:
+            d = Downloader()
+            d.download(basename, download_url, download_path)
+        except:
+            print "Failed to download. `%s`" % download_url
+            sys.exit(1)
+        
+        try:
+            s = Subprocess(shell=True, cwd=PATH_DISTS)
+            s.check_call("%s %s install" % (sys.executable, download_path))
+        except:
+            print "Failed to install. `%s`" % (download_path)
+            sys.exit(1)        
+
 class Pythonbrew(object):
     def run(self):
         options, args = parser.parse_args(sys.argv[1:])
@@ -647,6 +672,7 @@ class Pythonbrew(object):
         add_command(SearchCommand())
         add_command(UninstallCommand())
         add_command(CleanCommand())
+        add_command(UpdateCommand())
         
         command = args[0].lower()
         if command not in command_dict: