Fixed tweet error

Makefile

@@ -3,6 +3,9 @@ PYMAIN=$(firstword $(PYVERSIONS))
 NAME=bitter
 REPO=balkian
 VERSION=$(shell cat $(NAME)/VERSION)
+TARNAME=$(NAME)-$(VERSION).tar.gz 
+IMAGENAME=$(REPO)/$(NAME)
+IMAGEWTAG=$(IMAGENAME):$(VERSION)
 
 
 all: build run
@@ -12,6 +15,17 @@ dockerfiles: $(addprefix Dockerfile-,$(PYVERSIONS))
 Dockerfile-%: Dockerfile.template
 	sed "s/{{PYVERSION}}/$*/" Dockerfile.template > Dockerfile-$*
 
+
+dev-%:
+	@docker start $(NAME)-dev$* || (\
+		$(MAKE) build-$*; \
+		docker run -d -w /usr/src/app/ -v $$PWD:/usr/src/app --entrypoint=/bin/bash -ti --name $(NAME)-dev$* '$(IMAGEWTAG)-python$*'; \
+	)\
+
+	docker exec -ti $(NAME)-dev$* bash
+
+dev: dev-$(PYMAIN)
+
 build: $(addprefix build-, $(PYMAIN))
 
 buildall: $(addprefix build-, $(PYVERSIONS))

README.md

@@ -17,8 +17,8 @@ or
 Programmatically:
 
 ```python
-from bitter.crawlers import TwitterQueue
+from bitter import easy
-wq = TwitterQueue.from_credentials()
+wq = easy()
 print(wq.users.show(user_name='balkian'))
 ```
 

bitter/utils.py

@@ -315,12 +315,12 @@ def get_user(c, user):
 
 def download_tweet(wq, tweetid, write=True, folder="downloaded_tweets", update=False):
     cached = cached_tweet(tweetid, folder)
-    newtweet = None
+    tweet = None
     if update or not cached:
-        newtweet = get_tweet(wq, tweetid)
+        tweet = get_tweet(wq, tweetid)
         js = json.dumps(tweet, indent=2)
     if write:
-        if newtweet:
+        if tweet:
             write_tweet_json(js, folder)
     else:
         print(js)

tests/test_crawlers.py

@@ -5,14 +5,14 @@ import types
 import datetime
 import time
 
-from bitter import utils
+from bitter import utils, easy
-from bitter.crawlers import TwitterQueue, TwitterWorker, QueueException
+from bitter.crawlers import QueueException
 from bitter import config as c
 
-class TestUtils(TestCase):
+class TestCrawlers(TestCase):
 
     def setUp(self):
-        self.wq = TwitterQueue.from_credentials(os.path.join(os.path.dirname(__file__), 'credentials.json'))
+        self.wq = easy(os.path.join(os.path.dirname(__file__), 'credentials.json'))
 
     def test_create_worker(self):
         assert len(self.wq.queue)==1