diff --git a/Gemfile b/Gemfile index 63ab4ddfc2..ea2d3dd01d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' gem 'rails', '3.2.22' gem 'rake', '0.9.2.2' -gem 'pg', '0.13.2' +gem 'pg', '0.15.0' gem 'sequel', '3.42.0' gem 'sequel_pg', '1.6.3', require: 'sequel' @@ -38,7 +38,7 @@ gem 'net-ldap', '0.11' group :production, :staging do gem 'unicorn', '4.8.2' gem 'unicorn-worker-killer' - gem 'raindrops', '0.12.0' + gem 'raindrops', '0.15.0' end group :assets do @@ -55,11 +55,11 @@ gem 'faraday', '0.9.0' gem 'retriable', '1.4.1' # google-api-client needs this gem 'google-api-client', '0.7.0' gem 'dropbox-sdk', '1.6.3' -gem 'instagram', '1.1.3' +gem 'instagram', '1.1.6' gem 'gibbon', '1.1.4' # Geocoder (synchronizer doesn't needs it anymore) -gem 'eventmachine', '1.0.3' +gem 'eventmachine', '1.0.4' gem 'em-pg-client', '0.2.1' # Service components (/services) @@ -79,9 +79,11 @@ gem 'rollbar', '0.12.14' gem 'resque', '1.25.2' gem 'resque-metrics', '0.1.1' +# This is weird. In ruby 2 test-unit is required. We don't know why for sure +gem 'test-unit' + group :test do gem 'simplecov', require: false - gem 'db-query-matchers', '0.4.0' gem 'rack-test', '0.6.2', require: 'rack/test' gem 'factory_girl_rails', '~> 4.0.0' @@ -100,7 +102,7 @@ end group :development, :test do gem 'rspec-rails', '2.12.0' gem 'rb-readline' - gem 'debugger', '1.6.8' + gem 'byebug' gem 'rack' # Server diff --git a/Gemfile-ruby2 b/Gemfile-ruby2 deleted file mode 100644 index ea2d3dd01d..0000000000 --- a/Gemfile-ruby2 +++ /dev/null @@ -1,121 +0,0 @@ -source 'http://rubygems.org' - -gem 'rails', '3.2.22' - -gem 'rake', '0.9.2.2' -gem 'pg', '0.15.0' -gem 'sequel', '3.42.0' -gem 'sequel_pg', '1.6.3', require: 'sequel' - -gem 'activerecord-postgresql-adapter' -# NOTE: Forced on purpose due to this bug https://github.com/tlconnor/activerecord-postgres-array/issues/37 -gem 'activerecord-postgres-array', '0.0.9' - -gem 'vizzuality-sequel-rails', '0.3.7', git: 'https://github.com/Vizzuality/sequel-rails.git' - -gem 'rails_warden', '0.5.8' # Auth via the Warden Rack framework -gem 'oauth', '0.4.5' -gem 'oauth-plugin', '0.4.0.pre4' - -gem 'redis', '3.2.1' -gem 'hiredis', '0.6.0' -gem 'nokogiri', '~> 1.6.6.2' -gem 'statsd-client', '0.0.7', require: 'statsd' -gem 'aws-sdk', '1.8.5' -gem 'ruby-prof', '0.15.1' -gem 'request_store', '1.1.0' - -# It's used in the dataimport and arcgis. -# It's a replacement for the ruby uri that it's supposed to perform better parsing of a URI -gem 'addressable', '2.3.2', require: 'addressable/uri' - -gem 'ejs', '~> 1.1.1' -gem 'execjs', '~> 0.4' # Required by ejs -gem 'therubyracer', '0.12.1' # Required by ejs - -gem 'net-ldap', '0.11' - -group :production, :staging do - gem 'unicorn', '4.8.2' - gem 'unicorn-worker-killer' - gem 'raindrops', '0.15.0' -end - -group :assets do - gem "compass", "0.12.3" -end - -# Importer & sync tables -gem 'roo', '1.13.2' -gem 'state_machine', '1.1.2' -gem 'typhoeus', '0.7.2' -gem 'charlock_holmes', '0.7.2' -gem 'dbf', '2.0.6' -gem 'faraday', '0.9.0' -gem 'retriable', '1.4.1' # google-api-client needs this -gem 'google-api-client', '0.7.0' -gem 'dropbox-sdk', '1.6.3' -gem 'instagram', '1.1.6' -gem 'gibbon', '1.1.4' - -# Geocoder (synchronizer doesn't needs it anymore) -gem 'eventmachine', '1.0.4' -gem 'em-pg-client', '0.2.1' - -# Service components (/services) -gem 'virtus', '1.0.0.beta3' #, git: 'https://github.com/solnic/virtus.git' -gem 'aequitas', '0.0.2' -gem 'uuidtools', '2.1.5' - -# Markdown -gem 'redcarpet', '3.3.2' - -# TODO we should be able to remove this using the new -# Rails routes DSL -gem 'bartt-ssl_requirement', '~>1.4.0', require: 'ssl_requirement' - -# TODO Production gems, put them in :production group -gem 'rollbar', '0.12.14' -gem 'resque', '1.25.2' -gem 'resque-metrics', '0.1.1' - -# This is weird. In ruby 2 test-unit is required. We don't know why for sure -gem 'test-unit' - -group :test do - gem 'simplecov', require: false - gem 'db-query-matchers', '0.4.0' - gem 'rack-test', '0.6.2', require: 'rack/test' - gem 'factory_girl_rails', '~> 4.0.0' - gem 'selenium-webdriver', '>= 2.5.0' - gem 'capybara', '1.1.2' - gem 'delorean' - gem 'webrick', '1.3.1' - gem 'mocha', '1.1.0' - gem 'ci_reporter', '1.8.4' - gem 'poltergeist', '>= 1.0.0' - gem 'activerecord-nulldb-adapter', '0.3.1' - # Need to use specific branch from this fork as original gem is broken and outdated - gem 'fake_net_ldap', git: 'https://github.com/kuldeepaggarwal/fake_net_ldap.git', :branch => 'fix-responder' -end - -group :development, :test do - gem 'rspec-rails', '2.12.0' - gem 'rb-readline' - gem 'byebug' - gem 'rack' - - # Server - gem 'thin', require: false -end - -# segment metrics -gem 'analytics-ruby', '~> 2.0.0', :require => 'segment/analytics' - -# Load optional engines -# TODO activate when CartoDB plugins are finally included -# Dir['engines' + '/*/*.gemspec'].each do |gemspec_file| -# dir_name = File.dirname(gemspec_file) -# gem_name = File.basename(gemspec_file, File.extname(gemspec_file)) -# gem gem_name, :path => dir_name, :require => false -# end diff --git a/Gemfile-ruby2.lock b/Gemfile-ruby2.lock deleted file mode 100644 index bce09adbd3..0000000000 --- a/Gemfile-ruby2.lock +++ /dev/null @@ -1,407 +0,0 @@ -GIT - remote: https://github.com/Vizzuality/sequel-rails.git - revision: f61f914b55ff1c3f31a47516f6ffb1fb9409d067 - specs: - vizzuality-sequel-rails (0.3.7) - railties (~> 3.2.0) - sequel (~> 3.28) - -GIT - remote: https://github.com/kuldeepaggarwal/fake_net_ldap.git - revision: d99f2fcf13b9737a150f869fe9b9fbc0d788aa3f - branch: fix-responder - specs: - fake_net_ldap (0.0.1) - net-ldap - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (3.2.22) - actionpack (= 3.2.22) - mail (~> 2.5.4) - actionpack (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) - activemodel (3.2.22) - activesupport (= 3.2.22) - builder (~> 3.0.0) - activerecord (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activerecord-nulldb-adapter (0.3.1) - activerecord (>= 2.0.0) - activerecord-postgres-array (0.0.9) - activerecord - activerecord-postgresql-adapter (0.0.1) - pg - activeresource (3.2.22) - activemodel (= 3.2.22) - activesupport (= 3.2.22) - activesupport (3.2.22) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - addressable (2.3.2) - aequitas (0.0.2) - analytics-ruby (2.0.13) - arel (3.0.3) - autoparse (0.3.3) - addressable (>= 2.3.1) - extlib (>= 0.9.15) - multi_json (>= 1.0.0) - aws-sdk (1.8.5) - json (~> 1.4) - nokogiri (>= 1.4.4) - uuidtools (~> 2.1) - axiom-types (0.0.5) - descendants_tracker (~> 0.0.1) - ice_nine (~> 0.9) - backports (3.6.7) - bartt-ssl_requirement (1.4.2) - builder (3.0.4) - byebug (8.2.1) - capybara (1.1.2) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - selenium-webdriver (~> 2.0) - xpath (~> 0.1.4) - charlock_holmes (0.7.2) - childprocess (0.5.8) - ffi (~> 1.0, >= 1.0.11) - chronic (0.10.2) - chunky_png (1.3.5) - ci_reporter (1.8.4) - builder (>= 2.1.2) - coercible (0.2.0) - backports (~> 3.0, >= 3.1.0) - descendants_tracker (~> 0.0.1) - compass (0.12.3) - chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (= 3.2.14) - daemons (1.2.3) - db-query-matchers (0.4.0) - dbf (2.0.6) - fastercsv (~> 1.5.4) - delorean (2.1.0) - chronic - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.1.3) - docile (1.1.5) - dropbox-sdk (1.6.3) - json - ejs (1.1.1) - em-pg-client (0.2.1) - eventmachine (>= 0.12.10) - pg (>= 0.13.2) - equalizer (0.0.11) - erubis (2.7.0) - ethon (0.8.0) - ffi (>= 1.3.0) - eventmachine (1.0.4) - execjs (0.4.0) - multi_json (~> 1.0) - extlib (0.9.16) - factory_girl (4.0.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.0.0) - factory_girl (~> 4.0.0) - railties (>= 3.0.0) - faraday (0.9.0) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.9.2) - faraday (>= 0.7.4, < 0.10) - fastercsv (1.5.5) - faye-websocket (0.4.7) - eventmachine (>= 0.12.0) - ffi (1.9.10) - fssm (0.2.10) - get_process_mem (0.2.0) - gibbon (1.1.4) - httparty - multi_json (>= 1.3.4) - google-api-client (0.7.0) - addressable (>= 2.3.2) - autoparse (>= 0.3.3) - extlib (>= 0.9.15) - faraday (>= 0.9.0) - jwt (>= 0.1.5) - launchy (>= 2.1.1) - multi_json (>= 1.0.0) - signet (>= 0.5.0) - uuidtools (>= 2.1.0) - hashie (3.4.3) - hike (1.2.3) - hiredis (0.6.0) - http_parser.rb (0.5.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) - i18n (0.7.0) - ice_nine (0.11.1) - instagram (1.1.6) - faraday (>= 0.7, < 0.10) - faraday_middleware (>= 0.8, < 0.10) - hashie (>= 0.4.0) - multi_json (~> 1.0, >= 1.0.3) - journey (1.0.4) - json (1.8.3) - jwt (1.5.2) - kgio (2.10.0) - launchy (2.4.3) - addressable (~> 2.3) - libv8 (3.16.14.13) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - metaclass (0.0.4) - mime-types (1.25.1) - mini_portile (0.6.2) - mocha (1.1.0) - metaclass (~> 0.0.1) - mono_logger (1.1.0) - multi_json (1.11.2) - multi_xml (0.5.5) - multipart-post (2.0.0) - net-ldap (0.11) - nokogiri (1.6.6.4) - mini_portile (~> 0.6.0) - oauth (0.4.5) - oauth-plugin (0.4.0.pre4) - oauth (>= 0.4.4) - pg (0.15.0) - poltergeist (1.0.3) - capybara (~> 1.1) - childprocess (~> 0.3) - faye-websocket (~> 0.4.4) - http_parser.rb (~> 0.5.3) - multi_json (~> 1.0) - polyglot (0.3.5) - power_assert (0.2.2) - rack (1.4.7) - rack-cache (1.5.1) - rack (>= 0.4) - rack-protection (1.5.3) - rack - rack-ssl (1.3.4) - rack - rack-test (0.6.2) - rack (>= 1.0) - rails (3.2.22) - actionmailer (= 3.2.22) - actionpack (= 3.2.22) - activerecord (= 3.2.22) - activeresource (= 3.2.22) - activesupport (= 3.2.22) - bundler (~> 1.0) - railties (= 3.2.22) - rails_warden (0.5.8) - warden (>= 1.0.0) - railties (3.2.22) - actionpack (= 3.2.22) - activesupport (= 3.2.22) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - raindrops (0.15.0) - rake (0.9.2.2) - rb-readline (0.5.3) - rdoc (3.12.2) - json (~> 1.4) - redcarpet (3.3.2) - redis (3.2.1) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) - ref (2.0.0) - request_store (1.1.0) - resque (1.25.2) - mono_logger (~> 1.0) - multi_json (~> 1.0) - redis-namespace (~> 1.3) - sinatra (>= 0.9.2) - vegas (~> 0.1.2) - resque-metrics (0.1.1) - resque (~> 1.19) - retriable (1.4.1) - rollbar (0.12.14) - multi_json (~> 1.3) - roo (1.13.2) - nokogiri - rubyzip - spreadsheet (> 0.6.4) - rspec-core (2.12.2) - rspec-expectations (2.12.1) - diff-lcs (~> 1.1.3) - rspec-mocks (2.12.2) - rspec-rails (2.12.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) - ruby-ole (1.2.11.8) - ruby-prof (0.15.1) - rubyzip (1.1.7) - sass (3.2.14) - selenium-webdriver (2.48.1) - childprocess (~> 0.5) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0) - sequel (3.42.0) - sequel_pg (1.6.3) - pg (>= 0.8.0) - sequel (>= 3.39.0) - signet (0.6.1) - addressable (~> 2.3) - extlib (~> 0.9) - faraday (~> 0.9) - jwt (~> 1.5) - multi_json (~> 1.10) - simplecov (0.11.1) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.6) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - spreadsheet (1.0.9) - ruby-ole (>= 1.0) - sprockets (2.2.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - state_machine (1.1.2) - statsd-client (0.0.7) - test-unit (3.0.8) - power_assert - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) - ref - thin (1.6.4) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - typhoeus (0.7.2) - ethon (>= 0.7.4) - tzinfo (0.3.45) - unicorn (4.8.2) - kgio (~> 2.6) - rack - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uuidtools (2.1.5) - vegas (0.1.11) - rack (>= 1.0.0) - virtus (1.0.0.beta3) - axiom-types (~> 0.0.3) - coercible (~> 0.2) - descendants_tracker (~> 0.0.1) - equalizer (~> 0.0.7) - warden (1.2.3) - rack (>= 1.0) - webrick (1.3.1) - websocket (1.2.2) - xpath (0.1.4) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - activerecord-nulldb-adapter (= 0.3.1) - activerecord-postgres-array (= 0.0.9) - activerecord-postgresql-adapter - addressable (= 2.3.2) - aequitas (= 0.0.2) - analytics-ruby (~> 2.0.0) - aws-sdk (= 1.8.5) - bartt-ssl_requirement (~> 1.4.0) - byebug - capybara (= 1.1.2) - charlock_holmes (= 0.7.2) - ci_reporter (= 1.8.4) - compass (= 0.12.3) - db-query-matchers (= 0.4.0) - dbf (= 2.0.6) - delorean - dropbox-sdk (= 1.6.3) - ejs (~> 1.1.1) - em-pg-client (= 0.2.1) - eventmachine (= 1.0.4) - execjs (~> 0.4) - factory_girl_rails (~> 4.0.0) - fake_net_ldap! - faraday (= 0.9.0) - gibbon (= 1.1.4) - google-api-client (= 0.7.0) - hiredis (= 0.6.0) - instagram (= 1.1.6) - mocha (= 1.1.0) - net-ldap (= 0.11) - nokogiri (~> 1.6.6.2) - oauth (= 0.4.5) - oauth-plugin (= 0.4.0.pre4) - pg (= 0.15.0) - poltergeist (>= 1.0.0) - rack - rack-test (= 0.6.2) - rails (= 3.2.22) - rails_warden (= 0.5.8) - raindrops (= 0.15.0) - rake (= 0.9.2.2) - rb-readline - redcarpet (= 3.3.2) - redis (= 3.2.1) - request_store (= 1.1.0) - resque (= 1.25.2) - resque-metrics (= 0.1.1) - retriable (= 1.4.1) - rollbar (= 0.12.14) - roo (= 1.13.2) - rspec-rails (= 2.12.0) - ruby-prof (= 0.15.1) - selenium-webdriver (>= 2.5.0) - sequel (= 3.42.0) - sequel_pg (= 1.6.3) - simplecov - state_machine (= 1.1.2) - statsd-client (= 0.0.7) - test-unit - therubyracer (= 0.12.1) - thin - typhoeus (= 0.7.2) - unicorn (= 4.8.2) - unicorn-worker-killer - uuidtools (= 2.1.5) - virtus (= 1.0.0.beta3) - vizzuality-sequel-rails (= 0.3.7)! - webrick (= 1.3.1) - -BUNDLED WITH - 1.10.6 diff --git a/Gemfile.lock b/Gemfile.lock index 8417f28e0f..bce09adbd3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,9 +65,10 @@ GEM axiom-types (0.0.5) descendants_tracker (~> 0.0.1) ice_nine (~> 0.9) - backports (3.6.6) + backports (3.6.7) bartt-ssl_requirement (1.4.2) builder (3.0.4) + byebug (8.2.1) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -76,16 +77,15 @@ GEM selenium-webdriver (~> 2.0) xpath (~> 0.1.4) charlock_holmes (0.7.2) - childprocess (0.5.6) + childprocess (0.5.8) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) - chunky_png (1.3.4) + chunky_png (1.3.5) ci_reporter (1.8.4) builder (>= 2.1.2) coercible (0.2.0) backports (~> 3.0, >= 3.1.0) descendants_tracker (~> 0.0.1) - columnize (0.9.0) compass (0.12.3) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -94,12 +94,6 @@ GEM db-query-matchers (0.4.0) dbf (2.0.6) fastercsv (~> 1.5.4) - debugger (1.6.8) - columnize (>= 0.3.1) - debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.3.5) - debugger-linecache (1.2.0) - debugger-ruby_core_source (1.3.8) delorean (2.1.0) chronic descendants_tracker (0.0.4) @@ -114,9 +108,9 @@ GEM pg (>= 0.13.2) equalizer (0.0.11) erubis (2.7.0) - ethon (0.7.4) + ethon (0.8.0) ffi (>= 1.3.0) - eventmachine (1.0.3) + eventmachine (1.0.4) execjs (0.4.0) multi_json (~> 1.0) extlib (0.9.16) @@ -148,27 +142,27 @@ GEM multi_json (>= 1.0.0) signet (>= 0.5.0) uuidtools (>= 2.1.0) - hashie (3.4.2) + hashie (3.4.3) hike (1.2.3) hiredis (0.6.0) http_parser.rb (0.5.3) - httparty (0.13.5) + httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) i18n (0.7.0) ice_nine (0.11.1) - instagram (1.1.3) + instagram (1.1.6) faraday (>= 0.7, < 0.10) faraday_middleware (>= 0.8, < 0.10) hashie (>= 0.4.0) multi_json (~> 1.0, >= 1.0.3) journey (1.0.4) json (1.8.3) - jwt (1.5.1) + jwt (1.5.2) kgio (2.10.0) launchy (2.4.3) addressable (~> 2.3) - libv8 (3.16.14.11) + libv8 (3.16.14.13) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -182,12 +176,12 @@ GEM multi_xml (0.5.5) multipart-post (2.0.0) net-ldap (0.11) - nokogiri (1.6.6.2) + nokogiri (1.6.6.4) mini_portile (~> 0.6.0) oauth (0.4.5) oauth-plugin (0.4.0.pre4) oauth (>= 0.4.4) - pg (0.13.2) + pg (0.15.0) poltergeist (1.0.3) capybara (~> 1.1) childprocess (~> 0.3) @@ -195,8 +189,9 @@ GEM http_parser.rb (~> 0.5.3) multi_json (~> 1.0) polyglot (0.3.5) + power_assert (0.2.2) rack (1.4.7) - rack-cache (1.2) + rack-cache (1.5.1) rack (>= 0.4) rack-protection (1.5.3) rack @@ -221,7 +216,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - raindrops (0.12.0) + raindrops (0.15.0) rake (0.9.2.2) rb-readline (0.5.3) rdoc (3.12.2) @@ -262,7 +257,7 @@ GEM ruby-prof (0.15.1) rubyzip (1.1.7) sass (3.2.14) - selenium-webdriver (2.47.1) + selenium-webdriver (2.48.1) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -277,7 +272,7 @@ GEM faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) - simplecov (0.10.0) + simplecov (0.11.1) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) @@ -286,7 +281,7 @@ GEM rack (~> 1.4) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - spreadsheet (1.0.5) + spreadsheet (1.0.9) ruby-ole (>= 1.0) sprockets (2.2.3) hike (~> 1.2) @@ -295,12 +290,14 @@ GEM tilt (~> 1.1, != 1.3.0) state_machine (1.1.2) statsd-client (0.0.7) + test-unit (3.0.8) + power_assert therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thin (1.6.3) + thin (1.6.4) daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0) + eventmachine (~> 1.0, >= 1.0.4) rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) @@ -310,14 +307,14 @@ GEM polyglot (>= 0.3.1) typhoeus (0.7.2) ethon (>= 0.7.4) - tzinfo (0.3.44) + tzinfo (0.3.45) unicorn (4.8.2) kgio (~> 2.6) rack raindrops (~> 0.7) - unicorn-worker-killer (0.4.3) + unicorn-worker-killer (0.4.4) get_process_mem (~> 0) - unicorn (~> 4) + unicorn (>= 4, < 6) uuidtools (2.1.5) vegas (0.1.11) rack (>= 1.0.0) @@ -345,18 +342,18 @@ DEPENDENCIES analytics-ruby (~> 2.0.0) aws-sdk (= 1.8.5) bartt-ssl_requirement (~> 1.4.0) + byebug capybara (= 1.1.2) charlock_holmes (= 0.7.2) ci_reporter (= 1.8.4) compass (= 0.12.3) db-query-matchers (= 0.4.0) dbf (= 2.0.6) - debugger (= 1.6.8) delorean dropbox-sdk (= 1.6.3) ejs (~> 1.1.1) em-pg-client (= 0.2.1) - eventmachine (= 1.0.3) + eventmachine (= 1.0.4) execjs (~> 0.4) factory_girl_rails (~> 4.0.0) fake_net_ldap! @@ -364,19 +361,19 @@ DEPENDENCIES gibbon (= 1.1.4) google-api-client (= 0.7.0) hiredis (= 0.6.0) - instagram (= 1.1.3) + instagram (= 1.1.6) mocha (= 1.1.0) net-ldap (= 0.11) nokogiri (~> 1.6.6.2) oauth (= 0.4.5) oauth-plugin (= 0.4.0.pre4) - pg (= 0.13.2) + pg (= 0.15.0) poltergeist (>= 1.0.0) rack rack-test (= 0.6.2) rails (= 3.2.22) rails_warden (= 0.5.8) - raindrops (= 0.12.0) + raindrops (= 0.15.0) rake (= 0.9.2.2) rb-readline redcarpet (= 3.3.2) @@ -395,6 +392,7 @@ DEPENDENCIES simplecov state_machine (= 1.1.2) statsd-client (= 0.0.7) + test-unit therubyracer (= 0.12.1) thin typhoeus (= 0.7.2) @@ -404,3 +402,6 @@ DEPENDENCIES virtus (= 1.0.0.beta3) vizzuality-sequel-rails (= 0.3.7)! webrick (= 1.3.1) + +BUNDLED WITH + 1.10.6 diff --git a/Makefile b/Makefile index a8ed2e4cd5..7ab805ae9f 100644 --- a/Makefile +++ b/Makefile @@ -7,12 +7,6 @@ all: cat python_requirements.txt | grep -v gdal | sudo pip install -r /dev/stdin npm install -prepare-ruby-version: -ifeq ($(RUBY_MAJOR),2) - cp Gemfile-ruby2 Gemfile - cp Gemfile-ruby2.lock Gemfile.lock -endif - PENDING_SPECS = \ spec/lib/varnish_spec.rb (#321) \ $(NULL) diff --git a/NEWS.md b/NEWS.md index cc5f5742b1..90cf08a9e1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,11 @@ -3.11.1 (2015-mm-dd) +3.12.1 (2016-mm-dd) +------------------- + +3.12.0 (2016-01-05) +------------------- +* Ruby 2 support in CartoDB. Ruby 1.9 is now deprecated and not supported from this moment. + +3.11.1 (2016-01-05) ------------------- * Now the owner of the dataset is going to receive an email when the synchronization fails hits the max allowed number [#3501](https://github.com/CartoDB/cartodb/issues/3501) * If the dataset don't have an associated map we avoid to use the zoom property [#5447](https://github.com/CartoDB/cartodb/issues/5447)