+ Removed use of Gem.bin_wrapper. rdoc is now just rdoc.

[git-p4: depot-paths = "//src/hoe/dev/": change = 13970]
seattlerb · Nov 16, 2023 · b9a0f95 · b9a0f95
1 parent e4815cc
commit b9a0f95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/lib/hoe.rb b/lib/hoe.rb
@@ -961,7 +961,3 @@ def self.read_utf path
     end
   end
 end
-
-def Gem.bin_wrapper name # :nodoc: HACK
-  File.join Gem.bindir, Gem.default_exec_format % name
-end unless Gem.respond_to? :bin_wrapper
diff --git a/lib/hoe/publish.rb b/lib/hoe/publish.rb
@@ -204,26 +204,16 @@ def post_blog_task # :nodoc:
   def make_rdoc_cmd(*extra_args) # :nodoc:
     title = "#{name}-#{version} Documentation"
     title = "#{group_name}'s #{title}" if group_name != name
-    rdoc  = Gem.bin_wrapper "rdoc"
 
-    extra = nil
-
-    unless File.exist? rdoc then
-      warn "Can't find #{rdoc}. Falling back."
-      rdoc = "rdoc"
-      extra = "-S"
-    end
-
-    ( # I don't understand this bug... but removing empties definitely fixes it.
-    %W[#{Gem.ruby} #{extra}
-       #{rdoc}
-       --title #{title}
-       -o #{local_rdoc_dir}
-      ] +
-      spec.rdoc_options +
-      extra_args +
-      spec.require_paths +
-      spec.extra_rdoc_files
+    (
+     %W[#{Gem.ruby} -S rdoc
+        --title #{title}
+        -o #{local_rdoc_dir}
+       ] +
+       spec.rdoc_options +
+       extra_args +
+       spec.require_paths +
+       spec.extra_rdoc_files
     ).reject(&:empty?)
   end
 

diff --git a/test/test_hoe_publish.rb b/test/test_hoe_publish.rb
@@ -18,25 +18,16 @@ def linux? platform = RUBY_PLATFORM # TODO: push up to minitest?
   end
 
   def test_make_rdoc_cmd
-    rdoc = Gem.bin_wrapper "rdoc"
-
-    unless File.exist? rdoc then
-      extra = "-S"
-      rdoc  = "rdoc"
-    end
-
     expected = %W[
                 #{Gem.ruby}
-                #{rdoc}
+                -S rdoc
                 --title blah-1.0\ Documentation
                 -o doc
                 --main README.rdoc
                 lib
                 History.rdoc Manifest.txt README.rdoc
                ]
 
-    expected[1, 0] = extra if extra
-
     # skip if linux?
     capture_io do
       assert_equal expected, @hoe.make_rdoc_cmd