diff --git a/Gemfile b/Gemfile index 5c48fed..6e8ae15 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem 'compass-rails', :git => 'git://github.com/Compass/compass-rails.git' # GG! # Don't commit the :path! -gem 'gg', :git => 'git@github.com:dsjoerg/gg.git', :ref => 'b58ed5e12c2d201b368980e74090987d2050f321' +gem 'gg', :git => 'git://github.com/dsjoerg/gg.git', :ref => 'b58ed5e12c2d201b368980e74090987d2050f321' # gem 'gg', :path => '/Users/mr/dev/ruby/gems/gg' #gem 'gg', :path => '/Users/david/Dropbox/Programming/gg' @@ -107,7 +107,7 @@ gem 'gon' # create our own (it's a simple Nokogiri based scraper..) # Forked it and added portraits to profile scraping -gem 'bnet_scraper', :git => 'git@github.com:ggtracker/bnet_scraper.git', :ref => 'battlenetify' +gem 'bnet_scraper', :git => 'git://github.com/ggtracker/bnet_scraper.git', :ref => 'battlenetify' #gem 'bnet_scraper', :path => '/Users/david/Dropbox/Programming/bnet_scraper/' @@ -145,3 +145,5 @@ gem 'activemerchant' gem 'rack-attack' gem 'unf_ext', '0.0.6' + +gem 'foreman' diff --git a/Gemfile.lock b/Gemfile.lock index cdc043e..410f5bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,15 +16,7 @@ GIT sass (~> 3.3.0.rc.1) GIT - remote: git://github.com/thedarkone/rails-dev-boost.git - revision: 1e0cc0e1a3f6e51820b908d7de1f3e160ec2af0d - specs: - rails-dev-boost (0.2.1) - listen (>= 0.5) - railties (>= 3.0) - -GIT - remote: git@github.com:dsjoerg/gg.git + remote: git://github.com/dsjoerg/gg.git revision: b58ed5e12c2d201b368980e74090987d2050f321 ref: b58ed5e12c2d201b368980e74090987d2050f321 specs: @@ -35,7 +27,7 @@ GIT yajl-ruby GIT - remote: git@github.com:ggtracker/bnet_scraper.git + remote: git://github.com/ggtracker/bnet_scraper.git revision: 624e28dddbdbafba9fc5a48693ef1aa86ae8ca9f ref: battlenetify specs: @@ -43,6 +35,14 @@ GIT faraday nokogiri +GIT + remote: git://github.com/thedarkone/rails-dev-boost.git + revision: 1e0cc0e1a3f6e51820b908d7de1f3e160ec2af0d + specs: + rails-dev-boost (0.2.1) + listen (>= 0.5) + railties (>= 3.0) + GEM remote: https://rubygems.org/ specs: @@ -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) @@ -313,6 +315,7 @@ DEPENDENCIES ey_config factory_girl_rails (~> 4.0) faker + foreman formtastic gg! gon diff --git a/README.md b/README.md index 0bb2c08..0d15bbc 100644 --- a/README.md +++ b/README.md @@ -14,19 +14,6 @@ The other repos involved in ggtracker are: used by this codebase -### Running with vagrant -You can either run ggtracker in a vagrant-controlled virtualbox or on your host operating system (described after this section). -To run with vagrant run the following commands: - - * Make sure you have vagrant+virtualbox installed on your computer - * Run `vagrant up` to create the virtual box - * Run `vagrant ssh` to ssh into the vagrant box - * Run `ssh-keygen` in the vagrant box to generate ssh-keys for github - * Upload your public keys to Github - * Clone `ggtracker` project to `vagrant` user's home directory in the vagrant box - * Run the installation and updating steps below - * The app will be on the vagrant box's ip instead of localhost. - ### Requirements * Ruby 1.9+ (get RVM: https://rvm.io/) diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 6f65c9d..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,13 +0,0 @@ -Vagrant.configure("2") do |config| - config.vm.box = "ubuntu/trusty64" - config.vm.network :private_network, type: "dhcp" - config.vm.hostname = "ggtracker" - - config.vm.provision "shell", path: "setup-vagrantbox.sh" - - config.vm.provider :virtualbox do |vb| - vb.memory = 1536 - vb.cpus = 2 - vb.name = "ggtracker" - end -end diff --git a/app/assets/javascripts/setdocdomain.js b/app/assets/javascripts/setdocdomain.js index 388db33..e192408 100644 --- a/app/assets/javascripts/setdocdomain.js +++ b/app/assets/javascripts/setdocdomain.js @@ -1,4 +1,8 @@ // Proxino.log("gg.js domain was " + document.domain); // weird, was ggtracker.com even though script was served via CDN -document.domain = /(\w+)(.\w+)?$/.exec(location.hostname)[0]; +if (location.hostname.match(/^[0-9.]*$/) == null) { + // only set document.domain if our location is a hostname like ggtracker.com or + // ggtracker.test. But if it's an IP address, dont bother. + document.domain = /(\w+)(.\w+)?$/.exec(location.hostname)[0]; +} // Proxino.log("now gg.js domain is " + document.domain); diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index eb31482..8024f89 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -19,7 +19,7 @@ <% if @match.map_url.present? || @match.map["s2ma_hash"].present? %>
<% if !@match.map_url || @match.map_url.blank? %> - _100.png" /> + _100.png" /> <% else %> <% end %> @@ -62,7 +62,7 @@
<%= render 'shared/sidebarad' %> - _100.png" data-match="match"> + _100.png" data-match="match"> army strength, minerals + gas diff --git a/app/views/players/show.html.erb b/app/views/players/show.html.erb index e3763c8..4948d0f 100644 --- a/app/views/players/show.html.erb +++ b/app/views/players/show.html.erb @@ -11,7 +11,6 @@

<%= @identity.name %>

<%= link_to('bnet', @identity.profile_url, {:class => 'bnet'}) if @identity.profile_url.present? %> - <%= link_to('sc2ranks', @identity.sc2ranks_url) if @identity.sc2ranks_url.present? %> <% if controller.superuser? %> <%= link_to('+1Month', :controller => :players, :action => :give_one_month_ggtracker_pro) %> <% end %> diff --git a/setup-vagrantbox.sh b/setup-vagrantbox.sh deleted file mode 100644 index 6b1e38f..0000000 --- a/setup-vagrantbox.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -export DEBIAN_FRONTEND=noninteractive - -add-apt-repository ppa:chris-lea/redis-server -y - -apt-get update - -apt-get install -y ruby redis-server nodejs npm mysql-server git-core ruby-dev libcurl4-openssl-dev libmysqlclient-dev build-essential libxml2-dev libxslt-dev - -gem install bundler -npm install -g juggernaut