Pull dependencies from gemspec

Gemfile

@@ -1,8 +1,6 @@
-source 'http://rubygems.org'
+source :rubygems
 
-gem 'json', '>= 1.4.6'
-gem 'rake'
-gem 'oauth'
+gemspec
 
 group :test do
   gem 'jnunemaker-matchy', '0.4.0', :require => 'matchy'

Rakefile

@@ -17,9 +17,9 @@ spec = Gem::Specification.new do |s|
   s.email            = '[email protected]'
   s.homepage         = 'http://sneaq.net'
   s.files            = %w(README.rdoc Rakefile) + Dir.glob("{lib,test}/**/*")
-  # s.executables    = ['etsy']
 
-  s.add_dependency('json', '~> 1.1.0')
+  s.add_dependency('json', '~> 1.4.0')
+  s.add_dependency('oauth', '~> 0.4.0')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -32,7 +32,7 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-desc 'Generate the gemspec to serve this Gem from Github'
+desc 'Generate the gemspec for this Gem'
 task :gemspec do
   file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
   File.open(file, 'w') {|f| f << spec.to_ruby }

etsy.gemspec

@@ -6,27 +6,29 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Reagan"]
-  s.date = %q{2009-05-04}
+  s.date = %q{2010-10-11}
   s.email = %q{[email protected]}
   s.extra_rdoc_files = ["README.rdoc"]
-  s.files = ["README.rdoc", "Rakefile", "lib/etsy", "lib/etsy/image.rb", "lib/etsy/listing.rb", "lib/etsy/model.rb", "lib/etsy/request.rb", "lib/etsy/response.rb", "lib/etsy/shop.rb", "lib/etsy/user.rb", "lib/etsy/version.rb", "lib/etsy.rb", "test/fixtures", "test/fixtures/getShopDetails.json", "test/fixtures/getShopListings.json", "test/fixtures/getUserDetails.json", "test/test_helper.rb", "test/unit", "test/unit/etsy", "test/unit/etsy/image_test.rb", "test/unit/etsy/listing_test.rb", "test/unit/etsy/request_test.rb", "test/unit/etsy/response_test.rb", "test/unit/etsy/shop_test.rb", "test/unit/etsy/user_test.rb", "test/unit/etsy_test.rb"]
-  s.has_rdoc = true
+  s.files = ["README.rdoc", "Rakefile", "lib/etsy", "lib/etsy/authorization.rb", "lib/etsy/image.rb", "lib/etsy/listing.rb", "lib/etsy/model.rb", "lib/etsy/request.rb", "lib/etsy/response.rb", "lib/etsy/secure_connection.rb", "lib/etsy/shop.rb", "lib/etsy/user.rb", "lib/etsy/version.rb", "lib/etsy.rb", "test/fixtures", "test/fixtures/getShopDetails.json", "test/fixtures/getShopListings.json", "test/fixtures/getUserDetails.json", "test/fixtures/shop", "test/fixtures/shop/findAllShop.json", "test/fixtures/shop/findAllShop.single.json", "test/fixtures/shop/getShop.multiple.json", "test/fixtures/shop/getShop.single.json", "test/fixtures/user", "test/fixtures/user/findAllUser.json", "test/fixtures/user/getUser.multiple.json", "test/fixtures/user/getUser.single.json", "test/test_helper.rb", "test/unit", "test/unit/etsy", "test/unit/etsy/authorization_test.rb", "test/unit/etsy/image_test.rb", "test/unit/etsy/listing_test.rb", "test/unit/etsy/request_test.rb", "test/unit/etsy/response_test.rb", "test/unit/etsy/shop_test.rb", "test/unit/etsy/user_test.rb", "test/unit/etsy_test.rb"]
   s.homepage = %q{http://sneaq.net}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Provides a friendly ruby-like interface to the Etsy API}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, ["~> 1.1.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, ["~> 1.4.0"])
+      s.add_runtime_dependency(%q<oauth>, ["~> 0.4.0"])
     else
-      s.add_dependency(%q<json>, ["~> 1.1.0"])
+      s.add_dependency(%q<json>, ["~> 1.4.0"])
+      s.add_dependency(%q<oauth>, ["~> 0.4.0"])
     end
   else
-    s.add_dependency(%q<json>, ["~> 1.1.0"])
+    s.add_dependency(%q<json>, ["~> 1.4.0"])
+    s.add_dependency(%q<oauth>, ["~> 0.4.0"])
   end
 end

lib/etsy/authorization.rb

@@ -1,5 +1,3 @@
-require 'oauth'
-
 module Etsy
   # = OAuth
   #
@@ -45,7 +43,7 @@ def self.consumer
         :access_token_path => Etsy::Authorization.access_token_path,
         :authorize_url => Etsy::Authorization::AUTHORIZE_URL
       }
-      OAuth::Consumer.new(Etsy.api_key, Etsy.api_secret, options) 
+      OAuth::Consumer.new(Etsy.api_key, Etsy.api_secret, options)
     end
 
   end