gollum-lib 4.0.2 → 4.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Y4ZGU4MTBjNjg3YjBjNzVmNjNjZTE1ZjgzNWJjOWYwNGRhOGZjYw==
+    YjljZjMxYzNlY2MyMzg5NzYyZTk1ZGI2YjgwYzBhMDMzYmQ1MTRjZQ==
   data.tar.gz: !binary |-
-    ZmZiMTllMGJiMWRhNzUyMDIyNDUzZWZlMjBkNjlkYTNhMjAyN2UwOA==
+    ODIyNzMyNmU1ODlhZjRmMzU3MjRjMDU3YWIwZjI3YjhkZTZiZDdmZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDFmMDkyODFlZjc0YzJmMGNkNWIwNmI4NTk0OGJkYWQ1MTIwYzY3MTlkZjRh
-    N2ZjOTA5ODgwYjJkOGUyMzU1YTczN2EwOGJjMWQxMGMwYmIxMzE1NWJlZDBj
-    ZjJhNzc1ZDZjOTFjNGZkZTkzYTkxNGQxN2YxYjNkM2FhYzkzNTE=
+    ZDc2NDRmNDk5OTcwZjY5OGI1Yzk1OTdiNDQyNWE0MTZhMmY2OTExOTVjMmE3
+    NDlkMWRmOGYyN2JhZTcwNTZmMGFhZDViZjA1OTMxMjkzZjQ4NjM1OGVhZjRk
+    MjMyNzM4OWU4YTQ5YWY3YzE4NzUxNjAxNTUwNmM1YjBlMDExYWU=
   data.tar.gz: !binary |-
-    N2FkZGIwZGU5YTZkM2NiNGYwMWMzOGEyMDU1Yzc5MzcxYmU3N2MwNzdkMWIz
-    MTYwOGQ1OTViNmJmMmM2ZmQ3NWM1OTQyMDVlYTYwYjJhOTYwNThlZmZiNDMz
-    OTU5NzM2ZGFkOGQxZmY0YjZiOTYxYzMwMmZlOGViYzFmMWQ4YTE=
+    MGRmNDc4OTVlYjIzMTU2ZGQ3YWQzZGVkMmIzZGVhNGVlMDNiMDA1MTM3Mjg4
+    NjJiMmY1MTBhOWIwZWY0ZTc5ZWY0MzUyYzk3MTVhMDVhYmFhNzJlYzU5MjQ4
+    N2UyYmEzNmZlYTM4YjAxYzE3MjljZWE5NjQ2NzAwZDliNDExODc=

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec :name => RUBY_PLATFORM == 'java' ? 'gollum-lib_java' : 'gollum-lib'

data/Rakefile

