Fixed Vagrant development environment

.gitignore

@@ -15,6 +15,6 @@ log/searchd.development.pid
 *~
 \#*
 .\#*
-.DS_Store
+*.DS_Store
 *.swp
 .vagrant*

.travis.yml

@@ -1,4 +1,4 @@
 script: "bundle exec rake ci:setup db:drop db:create db:migrate spec"
 
 rvm:
-  - 1.8.7
+  - 1.9.3

Gemfile.lock

@@ -42,7 +42,7 @@ GEM
     acts-as-taggable-on (2.1.1)
       rails
     addressable (2.3.2)
-    annotate (2.6.2)
+    annotate (2.6.5)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
     arel (3.0.3)
@@ -51,10 +51,9 @@ GEM
       builder
       mime-types
       xml-simple
-    aws-sdk (1.36.0)
+    aws-sdk (1.45.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
     bcrypt (3.1.7)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
@@ -69,14 +68,14 @@ GEM
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
     celerity (0.9.2)
-    childprocess (0.5.1)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.0)
+    chunky_png (1.3.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.3)
+    cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    columnize (0.3.6)
+    columnize (0.8.9)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -85,29 +84,29 @@ GEM
       compass (>= 0.10.0)
     culerity (0.2.15)
     daemons (1.1.9)
-    database_cleaner (1.2.0)
-    debugger (1.6.6)
+    database_cleaner (1.3.0)
+    debugger (1.6.8)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
+      debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.2)
+    debugger-ruby_core_source (1.3.5)
     devise (1.4.9)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     drx (0.4.5)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    excon (0.25.3)
+    excon (0.37.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faker (1.2.0)
+    faker (1.3.0)
       i18n (~> 0.5)
     fakeweb (1.3.0)
     faraday (0.9.0)
@@ -117,18 +116,19 @@ GEM
       actionpack (>= 3.0)
     friendly_id4 (4.0.0.beta3)
     fssm (0.2.10)
-    geocoder (1.1.9)
+    geocoder (1.2.2)
     haml (3.1.8)
     has_scope (0.5.1)
-    hashie (2.0.5)
-    heroku (3.2.3)
-      heroku-api (~> 0.3.7)
+    hashie (2.1.2)
+    heroku (3.8.4)
+      heroku-api (~> 0.3.17)
       launchy (>= 0.3.2)
       netrc (~> 0.7.7)
       rest-client (~> 1.6.1)
       rubyzip
-    heroku-api (0.3.15)
-      excon (~> 0.25.1)
+    heroku-api (0.3.18)
+      excon (~> 0.27)
+      multi_json (~> 1.8)
     hike (1.2.3)
     httparty (0.8.3)
       multi_json (~> 1.0)
@@ -138,36 +138,35 @@ GEM
       has_scope (~> 0.5.0)
       responders (~> 0.6)
     journey (1.0.4)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.6.8)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
+    jwt (1.0.0)
     launchy (2.4.2)
       addressable (~> 2.3)
