rack-unreloader 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6fefe4d57aa2ea927929699e2a6aba2e8979cea284b0784fee379404b6f1726
-  data.tar.gz: 3aa21b88447194616e29d1ea2cf1181f102f5d58e6a29f4a11696a83d826a506
+  metadata.gz: f60b8ff5b4384a7f55f92c4e851e2589622112228849b63ed7cf520b2e4b4112
+  data.tar.gz: e01e616600037edc3eb954dd9cf7fd6c8667fa43b15590ec4bb5041547c5f4af
 SHA512:
-  metadata.gz: 6a5fbca1692b66ab4daf1f9b1677b15fb704d28bb972b26fdc15d78918fa37bed04657177438ff2351ba8c60a10105f7e138d869a4ab37fbd9e4143188c5685d
-  data.tar.gz: 12d9b2d24730e1f41da6089e5995c219af4b636755738405d1404e0be3f4044c8f935bd073ba53d92cada170761f79bfea82235c5b58d9ca6bc1dac1ee1b647f
+  metadata.gz: 5da4eebc546fcc8194667ca1c1176574f6299a2bef8b062f24edf09146fc151f234b8119af9c19120f5245a5b921cb6841bba29c4bfc20abdc5d229ac040305a
+  data.tar.gz: f7fcb791cb9a0d8f585444ba7bddc4f2ffd80759c4544c8a450c8ebeb38b8620bf24cd05c6a368921c395c9de2ddb1a60f6a31a26a30d76df2d458de35355904

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 2.0.0 (2022-06-23)
+
+* Fix TypeError being raised when requiring a file results in an error (jeremyevans)
+
+* Drop Unreloader#strip_path_prefix (jeremyevans)
+
+* Drop Ruby 1.8 support (jeremyevans)
+
 = 1.8.0 (2021-10-15)
 
 * Avoid warnings in verbose warning mode on Ruby 3+ (jeremyevans)

data/README.rdoc

@@ -253,18 +253,6 @@ decide that instead of specifying the constants, ObjectSpace should be used to
 automatically determine the constants loaded. You can specify this by having the
 block return the :ObjectSpace symbol.
 
-== chroot Support
-
-+Rack::Unreloader#strip_path_prefix+ exists for supporting reloading in
-chroot environments, where you chroot an application after it has been fully
-loaded, but still want to pick up changes to files inside the chroot. Example:
-
-  Unreloader.strip_path_prefix(Dir.pwd)
-  Dir.chroot(Dir.pwd)
-
-Note that Unreloader.strip_path_prefix also strips the path prefix from
-$LOADED_FEATURES, as that is necessary for correct operation.
-
 == Usage Outside Rack
 
 While +Rack::Unreloader+ is usually in the development of rack applications,
@@ -296,11 +284,9 @@ environment anytime there are any changes) are going to be more robust than
 this approach, but probably slower.  Be aware that you are trading robustness
 for speed when using this library.
 
-== Implementation Support
+== Ruby Version Support
 
-Rack::Unreloader works correctly on Ruby 1.8.7+, JRuby 9.1+, and Rubinius.  It
-also works on older versions of JRuby if you use a proc to specify the constants
-to unload.
+Rack::Unreloader works correctly on Ruby 1.9.2+ and JRuby 9.1+.
 
 == License
 

data/lib/rack/unreloader/reloader.rb

@@ -8,9 +8,6 @@ module Rack
       # Regexp for valid constant names, to prevent code execution.
       VALID_CONSTANT_NAME_REGEXP = /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/.freeze
 
-      # Options hash to force loading of files even if they haven't changed.
-      FORCE = {:force=>true}.freeze
-
       # Setup the reloader.  Supports :logger and :subclasses options, see
       # Rack::Unloader.new for details.
       def initialize(opts={})
@@ -55,47 +52,6 @@ module Rack
         @skip_reload = []
       end
 
