gollum-lib 5.0.1 → 5.0.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a39ec11de1f3cda57ce83f2ee9280e4eda1d0f4e4a5cb61e8a4c63c57c06639c
4
- data.tar.gz: ebd42559e9569648fd8d43afdccd2cc48f937f7a7f70029e8b47219f4eeb171c
3
+ metadata.gz: 204cefb65a7eba264c0d4940f7396bb9bb182b06bc4390e6a12f91afc4b315d9
4
+ data.tar.gz: d3150f2e9e8204fbdd4140eec0c1866a5001ccb0d3b555e42929d0369a9f09ae
5
5
  SHA512:
6
- metadata.gz: fa86da1e0ad83ddf4aa4e02f308947eeece40a1b9e3e1a638643e7f8d6dab231c0fa8d309ebfdf5c481df34e7fc7fa1cfe965a93ef8857d2975c9385d1681afd
7
- data.tar.gz: 7bed95172bf1640b3026b45e5919720974f70baae2796918281d6a346e615ed1d5066fe1e007a3a2b93c2a195283012e4c35e05a7de5af31dd29f0cdd8dbbbf9
6
+ metadata.gz: 276b4ba930ce6cff4b7278f817439236c0f8d265c0cca5fb7c8934923ae438ec07dfbd78bad20a79d5452f6874e3a45b9358e60ded3494d94183487bd2d5ba04
7
+ data.tar.gz: 0ae3bcfbf07852b32b60c70d7318aac13f074072316891b9c1a1e54a8ebe1f2e7f3b323fbeb43de5c50231e34965d5643bbd3c69b3b7aa2515f3ad308863dc42
data/Rakefile CHANGED
@@ -51,11 +51,11 @@ def gemspec_file
51
51
  end
52
52
 
53
53
  def gemspecs
54
- [RUBY_PLATFORM == 'java' ? "#{name}_java.gemspec" : "#{name}.gemspec"]
54
+ ["#{name}.gemspec", "#{name}_java.gemspec"]
55
55
  end
56
56
 
57
57
  def gem_files
58
- [RUBY_PLATFORM == 'java' ? "#{name}-#{version}-java.gem" : "#{name}-#{version}.gem"]
58
+ ["#{name}-#{version}.gem", "#{name}-#{version}-java.gem"]
59
59
  end
60
60
 
61
61
  def replace_header(head, header_name)
data/gemspec.rb CHANGED
@@ -8,7 +8,7 @@ def specification(version, default_adapter, platform = nil)
8
8
  s.name = 'gollum-lib'
9
9
  s.version = version
10
10
  s.platform = platform if platform
11
- s.date = '2020-03-29'
11
+ s.date = '2020-03-31'
12
12
  s.date = '2017-04-13'
13
13
  s.rubyforge_project = 'gollum-lib'
14
14
  s.license = 'MIT'
@@ -66,7 +66,6 @@ def specification(version, default_adapter, platform = nil)
66
66
  LICENSE
67
67
  README.md
68
68
  Rakefile
69
- adapter_dependencies.rb
70
69
  docs/sanitization.md
71
70
  gemspec.rb
72
71
  gollum-lib.gemspec
@@ -1,4 +1,10 @@
1
1
  require File.join(File.dirname(__FILE__), 'gemspec.rb')
2
- require File.join(File.dirname(__FILE__), 'adapter_dependencies.rb')
3
2
  require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
4
- Gem::Specification.new &specification(Gollum::Lib::VERSION, DEFAULT_ADAPTER_REQ)
3
+ # This file needs to conditionally define the default adapter for MRI and Java, because this is the file that is included from the Gemfile.
4
+ # 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.
5
+ if RUBY_PLATFORM == 'java' then
6
+ default_adapter = ['gollum-rjgit_adapter', '>= 0.5.1', '~> 0.5.1']
7
+ else
8
+ default_adapter = ['gollum-rugged_adapter', '>= 0.99.4', '~> 0.99.4']
9
+ end
10
+ Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)
@@ -1,4 +1,4 @@
1
1
  require File.join(File.dirname(__FILE__), 'gemspec.rb')
2
- require File.join(File.dirname(__FILE__), 'adapter_dependencies.rb')
3
2
  require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
4
- Gem::Specification.new &specification(Gollum::Lib::VERSION, DEFAULT_ADAPTER_REQ, "java")
3
+ default_adapter = ['gollum-rjgit_adapter', '>= 0.5.1', '~> 0.5.1']
4
+ Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter, "java")
@@ -7,12 +7,12 @@ module Gollum
7
7
  module Redirects
8
8
 
9
9
  def stale?
10
- @current_head != @wiki.repo.head.commit.sha
10
+ @current_head != get_head_sha
11
11
  end
12
12
 
13
13
  def init(wiki)
14
14
  @wiki = wiki
15
- @current_head = @wiki.repo.head.commit.sha
15
+ @current_head = get_head_sha
16
16
  end
17
17
 
18
18
  def load
@@ -33,6 +33,10 @@ module Gollum
33
33
  @wiki.overwrite_file(REDIRECTS_FILE, self.to_yaml, {})
34
34
  end
35
35
 
36
+ def get_head_sha
37
+ @wiki.repo.head ? @wiki.repo.head.commit.sha : nil
38
+ end
39
+
36
40
  end # Redirects Module
37
41
 
38
42
  end # Gollum Module
@@ -1,5 +1,5 @@
1
1
  module Gollum
2
2
  module Lib
3
- VERSION = '5.0.1'
3
+ VERSION = '5.0.2'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gollum-lib
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.1
4
+ version: 5.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Preston-Werner
@@ -456,7 +456,6 @@ files:
456
456
  - LICENSE
457
457
  - README.md
458
458
  - Rakefile
459
- - adapter_dependencies.rb
460
459
  - docs/sanitization.md
461
460
  - gemspec.rb
462
461
  - gollum-lib.gemspec
@@ -1,7 +0,0 @@
1
- # Set the default git adapter for use in gollum-lib.gemspec and gollum-lib_java.gemspec
2
-
3
- if RUBY_PLATFORM == 'java' then
4
- DEFAULT_ADAPTER_REQ = ['gollum-rjgit_adapter', '>= 0.5.1', '~> 0.5.1']
5
- else
6
- DEFAULT_ADAPTER_REQ = ['gollum-rugged_adapter', '>= 0.99.4', '~> 0.99.4']
7
- end