soywiki 0.9.7 → 0.9.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c1e6152993b6e0820791c73ebdea116eef9efff
+  data.tar.gz: 7ade48e0f2a70e0f238d2cc6e15f1d7f9c195718
+SHA512:
+  metadata.gz: 51957fd552e2ddae5997da054797930e43739a83f2e8edd28d11ecb0e4448af5afdb705e3517c4836b52fc8a59dbb4afd576cebca58a8ffbb5eca30821651313
+  data.tar.gz: 4bf43baa95088be55aec5e4d047a1cf6b5005c9be544b1284018e9e117d2c6dcefe6eeb32e44fa4cd04051e83228c65a7a20d0ade060a3aa087ef8d3f7a492bf

data/bin/soywiki-rename

@@ -1,26 +1,39 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 require 'soywiki'
+require 'pathname'
 
-oldname, newname = *ARGV
+repo_path, oldname, newname = *ARGV
+repo_path = Pathname.new(repo_path)
 
 MEMO = ["Updating inbound and outbound links..."]
 
+define_method :portion do |full_path|
+  full_path = Pathname.new(full_path) if full_path.is_a?(String)
+  full_path.relative_path_from(repo_path).to_s
+end
+
+define_method :full do |path|
+  path = Pathname.new(path) if path.is_a?(String)
+  return path.to_s if path.absolute?
+  repo_path.join(path).to_s
+end
+
 def report(file, oldname, newname)
   MEMO <<  "  - In #{file}: #{oldname.to_page_title} -> #{newname.to_page_title}"
 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 = `grep -rlF '#{portion(oldname).to_page_title}' #{full('')}`.strip.split(/\n/)
   target_files.select {|f| f !~ /(\.swp|\.swo)$/}.each do |file|
     text = File.read(file)
     begin
-      regex = /\b#{oldname.to_page_title}\b/
+      regex = /\b#{portion(oldname).to_page_title}\b/
       matches = text.scan(regex)
-      text = text.gsub(regex, newname.to_page_title)
+      text = text.gsub(regex, portion(newname).to_page_title)
       File.open(file, 'w') {|f| f.puts text}
-      report file, oldname.to_page_title, newname.to_page_title
+      report file, portion(oldname).to_page_title, portion(newname).to_page_title
     rescue
       puts "Error processing #{file}: #$!"
     end
@@ -29,13 +42,13 @@ 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 = `grep -rlF '#{portion(oldname).short_page_title}' #{full(portion(oldname).namespace)}`.strip.split(/\n/)
   target_files.select {|f| f !~ /(\.swp|\.swo)$/}.each do |file|
     text = File.read(file)
     begin
