Merge pull request dsjoerg#20 from nickelsen/vagrant

Run ggtracker in Vagrant

Author: dsjoerg

Gemfile

@@ -8,7 +8,7 @@ gem 'rails', '3.2.22'
 
 gem 'mysql2'
 
-gem 'unicorn', '1.1.5'
+gem 'unicorn'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -145,3 +145,5 @@ gem 'activemerchant'
 
 gem 'rack-attack'
 gem 'unf_ext', '0.0.6'
+
+gem 'foreman'

Gemfile.lock

@@ -136,6 +136,8 @@ GEM
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.0)
+    foreman (0.78.0)
+      thor (~> 0.19.1)
     formtastic (2.2.1)
       actionpack (>= 3.0)
     gon (4.1.1)
@@ -157,6 +159,7 @@ GEM
     json (1.8.3)
     juggernaut (2.1.1)
       redis
+    kgio (2.10.0)
     listen (1.1.6)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -213,6 +216,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
+    raindrops (0.16.0)
     rake (10.4.2)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
@@ -282,8 +286,9 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.6)
-    unicorn (1.1.5)
-      rack
+    unicorn (5.1.0)
+      kgio (~> 2.6)
+      raindrops (~> 0.7)
     uuidtools (2.1.4)
     vegas (0.1.11)
       rack (>= 1.0.0)
@@ -310,6 +315,7 @@ DEPENDENCIES
   ey_config
   factory_girl_rails (~> 4.0)
   faker
+  foreman
   formtastic
   gg!
   gon
@@ -332,4 +338,7 @@ DEPENDENCIES
   simplecov
   uglifier (>= 1.0.3)
   unf_ext (= 0.0.6)
-  unicorn (= 1.1.5)
+  unicorn
+
+BUNDLED WITH
+   1.11.2

app/views/matches/show.html.erb

@@ -19,7 +19,7 @@
       <% if @match.map_url.present? || @match.map["s2ma_hash"].present? %>
       <div class="last map block">
       <% if !@match.map_url || @match.map_url.blank? %>
-        <img class="minimap" height="90" src="http://s3.amazonaws.com/<%= Rails.configuration.s3['minimaps']['bucket']  %>/<%= @match.map["s2ma_hash"] %>_100.png" />
+          <img class="minimap" height="90" src="http://<%= Rails.configuration.s3['minimaps']['bucket']  %>.s3.amazonaws.com/<%= @match.map["s2ma_hash"] %>_100.png" />
       <% else %>
         <img src="<%= @match.map_url %>"/>
       <% end %>
@@ -62,7 +62,7 @@
   <div class="top">
     <%= render 'shared/sidebarad' %>    
 
-    <matchmap data-framee="current_framee" data-minimapurl="http://s3.amazonaws.com/<%= Rails.configuration.s3['minimaps']['bucket']  %>/<%= @match.map["s2ma_hash"] %>_100.png" data-match="match"></matchmap>
+    <matchmap data-framee="current_framee" data-minimapurl="http://<%= Rails.configuration.s3['minimaps']['bucket']  %>.s3.amazonaws.com/<%= @match.map["s2ma_hash"] %>_100.png" data-match="match"></matchmap>
     <a href class="ggtipper2" title="Total army strength in minerals + gas throughout the game.<br><br>Move your mouse over the chart to see what was in each army at any point in the game.<br><br>Click and drag to zoom.<br><br>Click on the chart to freeze that time selection." data-gravity="nw">
       <span class="title lefty">army strength, minerals + gas</span>
     </a>