@@ -13,7 +13,7 @@ def name
 end
 
 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line = File.read("lib/gollum-lib/version.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
@@ -27,13 +27,13 @@ def next_version
 end
 
 def bump_version
-  old_file = File.read("lib/#{name}.rb")
+  old_file = File.read("lib/gollum-lib/version.rb")
   old_version_line = old_file[/^\s*VERSION\s*=\s*.*/]
   new_version = next_version
   # replace first match of old version with new version
   old_file.sub!(old_version_line, "    VERSION = '#{new_version}'")
 
-  File.write("lib/#{name}.rb", old_file)
+  File.write("lib/gollum-lib/version.rb", old_file)
 
   new_version
 end
@@ -47,11 +47,15 @@ def rubyforge_project
 end
 
 def gemspec_file
-  "#{name}.gemspec"
+  "gemspec.rb"
 end
 
-def gem_file
-  "#{name}-#{version}.gem"
+def gemspecs
+  ["#{name}.gemspec", "#{name}_java.gemspec"]
+end
+
+def gem_files
+  ["#{name}-#{version}.gem", "#{name}-#{version}-java.gem"]
 end
 
 def replace_header(head, header_name)
@@ -124,6 +128,7 @@ task :release => :build do
   sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
+  sh "gem push pkg/#{name}-#{version}-java.gem"
 end
 
 desc 'Publish to rubygems. Same as release'
@@ -132,8 +137,12 @@ task :publish => :release
 desc 'Build gem'
 task :build => :gemspec do
   sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
+  gemspecs.each do |gemspec|
+    sh "gem build #{gemspec}"
+  end
+  gem_files.each do |gem_file|
+    sh "mv #{gem_file} pkg"
+  end
 end
 
 desc 'Update gemspec'
@@ -144,7 +153,6 @@ task :gemspec => :validate do
 
   # replace name version and date
   replace_header(head, :name)
-  replace_header(head, :version)
   replace_header(head, :date)
   #comment this out if your rubyforge_project has a different name
   replace_header(head, :rubyforge_project)

data/gemspec.rb

@@ -0,0 +1,100 @@
+def specification(version, default_adapter, platform = nil)
+  Proc.new do |s|
+    s.specification_version = 2 if s.respond_to? :specification_version=
+    s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+    s.rubygems_version = '0.0.1'
+    s.required_ruby_version = '>= 1.9'
+
+    s.name              = 'gollum-lib'
+    s.version           = version
+    s.platform          = platform if platform
+    s.date              = '2015-04-10'
+    s.rubyforge_project = 'gollum-lib'
+    s.license           = 'MIT'
+
+    s.summary     = 'A simple, Git-powered wiki.'
+    s.description = 'A simple, Git-powered wiki with a sweet API and local frontend.'
+
+    s.authors  = ['Tom Preston-Werner', 'Rick Olson']
+    s.email    = 'tom@github.com'
+    s.homepage = 'http://github.com/gollum/gollum-lib'
+
+    s.require_paths = %w[lib]
+
+    s.rdoc_options = ['--charset=UTF-8']
+    s.extra_rdoc_files = %w[README.md LICENSE]
+
+    s.add_dependency *default_adapter
+    s.add_dependency 'rouge', '~> 1.7.4'
+    s.add_dependency 'nokogiri', '~> 1.6.4'
+    s.add_dependency 'stringex', '~> 2.5.1'
+    s.add_dependency 'sanitize', '~> 2.1.0'
+    s.add_dependency 'github-markup', '~> 1.3.3'
+
+    s.add_development_dependency 'org-ruby', '~> 0.9.9'
+    s.add_development_dependency 'kramdown', '~> 1.6.0'
+    s.add_development_dependency 'RedCloth', '~> 4.2.9'
+    s.add_development_dependency 'mocha', '~> 1.1.0'
+    s.add_development_dependency 'shoulda', '~> 3.5.0'
+    s.add_development_dependency 'wikicloth', '~> 0.8.3'
+    s.add_development_dependency 'rake', '~> 10.4.0'
+    s.add_development_dependency 'pry', '~> 0.10.1'
+    # required by pry
+    s.add_development_dependency 'rb-readline', '~> 0.5.1'
+    # updating minitest-reporters requires a new minitest which fails with gollum's tests.
+    s.add_development_dependency 'minitest-reporters', '~> 0.14.16'
+    s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
+    # required by guard
+    s.add_development_dependency 'guard', '~> 2.8.2'
+    s.add_development_dependency 'guard-minitest', '~> 2.3.2'
+    s.add_development_dependency 'rb-inotify', '~> 0.9.3'
+    s.add_development_dependency 'rb-fsevent', '~> 0.9.4'
+    s.add_development_dependency 'rb-fchange', '~> 0.0.6'
+    s.add_development_dependency 'twitter_cldr', '~> 3.1.0'
+    # = MANIFEST =
+  s.files = %w[
+    Gemfile
+    HISTORY.md
+    LICENSE
+    README.md
+    Rakefile
+    docs/sanitization.md
+    gemspec.rb
+    gollum-lib.gemspec
+    gollum-lib_java.gemspec
+    lib/gollum-lib.rb
+    lib/gollum-lib/blob_entry.rb
+    lib/gollum-lib/committer.rb
+    lib/gollum-lib/file.rb
+    lib/gollum-lib/file_view.rb
+    lib/gollum-lib/filter.rb
+    lib/gollum-lib/filter/code.rb
+    lib/gollum-lib/filter/macro.rb
+    lib/gollum-lib/filter/metadata.rb
+    lib/gollum-lib/filter/plain_text.rb
+    lib/gollum-lib/filter/remote_code.rb
+    lib/gollum-lib/filter/render.rb
+    lib/gollum-lib/filter/sanitize.rb
+    lib/gollum-lib/filter/tags.rb
+    lib/gollum-lib/filter/toc.rb
+    lib/gollum-lib/filter/wsd.rb
+    lib/gollum-lib/git_access.rb
+    lib/gollum-lib/gitcode.rb
+    lib/gollum-lib/helpers.rb
+    lib/gollum-lib/hook.rb
+    lib/gollum-lib/macro.rb
+    lib/gollum-lib/macro/all_pages.rb
+    lib/gollum-lib/markup.rb
+    lib/gollum-lib/markups.rb
+    lib/gollum-lib/page.rb
+    lib/gollum-lib/pagination.rb
+    lib/gollum-lib/sanitization.rb
+    lib/gollum-lib/version.rb
+    lib/gollum-lib/wiki.rb
+    licenses/licenses.txt
+  ]
+  # = MANIFEST =
+
+    s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
+  end
+end

data/gollum-lib.gemspec

@@ -1,94 +1,4 @@
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '0.0.1'
-  s.required_ruby_version = '>= 1.9'
-
-  s.name              = 'gollum-lib'
-  s.version           = '4.0.2'
-  s.date              = '2015-01-19'
-  s.rubyforge_project = 'gollum-lib'
-  s.license           = 'MIT'
-
-  s.summary     = 'A simple, Git-powered wiki.'
-  s.description = 'A simple, Git-powered wiki with a sweet API and local frontend.'
-
-  s.authors  = ['Tom Preston-Werner', 'Rick Olson']
-  s.email    = 'tom@github.com'
-  s.homepage = 'http://github.com/gollum/gollum-lib'
-
-  s.require_paths = %w[lib]
-
-  s.rdoc_options = ['--charset=UTF-8']
-  s.extra_rdoc_files = %w[README.md LICENSE]
-
-  s.add_dependency 'gollum-grit_adapter', '~> 0.1', '>= 0.1.1'
-  s.add_dependency 'rouge', '~> 1.7.4'
-  s.add_dependency 'nokogiri', '~> 1.6.4'
-  s.add_dependency 'stringex', '~> 2.5.1'
-  s.add_dependency 'sanitize', '~> 2.1.0'
-  s.add_dependency 'github-markup', '~> 1.3.1'
-
-  s.add_development_dependency 'org-ruby', '~> 0.9.9'
-  s.add_development_dependency 'github-markdown', '~> 0.6.7'
-  s.add_development_dependency 'RedCloth', '~> 4.2.9'
-  s.add_development_dependency 'mocha', '~> 1.1.0'
-  s.add_development_dependency 'shoulda', '~> 3.5.0'
-  s.add_development_dependency 'wikicloth', '~> 0.8.1'
-  s.add_development_dependency 'rake', '~> 10.4.0'
-  s.add_development_dependency 'pry', '~> 0.10.1'
-  # required by pry
-  s.add_development_dependency 'rb-readline', '~> 0.5.1'
-  # updating minitest-reporters requires a new minitest which fails with gollum's tests.
-  s.add_development_dependency 'minitest-reporters', '~> 0.14.16'
-  s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
-  # required by guard
-  s.add_development_dependency 'guard', '~> 2.8.2'
-  s.add_development_dependency 'guard-minitest', '~> 2.3.2'
-  s.add_development_dependency 'rb-inotify', '~> 0.9.3'
-  s.add_development_dependency 'rb-fsevent', '~> 0.9.4'
-  s.add_development_dependency 'rb-fchange', '~> 0.0.6'
-  s.add_development_dependency 'twitter_cldr', '~> 3.1.0'
-  # = MANIFEST =
-  s.files = %w[
-    Gemfile
-    HISTORY.md
-    LICENSE
-    README.md
-    Rakefile
-    docs/sanitization.md
-    gollum-lib.gemspec
-    lib/gollum-lib.rb
-    lib/gollum-lib/blob_entry.rb
-    lib/gollum-lib/committer.rb
-    lib/gollum-lib/file.rb
-    lib/gollum-lib/file_view.rb
-    lib/gollum-lib/filter.rb
-    lib/gollum-lib/filter/code.rb
-    lib/gollum-lib/filter/macro.rb
-    lib/gollum-lib/filter/metadata.rb
-    lib/gollum-lib/filter/plain_text.rb
-    lib/gollum-lib/filter/remote_code.rb
-    lib/gollum-lib/filter/render.rb
-    lib/gollum-lib/filter/sanitize.rb
-    lib/gollum-lib/filter/tags.rb
-    lib/gollum-lib/filter/toc.rb
-    lib/gollum-lib/filter/wsd.rb
-    lib/gollum-lib/git_access.rb
-    lib/gollum-lib/gitcode.rb
-    lib/gollum-lib/helpers.rb
-    lib/gollum-lib/hook.rb
-    lib/gollum-lib/macro.rb
-    lib/gollum-lib/macro/all_pages.rb
-    lib/gollum-lib/markup.rb
-    lib/gollum-lib/markups.rb
-    lib/gollum-lib/page.rb
-    lib/gollum-lib/pagination.rb
-    lib/gollum-lib/sanitization.rb
-    lib/gollum-lib/wiki.rb
-    licenses/licenses.txt
-  ]
-  # = MANIFEST =
-
-  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
-end
+require File.join(File.dirname(__FILE__), 'gemspec.rb')
+require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
+default_adapter = ['gollum-grit_adapter', '~> 1.0']
+Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)

