Merge remote-tracking branch 'upstream/master' into mjtko0-merge

Conflicts:
	Gemfile
	dm-rest-adapter.gemspec
	spec/spec_helper.rb

Gemfile

@@ -1,48 +1,48 @@
 require 'pathname'
 
-source 'http://rubygems.org'
+source :rubygems
 
-SOURCE       = ENV.fetch('SOURCE', :git).to_sym
-REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
-DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION   = '~> 1.2.0'
+gemspec
 
-gem 'dm-serializer', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-serializer#{REPO_POSTFIX}", :branch => "release-1.2"
+SOURCE         = ENV.fetch('SOURCE', :git).to_sym
+REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
+DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
+# DM_VERSION     = '~> 1.3.0.beta'
+DM_VERSION     = '~> 1.2.0'
+CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
-gem 'multi_json',  '~> 1.0'
-gem 'json',        '>= 1.4.6'
-gem 'json_pure',   '>= 1.4.6'
-gem 'rest-client', '~> 1.6'
+gem 'dm-serializer', DM_VERSION,
+  SOURCE  => "#{DATAMAPPER}/dm-serializer#{REPO_POSTFIX}",
+  :branch => CURRENT_BRANCH
 
 group :development do
-
-  gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}", :branch => "release-1.2"
-  gem 'jeweler',        '~> 1.5.2'
-  gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 2.6'
-
+  gem 'dm-validations', DM_VERSION,
+    SOURCE  => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}",
+    :branch => CURRENT_BRANCH
 end
 
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end
 
 group :datamapper do
-
-  gem 'dm-core',      DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}", :branch => "release-1.2"
-  gem 'rest-client',  '~> 1.6.3'
+  gem 'dm-core', DM_VERSION,
+    SOURCE  => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}",
+    :branch => CURRENT_BRANCH
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
+    gem plugin, DM_VERSION,
+      SOURCE  => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}",
+      :branch => CURRENT_BRANCH
   end
 
 end

Rakefile

@@ -1,24 +1,4 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  gem 'jeweler', '~> 1.5.2'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'dm-rest-adapter'
-    gem.summary     = 'REST Adapter for DataMapper'
-    gem.description = gem.summary
-    gem.email       = 'scott.burton [a] joyent [d] com'
-    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
-    gem.authors     = [ 'Scott Burton @ Joyent Inc' ]
-
-    gem.rubyforge_project = 'datamapper'
-  end
-
-  Jeweler::GemcutterTasks.new
-
-  FileList['tasks/**/*.rake'].each { |task| import task }
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
-end
+FileList['tasks/**/*.rake'].each { |task| import task }

dm-rest-adapter.gemspec

@@ -1,103 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/dm-rest-adapter/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "dm-rest-adapter"
-  s.version = "1.1.2"
+Gem::Specification.new do |gem|
+  gem.authors     = [ 'Scott Burton @ Joyent Inc' ]
+  gem.email       = [ 'scott.burton [a] joyent [d] com' ]
+  gem.summary     = 'REST Adapter for DataMapper'
+  gem.description = gem.summary
+  gem.homepage    = "http://datamapper.org"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Burton @ Joyent Inc"]
-  s.date = "2011-10-31"
-  s.description = "REST Adapter for DataMapper"
-  s.email = "scott.burton [a] joyent [d] com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "dm-rest-adapter.gemspec",
-    "lib/dm-rest-adapter.rb",
-    "lib/dm-rest-adapter/adapter.rb",
-    "lib/dm-rest-adapter/exceptions.rb",
-    "lib/dm-rest-adapter/format.rb",
-    "lib/dm-rest-adapter/format/json.rb",
-    "lib/dm-rest-adapter/format/xml.rb",
-    "lib/dm-rest-adapter/spec/setup.rb",
-    "spec/fixtures/book.rb",
-    "spec/fixtures/book_cover.rb",
-    "spec/fixtures/chapter.rb",
-    "spec/fixtures/difficult_book.rb",
-    "spec/fixtures/publisher.rb",
-    "spec/fixtures/vendor.rb",
-    "spec/rcov.opts",
-    "spec/semipublic/format/json_spec.rb",
-    "spec/semipublic/format/xml_spec.rb",
-    "spec/semipublic/rest_adapter_spec.rb",
-    "spec/semipublic/shared/format.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "tasks/spec.rake",
-    "tasks/yard.rake",
-    "tasks/yardstick.rake"
-  ]
-  s.homepage = "http://github.com/datamapper/dm-rest-adapter"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "datamapper"
-  s.rubygems_version = "1.8.11"
-  s.summary = "REST Adapter for DataMapper"
-  s.test_files = [
-    "spec/fixtures/book.rb",
-    "spec/fixtures/book_cover.rb",
-    "spec/fixtures/chapter.rb",
-    "spec/fixtures/difficult_book.rb",
-    "spec/fixtures/publisher.rb",
-    "spec/fixtures/vendor.rb",
-    "spec/semipublic/format/json_spec.rb",
-    "spec/semipublic/format/xml_spec.rb",
-    "spec/semipublic/rest_adapter_spec.rb",
-    "spec/semipublic/shared/format.rb",
-    "spec/spec_helper.rb"
-  ]
+  gem.files            = `git ls-files`.split("\n")
+  gem.test_files       = `git ls-files -- {spec}/*`.split("\n")
+  gem.extra_rdoc_files = %w[LICENSE README.rdoc]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.name          = 'dm-rest-adapter'
+  gem.require_paths = [ "lib" ]
+  gem.version       = DataMapper::RestAdapter::VERSION
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6"])
-      s.add_runtime_dependency(%q<json>, [">= 1.4.6"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 1.4.6"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.2.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6"])
-    else
-      s.add_dependency(%q<dm-serializer>, ["~> 1.2.0"])
-      s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-      s.add_dependency(%q<json>, [">= 1.4.6"])
-      s.add_dependency(%q<json_pure>, [">= 1.4.6"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.2.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 2.6"])
-    end
-  else
-    s.add_dependency(%q<dm-serializer>, ["~> 1.2.0"])
-    s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-    s.add_dependency(%q<json>, [">= 1.4.6"])
-    s.add_dependency(%q<json_pure>, [">= 1.4.6"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.2.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 2.6"])
-  end
-end
+  #gem.add_runtime_dependency('dm-serializer', '~> 1.3.0.beta')
+  gem.add_runtime_dependency(%q<dm-serializer>, ["~> 1.2.0"])
+  gem.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
+  gem.add_runtime_dependency(%q<rest-client>, ["~> 1.6"])
+  gem.add_runtime_dependency(%q<json>, [">= 1.4.6"])
+  gem.add_runtime_dependency(%q<json_pure>, [">= 1.4.6"])
 
+  gem.add_development_dependency('rake',    '~> 0.9.2')
+  gem.add_development_dependency('rspec',   '~> 1.3.2')
+  gem.add_development_dependency('fakeweb', '~> 1.3')
+end

lib/dm-rest-adapter/version.rb

@@ -0,0 +1,5 @@
+module DataMapper
+  module RestAdapter
+    VERSION = '1.3.0.beta'
+  end
+end

spec/spec_helper.rb

@@ -19,4 +19,10 @@
 Pathname.glob((ROOT + 'spec/fixtures/**/*.rb').to_s).each { |file| require file }
 Pathname.glob((ROOT + 'spec/**/shared/**/*.rb').to_s).each { |file| require file }
 
-DataMapper.finalize
+FakeWeb.allow_net_connect = false
+
+Spec::Runner.configure do |config|
+  config.before :suite do
+    DataMapper.finalize
+  end
+end