-      # Strip the given path prefix from the internal data structures.
-      def strip_path_prefix(path_prefix)
-        empty = ''.freeze
-
-        # Strip the path prefix from $LOADED_FEATURES, otherwise the reloading won't work.
-        # Hopefully a future version of ruby will do this automatically when chrooting.
-        $LOADED_FEATURES.map!{|s| s.sub(path_prefix, empty)}
-
-        fix_path = lambda do |s|
-          s.sub(path_prefix, empty)
-        end
-
-        [@dependency_order, @skip_reload].each do |a|
-          a.map!(&fix_path)
-        end
-
-        [@files, @old_entries].each do |hash|
-          hash.each do |k,h|
-            h[:features].map!(&fix_path)
-          end
-        end
-        
-        @monitor_dirs.each_value do |a|
-          a[1].map!(&fix_path)
-        end
-
-        @dependencies.each_value do |a|
-          a.map!(&fix_path)
-        end
-
-        [@files, @old_entries, @monitor_files, @monitor_dirs, @constants_defined, @dependencies].each do |hash|
-          hash.keys.each do |k|
-            if k.start_with?(path_prefix)
-              hash[fix_path.call(k)] = hash.delete(k)
-            end
-          end
-        end
-
-        nil
-      end
-
       # Unload all reloadable constants and features, and clear the list
       # of files to monitor.
       def clear!
@@ -157,11 +113,7 @@ module Rack
         return if changed_files.empty?
 
         unless @dependencies.empty?
-          changed_files = reload_files(changed_files)
-          changed_files.flatten!
-          changed_files.map!{|f| File.directory?(f) ? Unreloader.ruby_files(f) : f}
-          changed_files.flatten!
-          changed_files.uniq!
+          changed_files = Unreloader.expand_directory_paths(reload_files(changed_files))
           
           order = @dependency_order
           order &= changed_files
@@ -169,14 +121,14 @@ module Rack
         end
 
         unless @skip_reload.empty?
-          skip_reload = @skip_reload.map{|f| File.directory?(f) ? Unreloader.ruby_files(f) : f}
-          skip_reload.flatten!
-          skip_reload.uniq!
-          changed_files -= skip_reload
+          changed_files -= Unreloader.expand_directory_paths(@skip_reload)
         end
 
+        changed_files.select! do |file|
+          @monitor_files.has_key?(file)
+        end
         changed_files.each do |file|
-          safe_load(file, FORCE)
+          safe_load(file)
         end
       end
 
@@ -200,14 +152,14 @@ module Rack
           begin
             safe_load(file, options)
           rescue NameError, LoadError => error
-            log "Cyclic dependency reload for #{error}"
+            log "Cyclic dependency reload for #{error.class}: #{error.message}"
           rescue Exception => error
+            log "Error: #{error.class}: #{error.message}"
             break
           end
         end
 
         if error
-          log error
           raise error
         end
       end
@@ -301,9 +253,6 @@ module Rack
       # by the require, and rolling back the constants and features if there
       # are any errors.
       def safe_load(file, options={})
-        return unless @monitor_files.has_key?(file)
-        return unless options[:force] || file_changed?(file)
-
         prepare(file) # might call #safe_load recursively
         log "Loading #{file}"
         begin

data/lib/rack/unreloader.rb

@@ -15,20 +15,21 @@ module Rack
     # in subdirecories if given a directory, and return an array of expanded
     # paths.
     def self.expand_directory_paths(paths)
-      expand_paths(paths).
-        map{|f| File.directory?(f) ? ruby_files(f) : f}.
-        flatten
+      paths = expand_paths(paths)
+      paths.map!{|f| File.directory?(f) ? ruby_files(f) : f}
+      paths.flatten!
+      paths
     end
 
     # Given the path glob or array of path globs, find all matching files
     # or directories, and return an array of expanded paths.
     def self.expand_paths(paths)
-      Array(paths).
-        flatten.
-        map{|path| Dir.glob(path).sort_by{|filename| filename.count('/')}}.
-        flatten.
-        map{|path| File.expand_path(path)}.
-        uniq
+      paths = Array(paths).flatten
+      paths.map!{|path| Dir.glob(path).sort_by!{|filename| filename.count('/')}}
+      paths.flatten!
+      paths.map!{|path| File.expand_path(path)}
+      paths.uniq!
+      paths
     end
 
     # The .rb files in the given directory or any subdirectory.
@@ -62,7 +63,7 @@ module Rack
         @cooldown = opts.fetch(:cooldown, 1)
         @handle_reload_errors = opts[:handle_reload_errors]
         @last = Time.at(0)
-        Kernel.require 'rack/unreloader/reloader'
+        require_relative 'unreloader/reloader'
         @reloader = Reloader.new(opts)
         reload!
       else
@@ -128,17 +129,5 @@ module Rack
     def reload!
       @reloader.reload! if @reloader
     end
-
-    # Strip the given path prefix from all absolute paths used by the
-    # reloader.  This is designed when chrooting an application.
-    #
-    # Options:
-    # :strip_core :: Also strips the path prefix from $LOADED_FEATURES and
-    #              $LOAD_PATH.
-    def strip_path_prefix(path_prefix, opts={})
-      if @reloader
-        @reloader.strip_path_prefix(path_prefix)
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-unreloader
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -66,12 +66,8 @@ files:
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
-- Rakefile
 - lib/rack/unreloader.rb
 - lib/rack/unreloader/reloader.rb
