Merge lp:~mayankjuneja/systers/product-release-systers into lp:~systers-dev/systers/product-release-systers

[Mayank Juneja]

- Modified script for pulling code to production server.
- Scripts for creating and applying systers patch.

[lp:~mayankjuneja/systers/product-release-systers]

12. By Mayank Juneja on 2012-07-12

New version of prodpatch (doesn't take step number as input)

13. By Mayank Juneja on 2012-07-30

Minor changes based on Code review

14. By root <email address hidden> on 2012-08-19

Added patch file

Unmerged revisions

14. By root <email address hidden> on 2012-08-19

Added patch file

13. By Mayank Juneja on 2012-07-30

Minor changes based on Code review

12. By Mayank Juneja on 2012-07-12

New version of prodpatch (doesn't take step number as input)

11. By Mayank Juneja on 2012-07-09

- Fixes in createpatch
- Added script for applying patch

10. By Mayank Juneja on 2012-07-09

Minor

9. By Mayank Juneja on 2012-07-09

Rewrote createpatch.py

8. By Mayank Juneja on 2012-07-05

Changes to prodpatch.py

=== added file 'applypatch.py'
--- applypatch.py	1970-01-01 00:00:00 +0000
+++ applypatch.py	2012-07-12 06:27:20 +0000
@@ -0,0 +1,78 @@
+#!/usr/bin/python -- tested on Python 2.5+ only
+# coding: utf-8 
+'''
+"applypatch.py" is the python program used to apply a mailman patch. 
+LICENSE: Copyright(C)2012, Mayank Juneja <[e-mail]>, GPLv3. 
+USAGE: python applypatch.py 
+'''
+
+# Python modules
+import sys
+import os
+import os.path
+import subprocess
+from optparse import OptionParser
+
+# Adding Parser for command line options
+Parser = OptionParser()
+Parser.add_option("-m", "--mailman-dir", dest="mailman_dir",
+                  help="Mailman source directory path", metavar="PATH")
+Parser.add_option("-p", "--patch-path", dest="patch_path", 
+                  help="Patch path", metavar="PATH")
+Parser.add_option("--dry-run", action="store_true", dest="dry_run",
+                  help="Do not actually change any files; just print what would happen.")
+
+(options, args) = Parser.parse_args()
+
+if(options.mailman_dir is None):
+    print "\nerror: Mailman directory path is missing"
+    print "Try `./applypatch.py --help' for more information."
+    sys.exit()
+ 
+if(options.patch_path is None):
+    print "\nerror: Patch path is missing"
+    print "Try `./applypatch.py --help' for more information."
+    sys.exit()
+
+# Get the paths
+mailman_dir = os.path.abspath(options.mailman_dir)
+patch_path  = os.path.abspath(options.patch_path)
+dry_run     = options.dry_run
+current_dir = os.getcwd()
+
+# Open log file
+log_file = open('log-applypatch.txt', 'w')
+
+dry_run_arg = ""
+if(dry_run):
+    dry_run_arg = "--dry-run"
+
+# Commands list, along with the description
+commands_list = [
+["patch %s -p0 < %s" % (dry_run_arg, patch_path) , "Applying patch"]
+]               
+
+# Change the current working directory to mailman source directory
+os.chdir(mailman_dir)
+
+#Execute the commands
+for i in range(len(commands_list)):
+    cmd  = commands_list[i][0]
+    desc = commands_list[i][1]
+    try:
+        print "Step %d/%d : %s " % ((i+1), len(commands_list), desc),
+
+        retcode = subprocess.call([ cmd ],  shell=True,  stdout=log_file, stderr=log_file)
+        if retcode < 0:
+            print "...FAIL:", -retcode
+            sys.exit()
+        else:
+            print "...OK"
+    except OSError, e:
+        print "...ERROR: ", e
+
+# Change the current working directory
+os.chdir(current_dir)
+
+# Close the log file
+log_file.close()

=== modified file 'createpatch.py'
--- createpatch.py	2010-08-15 10:14:18 +0000
+++ createpatch.py	2012-07-12 06:27:20 +0000
@@ -2,163 +2,90 @@
 # coding: utf-8 
 '''
 "createpatch.py" is the python program used used to create a mailman patch. 
-LICENSE: Copyright(C)2010, Vidya [svaksha] Ayer <[e-mail]>, GPLv3. 
-https://code.launchpad.net/~systers-dev/systers/product-release-systers
-http://systers.org/systers-dev/doku.php/how_to_create_a_patch
-
-USAGE: python createpatch.py (While the execution feedback will be displayed 
-on the terminal, its output is also logged in the "log-createpatch.txt" file. 
+LICENSE: Copyright(C)2012, Mayank Juneja <[e-mail]>, GPLv3. 
+USAGE: python createpatch.py 
 '''
 
 #python modules
 import sys
 import os
 import os.path
-import popen2
-import shlex
-import string 
-import time
-import commands
-import datetime
 import subprocess
-from glob import glob
-
-#python path.
-filepath, filename = os.path.split(os.path.abspath(os.path.dirname(__file__)))
-sys.path.append(filepath)
-sys.path.append("/usr/lib/python2.5/")
-sys.path.append("/usr/lib/python2.5/sitepackages/bzrlib/")
-sys.path.append("/usr/share/pyshared/bzrlib/")
-
-#print $user 
-user = os.environ['USER']
-print '\n User:', user
-startTime =  datetime.datetime.now()
-print '\nThe starting date, time is:', str(startTime)
-
-#logging to file and scr.
-sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
-tee = subprocess.Popen(["tee", "log-createpatch.txt"], stdin=subprocess.PIPE)
-os.dup2(tee.stdin.fileno(), sys.stdout.fileno())
-os.dup2(tee.stdin.fileno(), sys.stderr.fileno())
-
-#Terminal user input
-print "\nThis script automates the patch creation process for these steps: \
-    \n001. Make a patch with 2 files \
-    \n002. Patch with a directory of files \
-    \n003. Dry run before applying  the patch \
-    \n004. Apply the patch only when there are no errors. "
-print "\nEnter a step number [Ex. 001, to start from step one]:"
-
-#******************************************************************************
-#CREATE A PATCH steps are based on this write-up:
-#http://systers.org/systers-dev/doku.php/how_to_create_a_patch
-#******************************************************************************
-#ask user to  input starting step number.
-InpStpNo = int(input())   
-print "\nStarting step number is: %d" % InpStpNo 
-print "\nBatch job begins for: Creating a Patch."
-
-#1.Make a patch with 2 files (this works on most Linux distros):
-#*****************************************************************************
-#if start from step1
-if  int('001') >= InpStpNo:
-    try:
-        #ask user input for file path.
-        print "\nEnter 'oldfile' path (ex. '/home/path/olddir/oldfile' : "
-        oldfile = str(input())
-        print "\nEnter 'newfile' path (ex. '/home/path/newdir/newfile' : "
-        newfile = str(input())
-        retcode = subprocess.call(["diff -u %s %s > file.patch" % (oldfile, newfile)],  shell=True)
-        print "\nExecuting, diff  -u %s %s  > file.patch"           
-        if retcode < 0:
-            #if diff fails
-            print >>sys.stderr, "\nFAIL: step 001 (Cannot create a patch with two files)", -retcode
-            sys.exit()
-        else:
-            #create patch for 2 files.
-            print >>sys.stderr, "\nPASS: step001-Created a patch with 2 files. END 001, OK", retcode
-    except OSError, e:
-            print >>sys.stderr, "\nERROR: step 001", e
-else:
- pass 
-
-
-#2.Creating a patch with a directory of files
-#*****************************************************************************
-#if start from step2.
-if  int('002') >= InpStpNo and int('001') != InpStpNo:
-    try:
-        #user input for folder/directory path.
-        print "\nEnter 'oldDirectory' path name (Ex. '/home/path/olddir/' :"
-        olddir = str(input()) 
-        print "\nEnter 'newDirectory' path name (Ex. '/home/path/newdir/' :"
-        newdir = str(input()) 
-        retcode = subprocess.call(["diff -Naur %s %s > file.patch" % (olddir, newdir)],  shell=True)
-        print "\nExecuting, diff  -Naur %s %s  > file.patch"       
-        if retcode < 0:
-            #if diff of 'old-new' files fail
-            print >>sys.stderr, "FAIL: step002-Cannot create a patch with a directory of files:", -retcode
-            sys.exit()
-        else:
-            #create patch for 2 directory's.
-            print >>sys.stderr, "PASS: step002-Created a patch with a directory of files. END 002, OK.", retcode
-    except OSError, e:
-        print >>sys.stderr, "ERROR: step 002", e
-else:
- pass 
-
-
-#3.Dry run before applying the patch: 
-#*****************************************************************************
-#if start from step3.
-if  int('003') >= InpStpNo:
-    try:
-        #execute dry run.
-        retcode = subprocess.call(["patch -p0 --dry-run < file.patch"],  shell=True)
-        print "\nExecuting, patch -p0 --dry-run < file.patch"   
-        if retcode < 0:
-            #dry run fails
-            print >>sys.stderr, "FAIL: step003-Dry run failed.", -retcode
-            sys.exit()   
-        else:
-            #dry run OK.
-            print >>sys.stderr, "PASS: step003-Dry run to check for errors successful. END 003, OK", retcode
-    except OSError, e:
-        print >>sys.stderr, "ERROR: step 003, Dry run.", e
-else:
- pass
-
-#4.apply the patch only when there are no error
-#*****************************************************************************
-#if start from step4
-if  int('004') >= InpStpNo:
-    try:
-        #applying the patch
-        retcode = subprocess.call(["patch -p0 < file.patch"],  shell=True)
-        print "\nExecuting, patch -p0 --dry-run < file.patch"  
-        if retcode < 0:
-            #Fail to apply patch
-            print >>sys.stderr, "FAIL: step004, Cannot apply patch.", -retcode
-            sys.exit()
-        else:
-            #Patch applied successfully.
-            print >>sys.stderr, "PASS: step004, Application of patch successful. END 004, OK.", retcode
-            print  '\nStatus: Patches applied, OK.'
-    except OSError, e:
-        print >>sys.stderr, "ERROR: step 004, Dry run.", e
-else:
- pass
-
-#Printing Completion and difference TIME.
-#*****************************************************************************
-endTime = datetime.datetime.now()
-print "\nEnding Time for the program 'createpatch.py' is: ", str(endTime)
-timedelta = endTime - startTime
-
-#Printing total system installation time taken by 'createpatch.py'.
-#*****************************************************************************
-installationTime = timedelta
-print "\nTotal time taken by 'createpatch.py': ", installationTime
-
-
+from optparse import OptionParser
+
+# Adding Parser for command line options
+Parser = OptionParser()
+Parser.add_option("-m", "--mailman-dir", dest="mailman_dir",
+                  help="Mailman source directory path", metavar="PATH")
+Parser.add_option("-s", "--systers-dir", dest="systers_dir", 
+                  help="Systers source directory path", metavar="PATH")
+
+(options, args) = Parser.parse_args()
+
+if(options.mailman_dir is None):
+    print "\nerror: Mailman directory path is missing"
+    print "Try `./createpatch.py --help' for more information."
+    sys.exit()
+ 
+if(options.systers_dir is None):
+    print "\nerror: Systers directory path is missing"
+    print "Try `./createpatch.py --help' for more information."
+    sys.exit()
+
+# Get the paths
+mailman_dir = os.path.abspath(options.mailman_dir)
+systers_dir = os.path.abspath(options.systers_dir)
+current_dir = os.getcwd()
+patch_path  = current_dir + "/systers.patch"
+tmp_dir     = os.path.abspath("/tmp/systers-patch/")
+
+# Open log file
+log_file = open('log-createpatch.txt', 'w')
+
+# Commands list, along with the description
+commands_list = [
+["\cp -rf %s/* %s" % (mailman_dir,tmp_dir) , "Copying mailman source"],
+["bzr init ."                              , "Creating bzr repo"],
+["bzr add ."                               , "Adding mailman files to repo"],
+["bzr commit -m 'Init'"                    , "Initial commit"],
+["\cp -rf %s/* %s" % (systers_dir, tmp_dir), "Copying systers source"],
+["bzr add ."                               , "Adding systers files to repo"],      
+["bzr diff > %s" % (patch_path)            , "Generating patch"],
+["rm -rf %s" % (tmp_dir)                   , "Cleaning up temporary files"]
+]               
+
+
+# Create the temp directory
+try:
+    retcode = subprocess.call([ "mkdir %s" %(tmp_dir) ],  shell=True)
+    if retcode < 0:
+        print "FAIL:", -retcode
+        sys.exit()
+
+except OSError, e:
+    print "ERROR: ", e
+
+# Change the current working directory to temp directory
+os.chdir(tmp_dir)
+
+#Execute the commands
+for i in range(len(commands_list)):
+    cmd  = commands_list[i][0]
+    desc = commands_list[i][1]
+    try:
+        print "Step %d/%d : %s " % ((i+1), len(commands_list), desc),
+
+        retcode = subprocess.call([ cmd ],  shell=True,  stdout=log_file, stderr=log_file)
+        if retcode < 0:
+            print "...FAIL:", -retcode
+            sys.exit()
+        else:
+            print "...OK"
+    except OSError, e:
+        print "...ERROR: ", e
+
+# Change the current working directory
+os.chdir(current_dir)
+
+# Close the log file
+log_file.close()

=== added file 'prodpatch-new.py'
--- prodpatch-new.py	1970-01-01 00:00:00 +0000
+++ prodpatch-new.py	2012-07-12 06:27:20 +0000
@@ -0,0 +1,68 @@
+#!/usr/bin/python -- tested on Python 2.5+ only
+# coding: utf-8 
+'''
+"prodpatch.py" is the python program used used to create a mailman patch. 
+LICENSE: Copyright(C)2012, Mayank Juneja <[e-mail]>, GPLv3. 
+USAGE: python prodpatch.py 
+'''
+
+#python modules
+import sys
+import os
+import os.path
+import subprocess
+from optparse import OptionParser
+
+# Adding Parser for command line options
+Parser = OptionParser()
+Parser.add_option("-m", "--mailman-dir", dest="mailman_dir",
+                  help="Mailman source directory path", metavar="PATH")
+
+(options, args) = Parser.parse_args()
+
+if(options.mailman_dir is None):
+    print "\nerror: Mailman directory path is missing"
+    print "Try `./prodpatch.py --help' for more information."
+    sys.exit()
+ 
+
+# Get the paths
+mailman_dir = os.path.abspath(options.mailman_dir)
+current_dir = os.getcwd()
+
+# Open log file
+log_file = open('log-prodpatch.txt', 'w')
+
+# Commands list, along with the description
+commands_list = [
+["sudo /etc/init.d/mailman stop" , "Stop mailman"],
+["sudo bzr update"               , "Update repo with new release"],
+["bzr conflicts"                 , "Resolve conflicts"],
+["bzr resolve -all"              , "Clear bzr status log"],
+["sudo /etc/init.d/mailman start", "Start mailman"]
+]               
+
+# Change the current working directory to temp directory
+os.chdir(mailman_dir)
+
+#Execute the commands
+for i in range(len(commands_list)):
+    cmd  = commands_list[i][0]
+    desc = commands_list[i][1]
+    try:
+        print "Step %d/%d : %s " % ((i+1), len(commands_list), desc),
+
+        retcode = subprocess.call([ cmd ],  shell=True,  stdout=log_file, stderr=log_file)
+        if retcode < 0:
+            print "...FAIL:", -retcode
+            sys.exit()
+        else:
+            print "...OK"
+    except OSError, e:
+        print "...ERROR: ", e
+
+# Change the current working directory
+os.chdir(current_dir)
+
+# Close the log file
+log_file.close()

=== modified file 'prodpatch.py'
--- prodpatch.py	2010-08-15 10:14:18 +0000
+++ prodpatch.py	2012-07-12 06:27:20 +0000
@@ -1,8 +1,9 @@
 #!/usr/bin/python - Python 2.5+ only
 # coding: utf-8 
 '''
-"prodpatch.py" is a python program used to Pull a New Release to the 
-LICENSE: Copyright(C)2010, Vidya [svaksha] Ayer <[e-mail]>, GPLv3. 
+"prodpatch.py" is a python program used to Pull a New Release to the production server
+LICENSE: Copyright(C)2012, Mayank Juneja <[e-mail]>, GPLv3. 
+(Original code by Vidya [svaksha] Ayer <[e-mail]>)
 http://systers.org/systers-dev/doku.php/how_to_pull_a_new_release_to_the_production_server
 https://code.launchpad.net/~systers-dev/systers/product-release-systers
 
@@ -14,11 +15,6 @@
 import sys
 import os
 import os.path
-import popen2
-import shlex
-import string 
-import time
-import commands
 import datetime
 import subprocess
 
@@ -48,8 +44,12 @@
 #******************************************************************************
 
 #Terminal user input
-print "\nEnter the step number [Ex. 001, to start from step one]:"
-InpStpNo = int(input())   
+try:
+    InpStpNo = int(raw_input("\nEnter the step number [Ex. 001, to start from step one]: "))
+except ValueError, e:	
+    print >> sys.stderr, e
+    sys.exit()
+	
 print "\nStarting step number is: %d" % InpStpNo 
 print "\nBatch job begins for: Production Patch."
 
@@ -62,14 +62,13 @@
         retcode = subprocess.call(["sudo /etc/init.d/mailman stop"],  shell=True)
         print "\nExecuting, sudo /etc/init.d/mailman stop" 
         if retcode < 0:            
-            print >>sys.stderr, "\nFAIL: Attempt to stop Mailman failed at step001.", -retcode
+            print >> sys.stderr, "\nFAIL: Attempt to stop Mailman failed at step001.", -retcode
             sys.exit()
         else:
-            print >>sys.stderr, "\nPASS: Stopped Mailman to merge updates. Status: step001, OK.", retcode
+            print >> sys.stderr, "\nPASS: Stopped Mailman to merge updates. Status: step001, OK.", retcode
     except OSError, e:
-            print >>sys.stderr, "\nERROR: step001. Cannot stop Mailman", e
-else:
- pass 
+        print >> sys.stderr, "\nERROR: step001. Cannot stop Mailman", e
+        sys.exit()
 
 #2.Update server with new release.
 #******************************************************************************
@@ -79,14 +78,13 @@
         retcode = subprocess.call(["sudo bzr update"],  shell=True)
         print "\nExecuting, sudo bzr update" 
         if retcode < 0:
-            print >>sys.stderr, "\nFAIL: Attempt to update from server", -retcode
+            print >> sys.stderr, "\nFAIL: Attempt to update from server", -retcode
             sys.exit()
         else:
-            print >>sys.stderr, "\nPASS: Updated Mailman. Status: Step002 OK.", retcode
+            print >> sys.stderr, "\nPASS: Updated Mailman. Status: Step002 OK.", retcode
     except OSError, e:
-        print >>sys.stderr, "\nERROR: Server Update.", e
-else:
- pass 
+        print >> sys.stderr, "\nERROR: Server Update.", e
+        sys.exit()
 
 
 #3.Resolve any conflicts.
@@ -97,14 +95,13 @@
         retcode = subprocess.call(["bzr conflicts"],  shell=True)
         print "\nExecuting, bzr conflicts" 
         if retcode < 0:
-            print >>sys.stderr, "\nFAIL: A conflict was detected during the Update.", -retcode
+            print >> sys.stderr, "\nFAIL: A conflict was detected during the Update.", -retcode
             sys.exit()
         else:
-            print >>sys.stderr, "\nPASS: Resolved all conflicts in Mailman Update, Status: Step003, OK.", retcode
+            print >> sys.stderr, "\nPASS: Resolved all conflicts in Mailman Update, Status: Step003, OK.", retcode
     except OSError, e:
-        print >>sys.stderr, "\nERROR: Could not resolve conflict in update.", e
-else:
- pass
+        print >> sys.stderr, "\nERROR: Could not resolve conflict in update.", e
+        sys.exit()
 
 #4.Clear BZR status log.
 #******************************************************************************
@@ -114,15 +111,33 @@
         retcode = subprocess.call(["bzr resolve --all"],  shell=True)
         print "Executing command, bzr resolve --all"  
         if retcode < 0:
-            print >>sys.stderr, "\nFAIL: attempt to clear bzr status log failed.", -retcode
+            print >> sys.stderr, "\nFAIL: attempt to clear bzr status log failed.", -retcode
             sys.exit()
         else:
-            print >>sys.stderr, "\nPASS: Bzr status log cleared, Step004, OK.", retcode
+            print >> sys.stderr, "\nPASS: Bzr status log cleared, Step004, OK.", retcode
             print  '\nStatus: Pulled the New Release into the Production Server. OK.'
     except OSError, e:
-        print >>sys.stderr, "\nERROR: Could not clear bzr status log", e
-else:
- pass
+        print >> sys.stderr, "\nERROR: Could not clear bzr status log", e
+        sys.exit()
+
+
+#5.Start Mailman.
+#*****************************************************************************
+#if start from step5
+if  int('005') >= InpStpNo:
+    try:
+        #starts mailman
+        retcode = subprocess.call(["sudo /etc/init.d/mailman start"],  shell=True)
+        print "\nExecuting, sudo /etc/init.d/mailman start" 
+        if retcode < 0:            
+            print >> sys.stderr, "\nFAIL: Attempt to start Mailman failed at step005.", -retcode
+            sys.exit()
+        else:
+            print >> sys.stderr, "\nPASS: Started Mailman after merging updates. Status: step005, OK.", retcode
+    except OSError, e:
+        print >> sys.stderr, "\nERROR: step005. Cannot start Mailman", e
+        sys.exit()
+
 
 #To print Completion and difference TIME.
 endTime = datetime.datetime.now()