From 7c9771be02ddc707fea8ec96089c8a100c59f806 Mon Sep 17 00:00:00 2001 From: hsbt Date: Fri, 1 Feb 2019 13:41:56 +0000 Subject: Fixed gemspec location of bundler. FileCollector of rbinstall.rb requires location of gemspec under the sub-direcotry with the same name as default gems. I forgot to fix it with r66867. [Bug #15582][ruby-core:91374] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/bundler.gemspec | 64 --------------------------------------------- lib/bundler/bundler.gemspec | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 lib/bundler.gemspec create mode 100644 lib/bundler/bundler.gemspec (limited to 'lib') diff --git a/lib/bundler.gemspec b/lib/bundler.gemspec deleted file mode 100644 index f9d456204e..0000000000 --- a/lib/bundler.gemspec +++ /dev/null @@ -1,64 +0,0 @@ -# coding: utf-8 -# frozen_string_literal: true - -begin - require File.expand_path("../lib/bundler/version", __FILE__) -rescue LoadError - # for Ruby core repository - require File.expand_path("../bundler/version", __FILE__) -end - -Gem::Specification.new do |s| - s.name = "bundler" - s.version = Bundler::VERSION - s.license = "MIT" - s.authors = [ - "André Arko", "Samuel Giddins", "Colby Swandale", "Hiroshi Shibata", - "David Rodríguez", "Grey Baker", "Stephanie Morillo", "Chris Morris", "James Wen", "Tim Moore", - "André Medeiros", "Jessica Lynn Suttles", "Terence Lee", "Carl Lerche", - "Yehuda Katz" - ] - s.email = ["team@bundler.io"] - s.homepage = "http://bundler.io" - s.summary = "The best way to manage your application's dependencies" - s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably" - - if s.respond_to?(:metadata=) - s.metadata = { - "bug_tracker_uri" => "http://github.com/bundler/bundler/issues", - "changelog_uri" => "https://github.com/bundler/bundler/blob/master/CHANGELOG.md", - "homepage_uri" => "https://bundler.io/", - "source_code_uri" => "http://github.com/bundler/bundler/", - } - end - - if s.version >= Gem::Version.new("2.a".dup) - s.required_ruby_version = ">= 2.3.0" - s.required_rubygems_version = ">= 2.5.0" - else - s.required_ruby_version = ">= 1.8.7" - s.required_rubygems_version = ">= 1.3.6" - end - - s.add_development_dependency "automatiek", "~> 0.1.0" - s.add_development_dependency "mustache", "0.99.6" - s.add_development_dependency "rake", "~> 10.0" - s.add_development_dependency "rdiscount", "~> 2.2" - s.add_development_dependency "ronn", "~> 0.7.3" - s.add_development_dependency "rspec", "~> 3.6" - - # base_dir = File.dirname(__FILE__).gsub(%r{([^A-Za-z0-9_\-.,:\/@\n])}, "\\\\\\1") - # s.files = IO.popen("git -C #{base_dir} ls-files -z", &:read).split("\x0").select {|f| f.match(%r{^(lib|exe)/}) } - - # we don't check in man pages, but we need to ship them because - # we use them to generate the long-form help for each command. - # s.files += Dir.glob("man/**/*") - # Include the CHANGELOG.md, LICENSE.md, README.md manually - # s.files += %w[CHANGELOG.md LICENSE.md README.md] - # include the gemspec itself because warbler breaks w/o it - s.files += %w[bundler.gemspec] - - s.bindir = "exe" - s.executables = %w[bundle bundler] - s.require_paths = ["lib"] -end diff --git a/lib/bundler/bundler.gemspec b/lib/bundler/bundler.gemspec new file mode 100644 index 0000000000..b229ab224d --- /dev/null +++ b/lib/bundler/bundler.gemspec @@ -0,0 +1,64 @@ +# coding: utf-8 +# frozen_string_literal: true + +begin + require File.expand_path("../lib/bundler/version", __FILE__) +rescue LoadError + # for Ruby core repository + require File.expand_path("../version", __FILE__) +end + +Gem::Specification.new do |s| + s.name = "bundler" + s.version = Bundler::VERSION + s.license = "MIT" + s.authors = [ + "André Arko", "Samuel Giddins", "Colby Swandale", "Hiroshi Shibata", + "David Rodríguez", "Grey Baker", "Stephanie Morillo", "Chris Morris", "James Wen", "Tim Moore", + "André Medeiros", "Jessica Lynn Suttles", "Terence Lee", "Carl Lerche", + "Yehuda Katz" + ] + s.email = ["team@bundler.io"] + s.homepage = "http://bundler.io" + s.summary = "The best way to manage your application's dependencies" + s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably" + + if s.respond_to?(:metadata=) + s.metadata = { + "bug_tracker_uri" => "http://github.com/bundler/bundler/issues", + "changelog_uri" => "https://github.com/bundler/bundler/blob/master/CHANGELOG.md", + "homepage_uri" => "https://bundler.io/", + "source_code_uri" => "http://github.com/bundler/bundler/", + } + end + + if s.version >= Gem::Version.new("2.a".dup) + s.required_ruby_version = ">= 2.3.0" + s.required_rubygems_version = ">= 2.5.0" + else + s.required_ruby_version = ">= 1.8.7" + s.required_rubygems_version = ">= 1.3.6" + end + + s.add_development_dependency "automatiek", "~> 0.1.0" + s.add_development_dependency "mustache", "0.99.6" + s.add_development_dependency "rake", "~> 10.0" + s.add_development_dependency "rdiscount", "~> 2.2" + s.add_development_dependency "ronn", "~> 0.7.3" + s.add_development_dependency "rspec", "~> 3.6" + + # base_dir = File.dirname(__FILE__).gsub(%r{([^A-Za-z0-9_\-.,:\/@\n])}, "\\\\\\1") + # s.files = IO.popen("git -C #{base_dir} ls-files -z", &:read).split("\x0").select {|f| f.match(%r{^(lib|exe)/}) } + + # we don't check in man pages, but we need to ship them because + # we use them to generate the long-form help for each command. + # s.files += Dir.glob("man/**/*") + # Include the CHANGELOG.md, LICENSE.md, README.md manually + # s.files += %w[CHANGELOG.md LICENSE.md README.md] + # include the gemspec itself because warbler breaks w/o it + s.files += %w[bundler.gemspec] + + s.bindir = "exe" + s.executables = %w[bundle bundler] + s.require_paths = ["lib"] +end -- cgit v1.2.3