From 78a773657eb02c0fb8ab04f031461937f4280d57 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Thu, 6 Jun 2013 14:47:00 -0400 Subject: [PATCH] update gemfile --- Gemfile | 4 +-- Gemfile.lock | 91 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 35 deletions(-) diff --git a/Gemfile b/Gemfile index f7b4321..076bc8a 100644 --- a/Gemfile +++ b/Gemfile @@ -10,8 +10,8 @@ gem 'sqlite3' gem 'blacklight' gem 'hydra-head' gem 'sufia' -gem 'rubydora', :github => 'projecthydra/rubydora', :branch => 'fcrepo4' -gem 'active-fedora', :github =>'projecthydra/active_fedora' +gem 'rubydora', :git => 'http://github.com/projecthydra/rubydora.git', :branch => 'fcrepo4' +gem 'active-fedora', :git => 'http://github.com/projecthydra/active_fedora.git' gem 'solrizer', '3.1.0' gem 'jettywrapper' gem 'font-awesome-sass-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 45dacdc..dc3f478 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,6 @@ -PATH - remote: ../active_fedora +GIT + remote: http://github.com/projecthydra/active_fedora.git + revision: c2bbab5b147649062ae4f616c98862b281b23f9e specs: active-fedora (6.2.0) activesupport (>= 3.0.0) @@ -12,8 +13,10 @@ PATH rsolr rubydora (~> 1.6, >= 1.6.5) -PATH - remote: ../rubydora +GIT + remote: http://github.com/projecthydra/rubydora.git + revision: bdf69bfa9df76b64198535b471edb383931a28cf + branch: fcrepo4 specs: rubydora (1.6.5) activemodel @@ -27,33 +30,6 @@ PATH rdf rest-client -PATH - remote: ../sufia - specs: - sufia (1.3.0) - activerecord-import (= 0.3.0) - acts_as_follower (= 0.1.1) - blacklight (~> 4.0) - blacklight_advanced_search - daemons (= 1.1.9) - devise - font-awesome-sass-rails (~> 3.0) - hydra-batch-edit (~> 1.0) - hydra-head (~> 6.0) - mail_form - mailboxer (= 0.8.0) - nest (= 1.1.1) - noid (~> 0.6.6) - paperclip (= 3.3.0) - rails (~> 3.2.13) - rails_autolink (= 1.0.9) - rainbow (= 1.1.4) - resque (~> 1.23.0) - resque-pool (= 0.3.0) - rmagick - yaml_db (= 0.2.3) - zipruby (= 0.3.6) - GEM remote: https://rubygems.org/ specs: @@ -111,6 +87,16 @@ GEM sass (~> 3.2) builder (3.0.4) cancan (1.6.9) + capistrano (2.14.2) + highline + net-scp (>= 1.0.0) + net-sftp (>= 2.0.0) + net-ssh (>= 2.0.14) + net-ssh-gateway (>= 1.1.0) + capistrano-resque (0.1.0) + capistrano + resque + resque-scheduler carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -146,8 +132,9 @@ GEM sass-rails (>= 3.1.1) foreigner (1.4.1) activerecord (>= 3.0.0) + highline (1.6.18) hike (1.2.2) - hooks (0.3.0) + hooks (0.3.1) hydra-access-controls (6.1.0) active-fedora (~> 6.1) activesupport @@ -205,6 +192,13 @@ GEM nest (1.1.1) redis net-http-spy (0.2.1) + net-scp (1.1.0) + net-ssh (>= 2.6.5) + net-sftp (2.1.1) + net-ssh (>= 2.6.5) + net-ssh (2.6.7) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) noid (0.6.6) backports nokogiri (1.5.9) @@ -279,11 +273,17 @@ GEM rake resque (~> 1.20) trollop (~> 1.16) + resque-scheduler (2.0.1) + redis (>= 2.0.1) + resque (>= 1.20.0) + rufus-scheduler rest-client (1.6.7) mime-types (>= 1.16) rmagick (2.13.2) rsolr (1.0.9) builder (>= 2.1.2) + rufus-scheduler (2.0.18) + tzinfo (>= 0.3.23) sass (3.2.8) sass-rails (3.2.6) railties (~> 3.2.0) @@ -307,6 +307,29 @@ GEM tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) stomp (1.2.9) + sufia (1.3.0) + activerecord-import (= 0.3.0) + acts_as_follower (= 0.1.1) + blacklight (~> 4.0) + blacklight_advanced_search + daemons (= 1.1.9) + devise + font-awesome-sass-rails (~> 3.0) + hydra-batch-edit (~> 1.0) + hydra-head (~> 6.0) + mail_form + mailboxer (= 0.8.0) + nest (= 1.1.1) + noid (~> 0.6.6) + paperclip (= 3.3.0) + rails (~> 3.2.13) + rails_autolink (= 1.0.9) + rainbow (= 1.1.4) + resque (~> 1.23.0) + resque-pool (= 0.3.0) + rmagick + yaml_db (= 0.2.3) + zipruby (= 0.3.6) thor (0.18.1) tilt (1.4.0) treetop (1.4.12) @@ -332,6 +355,8 @@ DEPENDENCIES active-fedora! blacklight bootstrap-sass + capistrano + capistrano-resque coffee-rails (~> 3.2.1) devise devise-guests (~> 0.3) @@ -345,5 +370,5 @@ DEPENDENCIES sass-rails (~> 3.2.3) solrizer (= 3.1.0) sqlite3 - sufia! + sufia uglifier (>= 1.0.3)