fileutils 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d7f0ea2d7241dc23eba2ec5d7be548d2dab3edb9082e94fc7766b70ce8dcd2
-  data.tar.gz: c0a41797554a3a763ff7d7ac7b6f1f149d50bcefe0ddef959b98a1384f40ba93
+  metadata.gz: 5a996246ac1d77406d404ad05edf85ad12709c5228c721e8410a723542740e4c
+  data.tar.gz: 14ddbc3ce2d2bb2504e096c3a9826d9c5d6b3a116405b40dac6c1bd7e9870b3f
 SHA512:
-  metadata.gz: 78deb94048b06e1c7d3215f3bc796447caf909c047f14f137a367e907b4f4fb5655c5ceb211390d5ead7f9e8710b6daf33d262ff31a5b3f186bb2d40f2f4900f
-  data.tar.gz: f57997f8e332a07d3ab01db4e31ae2e196179a1fb35e6ebf1d123f156e96c5ab415f8f408690767216194a65d92b2d7f77adce83719ffe40d8eeada4cfbb8c4b
+  metadata.gz: d56948714f7d9fc5c8e98973bdd41489db7b4d107ee6060214e89a972062a23b8665cf8b0cbeb2ebcaf04140234111a4cc0ca672acdc766615868fcee3e64a20
+  data.tar.gz: ac2e352e239eb2fca476b0d5bd7704ca29d2cc49dd46690f1222c5df255129a5860428cf7352d4dd64915c686973497886314bde305a655e1de5cb9dd25d4dbc

data/Rakefile

@@ -4,9 +4,9 @@ require "rake/testtask"
 JRuby.objectspace = true if RUBY_PLATFORM == 'java'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test" << "test/lib"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/test_*.rb']
+  t.libs << "test/lib"
+  t.ruby_opts << "-rhelper"
+  t.test_files = FileList["test/**/test_*.rb"]
 end
 
 task :default => :test

data/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

data/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"
 # <tt>:verbose</tt> flags to methods in FileUtils.
 #
 module FileUtils
+  VERSION = "1.4.0"
 
   def self.private_module_function(name)   #:nodoc:
     module_function name
@@ -918,11 +917,8 @@ module FileUtils
   private_module_function :apply_mask
 
   def symbolic_modes_to_i(mode_sym, path)  #:nodoc:
-    mode = if File::Stat === path
-             path.mode
-           else
-             File.stat(path).mode
-           end
+    path = File.stat(path) unless File::Stat === path
+    mode = path.mode
     mode_sym.split(/,/).inject(mode & 07777) do |current_mode, clause|
       target, *actions = clause.split(/([=+-])/)
       raise ArgumentError, "invalid file mode: #{mode_sym}" if actions.empty?
@@ -939,7 +935,7 @@ module FileUtils
           when "x"
             mask | 0111
           when "X"
-            if FileTest.directory? path
+            if path.directory?
               mask | 0111
             else
               mask
@@ -1300,7 +1296,8 @@ module FileUtils
            .reject {|n| n == '.' or n == '..' }
       end
 
-      files.map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }
+      untaint = RUBY_VERSION < '2.7'
+      files.map {|n| Entry_.new(prefix(), join(rel(), untaint ? n.untaint : n)) }
     end
 
     def stat

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileutils
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-11-30 00:00:00.000000000 Z
 dependencies: []
 description: Several file utility methods for copying, moving, removing, etc.
 email:
@@ -22,7 +22,6 @@ files:
 - Rakefile
 - fileutils.gemspec
 - lib/fileutils.rb
-- lib/fileutils/version.rb
 homepage: https://github.com/ruby/fileutils
 licenses:
 - BSD-2-Clause

data/lib/fileutils/version.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module FileUtils
-  VERSION = "1.3.0"
-end