Mapwarper master overwrite. Import and overwrite with main mapwarper …

…master repository, for rails 4 upgrade, except db migration files

Capfile

@@ -1,3 +1,26 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy'
+# Load DSL and Setup Up Stages
+require 'capistrano/setup'
+
+# Includes default deployment tasks
+require 'capistrano/deploy'
+
+# Includes tasks from other gems included in your Gemfile
+#
+# For documentation on these, see for example:
+#
+#   https://github.com/capistrano/rvm
+#   https://github.com/capistrano/rbenv
+#   https://github.com/capistrano/chruby
+#   https://github.com/capistrano/bundler
+#   https://github.com/capistrano/rails
+#
+# require 'capistrano/rvm'
+# require 'capistrano/rbenv'
+# require 'capistrano/chruby'
+require 'capistrano/bundler'
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
+require 'rvm1/capistrano3'
+
+# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Gemfile

@@ -1,16 +1,70 @@
-source "http://rubygems.org/"
-gem "rails", "2.3.5"
-gem "i18n", "0.4.2"
-gem "georuby", "2.0.0"
-gem "yahoo-geoplanet"
-#gem "elecnix-ruby-geonames"
-gem "oauth"
-gem "pg","0.15.1"
-gem "fastthread"
-gem "simple-rss"
-gem "libxml-ruby"
-gem "nokogiri", "1.5.5"
-gem "rake", "0.9.2.2"
-gem "fastercsv"
-gem "rmagick"
-gem "json"
+source 'https://rubygems.org'
+
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.2.1'
+# Use sqlite3 as the database for Active Record
+#gem 'sqlite3'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 4.0.3'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer',  platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+gem "jquery-ui-rails", '3.0.1'  #loads jquery ui v 1.9.2
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+# gem 'turbolinks'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0',          group: :doc
+
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Use debugger
+# gem 'debugger', group: [:development, :test]
+
+gem 'devise'
+gem 'devise-encryptable'
+
+gem 'omniauth-twitter'
+gem 'omniauth-osm'
+gem 'omniauth-github'
+gem "omniauth-mediawiki"
+
+gem 'pg'
+#gem 'activerecord-postgis-adapter'
+gem 'activerecord-postgis-adapter', '3.0.0.beta2'
+
+gem 'acts-as-taggable-on', '~> 3.3.0'
+gem 'paperclip', '~> 4.2.0'
+gem 'acts_as_commentable'
+gem 'will_paginate', '~> 3.0'
+gem 'spawnling', '~>2.1'
+
+#Rails 4 support for the audited (acts_as_audited gem) is not quite rails4 worthy - see #https://github.com/collectiveidea/audited/pull/166
+gem 'audited-activerecord', github: 'timwaters/audited', branch: 'rails4'  
+
+gem 'gdal'
+gem 'georuby'
+gem 'geoplanet'
+gem 'yql', '0.0.2'
+
+group :development do
+   gem 'web-console', '~> 2.0'
+   gem 'spring'
+   gem 'thin'
+   gem 'capistrano', '~> 3.2.1'
+   gem 'capistrano-rails',    :require => false
+   gem 'capistrano-bundler',  :require => false
+   gem 'rvm1-capistrano3',    :require => false
+end