Added testing file and fixed issue with leaving credentials in files

Author: Tmonster

getTweets.py

@@ -2,27 +2,34 @@
 import tweet_dumper
 import sys
 import re
+import json
+
+# looks for json file with the proper credentials for the user
+# {
+# "consumer_key"        : "value",
+# "consumer_secret"     : "value",
+# "access_token"        : "value",
+# "access_token_secret" : "value"
+# }
+def get_credentials(filename):
+    with open(filename) as file:
+        cfg = json.load(file)
+    return cfg
 
 def get_api(cfg):
     auth = tweepy.OAuthHandler(cfg['consumer_key'], cfg['consumer_secret'])
     auth.set_access_token(cfg['access_token'], cfg['access_token_secret'])
     return tweepy.API(auth)
 
 def main():
-    if sys.argv[1] and sys.argv[2]:
+    try:
         username = sys.argv[1]
         amount = int(sys.argv[2])
-    else:
+    except IndexError as e:
       print "Usage: python getTweets.py username amount [filename]"
       sys.exit(1)
     # Fill in the values noted in previous step here
-    cfg = {
-    "consumer_key"        : "Ximk8dlrGGejLqL65TO39SqMD",
-    "consumer_secret"     : "SiwVIoNUygs8FdZRAb4D3n6IdQUYPfUG82UNu2OwWUFhO9fq0l",
-    "access_token"        : "705285627-hsGmup5zp84eZ6BPCqjmAWaR3g2YOXad3gPBnUac",
-    "access_token_secret" : "Z6ws8O78em89H4ErpD5O2A0UM90t7hBXLxXRVH2Rson6V"
-    }
-
+    cfg = get_credentials("the_Tmonster.json")
     api = get_api(cfg)
     user = api.get_user(username)
     if sys.argv[3]:
@@ -31,4 +38,4 @@ def main():
       tweet_dumper.get_all_tweets3args(username, api, amount)
 
 if __name__ == "__main__":
-  main()
+    main()

tweet_dumper.py

@@ -49,24 +49,33 @@ def get_all_tweets4args(screen_name, api, amount, filename):
     get_all_tweets5args(screen_name, api, amount, filename, lastTweetId)
 
 
-def get_all_tweets5args(screen_name, api, amount, filename, lastTweetScrapedFile):
-	#Twitter only allows access to a users most recent 3240 tweets with this method
+def writeTweets(filename, mode, tweets):
+    f = open(filename, mode)
+    # print len(alltweets)
+    for tweet in tweets:
+        if tweet != "\n" or tweet != "":
+            f.write(tweet)
+            f.write("\n")
+    f.close()
 
-	#initialize a list to hold all the tweepy Tweets
+def get_all_tweets5args(screen_name, api, amount, filename, lastTweetScrapedFile):
+    #Twitter only allows access to a users most recent 3240 tweets with this method
+    #initialize a list to hold all the tweepy Tweets
     alltweets = []
-    
-	# make request for most recent tweets (200 is the maximum allowed count)
+
+    # make request for most recent tweets (200 is the maximum allowed count)
     new_tweets = api.user_timeline(screen_name = screen_name,count=200, include_rts = True)
     numTweets = len(new_tweets)
     MostRecentTweetPulled = getMostRecentTweet(lastTweetScrapedFile, screen_name)
     print "Most Recent Tweet Pulled =", MostRecentTweetPulled
-    
-    # record most recent tweet obtained
+
+    # record most recent tweet id.
+    # The id of the last tweet the user tweeted.
     if len(new_tweets) > 0:
         most_recent_tweet = new_tweets[0].id
     else:
         most_recent_tweet = 0
-    # loop over first request and keep requesting until amount 
+    # loop over first request and keep requesting until amount
     # is reached or the 3240 threshold is reached
     while len(new_tweets) > 0:
         for tweet in new_tweets:
@@ -100,19 +109,10 @@ def get_all_tweets5args(screen_name, api, amount, filename, lastTweetScrapedFile
         new_tweets = api.user_timeline(screen_name = screen_name,count=200,max_id=oldest)
         if numTweets >= amount:
             break
-        numTweets += len(new_tweets) 
+        numTweets += len(new_tweets)
 
+    writeTweets(filename, 'a', alltweets)
     # write to txt file
-    f = open(filename, 'a')
-    # print len(alltweets)
-    numbs = 0
-    for tweet in alltweets:
-        if tweet != "\n":
-            f.write(tweet)
-            f.write("\n")
-        numbs += 1
-    f.close()
-
     updateLastTweet(lastTweetScrapedFile, screen_name, most_recent_tweet)