From 1ebd728361968b9a8656b6c8cae4f0040532b7a3 Mon Sep 17 00:00:00 2001 From: Juan Carlos Date: Fri, 30 May 2014 14:03:25 -0500 Subject: [PATCH] gemas de pruebas, #16 --- Gemfile | 28 ++++++--------------- Gemfile.lock | 71 +++++++++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 52 deletions(-) diff --git a/Gemfile b/Gemfile index db803e2..412a9c6 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.0' +gem 'rails', '~> 4.0.3' gem 'high_voltage' gem 'haml' gem 'haml-rails', :group => :development @@ -12,14 +12,15 @@ gem 'cancancan', '~> 1.8' # Use sqlite3 as the database for Active Record group :development, :test do gem 'sqlite3' - gem 'rspec-rails', '2.13.1' - gem 'guard-rspec', '2.5.0' - - gem 'spork-rails', '4.0.0' + gem 'rspec-rails' + gem 'guard-rspec' + gem "better_errors" + gem 'spork-rails' gem 'guard-spork', '1.5.0' gem 'childprocess' gem 'annotate' gem 'pry' + gem "quiet_assets", "~> 1.0.2" end @@ -28,7 +29,7 @@ group :test do gem 'selenium-webdriver' gem 'capybara' gem 'libnotify' - gem 'factory_girl' + gem 'factory_girl_rails' gem 'coveralls', require: false end gem 'will_paginate', '~> 3.0' @@ -51,7 +52,6 @@ gem 'coffee-rails', '~> 4.0.0' gem 'jquery-rails' # 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', '~> 1.2' @@ -65,17 +65,5 @@ group :doc do end group :production do -gem 'pg' + gem 'pg' end - -# Use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' - -# Use unicorn as the app server -# gem 'unicorn' - -# Use Capistrano for deployment -# gem 'capistrano', group: :development - -# Use debugger -# gem 'debugger', group: [:development, :test] diff --git a/Gemfile.lock b/Gemfile.lock index cd4e959..c35e8d6 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,26 +1,26 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) + actionmailer (4.0.5) + actionpack (= 4.0.5) + mail (~> 2.5.4) + actionpack (4.0.5) + activesupport (= 4.0.5) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.0) - activesupport (= 4.0.0) + activemodel (4.0.5) + activesupport (= 4.0.5) builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) + activerecord (4.0.5) + activemodel (= 4.0.5) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) + activesupport (= 4.0.5) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) - i18n (~> 0.6, >= 0.6.4) + activesupport (4.0.5) + i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) @@ -30,6 +30,9 @@ GEM rake (>= 0.8.7) arel (4.0.2) bcrypt (3.1.7) + better_errors (1.1.0) + coderay (>= 1.0.0) + erubis (>= 2.6.6) builder (3.1.4) cancancan (1.8.1) capybara (2.2.1) @@ -68,6 +71,9 @@ GEM execjs (2.0.2) factory_girl (4.4.0) activesupport (>= 3.0.0) + factory_girl_rails (4.4.1) + factory_girl (~> 4.4.0) + railties (>= 3.0.0) ffi (1.9.3) formatador (0.2.4) friendly_id (5.0.3) @@ -119,30 +125,32 @@ GEM mime-types (1.25.1) mini_portile (0.6.0) minitest (4.7.5) - multi_json (1.10.0) + multi_json (1.10.1) nokogiri (1.6.2.1) mini_portile (= 0.6.0) orm_adapter (0.5.0) pg (0.17.1) - polyglot (0.3.4) + polyglot (0.3.5) pry (0.9.12.6) coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) + quiet_assets (1.0.2) + railties (>= 3.1, < 5.0) rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.0) + rails (4.0.5) + actionmailer (= 4.0.5) + actionpack (= 4.0.5) + activerecord (= 4.0.5) + activesupport (= 4.0.5) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) + railties (= 4.0.5) sprockets-rails (~> 2.0.0) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + railties (4.0.5) + actionpack (= 4.0.5) + activesupport (= 4.0.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -206,15 +214,13 @@ GEM term-ansicolor (1.3.0) tins (~> 1.0) thor (0.19.1) - thread_safe (0.3.3) + thread_safe (0.3.4) tilt (1.4.1) timers (1.1.0) tins (1.3.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - turbolinks (2.2.2) - coffee-rails tzinfo (0.3.39) uglifier (2.5.0) execjs (>= 0.3.0) @@ -231,16 +237,17 @@ PLATFORMS DEPENDENCIES annotate + better_errors cancancan (~> 1.8) capybara childprocess coffee-rails (~> 4.0.0) coveralls devise - factory_girl + factory_girl_rails friendly_id (~> 5.0.0) geocoder - guard-rspec (= 2.5.0) + guard-rspec guard-spork (= 1.5.0) haml haml-rails @@ -251,13 +258,13 @@ DEPENDENCIES libnotify pg pry - rails (= 4.0.0) - rspec-rails (= 2.13.1) + quiet_assets (~> 1.0.2) + rails (~> 4.0.3) + rspec-rails sass-rails (~> 4.0.0) sdoc selenium-webdriver - spork-rails (= 4.0.0) + spork-rails sqlite3 - turbolinks uglifier (>= 1.3.0) will_paginate (~> 3.0)