-    macaddr (1.6.7)
+    macaddr (1.7.1)
       systemu (~> 2.6.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
-    mocha (1.0.0)
+    mini_portile (0.6.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.9.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-dns (0.6.1)
     netrc (0.7.7)
     nifty-generators (0.4.6)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     oauth (0.4.7)
-    oauth2 (0.9.3)
+    oauth2 (0.9.4)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
@@ -176,17 +175,17 @@ GEM
       rack (~> 1.0)
     omniauth-facebook (1.6.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-foursquare (1.0.0)
+    omniauth-foursquare (1.0.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-github (1.1.1)
+    omniauth-github (1.1.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
     omniauth-google-apps (0.0.2)
       omniauth (~> 1.0)
       omniauth-openid (~> 1.0)
       ruby-openid-apps-discovery (~> 1.2.0)
-    omniauth-linkedin (0.1.0)
+    omniauth-linkedin (0.2.0)
       omniauth-oauth (~> 1.0)
     omniauth-oauth (1.0.1)
       oauth
@@ -212,7 +211,7 @@ GEM
       cocaine (>= 0.0.2)
       mime-types
     pg (0.17.1)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     powder (0.2.1)
       thor (>= 0.11.5)
     rack (1.4.5)
@@ -223,7 +222,7 @@ GEM
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -252,28 +251,32 @@ GEM
     responders (0.6.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.1)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.1)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
-    rubyzip (1.1.0)
+    rubyzip (1.1.4)
     sass (3.1.21)
-    selenium-webdriver (2.40.0)
+    selenium-webdriver (2.42.0)
       childprocess (>= 0.5.0)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
@@ -299,23 +302,22 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.18.1)
+    thor (0.19.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     utility_belt (1.1.0)
       Platform (>= 0.4.0)
       aws-s3 (>= 0.4.0)
       wirble (>= 0.1.2)
     uuid (2.3.7)
       macaddr (~> 1.0)
-    uuidtools (2.1.4)
     warden (1.0.6)
       rack (>= 1.0)
     websocket (1.0.7)
-    will_paginate (3.0.5)
+    will_paginate (3.0.6)
     wirble (0.1.3)
     xml-simple (1.1.3)
     xpath (0.1.4)

README.markdown

@@ -52,29 +52,28 @@ You can avoid installing the dependencies listed above on your machine by runnin
 
 Before proceeding you need to have installed:
 
-* [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-* [Vagrant](http://www.vagrantup.com/)
+* [VirtualBox 4.3.12](https://www.virtualbox.org/wiki/Downloads)
+* [Vagrant 1.6.0](http://www.vagrantup.com/)
 
 To start up a vm:
 
-* Clone this repo to your machine
-* `cd wearetechwomen` on your machine
-* `vagrant up` on your machine
-* Wait for the vm to load. The first time you run this command it will take a while as it installs a bunch of software.
-    You'll know it's done when you see: `SETUP COMPLETE: We Are Tech Women works in Vagrant!`
-* `vagrant ssh` this will get you into the vm without a password
-* `cd watw`
-* `bundle install`
-* `./go` to start the server"
+* Clone this repository
+* `host $ cd wearetechwomen`
+* `host $ vagrant up`
+* `host $ vagrant ssh` this will get you into the vm without a password
+* `vagrant $ cd source`
+* `vagrant $ bundle install`
+* `vagrant $ bundle exec rake db:create db:migrate db:test:prepare` to create database, migrate, prepare db tests
+* `vagrant $ ./go` to start the server
 * Go to http://localhost:3000 in your browser
 
 Not familiar with Vagrant? Check out the [Getting Started](http://docs.vagrantup.com/v2/getting-started/index.html) guide.
 
-`vagrant ssh` will get you onto the vm where you can run rake/rails commands, etc.
+The code directory on your machine is mounted into the vm. When you ssh in it's in the `source` folder. \
+You can edit files and perform git operations on your host computer using your tools of choice and the changes will be reflected on the vm.
 
-The code directory on your machine is mounted into the vm. When you ssh in it's in the `watw` folder. You can edit files and perform git operations on your host computer using your tools of choice and the changes will be reflected on the vm.
-
-After your first `vagrant up` you can [stop](http://docs.vagrantup.com/v2/getting-started/teardown.html) and [start](http://docs.vagrantup.com/v2/getting-started/up.html) the vm more quickly. The initial provisioning only needs to run once. If anything happens with your setup you can `vagrant destroy` and `vagrant up` to bring back a fresh environment.
+After your first `vagrant up` you can [stop](http://docs.vagrantup.com/v2/getting-started/teardown.html)
+and [start](http://docs.vagrantup.com/v2/getting-started/up.html) the vm more quickly. The initial provisioning only needs to run once. If anything happens with your setup you can `vagrant destroy` and `vagrant up` to bring back a fresh environment.
 
 ## Original Developer Notes