Making the script a lot more secure

Removing the need for a text file with settings stored in it. Instead store
everything in the python file, and ask for username/password at launch

	modified:   FTP.py
	modified:   README.md

Author: repwolfe

FTP.py

@@ -4,15 +4,17 @@
 @author: robbie
 '''
 from ftplib import FTP
-import os, sys, subprocess
+import os, sys, subprocess, getpass
 
-REMOTE_ROOT     = "./"          # Changed in settings file
 TRUNK           = "trunk/"
 ADDED           = "A   "
 DELETED         = "D   "
 UPDATED         = "U   "
 OFFSET          = len(ADDED) + len(TRUNK)
-SETTINGS_FILE   = "E:\website.txt"
+
+LOCAL       = "C:\\My Site"
+FTP_SERVER  = "mysite.example.com"
+REMOTE_ROOT = "public_html/"
 
 def upload(ftp, local_root, files):
     for file_name in files:
@@ -82,14 +84,10 @@ def delete(ftp, files):
     if repo == "" or rev == "":
         raise Exception("Empty repo or rev")
 
-    with open(SETTINGS_FILE, "r") as settings:
-        local       = settings.readline().rstrip()
-        ftp_server  = settings.readline().rstrip()
-        user        = settings.readline().rstrip()
-        password    = settings.readline().rstrip()
-        REMOTE_ROOT = settings.readline().rstrip()
+    user = raw_input("Please enter your ftp username: ")
+    password = getpass.getpass()
 
-    local_root = os.path.join(local, TRUNK)
+    local_root = os.path.join(LOCAL, TRUNK)
 
     # Take SVN changed output and convert it to a list of Added/Deleted/Modified
     changed = subprocess.check_output(["svnlook", "changed", "-r", rev, repo]).split("\r\n")[:-1]
@@ -106,7 +104,7 @@ def delete(ftp, files):
         elif change.startswith(UPDATED):
             updated.append(file_name)
 
-    ftp = FTP(ftp_server)
+    ftp = FTP(FTP_SERVER)
     ftp.login(user, password)
 
     print "Adding new files to FTP"

README.md

@@ -1,42 +1,23 @@
 svn2ftp
 =======
-## Purpose
-### Short Story
-This Python script automatically uploads SVN commits to a specified FTP location.
-
-### Long Story
+## Features
 When converting my website to SVN, I wanted a tool to allow me to avoid manually
-uploading changes to my FTP server. I found some solutions online, but most of
+uploading commit changes to my FTP server. I found some solutions online, but most of
 them weren't exactly what I was looking for, and many were too complicated.
-
 I ended up making something from scratch using the changelist provided by SVN.
-I had to figure out how to pass it the sensitive user information. I decided
-to use a local file which the script would use to extract what it needed.
-While it's not the most secure solution, it was good enough for my needs.
-Feel free to fork this project and implement your own way of passing the ftp information.
-An example solution could be to prompt the user each time a commit is pushed.
+
+This tool automatically uploads all new and modified files to the server, and deletes
+any file or folder that was removed from the SVN repo. The script runs when a commit completes.
 
 ## Installation
 This script is very simple to install.
 
 1. Copy post-commit.bat and FTP.py to your svn\hooks\ folder.
-2. Create a file that will contain the necessary FTP server information (each item should be on its own line, in the following order):
- - The full path location to the local SVN repo
- - The full URL to the FTP server
- - The username for the FTP server
- - The password for the FTP server
- - The root directory to upload the repo to (default should be './')
-3. Modify FTP.py's SETTINGS_FILE variable to the full location of this file
-4. Make a commit and see the script run.
-
-### Example settings file
-<pre>
-E:\mysite
-robbie.ftpserver.org
-robbie
-thepassword
-public_html/
-</pre>
+2. Modify the following varaibles in FTP.py
+ - LOCAL        - The full path location to the local SVN repo
+ - FTP_SERVER   - The full URL to the FTP server
+ - REMOTE_ROOT  - The root directory to upload the repo to
+3. Make a commit, enter your username and password, and see the script run.
 
 ## TODO
 - Modify post-commit.bat so the command prompt closes automatically