updated default.json exercise[units]; updated readme to account for d…

…esign changes

.gitignore

@@ -2,4 +2,5 @@ config.json
 *.pyc
 
 log*.csv
+log*.csv_DEBUG
 user_cache.save

README.md

@@ -18,15 +18,25 @@ A fun hack that gets Slackbot to force your teammates to work out!
 
     <img src="https://ctrlla-blog.s3.amazonaws.com/2015/Jun/Screen_Shot_2015_06_05_at_7_19_44_PM-1433557206307.png" width = 500>
 
-4. In the **Slack API Page**, select **WebAPI** in the left side bar, scroll all the way down, and register yourself an auth token. You should see this. Take note of that token, e.g. `xoxp-2751727432-4028172038-5281317294-3c46b1`. That's your **User Auth Token**
+4. In the **Slack API Page**, select **WebAPI** in the left side bar, scroll all the way down, and register yourself an auth token. You should see this. Take note of the token, e.g. `xoxp-2751727432-4028172038-5281317294-3c46b1`. This is your **User Auth Token**
 
     <img src="https://ctrlla-blog.s3.amazonaws.com/2015/Jun/Screen_Shot_2015_06_05_at_7_00_24_PM-1433557433415.png" width = 500>
 
 5. In the **Slackbot** (Remote control page). Register an integration & you should see this. __Make sure you grab just the token out of the url__, e.g. `AizJbQ24l38ai4DlQD9yFELb`
 
     <img src="https://ctrlla-blog.s3.amazonaws.com/2015/Jun/Screen_Shot_2015_06_03_at_8_44_00_AM-1433557565175.png" width = 500>
 
-6. Open `config.json` in a text editor and set the **URLTOKENSTRING** and **USERAUTHTOKEN** with the tokens that you got from the **Slackbot Remote Control** and **Slack Web API**, respectively. Set the **TEAMNAMESTRING** to your slack team name (no spaces).
+6. Save your SLACK_USER_TOKEN_STRING and SLACK_URL_TOKEN_STRING as environmental variables in your terminal.
+
+    `$ export SLACK_USER_TOKEN_STRING=YOURUSERTOKEN`
+
+    `$ export SLACK_URL_TOKEN_STRING=YOURURLTOKEN`
+
+    Open `default.json` and set `teamDomain` (ex: ctrlla) `channelName` (ex: general) and `channelId` (ex: B22D35YMS). Save the file as `config.json` in the same directory. Set any other configurations as you like.
+
+    If you don't know the channel Id, fetch it using
+
+    `$ python fetchChannelId.py channelname`
 
 7. If you haven't set up pip for python, go in your terminal and run.
 `$ sudo easy_install pip`

default.json

@@ -11,7 +11,7 @@
       "maxTime": 23,
       "units": "minutes"
     },
-    "numPeople": 4,
+    "numPeople": 3,
     "slidingWindowSize": 8,
     "groupCalloutChance": 0.05
   },
@@ -22,35 +22,35 @@
       "name": "pushups",
       "minReps": 15,
       "maxReps": 20,
-      "units": "reps"
+      "units": "rep"
     },
     {
       "id": 1,
       "name": "planks",
       "minReps": 40,
       "maxReps": 60,
-      "units": "seconds"
+      "units": "second"
     },
     {
       "id": 2,
       "name": "wall sit",
       "minReps": 40,
       "maxReps": 50,
-      "units": "seconds"
+      "units": "second"
     },
     {
       "id": 3,
       "name": "chair dips",
       "minReps": 15,
       "maxReps": 30,
-      "units": "reps"
+      "units": "rep"
     },
     {
       "id": 4,
       "name": "calf raises",
       "minReps": 20,
       "maxReps": 30,
-      "units": "reps"
+      "units": "rep"
     }
   ]
 }