soywiki 0.3.0 → 0.3.1

data/bin/soywiki-rename

@@ -13,12 +13,12 @@ end
 def change_all_absolute_links(oldname, newname)
   MEMO << "- Updating all absolute links"
   target_files = `grep -rlF '#{oldname.to_page_title}' *`.strip.split(/\n/)
-  target_files.each do |file|
+  target_files.select {|f| f !~ /(\.swp|\.swo)$/}.each do |file|
     text = File.read(file)
     begin
       regex = /\b#{oldname.to_page_title}\b/
       matches = text.scan(regex)
-      text.gsub!(regex, newname.to_page_title)
+      text = text.gsub(regex, newname.to_page_title)
       File.open(file, 'w') {|f| f.puts text}
       report file, oldname.to_page_title, newname.to_page_title
     rescue
@@ -30,10 +30,10 @@ end
 def change_unqualified_inbound_links_in_same_namespace(oldname, newname)
   MEMO << "- Updating unqualified inbound links"
   target_files = `grep -rlF '[^.]#{oldname.short_page_title}' #{oldname.namespace}/*`.strip.split(/\n/)
-  target_files.each do |file|
+  target_files.select {|f| f !~ /(\.swp|\.swo)$/}.each do |file|
     text = File.read(file)
     begin
-      text.gsub!(/(\A|\s)#{oldname.short_page_title}\b/, "." + newname)
+      text = text.gsub(/(\A|\s)#{oldname.short_page_title}\b/, "." + newname)
       File.open(file, 'w') {|f| f.puts text}
       report file, oldname.short_page_title, newname
     rescue
@@ -42,7 +42,7 @@ def change_unqualified_inbound_links_in_same_namespace(oldname, newname)
   end
 end
 
-RELATIVE_LINK_REGEX =/(\A\s)([A-Z][a-z]+[A-Z]\w*)/
+RELATIVE_LINK_REGEX =/(\A|\s)([A-Z][a-z]+[A-Z]\w*)/
 
 def absolutize_unqualified_outbound_links(oldname, newname)
   MEMO << "Absolutizing unqualified inbound links"
@@ -51,7 +51,7 @@ def absolutize_unqualified_outbound_links(oldname, newname)
     text = File.read(target_file)
     begin
       matches = text.scan(RELATIVE_LINK_REGEX)
-      text.gsub!(RELATIVE_LINK_REGEX, oldname.namespace + '.\1')
+      text = text.gsub(RELATIVE_LINK_REGEX, oldname.namespace + '.\1')
       File.open(target_file, 'w') {|f| f.puts text}
       MEMO <<  "  - In file #{target_file}: Absolutized these unqualified links: #{matches.inspect}"
     rescue
@@ -71,10 +71,10 @@ end
 if oldname.namespace == newname.namespace
   MEMO << "- Updating unqualified links in same namespace"
   target_files = `grep -rlF '#{oldname.short_page_title}' #{oldname.namespace}/*`.strip.split(/\n/)
-  target_files.each do |file|
+  target_files.select {|f| f !~ /(\.swp|\.swo)$/}.each do |file|
     text = File.read(file)
     begin
-      text.gsub!(/(\A\s)(#{oldname.short_page_title})\b/, newname.short_page_title)
+      text = text.gsub(/(\A|\s)(#{oldname.short_page_title})\b/, newname.short_page_title)
       File.open(file, 'w') {|f| f.puts text}
       report file, oldname.short_page_title, newname.short_page_title
     rescue

data/lib/soywiki.rb

@@ -1,7 +1,7 @@
 require 'string_ext'
 
 module Soywiki
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
   WIKI_WORD = /\b([a-z][\w_]+\.)?[A-Z][a-z]+[A-Z]\w*\b/
   HYPERLINK = %r|\bhttps?://[^ >)\n\]]+|
 

data/lib/soywiki.vim

@@ -239,8 +239,9 @@ func! s:rename_page(page_path_or_title)
     write!
     let original_file = bufname('')
     echo system("git mv " . original_file . " " .  newfile)
+    call system("git commit -am 'rename wiki page'")
     exec "!" . s:rename_links_command . original_file . " " . newfile
-    call system("git commit -am 'rename wiki page and links'")
+    call system("git commit -am 'rename wiki links'")
     exec "e " . newfile
   else
     call s:display_invalid_wiki_word_error(page_title)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Daniel Choi