From 0a7d26bea1b2d7ab4c36e471d387d1a9907a486d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 3 Oct 2019 00:55:19 +0900 Subject: [PATCH] [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 --- lib/fileutils.rb | 3 +-- lib/fileutils/fileutils.gemspec | 25 +++++++++++++------------ lib/fileutils/version.rb | 5 ----- 3 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 lib/fileutils/version.rb diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 1140dd817b..b527e89c0f 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -6,8 +6,6 @@ rescue LoadError # for make mjit-headers end -require_relative "fileutils/version" - # # = fileutils.rb # @@ -104,6 +102,7 @@ require_relative "fileutils/version" # :verbose 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 ae29c42b68..cd35c09dbc 100644 --- a/lib/fileutils/fileutils.gemspec +++ b/lib/fileutils/fileutils.gemspec @@ -1,20 +1,23 @@ # 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| 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 9f3f78d621..0000000000 --- a/lib/fileutils/version.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -module FileUtils - VERSION = "1.3.0" -end