Skip to content
Browse files

Removes duplicate dependency listings in gemspec.

That's a known issue in jeweler:
technicalpickles/jeweler#152
It's advised to avoid reading dependencies from the gemspec in the Gemfile.
  • Loading branch information...
1 parent 9dc4450 commit 3a174e10cf355ade2da5ea3d9b06c9574330126c Maciej Bilas committed
Showing with 15 additions and 34 deletions.
  1. +5 −2 Gemfile
  2. +2 −9 Gemfile.lock
  3. +2 −2 Rakefile
  4. +6 −21 flickr_fu.gemspec
View
7 Gemfile
@@ -3,8 +3,6 @@ source "http://rubygems.org"
# Example:
# gem "activesupport", ">= 2.3.5"
-gemspec
-
# Add dependencies to develop your gem here.
# Include everything needed to run rake, tests, features, etc.
group :development do
@@ -15,3 +13,8 @@ group :development do
gem "rdoc"
# gem "rcov", ">= 0"
end
+
+gem "mime-types"
+gem "xml-magic"
+
+#gemspec
View
11 Gemfile.lock
@@ -1,11 +1,3 @@
-PATH
- remote: .
- specs:
- flickr_fu (0.3.1)
- flickr_fu
- mime-types (> 0.0.0)
- xml-magic (> 0.0.0)
-
GEM
remote: http://rubygems.org/
specs:
@@ -35,7 +27,8 @@ PLATFORMS
DEPENDENCIES
bundler (~> 1)
- flickr_fu!
jeweler (~> 1.6.4)
+ mime-types
rdoc
rspec
+ xml-magic
View
4 Rakefile
@@ -22,8 +22,8 @@ Jeweler::Tasks.new do |s|
s.authors = ["Ben Wyrosdick", "Maciej Bilas"]
s.rdoc_options = ["--main", "README"]
s.extra_rdoc_files = ["README"]
- s.add_dependency("mime-types", ["> 0.0.0"])
- s.add_dependency("xml-magic", ["> 0.0.0"])
+# s.add_dependency("mime-types", ["> 0.0.0"])
+# s.add_dependency("xml-magic", ["> 0.0.0"])
s.files.exclude("spec/spec.local.opts")
end
Jeweler::RubygemsDotOrgTasks.new
View
27 flickr_fu.gemspec
@@ -95,42 +95,27 @@ 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<flickr_fu>, [">= 0"])
+ s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+ s.add_runtime_dependency(%q<xml-magic>, [">= 0"])
s.add_development_dependency(%q<bundler>, ["~> 1"])
s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_development_dependency(%q<rspec>, [">= 0"])
s.add_development_dependency(%q<rdoc>, [">= 0"])
- s.add_development_dependency(%q<bundler>, ["~> 1"])
- s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
- s.add_development_dependency(%q<rspec>, [">= 0"])
- s.add_development_dependency(%q<rdoc>, [">= 0"])
- s.add_runtime_dependency(%q<mime-types>, ["> 0.0.0"])
- s.add_runtime_dependency(%q<xml-magic>, ["> 0.0.0"])
else
- s.add_dependency(%q<flickr_fu>, [">= 0"])
- s.add_dependency(%q<bundler>, ["~> 1"])
- s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
- s.add_dependency(%q<rspec>, [">= 0"])
- s.add_dependency(%q<rdoc>, [">= 0"])
+ s.add_dependency(%q<mime-types>, [">= 0"])
+ s.add_dependency(%q<xml-magic>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1"])
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_dependency(%q<rspec>, [">= 0"])
s.add_dependency(%q<rdoc>, [">= 0"])
- s.add_dependency(%q<mime-types>, ["> 0.0.0"])
- s.add_dependency(%q<xml-magic>, ["> 0.0.0"])
end
else
- s.add_dependency(%q<flickr_fu>, [">= 0"])
- s.add_dependency(%q<bundler>, ["~> 1"])
- s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
- s.add_dependency(%q<rspec>, [">= 0"])
- s.add_dependency(%q<rdoc>, [">= 0"])
+ s.add_dependency(%q<mime-types>, [">= 0"])
+ s.add_dependency(%q<xml-magic>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1"])
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_dependency(%q<rspec>, [">= 0"])
s.add_dependency(%q<rdoc>, [">= 0"])
- s.add_dependency(%q<mime-types>, ["> 0.0.0"])
- s.add_dependency(%q<xml-magic>, ["> 0.0.0"])
end
end

0 comments on commit 3a174e1

Please sign in to comment.
Something went wrong with that request. Please try again.