data/gollum-lib_java.gemspec

@@ -0,0 +1,4 @@
+require File.join(File.dirname(__FILE__), 'gemspec.rb')
+require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
+default_adapter = ['gollum-rjgit_adapter', '~> 0.1']
+Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter, "java")

data/lib/gollum-lib.rb

@@ -4,7 +4,7 @@ require 'digest/md5'
 require 'digest/sha1'
 require 'ostruct'
 
-DEFAULT_ADAPTER = 'grit_adapter'
+DEFAULT_ADAPTER = RUBY_PLATFORM == 'java' ? 'rjgit_adapter' : 'grit_adapter'
 
 if defined?(Gollum::GIT_ADAPTER)
   require "#{Gollum::GIT_ADAPTER.downcase}_adapter"
@@ -37,9 +37,6 @@ require File.expand_path('../gollum-lib/filter', __FILE__)
 $KCODE = 'U' if RUBY_VERSION[0, 3] == '1.8'
 
 module Gollum
-  module Lib
-    VERSION = '4.0.2'
-  end
 
   def self.assets_path
     ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))

data/lib/gollum-lib/committer.rb

@@ -53,8 +53,8 @@ module Gollum
     # Returns a Gollum::Git::Actor.
     def actor
       @actor ||= begin
-        @options[:name]  = @wiki.default_committer_name if @options[:name].to_s.empty?
-        @options[:email] = @wiki.default_committer_email if @options[:email].to_s.empty?
+        @options[:name]  = @wiki.default_committer_name if @options[:name].nil?
+        @options[:email] = @wiki.default_committer_email if @options[:email].nil?
         Gollum::Git::Actor.new(@options[:name], @options[:email])
       end
     end

