rdoc_osx_dictionary 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.1.1 / 2010-02-02
+
+* 1 minor enhancement:
+
+  * Extra munging to remove more (all?) warnings from the dictionary compiler
+
+* 1 bug fix:
+
+  * Only run the hooks once per gem invocation, not once per install/uninstall
+
 === 1.1.0 / 2010-02-01
 
 * 2 minor enhancements:

data/lib/rdoc_osx_dictionary.rb

@@ -8,7 +8,7 @@ ENV['LANG'] = ""
 ENV['LC_ALL'] = "C"
 
 class RDoc::OSXDictionary
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   exclude = %w[ StringScanner#pre_match
                 StringScanner#post_match
@@ -77,10 +77,12 @@ class RDoc::OSXDictionary
 
     result = []
 
+    shortname = "<d:index d:value="#{name.munge}"/>" if name != fullname
+
     result << <<-"EOD".gsub(/^    /, '')
     <d:entry id="#{id}" d:title="#{fullname}">
       <d:index d:value="#{fullname.munge}"/>
-      <d:index d:value="#{name.munge}"/>
+      #{shortname}
       <h1>#{title.munge}</h1>
 
       #{comment}
@@ -268,10 +270,10 @@ class RDoc::OSXDictionary
     abort "command failed" unless system(*cmd)
   end
 
-  @hooked = false
+  @hooked = {}
 
   def self.install_gem_hooks
-    return if @hooked
+    return if @hooked[:hook]
 
     cmd = File.expand_path File.join(__FILE__, "../../bin/rdoc_osx_dictionary")
 
@@ -279,6 +281,8 @@ class RDoc::OSXDictionary
     # force via at_exit :(
     Gem.post_install do |i|
       at_exit do
+        return if @hooked[:install]
+        @hooked[:install] = true
         warn "updating OSX ruby + gem dictionary, if necessary"
         system cmd
       end
@@ -286,6 +290,8 @@ class RDoc::OSXDictionary
 
     Gem.post_uninstall do |i|
       at_exit do
+        return if @hooked[:uninstall]
+        @hooked[:uninstall] = true
         require 'fileutils'
         warn "nuking old ri cache to force rebuild"
         FileUtils.rm_r File.expand_path("~/.ri")
@@ -293,13 +299,13 @@ class RDoc::OSXDictionary
       end
     end
 
-    @hooked = true
+    @hooked[:hook] = true
   end
 end
 
 class String
   def munge
-    self.gsub(/&/, '&amp;').gsub(/>/, '&gt;').gsub(/</, '&lt;')
+    self.gsub(/&/, '&amp;').gsub(/>/, '&gt;').gsub(/</, '&lt;').gsub(/-/, 'minus')
   end
 end
 

metadata

@@ -1,36 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rdoc_osx_dictionary
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
-  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
-  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
-  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
-  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
-  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
-  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
-  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
-  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
-  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
-  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
-  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
-  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
-  FBHgymkyj/AOSqKRIpXPhjC6
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2010-02-01 00:00:00 -08:00
+date: 2010-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency