soywiki 0.9.8 → 0.9.8.1

data/Gemfile

@@ -1,3 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
+
 gem "haml"
 gem "rdiscount"

data/Gemfile.lock

@@ -1,10 +1,12 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     haml (3.0.25)
+    rdiscount (2.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   haml
+  rdiscount

data/README.markdown

@@ -46,8 +46,7 @@ SoyWiki is free and open source.
 ## Prerequisites
 
 * a recent version of Vim (SoyWiki is developed against Vim 7.2 and 7.3)
-* a recent version of Ruby: Ruby 1.9.2 is recommended
-* RubyGems (if Ruby version is older than 1.9)
+* a recent version of Ruby: at least Ruby 1.9.3, but we recommend 2.0.0 or above
 * a recent version of [Git][git] (1.7.0.4 or above to be safe)
 
 [git]:http://git-scm.com/
@@ -56,9 +55,11 @@ The current version of SoyWiki assumes a Unix environment.
 
 To use SoyWiki you should be fairly good at using Vim. 
 
-To install Ruby 1.9.2, I recommend using the [RVM Version Manager][rvm].
+To install Ruby we recommend using the a ruby version manager,
+like [RVM Version Manager][rvm] or [rbenv][rbenv].
 
 [rvm]:http://rvm.beginrescueend.com
+[rbenv]: https://github.com/sstephenson/rbenv
 
 Most of SoyWiki's commands should work even if you don't have Git
 installed. But the revision history commands will not.
@@ -70,7 +71,7 @@ installed. But the revision history commands will not.
 Test your installation by typing `soywiki -h`. You should see SoyWiki's help.
 
 If you run into any PATH errors, try the following: Install the RVM
-Version Manager, then install Ruby 1.9.2 through RVM, and then run `gem
+Version Manager, then install a recent version of ruby through RVM, and run `gem
 install soywiki`.  This should solve any installation issues.
 
 If you ever want to uninstall SoyWiki from your system, execute this command:
@@ -520,9 +521,16 @@ You can also join the [Google Group][group] and comment there.
 
 The original version of Soywiki was created by Daniel Choi (email: dhchoi at gmail.com).  
 
-Soywiki is now being maintained and extended by Tim r. Reddehase (github: [@0robustus1][tim]).
+Soywiki is now being maintained and extended by Tim Reddehase (github: [@0robustus1][tim]).
 
 [tim]:https://github.com/0robustus1
 
+## Roadmap
+
+There are some more git-related features (e.g. push from inside vim)
+we would like to implement before releasing 1.0.
+However with the 1.0 release we will no longer support
+ruby versions below `2.0.0`.
+
 
 

data/bin/soywiki-expand

@@ -1,64 +1,7 @@
 #!/usr/bin/env ruby
 require 'soywiki'
+require 'expander'
 
-# Takes any wiki link that stands alone on a line and expands it
-
-# this is different from Soywiki::WIKI_WORD in that it requires ^\s* before the
-# first letter
-
-WIKI_LINK_PATTERN =  /^\s*([a-z0-9]\w+\.)?[A-Z][a-z]+[A-Z0-9]\w*\s*$/
-
-PROCESSED_FILES = []
-
-def indent(text, level, mode)
-  return text if mode == 'seamless'
-  return text if level == 0
-  ('|' * level) + ' ' +  text
-
-end
-
-def divider
-  puts '+' + '-' * 78 + '+'
-end
-
-def expand(file, mode, level=0)
-  PROCESSED_FILES << file
-  lines = File.readlines(file)
-  if mode == 'seamless'
-    lines.shift   # strips title
-  end
-  lines = lines.join.strip.split("\n")
-  lines.each do |line|
-    # note that the wiki link must be alone on the line to be expanded
-    if line =~ WIKI_LINK_PATTERN 
-      link = line.strip
-      if link =~ /(\A|\s)[A-Z]/ # short link in namespace (relative link)
-        namespace = file.namespace
-        link = [namespace, link].join('.')
-      end
-      if File.file?(link.to_file_path) && !PROCESSED_FILES.include?(link.to_file_path) 
-        if mode == 'seamful'
-          divider
-        end
-        expand(link.to_file_path, mode, level + 1) # recursive call
-        if mode == 'seamful'
-          divider
-        end
-      elsif PROCESSED_FILES.include?(link) 
-        puts indent("#{link} [[already expanded]]", level, mode)
-      elsif !File.file?(link.to_file_path)
-        puts indent("#{link} [[no file found]]", level, mode)
-      else
-        puts indent("#{link}", level, mode)
-      end
-    else
-      puts indent(line, level, mode)
-    end
-  end
-end
-
-mode, file = *ARGV
-
-expand(file, mode)
-
-
+repo_path, mode, file = *ARGV
+expander = Soywiki::Expander.new(repo_path, mode, file)
+puts expander.expand

data/bin/soywiki-rename

@@ -1,123 +1,11 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 require 'soywiki'
-require 'pathname'
+require 'renamer'
 
-repo_path, oldname, newname = *ARGV
+repo_path, old_name, new_name = *ARGV
 repo_path = Pathname.new(repo_path)
+renamer = Soywiki::Renamer.new(repo_path, old_name, new_name)
 
-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 '#{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#{portion(oldname).to_page_title}\b/
-      matches = text.scan(regex)
-      text = text.gsub(regex, portion(newname).to_page_title)
-      File.open(file, 'w') {|f| f.puts text}
-      report file, portion(oldname).to_page_title, portion(newname).to_page_title
-    rescue
-      puts "Error processing #{file}: #$!"
-    end
-  end
-end
-
-def change_unqualified_inbound_links_in_same_namespace(oldname, newname)
-  MEMO << "- Updating unqualified inbound links"
-  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)(#{portion(oldname).short_page_title}\b)/, '\1' + portion(newname).to_page_title)
-      File.open(file, 'w') {|f| f.puts text}
-      report file, portion(oldname).short_page_title, portion(newname)
-    rescue
-      puts "Error processing #{file}: #$!"
-    end
-  end
-end
-
-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 = 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?( 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#{portion(oldname).namespace}.#{$2}"
-          MEMO <<  "  - In file #{target_file}: #{$2} -> #{res.strip}"
-          res
-        else
-          MEMO <<  "  - In file #{target_file}: skipping #{$2}"
-          match
-        end
-      end
-      File.open(target_file, 'w') {|f| f.puts text}
-    rescue
-      puts "Error processing #{target_file}: #$!"
-    end
-  end
-end
-
-
-# Three other cases to cover, involving namespaces:
-#
-# Case 1: newname is in same namespace as oldname
-#
-# In the directory for OldName's namespace, change all unqualified referenecs to
-# OldName to NewName
-
-if portion(oldname).namespace == portion(newname).namespace
-  MEMO << "- Updating unqualified links in same namespace"
-  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)(#{portion(oldname).short_page_title})\b/, '\1' + portion(newname).short_page_title)
-      File.open(file, 'w') {|f| f.puts text}
-      report file, portion(oldname).short_page_title, portion(newname).short_page_title
-    rescue
-      puts "Error processing #{file}: #$!"
-    end
-  end
-# Case 2: newname is in different namespace from oldname
-# 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)
-  # And in the renamed file, change all unqualified references to
-  # PageName to oldnamespace.PageName
-  absolutize_unqualified_outbound_links(oldname, newname)
-end
-
-# Finally,
-change_all_absolute_links oldname, newname
-
-puts MEMO.join("\n")
+renamer.rename
+renamer.print_report

data/lib/path_helper.rb

@@ -0,0 +1,24 @@
+require 'pathname'
+
+module PathHelper
+
+  def repo_path=(repo_path)
+    @repo_path = repo_path
+  end
+
+  def repo_path
+    @repo_path
+  end
+
+  def repo_relative(path)
+    ensure_path(path).relative_path_from(repo_path)
+  end
+
+  def in_repo(path)
+    repo_path.join(path)
+  end
+
+  def ensure_path(path)
+    path.is_a?(Pathname) ? path : Pathname.new(path)
+  end
+end

data/lib/soywiki.rb

@@ -1,7 +1,8 @@
 require 'string_ext'
+require 'path_helper'
 module Template_Substitution; end
 module Soywiki
-  VERSION = '0.9.8'
+  VERSION = '0.9.8.1'
   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

@@ -587,10 +587,10 @@ func! s:expand(seamless, vertical)
   if a:seamless == 1
     " seamful, the default
     echom "Expanding seamfully. Please wait."
-    let res = system(s:expand_command . " seamless " . bufname('%'))
+    let res = system(s:expand_command . " " . s:wiki_root() . " seamless " . bufname('%'))
   else " seamless
     echom "Expanding seamlessly. Please wait."
-    let res = system(s:expand_command . " seamful " . bufname('%'))
+    let res = system(s:expand_command . " " . s:wiki_root() . " seamful " . bufname('%'))
   endif
   if a:vertical
     botright vnew 

data/lib/soywiki/expander.rb

@@ -0,0 +1,86 @@
+module Soywiki
+  class Expander
+    # Takes any wiki link that stands alone on a line and expands it
+    # this is different from Soywiki::WIKI_WORD in that it requires ^\s* before the
+    # first letter
+
+    WIKI_LINK_PATTERN =  /^\s*([a-z0-9]\w+\.)?[A-Z][a-z]+[A-Z0-9]\w*\s*$/
+
+    attr_reader :mode, :file, :processed_files
+    attr_reader :repo_path, :file_path
+    attr_reader :expanded_text
+
+    include PathHelper
+
+    def initialize(repo_path, mode, file)
+      @repo_path = ensure_path(repo_path)
+      @mode = mode
+      @file_path = ensure_path(file)
+      @file = repo_relative(file).to_s
+      @processed_files = []
+    end
+
+    def seamless?
+      mode == 'seamless'
+    end
+
+    def seamful?
+      mode == 'seamful'
+    end
+
+    def indent(text, level)
+      return text if seamless?
+      return text if level == 0
+      ('|' * level) + ' ' +  text
+    end
+
+    def divider
+      '+' + '-' * 78 + '+'
+    end
+
+    def register_in_expansion(text, inline=false)
+      @expanded_text ||= ''
+      full_text = inline ? text : text + "\n"
+      @expanded_text << full_text
+    end
+
+    def recursive_expand(file_path, name, level=0)
+      processed_files << file_path
+      lines = file_path.readlines
+      title = lines.shift # takes title
+      lines = lines.join.strip.split("\n")
+      if seamful?
+        register_in_expansion divider unless level == 0
+        register_in_expansion indent(title, level)
+      end
+      lines.each do |line|
+        # note that the wiki link must be alone on the line to be expanded
+        if line =~ WIKI_LINK_PATTERN
+          link = line.strip
+          if link =~ /(\A|\s)[A-Z]/ # short link in namespace (relative link)
+            link = [name.namespace, link].join('.')
+          end
+          link_file_path = in_repo(link.to_file_path)
+          if link_file_path.file? && !processed_files.include?(link_file_path)
+            recursive_expand(link_file_path, link, level + 1) # recursive call
+          elsif processed_files.include?(link_file_path)
+            register_in_expansion indent("#{link} [[already expanded]]", level)
+          elsif !link_file_path.file?
+            register_in_expansion indent("#{link} [[no file found]]", level)
+          else
+            register_in_expansion indent("#{link}", level)
+          end
+        else
+          register_in_expansion indent(line, level)
+        end
+      end
+      register_in_expansion divider if seamful? && level != 0
+    end
+
+    def expand
+      recursive_expand(file_path, file.to_page_title)
+      expanded_text
+    end
+
+  end
+end

data/lib/soywiki/renamer.rb

@@ -0,0 +1,153 @@
+module Soywiki
+  class Renamer
+    attr_reader :repo_path, :old_name, :new_name
+    attr_reader :memo
+
+    include PathHelper
+
+    def initialize(repo_path, old_name, new_name)
+      @repo_path = ensure_path(repo_path)
+      @old_path = ensure_path(old_name)
+      @new_path = ensure_path(new_name)
+      @old_name = repo_relative(@old_path).to_s
+      @new_name = repo_relative(@new_path).to_s
+      @memo = ["Updating inbound and outbound links..."]
+    end
+
+    def namespace(query=nil)
+      self.instance_variable_get("@#{query}_name").namespace
+    rescue
+      nil
+    end
+
+    def page_title(query=nil)
+      self.instance_variable_get("@#{query}_name").to_page_title
+    rescue
+      nil
+    end
+
+    def short_page_title(query=nil)
+      self.instance_variable_get("@#{query}_name").short_page_title
+    rescue
+      nil
+    end
+
+    def report(file, oldname, newname)
+      @memo <<  "  - In #{file}: #{oldname} -> #{newname}"
+    end
+
+    def memorize(message)
+      @memo ||= []
+      @memo << message if message.is_a?(String)
+      @memo += message if message.is_a?(Array)
+      message
+    end
+
+    def print_report
+      puts @memo.join("\n")
+    end
+
+    def grep_for_files(search, where, ignore=/(\.swp|\.swo)$/)
+      cmd = "grep -rlF '#{search}' #{where}"
+      puts cmd
+      files = `#{cmd}`.strip.split(/\n/)
+      ignore ? files.select { |f| f !~ ignore } : files
+    end
+
+    def change_all_absolute_links
+      memorize "- Updating all absolute links"
+      grep_for_files(page_title(:old), repo_path).each do |file|
+        text = File.read(file)
+        begin
+          regex = /\b#{page_title(:old)}\b/
+          matches = text.scan(regex)
+          text = text.gsub(regex, page_title(:new))
+          File.open(file, 'w') {|f| f.puts text}
+          report file, page_title(:old), page_title(:new)
+        rescue
+          puts "Error processing #{file}: #$!"
+        end
+      end
+    end
+
+    def change_unqualified_inbound_links_in_same_namespace
+      memorize "- Updating unqualified inbound links"
+      grep_for_files(short_page_title(:old), in_repo(namespace(:old))).each do |file|
+        text = File.read(file)
+        begin
+          text = text.gsub(/(\A|\s)(#{short_page_title(:old)}\b)/, '\1' + page_title(:new))
+          File.open(file, 'w') {|f| f.puts text}
+          report file, short_page_title(:old), new_name
+        rescue
+          puts "Error processing #{file}: #$!"
+        end
+      end
+    end
+
+    RELATIVE_LINK_REGEX = /(\A|\s)([A-Z][a-z]+[A-Z0-9]\w*)/
+
+    def absolutize_unqualified_outbound_links
+      memorize "Absolutizing unqualified inbound links"
+      target_file = ensure_path(in_repo(new_name).to_s.to_file_path)
+      if target_file.exist?
+        text = target_file.read
+        begin
+          matches = text.scan(RELATIVE_LINK_REGEX).map {|x| x[1]}.
+            select {|match| match.strip != "" }.
+            select {|match| in_repo("#{namespace(:old)}/#{match}").exist? }
+          puts memorize("  - In file #{target_file}: matches: #{matches.inspect}")
+
+          text = text.gsub(RELATIVE_LINK_REGEX) do |match|
+            if matches.include?($2)
+              res = "#$1#{namespace(:old)}.#{$2}"
+              memorize "  - In file #{target_file}: #{$2} -> #{res.strip}"
+              res
+            else
+              memorize  "  - In file #{target_file}: skipping #{$2}"
+              match
+            end
+          end
+          File.open(target_file, 'w') {|f| f.puts text}
+        rescue
+          puts "Error processing #{target_file}: #$!"
+        end
+      end
+    end
+
+    def rename
+      # Three other cases to cover, involving namespaces:
+      #
+      # Case 1: newname is in same namespace as oldname
+      #
+      # In the directory for OldName's namespace, change all unqualified references to
+      # OldName to NewName
+
+      if namespace(:old) == namespace(:new)
+        memorize "- Updating unqualified links in same namespace"
+        grep_for_files(short_page_title(:old), in_repo(namespace(:old))).each do |file|
+          text = File.read(file)
+          begin
+            text = text.gsub(/(\A|\s)(#{short_page_title(:old)})\b/, '\1' + short_page_title(:new))
+            File.open(file, 'w') {|f| f.puts text}
+            report file, short_page_title(:old), short_page_title(:new)
+          rescue
+            puts "Error processing #{file}: #$!"
+          end
+        end
+        # Case 2: newname is in different namespace from oldname
+        # 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
+        # And in the renamed file, change all unqualified references to
+        # PageName to oldnamespace.PageName
+        absolutize_unqualified_outbound_links
+      end
+
+      # Finally,
+      change_all_absolute_links
+    end
+
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: soywiki
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.8.1
+  prerelease: 
 platform: ruby
 authors:
 - Daniel Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies: []
 description: A personal and collaborative wiki for Vim users
 email:
@@ -22,7 +23,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE.txt
@@ -35,45 +36,42 @@ files:
 - bin/soywiki-rename
 - lib/index_template.html.haml
 - lib/page_template.html.haml
+- lib/path_helper.rb
 - lib/plugin.erb
 - lib/soywiki.rb
 - lib/soywiki.vim
+- lib/soywiki/expander.rb
 - lib/soywiki/html.rb
+- lib/soywiki/renamer.rb
 - lib/string_ext.rb
 - plugin/soywiki_starter.vim
 - soywiki.gemspec
 homepage: http://danielchoi.com/software/soywiki.html
 licenses:
 - MIT
-metadata: {}
-post_install_message: |
-  For optional compilation of the wiki to html you will need:
-   - haml
-  and for markdown support:
-   - rdiscount
+post_install_message: ! "For optional compilation of the wiki to html you will need:\n
+  - haml\nand for markdown support:\n - rdiscount\n"
 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:
-   - haml
-  and for markdown support:
-   - rdiscount
+- ! "For optional compilation of the wiki to html you will need:\n - haml\nand for
+  markdown support:\n - rdiscount\n"
 rubyforge_project: soywiki
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Wiki with Vim interface and Git repo
 test_files: []
-has_rdoc: 

checksums.yaml

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