From 1c3c105d2722bf3fbb79dc7463961090ca1b2c26 Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Sat, 31 Aug 2013 18:32:04 +0300 Subject: [PATCH] deps update --- Gemfile | 88 ++++++++++-------------- Gemfile.lock | 184 +++++++++++++-------------------------------------- 2 files changed, 80 insertions(+), 192 deletions(-) diff --git a/Gemfile b/Gemfile index 0ea70a8..122ef15 100644 --- a/Gemfile +++ b/Gemfile @@ -1,96 +1,76 @@ source 'http://rubygems.org' gem 'rails', '4.0.0' - -# Bundle edge Rails instead: -# gem 'rails', :git => 'git://github.com/rails/rails.git' - -# gem 'pg' -gem 'mysql2' +gem 'mysql2', '~> 0.3.13' gem 'devise', '~> 3.0.3' gem 'cancan', '= 1.6.7' gem 'squeel', '~> 1.1.0' gem 'sentient_model', '~> 1.0.4' -gem 'userstamp', '~> 2.0.2', - git: 'https://github.com/delynn/userstamp.git' -gem 'validates_hostname', '~> 1.0.0', - git: 'https://github.com/KimNorgaard/validates_hostname.git' -gem 'nilify_blanks', '~> 1.0.0' +gem 'userstamp', '~> 2.0.2', github: 'kimkong/userstamp' +gem 'validates_hostname', '~> 1.0.0', github: 'KimNorgaard/validates_hostname' +gem 'nilify_blanks', '~> 1.0.2' gem 'rails_config', '~> 0.3.3' gem 'rails-settings-cached', '~> 0.3.1' gem 'active-model-email-validator', '~> 1.0.2' -gem 'mail_form', '~> 1.5.0.rc', - git: 'https://github.com/plataformatec/mail_form.git' +gem 'mail_form', '~> 1.5.0.rc', github: 'plataformatec/mail_form' gem 'switch_user', '~> 0.9.3' -gem 'simple_form', '~> 3.0.0.rc', - git: 'https://github.com/plataformatec/simple_form.git' +gem 'simple_form', '~> 3.0.0.rc', github: 'plataformatec/simple_form' gem 'concerned_with', '~> 0.1.0' -gem 'navigasmic', '~> 0.5.6', - git: 'https://github.com/jejacks0n/navigasmic.git', - tag: 'v0.5.6', - ref: '1ffe437f279657c6fb87bb4b0215eb723df4ea7a' +gem 'navigasmic', '~> 0.5.6', github: 'jejacks0n/navigasmic', + tag: 'v0.5.6', ref: '1ffe437f279657c6fb87bb4b0215eb723df4ea7a' gem 'acts_as_nested_interval', '~> 0.1.0' -gem 'seedbank', github: 'james2m/seedbank' -# gem 'rails_admin', '~> 0.5.0' +gem 'seedbank', '~> 0.3.0.pre2', github: 'james2m/seedbank' gem 'unicorn', '~> 4.6.3' - gem 'sass-rails', '~> 4.0.0' -gem 'compass-rails', - github: 'milgner/compass-rails', - branch: 'rails4' -gem 'bootstrap-sass', - git: 'git://github.com/thomas-mcdonald/bootstrap-sass.git', - branch: '3' +gem 'compass-rails', github: 'milgner/compass-rails', branch: 'rails4' +gem 'bootstrap-sass', github: 'thomas-mcdonald/bootstrap-sass', branch: '3' gem 'webshims-rails', '~> 1.10.10' gem 'detect_timezone_rails', '~> 0.0.3' -# gem 'jquery-cookie-rails', '~> 1.3.1' gem 'nprogress-rails', '~> 0.1.2.2' gem 'animate-rails', '~> 1.0.0' gem 'coffee-rails', '~> 4.0.0' -gem 'uglifier', '>= 1.3.0' -gem 'oily_png', '1.1.0' -gem 'therubyracer' - +gem 'uglifier', '~> 2.2.1' +gem 'oily_png', '~> 1.1.0' +gem 'therubyracer', '~> 0.12.0' gem 'jquery-rails', '~> 3.0.4' gem 'jquery-ui-rails', '~> 4.0.4' gem 'dalli', '~> 2.6.2' -gem 'active_scaffold', '~> 3.3.4.rc', - git: 'https://github.com/activescaffold/active_scaffold.git' -# path: '/home/clyfe/dev/active_scaffold' +gem 'active_scaffold', '~> 3.3.4.rc', github: 'activescaffold/active_scaffold' gem 'turbolinks', '~> 1.3.0' -# gem 'foreigner' ? +# gem 'rails_admin', '~> 0.5.0' +# gem 'jquery-cookie-rails', '~> 1.3.1' +# gem 'foreigner', '~> 1.4.2 group :development do - gem 'capistrano', '~> 2.15.5' - gem 'capistrano-ext', '~> 1.2.1' - gem 'mongrel', '>= 1.2.0.pre2' gem 'quiet_assets', '~> 1.0.1' - gem 'parallel_tests', '0.15.3' - gem 'progress_bar', require: false - gem 'yaml_db', '0.2.3' - # gem 'mailcatcher', '0.5.11' - # gem 'spring', '0.0.10' gem 'better_errors', '0.9.0' gem 'binding_of_caller', '0.7.2' - # gem 'figaro', '0.7.0' - - gem 'debase', '~> 0.0.4' + gem 'debase', '~> 0.0.7' gem 'ruby-debug-ide', '~> 0.4.18' + # gem 'mongrel', '>= 1.2.0.pre2' + # gem 'capistrano', '~> 2.15.5' + # gem 'capistrano-ext', '~> 1.2.1' + # gem 'progress_bar', require: false + # gem 'parallel_tests', '0.15.3' + # gem 'yaml_db', '0.2.3' + # gem 'mailcatcher', '0.5.11' + # gem 'spring', '0.0.10' + # gem 'figaro', '0.7.0' end group :test, :development do - gem 'sourcify', '~> 0.6.0.rc1' gem 'rspec-rails', '~> 2.14.0' gem 'faker','~> 1.2.0' gem 'factory_girl_rails', '~> 4.2.1' + # gem 'sourcify', '~> 0.6.0.rc1' end group :test do gem 'capybara', '~> 2.1.0' gem 'database_cleaner', '~> 1.1.1' - gem 'simplecov', :require => false - gem 'rb-inotify', '~> 0.9.0' - gem 'libnotify', '~> 0.8.1' - gem 'guard', '1.8.2' - gem 'guard-rspec', '3.0.2' + # gem 'rb-inotify', '~> 0.9.0' + # gem 'libnotify', '~> 0.8.1' + # gem 'guard', '1.8.2' + # gem 'guard-rspec', '3.0.2' + # gem 'simplecov', '~> 0.7.1', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 00a6765..72609ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,46 +1,24 @@ GIT - remote: git://github.com/james2m/seedbank.git - revision: c7a272751336f0d17103028f45b88eac62cbedd7 - specs: - seedbank (0.3.0.pre2) - -GIT - remote: git://github.com/milgner/compass-rails.git - revision: c86e7fd9c2605c80816a2f64a3fb8b7c3a09e494 - branch: rails4 - specs: - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) - -GIT - remote: git://github.com/thomas-mcdonald/bootstrap-sass.git - revision: 571ba865e1cd01f583c5949446803b9f2cd21926 - branch: 3 - specs: - bootstrap-sass (3.0.0.0) - sass (~> 3.2) - -GIT - remote: https://github.com/KimNorgaard/validates_hostname.git + remote: git://github.com/KimNorgaard/validates_hostname.git revision: 6421e9bd8261a2fe010c627191a0dbe30352469f specs: validates_hostname (1.0.0) GIT - remote: https://github.com/activescaffold/active_scaffold.git - revision: 425c3702d102ee5c6387be35012175f8f170ca4d + remote: git://github.com/activescaffold/active_scaffold.git + revision: 6ef005c0dc384a6189d6ccdf1a6ba8ff5fce3a90 specs: active_scaffold (3.3.4.rc) rails (>= 3.2.6, < 5) GIT - remote: https://github.com/delynn/userstamp.git - revision: 777633aa564f8457c999ddb96afa4c5ae18d319f + remote: git://github.com/james2m/seedbank.git + revision: c7a272751336f0d17103028f45b88eac62cbedd7 specs: - userstamp (2.0.2) + seedbank (0.3.0.pre2) GIT - remote: https://github.com/jejacks0n/navigasmic.git + remote: git://github.com/jejacks0n/navigasmic.git revision: 1ffe437f279657c6fb87bb4b0215eb723df4ea7a ref: 1ffe437f279657c6fb87bb4b0215eb723df4ea7a tag: v0.5.6 @@ -48,7 +26,21 @@ GIT navigasmic (0.5.6) GIT - remote: https://github.com/plataformatec/mail_form.git + remote: git://github.com/kimkong/userstamp.git + revision: fbb35ccb5004bb04f87e01cbe9b7a5ccdd06b856 + specs: + userstamp (2.0.2) + +GIT + remote: git://github.com/milgner/compass-rails.git + revision: c86e7fd9c2605c80816a2f64a3fb8b7c3a09e494 + branch: rails4 + specs: + compass-rails (1.0.3) + compass (>= 0.12.2, < 0.14) + +GIT + remote: git://github.com/plataformatec/mail_form.git revision: 9eb221a9c5e3f6dad631a547c7518fc0d1cde070 specs: mail_form (1.5.0.rc) @@ -56,13 +48,21 @@ GIT activemodel (>= 3.2, < 5) GIT - remote: https://github.com/plataformatec/simple_form.git + remote: git://github.com/plataformatec/simple_form.git revision: 359606f222fa0972a4a14ec70140ac00f7c80839 specs: simple_form (3.0.0.rc) actionpack (>= 4.0.0, < 4.1) activemodel (>= 4.0.0, < 4.1) +GIT + remote: git://github.com/thomas-mcdonald/bootstrap-sass.git + revision: 82f1b343ffc0069bf99d2a3d4f0190bc87ba89ed + branch: 3 + specs: + bootstrap-sass (3.0.0.0) + sass (~> 3.2) + GEM remote: http://rubygems.org/ specs: @@ -99,7 +99,7 @@ GEM rails arel (4.0.0) atomic (1.1.13) - bcrypt-ruby (3.1.1) + bcrypt-ruby (3.1.2) better_errors (0.9.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -107,14 +107,6 @@ GEM debug_inspector (>= 0.0.1) builder (3.1.4) cancan (1.6.7) - capistrano (2.15.5) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.1.0) - capistrano-ext (1.2.1) - capistrano (>= 1.0.0) capybara (2.1.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -135,11 +127,12 @@ GEM fssm (>= 0.2.7) sass (~> 3.1) concerned_with (0.1.0) - daemons (1.0.10) dalli (2.6.4) database_cleaner (1.1.1) - debase (0.0.4) + debase (0.0.7) + debugger-ruby_core_source debug_inspector (0.0.2) + debugger-ruby_core_source (1.2.3) detect_timezone_rails (0.0.5) railties (>= 3.1) devise (3.0.3) @@ -149,7 +142,7 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.4) erubis (2.7.0) - execjs (2.0.0) + execjs (2.0.1) factory_girl (4.2.0) activesupport (>= 3.0.0) factory_girl_rails (4.2.1) @@ -157,23 +150,7 @@ GEM railties (>= 3.0.0) faker (1.2.0) i18n (~> 0.5) - fattr (2.2.1) - ffi (1.9.0) - file-tail (1.0.12) - tins (~> 0.5) - formatador (0.2.4) fssm (0.2.10) - gem_plugin (0.2.3) - guard (1.8.2) - formatador (>= 0.2.4) - listen (>= 1.0.0) - lumberjack (>= 1.0.2) - pry (>= 0.9.10) - thor (>= 0.14.6) - guard-rspec (3.0.2) - guard (>= 1.8) - rspec (~> 2.13) - highline (1.6.19) hike (1.2.3) i18n (0.6.5) jquery-rails (3.0.4) @@ -183,34 +160,16 @@ GEM jquery-rails railties (>= 3.1.0) kgio (2.8.0) - libnotify (0.8.1) - ffi (>= 1.0.11) libv8 (3.16.14.3) - listen (1.3.0) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) - lumberjack (1.0.4) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - method_source (0.8.2) - mime-types (1.24) + mime-types (1.25) mini_portile (0.5.1) minitest (4.7.5) - mongrel (1.2.0.pre2) - daemons (~> 1.0.10) - gem_plugin (~> 0.2.3) multi_json (1.7.9) mysql2 (0.3.13) - net-scp (1.1.2) - net-ssh (>= 2.6.5) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (2.6.8) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) - nilify_blanks (1.0.1) + nilify_blanks (1.0.2) activerecord (>= 3.0.0) activesupport (>= 3.0.0) nokogiri (1.6.0) @@ -218,22 +177,10 @@ GEM nprogress-rails (0.1.2.2) oily_png (1.1.0) chunky_png (~> 1.2.7) - options (2.3.0) - fattr orm_adapter (0.4.0) - parallel (0.7.1) - parallel_tests (0.15.3) - parallel polyamorous (0.6.3) activerecord (>= 3.0) polyglot (0.3.3) - progress_bar (1.0.0) - highline (~> 1.6.1) - options (~> 2.3.0) - pry (0.9.12.2) - coderay (~> 1.0.5) - method_source (~> 0.8) - slop (~> 3.4) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) rack (1.5.2) @@ -258,16 +205,7 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.11.0) rake (10.1.0) - rb-fsevent (0.9.3) - rb-inotify (0.9.1) - ffi (>= 0.5.0) - rb-kqueue (0.2.0) - ffi (>= 0.5.0) ref (1.0.5) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) rspec-core (2.14.5) rspec-expectations (2.14.2) diff-lcs (>= 1.1.3, < 2.0) @@ -281,11 +219,6 @@ GEM rspec-mocks (~> 2.14.0) ruby-debug-ide (0.4.18) rake (>= 0.8.1) - ruby2ruby (1.3.1) - ruby_parser (~> 2.0) - sexp_processor (~> 3.0) - ruby_parser (2.3.1) - sexp_processor (~> 3.0) sass (3.2.10) sass-rails (4.0.0) railties (>= 4.0.0.beta, < 5.0) @@ -293,17 +226,6 @@ GEM sprockets-rails (~> 2.0.0) sentient_model (1.0.4) bundler (>= 1.0) - sexp_processor (3.2.0) - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) - slop (3.4.6) - sourcify (0.6.0.rc4) - file-tail (~> 1.0.10) - ruby2ruby (~> 1.3.1) - ruby_parser (~> 2.3.1) - sexp_processor (~> 3.2.0) sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) @@ -325,14 +247,13 @@ GEM thread_safe (0.1.2) atomic tilt (1.4.1) - tins (0.9.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) turbolinks (1.3.0) coffee-rails tzinfo (0.3.37) - uglifier (2.1.2) + uglifier (2.2.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) unicorn (4.6.3) @@ -345,7 +266,6 @@ GEM rails (> 3.1.0) xpath (2.0.0) nokogiri (~> 1.3) - yaml_db (0.2.3) PLATFORMS ruby @@ -359,53 +279,41 @@ DEPENDENCIES binding_of_caller (= 0.7.2) bootstrap-sass! cancan (= 1.6.7) - capistrano (~> 2.15.5) - capistrano-ext (~> 1.2.1) capybara (~> 2.1.0) coffee-rails (~> 4.0.0) compass-rails! concerned_with (~> 0.1.0) dalli (~> 2.6.2) database_cleaner (~> 1.1.1) - debase (~> 0.0.4) + debase (~> 0.0.7) detect_timezone_rails (~> 0.0.3) devise (~> 3.0.3) factory_girl_rails (~> 4.2.1) faker (~> 1.2.0) - guard (= 1.8.2) - guard-rspec (= 3.0.2) jquery-rails (~> 3.0.4) jquery-ui-rails (~> 4.0.4) - libnotify (~> 0.8.1) mail_form (~> 1.5.0.rc)! - mongrel (>= 1.2.0.pre2) - mysql2 + mysql2 (~> 0.3.13) navigasmic (~> 0.5.6)! - nilify_blanks (~> 1.0.0) + nilify_blanks (~> 1.0.2) nprogress-rails (~> 0.1.2.2) - oily_png (= 1.1.0) - parallel_tests (= 0.15.3) - progress_bar + oily_png (~> 1.1.0) quiet_assets (~> 1.0.1) rails (= 4.0.0) rails-settings-cached (~> 0.3.1) rails_config (~> 0.3.3) - rb-inotify (~> 0.9.0) rspec-rails (~> 2.14.0) ruby-debug-ide (~> 0.4.18) sass-rails (~> 4.0.0) - seedbank! + seedbank (~> 0.3.0.pre2)! sentient_model (~> 1.0.4) simple_form (~> 3.0.0.rc)! - simplecov - sourcify (~> 0.6.0.rc1) squeel (~> 1.1.0) switch_user (~> 0.9.3) - therubyracer + therubyracer (~> 0.12.0) turbolinks (~> 1.3.0) - uglifier (>= 1.3.0) + uglifier (~> 2.2.1) unicorn (~> 4.6.3) userstamp (~> 2.0.2)! validates_hostname (~> 1.0.0)! webshims-rails (~> 1.10.10) - yaml_db (= 0.2.3)