From 1e784075a97bdb65dd19464574e79d3887432042 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Thu, 4 Feb 2016 14:04:14 +0100 Subject: [PATCH] Revert "Set specific version for gems in gemfile." This reverts commit 2ca23ea8e07346a664822b53bfafc82fdb3e55f9. --- Gemfile | 106 +++++++++---------- Gemfile.lock | 288 +++++++++++++++++++++++++-------------------------- 2 files changed, 195 insertions(+), 199 deletions(-) diff --git a/Gemfile b/Gemfile index c2b7a84bb..8ad3045cb 100644 --- a/Gemfile +++ b/Gemfile @@ -5,20 +5,20 @@ source 'https://rubygems.org' gem 'rails', '4.2.0' # Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0.3' +gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .coffee assets and views gem 'coffee-rails', '~> 4.1.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -gem 'therubyracer', '~> 0.12.2', platforms: :ruby +gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library -gem 'jquery-rails', '~> 4.1.0' +gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks', '~> 2.5.3' +gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.3.1' +gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc @@ -26,102 +26,102 @@ gem 'sdoc', '~> 0.4.0', group: :doc # gem 'bcrypt', '~> 3.1.7' # Use Unicorn as the app server -gem 'unicorn', '~> 4.9.0' +gem 'unicorn' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development # serializer -gem 'active_model_serializers', '~> 0.8.3' +gem 'active_model_serializers' #haml -gem 'haml-rails', '~> 0.9.0' +gem 'haml-rails' #bootstrap saas gem 'bootstrap-sass', '~> 3.3.5' # Pagination -gem 'will_paginate-bootstrap', '~> 1.0.1' +gem 'will_paginate-bootstrap' # Decorators -gem 'draper', '~> 2.1.0' +gem 'draper' #Gestion des comptes utilisateurs -gem 'devise', '~> 3.4.1' -gem 'openid_connect', '~> 0.9.2' -gem 'rest-client', '~> 1.8.0' +gem 'devise' +gem 'openid_connect' +gem 'rest-client' -gem 'carrierwave', '~> 0.10.0' +gem 'carrierwave' -gem 'pg', '~> 0.18.2' +gem 'pg' -gem 'rgeo-geojson', '~> 0.3.1' -gem 'leaflet-rails', '~> 0.7.4' +gem 'rgeo-geojson' +gem 'leaflet-rails' gem 'leaflet-markercluster-rails', '~> 0.7.0' -gem 'leaflet-draw-rails', '~> 0.1.0' +gem 'leaflet-draw-rails' -gem 'bootstrap-datepicker-rails', '~> 1.4.0' +gem 'bootstrap-datepicker-rails' -gem 'chartkick', '~> 1.3.2' +gem 'chartkick' -gem 'logstasher', '~> 0.6.5' +gem 'logstasher' -gem "font-awesome-rails", '~> 4.4.0' +gem "font-awesome-rails" -gem 'hashie', '~> 3.4.1' +gem 'hashie' -gem 'mailjet', '~> 1.1.0' +gem 'mailjet' -gem "smart_listing", '~> 1.1.2' +gem "smart_listing" gem 'swagger-docs' group :test do - gem 'capybara', '~> 2.1' - gem 'factory_girl', '~> 4.5.0' - gem 'database_cleaner', '~> 1.4.1' - gem 'selenium-webdriver', '~> 2.44.0' - gem 'webmock', '~> 1.21.0' - gem 'shoulda-matchers', '~> 2.8.0', require: false - gem 'simplecov', '~> 0.9.1', require: false - gem 'poltergeist', '~> 1.6.0' - gem 'timecop', '~> 0.7.3' - gem 'guard', '~> 2.13.0' - gem 'guard-rspec', '~> 4.3.1', require: false - gem 'guard-livereload', '~> 2.5.1', require: false + gem 'capybara' + gem 'factory_girl' + gem 'database_cleaner' + gem 'selenium-webdriver' + gem 'webmock' + gem 'shoulda-matchers', require: false + gem 'simplecov', require: false + gem 'poltergeist' + gem 'timecop' + gem 'guard' + gem 'guard-rspec', require: false + gem 'guard-livereload', '~> 2.4', require: false end group :development, :test do - gem 'terminal-notifier', '~> 1.6.3' - gem 'terminal-notifier-guard', '~> 1.6.4' + gem 'terminal-notifier' + gem 'terminal-notifier-guard' # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem 'byebug', '~> 5.0.0' - gem 'pry-byebug', '~> 3.2.0' + gem 'byebug' + gem 'pry-byebug' # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 2.2.1' + gem 'web-console', '~> 2.0' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring - gem 'spring', '~> 1.3.6' - gem 'spring-commands-rspec', '~> 1.0.4' - gem 'rspec-rails', '~> 3.2.0' + gem 'spring' + gem 'spring-commands-rspec' + gem 'rspec-rails', '~> 3.0' - gem 'railroady', '~> 1.3.0' + gem 'railroady' - gem 'rubocop', '~> 0.30.1', require: false - gem 'rubocop-checkstyle_formatter', '~> 0.2.0', require: false - gem 'rubocop-rspec', '~> 1.3.0', require: false + gem 'rubocop', require: false + gem 'rubocop-checkstyle_formatter', require: false + gem 'rubocop-rspec', require: false - gem "nyan-cat-formatter", '0.11' + gem "nyan-cat-formatter" - gem 'parallel_tests', '~> 1.9' + gem 'parallel_tests' # Deploy - gem 'mina', git: 'https://github.com/mina-deploy/mina.git', :tag => 'v0.3.8' + gem 'mina', git: 'https://github.com/mina-deploy/mina.git' end group :production, :staging do - gem 'sentry-raven', '~> 0.13.1' + gem 'sentry-raven' end diff --git a/Gemfile.lock b/Gemfile.lock index 162aa9250..a4c18b349 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,8 @@ GIT remote: https://github.com/mina-deploy/mina.git - revision: cf890b9556d718caf51ec335649f33630428afb3 - tag: v0.3.8 + revision: a66b55a72833b19ac0ffb240afb37c86c0227582 specs: - mina (0.3.8) + mina (0.3.7) open4 (~> 1.3.4) rake @@ -47,29 +46,28 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) - arel (6.0.3) - ast (2.2.0) - astrolabe (1.3.1) - parser (~> 2.2) - attr_required (1.0.1) - autoprefixer-rails (6.3.1) + addressable (2.3.8) + arel (6.0.2) + ast (2.0.0) + astrolabe (1.3.0) + parser (>= 2.2.0.pre.3, < 3.0) + attr_required (1.0.0) + autoprefixer-rails (5.2.1) execjs json bcrypt (3.1.10) - bindata (2.2.0) + bindata (2.1.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) bootstrap-datepicker-rails (1.4.0) railties (>= 3.0) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + bootstrap-sass (3.3.5) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) builder (3.2.2) byebug (5.0.0) columnize (= 0.9.0) - capybara (2.6.2) - addressable + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -81,20 +79,19 @@ GEM json (>= 1.7) mime-types (>= 1.16) chartkick (1.3.2) - childprocess (0.5.9) + childprocess (0.5.5) ffi (~> 1.0, >= 1.0.11) cliver (0.3.2) coderay (1.1.0) - coffee-rails (4.1.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0, < 5.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.9.1.1) columnize (0.9.0) - concurrent-ruby (1.0.0) - crack (0.4.3) + crack (0.4.2) safe_yaml (~> 1.0.0) database_cleaner (1.4.1) debug_inspector (0.0.2) @@ -107,7 +104,7 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160128) + domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) draper (2.1.0) actionpack (>= 3.0) @@ -118,17 +115,17 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.9.1) - execjs (2.6.0) + eventmachine (1.0.8) + execjs (2.5.2) factory_girl (4.5.0) activesupport (>= 3.0.0) - faraday (0.9.2) + faraday (0.9.1) multipart-post (>= 1.2, < 3) - ffi (1.9.10) + ffi (1.9.6) font-awesome-rails (4.4.0.0) railties (>= 3.2, < 5.0) formatador (0.2.5) - globalid (0.3.6) + globalid (0.3.5) activesupport (>= 4.1.0) guard (2.13.0) formatador (>= 0.2.4) @@ -148,7 +145,7 @@ GEM guard-rspec (4.3.1) guard (~> 2.1) rspec (>= 2.14, < 4.0) - haml (4.0.7) + haml (4.0.6) tilt haml-rails (0.9.0) actionpack (>= 4.0.1) @@ -156,7 +153,7 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashie (3.4.3) + hashie (3.4.1) html2haml (2.0.0) erubis (~> 2.7.0) haml (~> 4.0.0) @@ -165,17 +162,17 @@ GEM http-cookie (1.0.2) domain_name (~> 0.5) http_parser.rb (0.6.0) - httpclient (2.7.1) + httpclient (2.6.0.1) i18n (0.7.0) - jbuilder (2.3.2) + jbuilder (2.3.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (4.1.0) + jquery-rails (4.0.4) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) - json-jwt (1.5.2) + json-jwt (1.5.1) activesupport bindata multi_json (>= 1.3) @@ -184,38 +181,38 @@ GEM kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.10.0) + kgio (2.9.3) leaflet-draw-rails (0.1.0) leaflet-markercluster-rails (0.7.0) railties (>= 3.1) leaflet-rails (0.7.4) - libv8 (3.16.14.13) - listen (3.0.5) + libv8 (3.16.14.7) + listen (3.0.4) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) logstash-event (1.2.02) logstasher (0.6.5) logstash-event (~> 1.2.0) request_store - loofah (2.0.3) + loofah (2.0.2) nokogiri (>= 1.5.9) - lumberjack (1.0.10) + lumberjack (1.0.9) mail (2.6.3) mime-types (>= 1.16, < 3) - mailjet (1.1.1) + mailjet (1.1.0) activesupport (>= 3.1.0) rack (>= 1.4.0) rest-client method_source (0.8.2) - mime-types (2.99) - mini_portile2 (2.0.0) - minitest (5.8.4) + mime-types (2.6.1) + mini_portile (0.6.2) + minitest (5.7.0) multi_json (1.11.2) multipart-post (2.0.0) nenv (0.2.0) - netrc (0.11.0) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + netrc (0.10.3) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) @@ -237,16 +234,16 @@ GEM parallel (1.6.1) parallel_tests (1.9.0) parallel - parser (2.3.0.2) - ast (~> 2.2) - pg (0.18.4) + parser (2.2.2.2) + ast (>= 1.1, < 3.0) + pg (0.18.2) poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - powerpack (0.1.1) - pry (0.10.3) + powerpack (0.1.0) + pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) @@ -254,7 +251,7 @@ GEM byebug (~> 5.0) pry (~> 0.10) rack (1.6.4) - rack-oauth2 (1.2.2) + rack-oauth2 (1.2.1) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -262,7 +259,7 @@ GEM rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) - railroady (1.3.1) + railroady (1.3.0) rails (4.2.0) actionmailer (= 4.2.0) actionpack (= 4.2.0) @@ -276,36 +273,36 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.6) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) + rails-html-sanitizer (1.0.2) loofah (~> 2.0) railties (4.2.0) actionpack (= 4.2.0) activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.15.0) - rake (10.5.0) - rb-fsevent (0.9.7) + rainbow (2.0.0) + raindrops (0.13.0) + rake (10.4.2) + rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) - rdoc (4.2.1) + rdoc (4.2.0) json (~> 1.4) ref (2.0.0) - request_store (1.3.0) - responders (2.1.1) - railties (>= 4.2.0, < 5.1) + request_store (1.1.0) + responders (2.1.0) + railties (>= 4.2.0, < 5) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rgeo (0.5.2) - rgeo-geojson (0.3.3) - rgeo (~> 0.5) + rgeo (0.3.20) + rgeo-geojson (0.3.1) + rgeo (~> 0.3) rspec (3.2.0) rspec-core (~> 3.2.0) rspec-expectations (~> 3.2.0) @@ -318,7 +315,7 @@ GEM rspec-mocks (3.2.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.2.0) - rspec-rails (3.2.3) + rspec-rails (3.2.1) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) @@ -335,19 +332,19 @@ GEM ruby-progressbar (~> 1.4) rubocop-checkstyle_formatter (0.2.0) rubocop (>= 0.20.1) - rubocop-rspec (1.3.1) + rubocop-rspec (1.3.0) ruby-progressbar (1.7.5) - ruby_parser (3.7.3) + ruby_parser (3.7.0) sexp_processor (~> 4.1) rubyzip (1.1.7) safe_yaml (1.0.4) - sass (3.4.21) - sass-rails (5.0.4) + sass (3.4.16) + sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + tilt (~> 1.1) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -357,17 +354,17 @@ GEM multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) - sentry-raven (0.13.3) + sentry-raven (0.13.1) faraday (>= 0.7.6) - sexp_processor (4.6.1) + sexp_processor (4.6.0) shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - simplecov (0.9.2) + simplecov (0.9.1) docile (~> 1.1.0) multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) slop (3.6.0) smart_listing (1.1.2) coffee-rails @@ -377,17 +374,16 @@ GEM spring (1.3.6) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.5.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.0.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) + sprockets (3.2.0) + rack (~> 1.0) + sprockets-rails (2.3.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) swagger-docs (0.2.8) activesupport (>= 3, < 5) rails (>= 3, < 5) - swd (1.0.1) + swd (1.0.0) activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -400,13 +396,13 @@ GEM ref thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.2) - timecop (0.7.4) + tilt (1.4.1) + timecop (0.7.3) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) unf (0.1.4) @@ -423,25 +419,25 @@ GEM validate_url (1.0.2) activemodel (>= 3.0.0) addressable - warden (1.2.6) + warden (1.2.3) rack (>= 1.0) web-console (2.2.1) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - webfinger (1.0.2) + webfinger (1.0.1) activesupport httpclient (>= 2.4) multi_json webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket (1.2.2) - websocket-driver (0.6.3) + websocket (1.2.1) + websocket-driver (0.5.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - will_paginate (3.1.0) + will_paginate (3.0.7) will_paginate-bootstrap (1.0.1) will_paginate (>= 3.0.3) xpath (2.0.0) @@ -451,66 +447,66 @@ PLATFORMS ruby DEPENDENCIES - active_model_serializers (~> 0.8.3) - bootstrap-datepicker-rails (~> 1.4.0) + active_model_serializers + bootstrap-datepicker-rails bootstrap-sass (~> 3.3.5) - byebug (~> 5.0.0) - capybara (~> 2.1) - carrierwave (~> 0.10.0) - chartkick (~> 1.3.2) + byebug + capybara + carrierwave + chartkick coffee-rails (~> 4.1.0) - database_cleaner (~> 1.4.1) - devise (~> 3.4.1) - draper (~> 2.1.0) - factory_girl (~> 4.5.0) - font-awesome-rails (~> 4.4.0) - guard (~> 2.13.0) - guard-livereload (~> 2.5.1) - guard-rspec (~> 4.3.1) - haml-rails (~> 0.9.0) - hashie (~> 3.4.1) - jbuilder (~> 2.3.1) - jquery-rails (~> 4.1.0) - leaflet-draw-rails (~> 0.1.0) + database_cleaner + devise + draper + factory_girl + font-awesome-rails + guard + guard-livereload (~> 2.4) + guard-rspec + haml-rails + hashie + jbuilder (~> 2.0) + jquery-rails + leaflet-draw-rails leaflet-markercluster-rails (~> 0.7.0) - leaflet-rails (~> 0.7.4) - logstasher (~> 0.6.5) - mailjet (~> 1.1.0) + leaflet-rails + logstasher + mailjet mina! - nyan-cat-formatter (= 0.11) - openid_connect (~> 0.9.2) - parallel_tests (~> 1.9) - pg (~> 0.18.2) - poltergeist (~> 1.6.0) - pry-byebug (~> 3.2.0) - railroady (~> 1.3.0) + nyan-cat-formatter + openid_connect + parallel_tests + pg + poltergeist + pry-byebug + railroady rails (= 4.2.0) - rest-client (~> 1.8.0) - rgeo-geojson (~> 0.3.1) - rspec-rails (~> 3.2.0) - rubocop (~> 0.30.1) - rubocop-checkstyle_formatter (~> 0.2.0) - rubocop-rspec (~> 1.3.0) - sass-rails (~> 5.0.3) + rest-client + rgeo-geojson + rspec-rails (~> 3.0) + rubocop + rubocop-checkstyle_formatter + rubocop-rspec + sass-rails (~> 5.0) sdoc (~> 0.4.0) - selenium-webdriver (~> 2.44.0) - sentry-raven (~> 0.13.1) - shoulda-matchers (~> 2.8.0) - simplecov (~> 0.9.1) - smart_listing (~> 1.1.2) - spring (~> 1.3.6) - spring-commands-rspec (~> 1.0.4) + selenium-webdriver + sentry-raven + shoulda-matchers + simplecov + smart_listing + spring + spring-commands-rspec swagger-docs - terminal-notifier (~> 1.6.3) - terminal-notifier-guard (~> 1.6.4) - therubyracer (~> 0.12.2) - timecop (~> 0.7.3) - turbolinks (~> 2.5.3) + terminal-notifier + terminal-notifier-guard + therubyracer + timecop + turbolinks uglifier (>= 1.3.0) - unicorn (~> 4.9.0) - web-console (~> 2.2.1) - webmock (~> 1.21.0) - will_paginate-bootstrap (~> 1.0.1) + unicorn + web-console (~> 2.0) + webmock + will_paginate-bootstrap BUNDLED WITH - 1.11.2 + 1.10.6