-- spec/spec_helper.rb
-- spec/strip_paths_spec.rb
-- spec/unreloader_spec.rb
 homepage: http://github.com/jeremyevans/rack-unreloader
 licenses:
 - MIT
@@ -95,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Reload application when files change, unloading constants first

data/Rakefile

@@ -1,45 +0,0 @@
-require "rake"
-require "rake/clean"
-
-CLEAN.include ["rack-unreloader-*.gem", "rdoc"]
-
-desc "Build rack-unreloader gem"
-task :package=>[:clean] do |p|
-  sh %{#{FileUtils::RUBY} -S gem build rack-unreloader.gemspec}
-end
-
-### Specs
-
-desc "Run specs"
-task :spec do
-  sh "#{FileUtils::RUBY} #{'-w ' if RUBY_VERSION >= '3'}spec/unreloader_spec.rb"
-end
-
-task :default => :spec
-
-### RDoc
-
-RDOC_DEFAULT_OPTS = ["--quiet", "--line-numbers", "--inline-source", '--title', 'Rack::Unreloader: Reload application when files change, unloading constants first']
-
-begin
-  gem 'hanna-nouveau'
-  RDOC_DEFAULT_OPTS.concat(['-f', 'hanna'])
-rescue Gem::LoadError
-end
-
-rdoc_task_class = begin
-  require "rdoc/task"
-  RDoc::Task
-rescue LoadError
-  require "rake/rdoctask"
-  Rake::RDocTask
-end
-
-RDOC_OPTS = RDOC_DEFAULT_OPTS + ['--main', 'README.rdoc']
-
-rdoc_task_class.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.options += RDOC_OPTS
-  rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/**/*.rb"
-end
-

data/spec/spec_helper.rb

@@ -1,87 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), '../lib/rack/unreloader')
-require 'rubygems'
-$: << 'lib'
-ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
-gem 'minitest'
-require 'minitest/global_expectations/autorun'
-require 'minitest/hooks'
-
-module ModifiedAt
-  def set_modified_time(file, time)
-    time = Time.now + time if time.is_a?(Integer)
-    modified_times[File.expand_path(file)] = time
-  end
-
-  def modified_times
-    @modified_times ||= {}
-  end
-
-  private
-
-  def modified_at(file)
-    modified_times[file] || super
-  end
-end
-
-class Minitest::Spec
-  def code(i)
-    "class App; class << self; def call(env) @a end; alias call call; end; @a ||= []; @a << #{i}; end"
-  end
-
-  def update_app(code, file=@filename)
-    if ru.reloader
-      ru.reloader.set_modified_time(File.dirname(file), @i += 1) unless File.file?(file)
-      ru.reloader.set_modified_time(file, @i += 1)
-    end
-    File.open(file, 'wb'){|f| f.write(code)}
-  end
-
-  def file_delete(file)
-    if ru.reloader
-      ru.reloader.set_modified_time(File.dirname(file), @i += 1)
-    end
-    File.delete(file)
-  end
-
-  def logger
-    return @logger if @logger
-    @logger = []
-    def @logger.method_missing(meth, log)
-      self << log
-    end
-    @logger
-  end
-
-  def base_ru(opts={})
-    block = opts[:block] || proc{App}
-    @ru = Rack::Unreloader.new({:logger=>logger, :cooldown=>0}.merge(opts), &block)
-    @ru.reloader.extend ModifiedAt if @ru.reloader
-    Object.const_set(:RU, @ru)
-  end
-
-  def ru(opts={})
-    return @ru if @ru
-    base_ru(opts)
-    update_app(opts[:code]||code(1))
-    @ru.require @filename
-    @ru
-  end
-
-  def log_match(*logs)
-    @logger.length.must_equal logs.length
-    logs.zip(@logger).each{|l, log| l.is_a?(String) ? log.must_equal(l) : log.must_match(l)}
-  end
-
-  before do
-    @i = 0
-    @filename = 'spec/app.rb'
-  end
-
-  after do
-    ru.reloader.clear! if ru.reloader
-    Object.send(:remove_const, :RU)
-    Object.send(:remove_const, :App) if defined?(::App)
-    Object.send(:remove_const, :App2) if defined?(::App2)
-    Dir['spec/app*.rb'].each{|f| File.delete(f)}
-  end
-end