Skip to content
This repository has been archived by the owner on Apr 17, 2018. It is now read-only.

Commit

Permalink
Merge pull request #32 from postmodern/loosen_deps
Browse files Browse the repository at this point in the history
Loosen deps
  • Loading branch information
dkubb committed Jul 24, 2012
2 parents c8af6b5 + 24e9ffb commit f411407
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 124 deletions.
19 changes: 9 additions & 10 deletions Gemfile
Expand Up @@ -10,31 +10,30 @@ DO_VERSION = '~> 0.10.6'
DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')

gem 'fastercsv', '~> 1.5'
gem 'multi_json', '~> 1.0'
gem 'json', '~> 1.6', :platforms => [ :ruby_18, :jruby ]
gem 'json_pure', '~> 1.6', :platforms => [ :mswin ]

gem 'dm-core', DM_VERSION,
SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}",
:branch => CURRENT_BRANCH

gem 'fastercsv', '~> 1.5.4'
gem 'multi_json', '~> 1.0.3'
gem 'json', '~> 1.6.1', :platforms => [ :ruby_18, :jruby ]
gem 'json_pure', '~> 1.6.1', :platforms => [ :mswin ]

group :development do

gem 'dm-validations', DM_VERSION,
SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}",
:branch => CURRENT_BRANCH

gem 'jeweler', '~> 1.6.4'
gem 'rake', '~> 0.9.2'
gem 'rspec', '~> 1.3.2'
gem 'rake', '~> 0.9'
gem 'rspec', '~> 1.3'

end

group :testing do

gem 'nokogiri', '~> 1.4.4'
gem 'libxml-ruby', '~> 1.1.4', :platforms => [ :mri, :mswin ]
gem 'nokogiri', '~> 1.4'
gem 'libxml-ruby', '~> 2.0', :platforms => [ :mri, :mswin ]

end

Expand Down
23 changes: 1 addition & 22 deletions Rakefile
@@ -1,25 +1,4 @@
require 'rubygems'
require 'rake'

begin
gem 'jeweler', '~> 1.6.4'
require 'jeweler'

Jeweler::Tasks.new do |gem|
gem.name = 'dm-serializer'
gem.summary = 'DataMapper plugin for serializing Resources and Collections'
gem.description = gem.summary
gem.email = 'vandenberg.guy [a] gmail [d] com'
gem.homepage = 'http://github.com/datamapper/%s' % gem.name
gem.authors = [ 'Guy van den Berg' ]
gem.has_rdoc = 'yard'

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.6.4'
end
FileList['tasks/**/*.rake'].each { |task| import task }
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

111 changes: 20 additions & 91 deletions dm-serializer.gemspec
@@ -1,97 +1,26 @@
# Generated by jeweler
# DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-

Gem::Specification.new do |s|
s.name = "dm-serializer"
s.version = "1.2.1"
Gem::Specification.new do |gem|
gem.authors = [ 'Guy van den Berg', 'Dan Kubb' ]
gem.email = [ "dan.kubb@gmail.com" ]
gem.summary = "DataMapper plugin for serializing Resources and Collections"
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 = ["Guy van den Berg"]
s.date = "2011-10-24"
s.description = "DataMapper plugin for serializing Resources and Collections"
s.email = "vandenberg.guy [a] gmail [d] com"
s.extra_rdoc_files = [
"LICENSE",
"README.rdoc"
]
s.files = [
"Gemfile",
"LICENSE",
"README.rdoc",
"Rakefile",
"VERSION",
"benchmarks/to_json.rb",
"benchmarks/to_xml.rb",
"dm-serializer.gemspec",
"lib/dm-serializer.rb",
"lib/dm-serializer/common.rb",
"lib/dm-serializer/to_csv.rb",
"lib/dm-serializer/to_json.rb",
"lib/dm-serializer/to_xml.rb",
"lib/dm-serializer/to_yaml.rb",
"lib/dm-serializer/xml.rb",
"lib/dm-serializer/xml/libxml.rb",
"lib/dm-serializer/xml/nokogiri.rb",
"lib/dm-serializer/xml/rexml.rb",
"spec/fixtures/cow.rb",
"spec/fixtures/planet.rb",
"spec/fixtures/quan_tum_cat.rb",
"spec/fixtures/vehicle.rb",
"spec/lib/serialization_method_shared_spec.rb",
"spec/public/serializer_spec.rb",
"spec/public/to_csv_spec.rb",
"spec/public/to_json_spec.rb",
"spec/public/to_xml_spec.rb",
"spec/public/to_yaml_spec.rb",
"spec/rcov.opts",
"spec/spec.opts",
"spec/spec_helper.rb",
"tasks/spec.rake",
"tasks/yard.rake",
"tasks/yardstick.rake"
]
s.homepage = "http://github.com/datamapper/dm-serializer"
s.require_paths = ["lib"]
s.rubyforge_project = "datamapper"
s.rubygems_version = "1.8.11"
s.summary = "DataMapper plugin for serializing Resources and Collections"
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-serializer"
gem.require_paths = [ "lib" ]
gem.version = '1.2.1'

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0"])
s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.4"])
s.add_runtime_dependency(%q<multi_json>, ["~> 1.0.3"])
s.add_runtime_dependency(%q<json>, ["~> 1.6.1"])
s.add_runtime_dependency(%q<json_pure>, ["~> 1.6.1"])
s.add_development_dependency(%q<dm-validations>, ["~> 1.2.0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
else
s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
s.add_dependency(%q<json>, ["~> 1.6.1"])
s.add_dependency(%q<json_pure>, ["~> 1.6.1"])
s.add_dependency(%q<dm-validations>, ["~> 1.2.0"])
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_dependency(%q<rake>, ["~> 0.9.2"])
s.add_dependency(%q<rspec>, ["~> 1.3.2"])
end
else
s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
s.add_dependency(%q<json>, ["~> 1.6.1"])
s.add_dependency(%q<json_pure>, ["~> 1.6.1"])
s.add_dependency(%q<dm-validations>, ["~> 1.2.0"])
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_dependency(%q<rake>, ["~> 0.9.2"])
s.add_dependency(%q<rspec>, ["~> 1.3.2"])
end
end
gem.add_runtime_dependency('fastercsv', '~> 1.5')
gem.add_runtime_dependency('multi_json', '~> 1.0')
gem.add_runtime_dependency('json', '~> 1.6')
gem.add_runtime_dependency('json_pure', '~> 1.6')
gem.add_runtime_dependency('dm-core', '~> 1.2.0')

gem.add_development_dependency('rake', '~> 0.9')
gem.add_development_dependency('rspec', '~> 1.3')
end

0 comments on commit f411407

Please sign in to comment.