From 2a96ecb88f0675a5b19f384ddcc55f934c1e29c1 Mon Sep 17 00:00:00 2001 From: Postmodern Date: Sun, 27 May 2012 19:02:57 -0700 Subject: [PATCH] Updated the gemspec using Ore 0.10.0. --- data_paths.gemspec | 90 ++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 56 deletions(-) diff --git a/data_paths.gemspec b/data_paths.gemspec index 6b63050..f88e87c 100644 --- a/data_paths.gemspec +++ b/data_paths.gemspec @@ -3,92 +3,70 @@ require 'yaml' Gem::Specification.new do |gemspec| - files = if File.directory?('.git') - `git ls-files`.split($/) - elsif File.directory?('.hg') - `hg manifest`.split($/) - elsif File.directory?('.svn') - `svn ls -R`.split($/).select { |path| File.file?(path) } - else - Dir['{**/}{.*,*}'].select { |path| File.file?(path) } - end + root = File.dirname(__FILE__) + lib_dir = File.join(root,'lib') + files = `git ls-files`.split($/) filter_files = lambda { |paths| - case paths - when Array - (files & paths) - when String - (files & Dir[paths]) - end + files & case paths + when Array + paths + when String + Dir[paths] + end } version = { - :file => 'lib/data_paths/version.rb', + :file => 'data_paths/version', :constant => 'DataPaths::VERSION' } defaults = { - 'name' => File.basename(File.dirname(__FILE__)), - 'files' => files, - 'executables' => filter_files['bin/*'].map { |path| File.basename(path) }, - 'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'], - 'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'], + 'name' => File.basename(root), + 'files' => files, + 'require_paths' => ['ext', 'lib'].select { |dir| File.directory?(dir) }, + 'executables' => filter_files['bin/*'].map { |path| File.basename(path) }, + 'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'], + 'doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'], + 'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'] } metadata = defaults.merge(YAML.load_file('gemspec.yml')) - gemspec.name = metadata.fetch('name',defaults[:name]) + gemspec.name = metadata['name'] gemspec.version = if metadata['version'] metadata['version'] - elsif File.file?(version[:file]) - require File.join('.',version[:file]) + else + $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir) + + require version[:file] eval(version[:constant]) end - gemspec.summary = metadata.fetch('summary',metadata['description']) + gemspec.summary = metadata.fetch('summary',metadata['description']) gemspec.description = metadata.fetch('description',metadata['summary']) - case metadata['license'] - when Array - gemspec.licenses = metadata['license'] - when String - gemspec.license = metadata['license'] - end - - case metadata['authors'] - when Array - gemspec.authors = metadata['authors'] - when String - gemspec.author = metadata['authors'] - end + gemspec.licenses = Array(metadata['license']) + gemspec.authors = Array(metadata['authors']) - gemspec.email = metadata['email'] + gemspec.email = metadata['email'] gemspec.homepage = metadata['homepage'] - case metadata['require_paths'] - when Array - gemspec.require_paths = metadata['require_paths'] - when String - gemspec.require_path = metadata['require_paths'] - end - - gemspec.files = filter_files[metadata['files']] - - gemspec.executables = metadata['executables'] - gemspec.extensions = metadata['extensions'] + gemspec.require_paths = Array(metadata['require_paths']) + gemspec.files = filter_files[metadata['files']] + gemspec.files += Array(metadata['generated_files']) + gemspec.executables = metadata['executables'] + gemspec.extensions = metadata['extensions'] if Gem::VERSION < '1.7.' gemspec.default_executable = gemspec.executables.first end - gemspec.test_files = filter_files[metadata['test_files']] - - unless gemspec.files.include?('.document') - gemspec.extra_rdoc_files = metadata['extra_doc_files'] - end + gemspec.test_files = filter_files[metadata['test_files']] + gemspec.extra_rdoc_files = Array(metadata['extra_doc_files']) gemspec.post_install_message = metadata['post_install_message'] - gemspec.requirements = metadata['requirements'] + gemspec.requirements = metadata['requirements'] if gemspec.respond_to?(:required_ruby_version=) gemspec.required_ruby_version = metadata['required_ruby_version']