data/lib/gollum-lib/git_access.rb

@@ -10,7 +10,7 @@ module Gollum
     # page_file_dir - String the directory in which all page files reside
     #
     # Returns this instance.
-    def initialize(path, page_file_dir = nil, bare = false)
+    def initialize(path, page_file_dir = nil, bare = nil)
       @page_file_dir = page_file_dir
       @path          = path
       @repo = Gollum::Git::Repo.new(path, { :is_bare => bare })

data/lib/gollum-lib/markups.rb

@@ -1,6 +1,11 @@
 # ~*~ encoding: utf-8 ~*~
 module Gollum
   class Markup
+    
+    GitHub::Markup::Markdown::MARKDOWN_GEMS['kramdown'] = proc { |content|
+        Kramdown::Document.new(content, :auto_ids => false, :input => "markdown").to_html
+    }
+
     register(:markdown,  "Markdown", :regexp => /md|mkdn?|mdown|markdown/)
     register(:textile,   "Textile")
     register(:rdoc,      "RDoc")

data/lib/gollum-lib/version.rb

@@ -0,0 +1,5 @@
+module Gollum
+  module Lib
+    VERSION = '4.0.3'
+  end
+end

data/lib/gollum-lib/wiki.rb

@@ -885,8 +885,9 @@ module Gollum
     #
     # Returns the String email address.
     def default_committer_email
-      @default_committer_email ||= \
-        @repo.config['user.email'] || self.class.default_committer_email
+      email = @repo.config['user.email']
+      email = email.delete('<>') if email
+      @default_committer_email ||= email || self.class.default_committer_email
     end
 
     # Gets the commit object for the given ref or sha.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-grit_adapter
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +87,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -116,19 +110,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.9
 - !ruby/object:Gem::Dependency
-  name: github-markdown
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -177,14 +171,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -353,7 +347,9 @@ files:
 - README.md
 - Rakefile
 - docs/sanitization.md
+- gemspec.rb
 - gollum-lib.gemspec
+- gollum-lib_java.gemspec
 - lib/gollum-lib.rb
 - lib/gollum-lib/blob_entry.rb
 - lib/gollum-lib/committer.rb
@@ -381,6 +377,7 @@ files:
 - lib/gollum-lib/page.rb
 - lib/gollum-lib/pagination.rb
 - lib/gollum-lib/sanitization.rb
+- lib/gollum-lib/version.rb
 - lib/gollum-lib/wiki.rb
 - licenses/licenses.txt
 homepage: http://github.com/gollum/gollum-lib