gollum-lib 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39ec11de1f3cda57ce83f2ee9280e4eda1d0f4e4a5cb61e8a4c63c57c06639c
-  data.tar.gz: ebd42559e9569648fd8d43afdccd2cc48f937f7a7f70029e8b47219f4eeb171c
+  metadata.gz: 204cefb65a7eba264c0d4940f7396bb9bb182b06bc4390e6a12f91afc4b315d9
+  data.tar.gz: d3150f2e9e8204fbdd4140eec0c1866a5001ccb0d3b555e42929d0369a9f09ae
 SHA512:
-  metadata.gz: fa86da1e0ad83ddf4aa4e02f308947eeece40a1b9e3e1a638643e7f8d6dab231c0fa8d309ebfdf5c481df34e7fc7fa1cfe965a93ef8857d2975c9385d1681afd
-  data.tar.gz: 7bed95172bf1640b3026b45e5919720974f70baae2796918281d6a346e615ed1d5066fe1e007a3a2b93c2a195283012e4c35e05a7de5af31dd29f0cdd8dbbbf9
+  metadata.gz: 276b4ba930ce6cff4b7278f817439236c0f8d265c0cca5fb7c8934923ae438ec07dfbd78bad20a79d5452f6874e3a45b9358e60ded3494d94183487bd2d5ba04
+  data.tar.gz: 0ae3bcfbf07852b32b60c70d7318aac13f074072316891b9c1a1e54a8ebe1f2e7f3b323fbeb43de5c50231e34965d5643bbd3c69b3b7aa2515f3ad308863dc42

data/Rakefile

@@ -51,11 +51,11 @@ def gemspec_file
 end
 
 def gemspecs
-  [RUBY_PLATFORM == 'java' ? "#{name}_java.gemspec" : "#{name}.gemspec"]
+   ["#{name}.gemspec", "#{name}_java.gemspec"]
 end
 
 def gem_files
-  [RUBY_PLATFORM == 'java' ? "#{name}-#{version}-java.gem" : "#{name}-#{version}.gem"]
+ ["#{name}-#{version}.gem", "#{name}-#{version}-java.gem"]
 end
 
 def replace_header(head, header_name)

data/gemspec.rb

@@ -8,7 +8,7 @@ def specification(version, default_adapter, platform = nil)
     s.name              = 'gollum-lib'
     s.version           = version
     s.platform          = platform if platform
-    s.date              = '2020-03-29'
+    s.date              = '2020-03-31'
     s.date              = '2017-04-13'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
@@ -66,7 +66,6 @@ def specification(version, default_adapter, platform = nil)
     LICENSE
     README.md
     Rakefile
-    adapter_dependencies.rb
     docs/sanitization.md
     gemspec.rb
     gollum-lib.gemspec

data/gollum-lib.gemspec

@@ -1,4 +1,10 @@
 require File.join(File.dirname(__FILE__), 'gemspec.rb')
-require File.join(File.dirname(__FILE__), 'adapter_dependencies.rb')
 require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
-Gem::Specification.new &specification(Gollum::Lib::VERSION, DEFAULT_ADAPTER_REQ)
+# This file needs to conditionally define the default adapter for MRI and Java, because this is the file that is included from the Gemfile.
+# In addition, the default Java adapter needs to be defined in gollum-lib_java.gemspec beause that file is used to *build* the Java gem.
+if RUBY_PLATFORM == 'java' then
+  default_adapter = ['gollum-rjgit_adapter', '>= 0.5.1', '~> 0.5.1']
+else
+  default_adapter = ['gollum-rugged_adapter', '>= 0.99.4', '~> 0.99.4']
+end
+Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)

data/gollum-lib_java.gemspec

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

data/lib/gollum-lib/redirects.rb

@@ -7,12 +7,12 @@ module Gollum
   module Redirects
         
     def stale?
-      @current_head != @wiki.repo.head.commit.sha
+      @current_head != get_head_sha
     end
 
     def init(wiki)
       @wiki = wiki
-      @current_head = @wiki.repo.head.commit.sha
+      @current_head = get_head_sha
     end
 
     def load
@@ -33,6 +33,10 @@ module Gollum
       @wiki.overwrite_file(REDIRECTS_FILE, self.to_yaml, {})
     end
     
+    def get_head_sha
+      @wiki.repo.head ? @wiki.repo.head.commit.sha : nil
+    end
+    
   end # Redirects Module
 
 end # Gollum Module

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '5.0.1'
+    VERSION = '5.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -456,7 +456,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- adapter_dependencies.rb
 - docs/sanitization.md
 - gemspec.rb
 - gollum-lib.gemspec

data/adapter_dependencies.rb

@@ -1,7 +0,0 @@
-# Set the default git adapter for use in gollum-lib.gemspec and gollum-lib_java.gemspec
-
-if RUBY_PLATFORM == 'java' then
-  DEFAULT_ADAPTER_REQ = ['gollum-rjgit_adapter', '>= 0.5.1', '~> 0.5.1']
-else
-  DEFAULT_ADAPTER_REQ = ['gollum-rugged_adapter', '>= 0.99.4', '~> 0.99.4']
-end