-      text = text.gsub(/(\A|\s)(#{oldname.short_page_title}\b)/, '\1' + newname.to_page_title)
+      text = text.gsub(/(\A|\s)(#{portion(oldname).short_page_title}\b)/, '\1' + portion(newname).to_page_title)
       File.open(file, 'w') {|f| f.puts text}
-      report file, oldname.short_page_title, newname
+      report file, portion(oldname).short_page_title, portion(newname)
     rescue
       puts "Error processing #{file}: #$!"
     end
@@ -46,18 +59,18 @@ RELATIVE_LINK_REGEX = /(\A|\s)([A-Z][a-z]+[A-Z0-9]\w*)/
 
 def absolutize_unqualified_outbound_links(oldname, newname)
   MEMO << "Absolutizing unqualified inbound links"
-  target_file = newname.to_file_path
+  target_file = full(newname).to_file_path
   if File.exist?(target_file)
     text = File.read(target_file)
     begin
       matches = text.scan(RELATIVE_LINK_REGEX).map {|x| x[1]}.
         select {|match| match.strip != "" }.
-        select {|match| File.exist?( oldname.namespace + "/#{match}" ) }
+        select {|match| File.exist?( portion(oldname).namespace + "/#{match}" ) }
       puts MEMO << "  - In file #{target_file}: matches: #{matches.inspect}"
 
       text = text.gsub(RELATIVE_LINK_REGEX) do |match|
         if matches.include?($2)
-          res = "#$1#{oldname.namespace}.#{$2}"
+          res = "#$1#{portion(oldname).namespace}.#{$2}"
           MEMO <<  "  - In file #{target_file}: #{$2} -> #{res.strip}"
           res
         else
@@ -80,23 +93,22 @@ end
 # In the directory for OldName's namespace, change all unqualified referenecs to
 # OldName to NewName
 
-if oldname.namespace == newname.namespace
+if portion(oldname).namespace == portion(newname).namespace
   MEMO << "- Updating unqualified links in same namespace"
-  target_files = `grep -rlF '#{oldname.short_page_title}' #{oldname.namespace}/*`.strip.split(/\n/)
+  target_files = `grep -rlF '#{portion(oldname).short_page_title}' #{full(portion(oldname).namespace)}`.strip.split(/\n/)
   target_files.select {|f| f !~ /(\.swp|\.swo)$/}.each do |file|
     text = File.read(file)
     begin
-      text = text.gsub(/(\A|\s)(#{oldname.short_page_title})\b/, '\1' + newname.short_page_title)
+      text = text.gsub(/(\A|\s)(#{portion(oldname).short_page_title})\b/, '\1' + portion(newname).short_page_title)
       File.open(file, 'w') {|f| f.puts text}
-      report file, oldname.short_page_title, newname.short_page_title
+      report file, portion(oldname).short_page_title, portion(newname).short_page_title
     rescue
       puts "Error processing #{file}: #$!"
     end
   end
-end
-
 # Case 2: newname is in different namespace from oldname
-if oldname.namespace != newname.namespace
+# oldname.namespace != newname.namespace
+else
   # In the directory for OldName's namespace, change all unqualified references to
   # OldName to newnamespace.NewName (i.e. NewName).
   change_unqualified_inbound_links_in_same_namespace(oldname, newname)

data/lib/soywiki.rb

@@ -1,7 +1,7 @@
 require 'string_ext'
 module Template_Substitution; end
 module Soywiki
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
   WIKI_WORD = /\b([a-z0-9][\w_]+\.)?[A-Z][a-z]+[A-Z0-9]\w*\b/
   SCHEMES = %w{https http file soyfile}
   HYPERLINK = %r|\b(?:#{SCHEMES.join('|')})://[^ >)\n\]]+|

data/lib/soywiki.vim

@@ -22,6 +22,10 @@ let s:expand_command = 'soywiki-expand '
 let s:ls_command = 'soywiki-ls-t '
 let s:search_for_link = ""
 
+if !exists("g:soywiki_filetype")
+	let g:soywiki_filetype = 'txt'
+endif
+
 func! s:trimString(string)
   let string = substitute(a:string, '\s\+$', '', '')
   return substitute(string, '^\s\+', '', '')
@@ -293,7 +297,8 @@ func! s:rename_page(page_path_or_title)
       echo system("mv " . original_file . " " .  newfile)
     endif
     call system("git commit -am 'rename wiki page'")
-    exec "!" . s:rename_links_command . original_file . " " . newfile
+    let &buftype = "nofile"
+    exec "!" . s:rename_links_command . s:wiki_root() . " " . original_file . " " . newfile
     call system("git commit -am 'rename wiki links'")
     exec "e " . newfile
   else
@@ -690,7 +695,7 @@ endfunc
 func! s:prep_buffer()
   if (s:is_wiki_page() && !exists("b:mappings_loaded"))
     " let user decide on the textwidth
-    set filetype=txt
+    let &filetype=g:soywiki_filetype
     nnoremap <buffer> <cr> :call <SID>follow_link_under_cursor(0)<cr>
     nnoremap <buffer> <c-l> :call <SID>follow_link_under_cursor(2)<cr>
     nnoremap <buffer> <c-h> :call <SID>follow_link_under_cursor(1)<cr>

data/soywiki.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "soywiki"
   s.version     = Soywiki::VERSION
   s.platform    = Gem::Platform::RUBY
+  s.licenses    = ['MIT']
   s.authors     = ["Daniel Choi"]
   s.email       = ["dhchoi@gmail.com"]
   s.homepage    = "http://danielchoi.com/software/soywiki.html"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soywiki
 version: !ruby/object:Gem::Version
-  version: 0.9.7
-  prerelease: 
+  version: 0.9.8
 platform: ruby
 authors:
 - Daniel Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies: []
 description: A personal and collaborative wiki for Vim users
 email:
@@ -23,7 +22,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE.txt
@@ -44,31 +43,37 @@ files:
 - plugin/soywiki_starter.vim
 - soywiki.gemspec
 homepage: http://danielchoi.com/software/soywiki.html
-licenses: []
-post_install_message: ! "For optional compilation of the wiki to html you will need:\n
-  - haml\nand for markdown support:\n - rdiscount\n"
+licenses:
+- MIT
+metadata: {}
+post_install_message: |
+  For optional compilation of the wiki to html you will need:
+   - haml
+  and for markdown support:
+   - rdiscount
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ! "For optional compilation of the wiki to html you will need:\n - haml\nand for
-  markdown support:\n - rdiscount\n"
+- |
+  For optional compilation of the wiki to html you will need:
+   - haml
+  and for markdown support:
+   - rdiscount
 rubyforge_project: soywiki
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wiki with Vim interface and Git repo
 test_files: []
 has_rdoc: