Skip to content

Commit

Permalink
2.0.2:
Browse files Browse the repository at this point in the history
Fixed activeresource requirement in specfile
Switched Bundler to rely on specfile for runtime dependencies.
  • Loading branch information
flyingzumwalt committed Mar 12, 2011
1 parent 7806db8 commit 7db96f5
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 67 deletions.
15 changes: 4 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
source "http://rubygems.org"

gem 'solr-ruby', '>= 0.0.6'
gem 'xml-simple', '>= 1.0.12'
gem 'mime-types', '>= 1.16'
gem 'multipart-post'
gem 'nokogiri'
gem 'om', '>= 1.0'
gem 'solrizer', '>=1.0.0', '<2.0.0'
gem 'activeresource'
gem 'mediashelf-loggable'
gem "equivalent-xml"

group :development, :test do
gem "jeweler"
gem "rspec", "<2.0.0"
gem "mocha", ">= 0.9.8"
gem "ruby-debug"
end

# Bundler will rely on active-fedora.gemspec (which is generated by Jeweler section of Rakefile) for runtime dependency information.

gemspec
26 changes: 16 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
PATH
remote: .
specs:
active-fedora (2.0.1)
activeresource
equivalent-xml
mediashelf-loggable
mime-types (>= 1.16)
multipart-post
nokogiri
om (>= 1.0)
solr-ruby (>= 0.0.6)
solrizer (> 1.0.0)
xml-simple (>= 1.0.12)

GEM
remote: http://rubygems.org/
specs:
Expand Down Expand Up @@ -54,17 +69,8 @@ PLATFORMS
ruby

DEPENDENCIES
activeresource
equivalent-xml
active-fedora!
jeweler
mediashelf-loggable
mime-types (>= 1.16)
mocha (>= 0.9.8)
multipart-post
nokogiri
om (>= 1.0)
rspec (< 2.0.0)
ruby-debug
solr-ruby (>= 0.0.6)
solrizer (>= 1.0.0, < 2.0.0)
xml-simple (>= 1.0.12)
5 changes: 5 additions & 0 deletions History.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2.0.2

Fixed activeresource requirement in specfile
Switched Bundler to rely on specfile for runtime dependencies.

2.0.1

Made Gemfile agnostic about Rails version (dependency on activeresource)
Expand Down
8 changes: 4 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ begin
gem.add_dependency('nokogiri')
gem.add_dependency('om', '>= 1.0')
gem.add_dependency('solrizer', '>1.0.0')
gem.add_dependency("activeresource", "<3.0.0")
gem.add_development_dependency "rspec", ">= 1.2.9"
gem.add_development_dependency "mocha", ">= 0.9.8"
gem.add_development_dependency "ruby-debug"
gem.add_dependency("activeresource")
gem.add_dependency("mediashelf-loggable")
gem.add_dependency("equivalent-xml")

# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
end
Jeweler::GemcutterTasks.new
Expand Down
51 changes: 9 additions & 42 deletions active-fedora.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -346,16 +346,6 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<solr-ruby>, [">= 0.0.6"])
s.add_runtime_dependency(%q<xml-simple>, [">= 1.0.12"])
s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
s.add_runtime_dependency(%q<om>, [">= 1.0"])
s.add_runtime_dependency(%q<solrizer>, [">= 1.0.0", "< 2.0.0"])
s.add_runtime_dependency(%q<activeresource>, [">= 0"])
s.add_runtime_dependency(%q<mediashelf-loggable>, [">= 0"])
s.add_runtime_dependency(%q<equivalent-xml>, [">= 0"])
s.add_development_dependency(%q<jeweler>, [">= 0"])
s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
Expand All @@ -367,21 +357,10 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
s.add_runtime_dependency(%q<om>, [">= 1.0"])
s.add_runtime_dependency(%q<solrizer>, ["> 1.0.0"])
s.add_runtime_dependency(%q<activeresource>, ["< 3.0.0"])
s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
s.add_development_dependency(%q<ruby-debug>, [">= 0"])
s.add_runtime_dependency(%q<activeresource>, [">= 0"])
s.add_runtime_dependency(%q<mediashelf-loggable>, [">= 0"])
s.add_runtime_dependency(%q<equivalent-xml>, [">= 0"])
else
s.add_dependency(%q<solr-ruby>, [">= 0.0.6"])
s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
s.add_dependency(%q<mime-types>, [">= 1.16"])
s.add_dependency(%q<multipart-post>, [">= 0"])
s.add_dependency(%q<nokogiri>, [">= 0"])
s.add_dependency(%q<om>, [">= 1.0"])
s.add_dependency(%q<solrizer>, [">= 1.0.0", "< 2.0.0"])
s.add_dependency(%q<activeresource>, [">= 0"])
s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
s.add_dependency(%q<equivalent-xml>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<rspec>, ["< 2.0.0"])
s.add_dependency(%q<mocha>, [">= 0.9.8"])
Expand All @@ -393,22 +372,11 @@ Gem::Specification.new do |s|
s.add_dependency(%q<nokogiri>, [">= 0"])
s.add_dependency(%q<om>, [">= 1.0"])
s.add_dependency(%q<solrizer>, ["> 1.0.0"])
s.add_dependency(%q<activeresource>, ["< 3.0.0"])
s.add_dependency(%q<rspec>, [">= 1.2.9"])
s.add_dependency(%q<mocha>, [">= 0.9.8"])
s.add_dependency(%q<ruby-debug>, [">= 0"])
s.add_dependency(%q<activeresource>, [">= 0"])
s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
s.add_dependency(%q<equivalent-xml>, [">= 0"])
end
else
s.add_dependency(%q<solr-ruby>, [">= 0.0.6"])
s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
s.add_dependency(%q<mime-types>, [">= 1.16"])
s.add_dependency(%q<multipart-post>, [">= 0"])
s.add_dependency(%q<nokogiri>, [">= 0"])
s.add_dependency(%q<om>, [">= 1.0"])
s.add_dependency(%q<solrizer>, [">= 1.0.0", "< 2.0.0"])
s.add_dependency(%q<activeresource>, [">= 0"])
s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
s.add_dependency(%q<equivalent-xml>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<rspec>, ["< 2.0.0"])
s.add_dependency(%q<mocha>, [">= 0.9.8"])
Expand All @@ -420,10 +388,9 @@ Gem::Specification.new do |s|
s.add_dependency(%q<nokogiri>, [">= 0"])
s.add_dependency(%q<om>, [">= 1.0"])
s.add_dependency(%q<solrizer>, ["> 1.0.0"])
s.add_dependency(%q<activeresource>, ["< 3.0.0"])
s.add_dependency(%q<rspec>, [">= 1.2.9"])
s.add_dependency(%q<mocha>, [">= 0.9.8"])
s.add_dependency(%q<ruby-debug>, [">= 0"])
s.add_dependency(%q<activeresource>, [">= 0"])
s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
s.add_dependency(%q<equivalent-xml>, [">= 0"])
end
end

0 comments on commit 7db96f5

Please sign in to comment.