ruby-changes:58982
From: Nobuyoshi <ko1@a...>
Date: Sat, 30 Nov 2019 17:37:24 +0900 (JST)
Subject: [ruby-changes:58982] 0a7d26bea1 (master): [ruby/fileutils] Remove version.rb
https://git.ruby-lang.org/ruby.git/commit/?id=0a7d26bea1 From 0a7d26bea1b2d7ab4c36e471d387d1a9907a486d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Thu, 3 Oct 2019 00:55:19 +0900 Subject: [ruby/fileutils] Remove version.rb Loading separate version.rb unnecessary increases every start-up time. In the other hand, the gemspec file is parsed only when building the gem file. https://github.com/ruby/fileutils/commit/8359cf7cce diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 1140dd8..b527e89 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -6,8 +6,6 @@ rescue LoadError https://github.com/ruby/ruby/blob/trunk/lib/fileutils.rb#L6 # for make mjit-headers end -require_relative "fileutils/version" - # # = fileutils.rb # @@ -104,6 +102,7 @@ require_relative "fileutils/version" https://github.com/ruby/ruby/blob/trunk/lib/fileutils.rb#L102 # <tt>:verbose</tt> flags to methods in FileUtils. # module FileUtils + VERSION = "1.3.0" def self.private_module_function(name) #:nodoc: module_function name diff --git a/lib/fileutils/fileutils.gemspec b/lib/fileutils/fileutils.gemspec index ae29c42..cd35c09 100644 --- a/lib/fileutils/fileutils.gemspec +++ b/lib/fileutils/fileutils.gemspec @@ -1,20 +1,23 @@ https://github.com/ruby/ruby/blob/trunk/lib/fileutils/fileutils.gemspec#L1 # frozen_string_literal: true -begin - require_relative "lib/fileutils/version" -rescue LoadError - # for Ruby core repository - require_relative "version" +source_version = ["", "lib/"].find do |dir| + begin + break File.open(File.join(__dir__, "#{dir}fileutils.rb")) {|f| + f.gets("\n VERSION = ") + f.gets[/\s*"(.+)"/, 1] + } + rescue Errno::ENOENT + end end Gem::Specification.new do |s| s.name = "fileutils" - s.version = FileUtils::VERSION + s.version = source_version s.summary = "Several file utility methods for copying, moving, removing, etc." s.description = "Several file utility methods for copying, moving, removing, etc." s.require_path = %w{lib} - s.files = ["LICENSE.txt", "README.md", "Rakefile", "fileutils.gemspec", "lib/fileutils.rb", "lib/fileutils/version.rb"] + s.files = ["LICENSE.txt", "README.md", "Rakefile", "fileutils.gemspec", "lib/fileutils.rb"] s.required_ruby_version = ">= 2.3.0" s.authors = ["Minero Aoki"] @@ -22,9 +25,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/lib/fileutils/fileutils.gemspec#L25 s.homepage = "https://github.com/ruby/fileutils" s.license = "BSD-2-Clause" - if s.respond_to?(:metadata=) - s.metadata = { - "source_code_uri" => "https://github.com/ruby/fileutils" - } - end + s.metadata = { + "source_code_uri" => "https://github.com/ruby/fileutils" + } end diff --git a/lib/fileutils/version.rb b/lib/fileutils/version.rb deleted file mode 100644 index 9f3f78d..0000000 --- a/lib/fileutils/version.rb +++ /dev/null @@ -1,5 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/lib/fileutils/fileutils.gemspec#L0 -# frozen_string_literal: true - -module FileUtils - VERSION = "1.3.0" -end -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/