smeagol 0.6.1 → 0.6.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/.index +11 -7
  3. data/lib/smeagol/controller.rb +1 -0
  4. data/lib/smeagol/settings.rb +17 -1
  5. metadata +23 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 51e6f36277b0f6f7d5261c251f6bbb475587bd9f
4
- data.tar.gz: 3443d535ff9bced5c866c31fe816a2a0715b99a5
3
+ metadata.gz: c09dd487633a8355d767a2a8c7a33b88a3f53b40
4
+ data.tar.gz: 27c73afa00c587cbbf9d1fdadda2484b125624cc
5
5
  SHA512:
6
- metadata.gz: 192b9a278897314cc70fc3d4c03559c21edf8665f5dafd0a97cd391be8797a0357c7521c0522547171f0b0eb49557590c056a05bf61d3fd3fe8567b4d2f357a0
7
- data.tar.gz: f5193495ba0067f9e3da33b79a12125a3f616e6406edb0d8a12ce808672cee5cf36fa1db7ff49f095ec70e8630757e6f564f42510c0e9ecfa587e51d4b9d8b81
6
+ metadata.gz: c0577a839d9773c2f9d45dcb80c90c7f0561e691e6f605eb18ee72eaee4b1afdc8ffd218667ed76d8ef419c816c2d8d77884f5abc376a16a8ea23d1a70b8cb74
7
+ data.tar.gz: d63fe18cc1b0cd0030bc6977d24e670f661d6480c0f766c66c6bf05d1f5e64a4da936f9721806aae467e0ae8eccc0f6ec5724cf52e58c3ba419c0e8f0e5256b2
data/.index CHANGED
@@ -14,30 +14,34 @@ requirements:
14
14
  name: rack
15
15
  - version: 2.5+
16
16
  name: gollum
17
- - version: 2.5+
18
- name: grit
19
17
  - version: 1.4+
20
18
  name: sinatra
21
19
  - version: 0.5+
22
20
  name: rubypython
23
21
  - groups:
24
- - development
22
+ - compiled
23
+ version: 0.5+
24
+ development: true
25
+ name: github-markdown
26
+ - groups:
27
+ - test
28
+ development: true
29
+ name: rubytest-cli
30
+ - groups:
25
31
  - test
26
32
  development: true
27
33
  name: citron
28
34
  - groups:
29
- - develpoment
30
35
  - test
31
36
  development: true
32
37
  name: ae
33
38
  - groups:
34
- - development
35
39
  - test
36
40
  development: true
37
41
  name: rack-test
38
42
  - groups:
39
- - development
40
43
  - doc
44
+ - compiled
41
45
  development: true
42
46
  name: rdiscount
43
47
  conflicts: []
@@ -78,5 +82,5 @@ description: |-
78
82
  Smeagol is a customizable read-only Gollum wiki server.
79
83
  Smeagol makes it possible to maintain a standalone website,
80
84
  but update it through the Gollum wiki interface, e.g. via GitHub.
81
- version: 0.6.1
85
+ version: 0.6.2
82
86
  date: '2013-08-08'
data/lib/smeagol/controller.rb CHANGED
@@ -45,6 +45,7 @@ module Smeagol
45
45
  Views::Page.new(self, wiki_file, version)
46
46
  end
47
47
  when Gollum::File
48
+ # TODO: Support for other markup formats.
48
49
  if wiki_file.extname == '.mustache'
49
50
  Views::Form.new(self, wiki_file, version)
50
51
  else
data/lib/smeagol/settings.rb CHANGED
@@ -82,7 +82,7 @@ module Smeagol
82
82
  # Deprecated: Alias for #assign.
83
83
  alias update assign
84
84
 
85
- # Internal: Do not set this settings.yml!
85
+ # Internal: Do not set this in _settings.yml!
86
86
  attr_accessor :wiki_dir
87
87
 
88
88
  # Gollum wiki's repo uri.
@@ -99,6 +99,22 @@ module Smeagol
99
99
  # If a site is intended for static deployment, `static` should be set to `true`.
100
100
  #attr_accessor :static
101
101
 
102
+ #
103
+ def wiki
104
+ {'origin'=>wiki_origin, 'ref'=>wiki_ref}
105
+ end
106
+
107
+ #
108
+ def wiki=(entry)
109
+ case entry
110
+ when Hash
111
+ self.wiki_origin = site['origin']
112
+ self.wiki_ref = site['ref']
113
+ else
114
+ raise ArgumentError, 'wiki must be a mapping'
115
+ end
116
+ end
117
+
102
118
  #
103
119
  def site
104
120
  {'stage'=>site_stage, 'origin'=>site_origin, 'branch'=>site_branch}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smeagol
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.1
4
+ version: 0.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Johnson
@@ -40,47 +40,61 @@ dependencies:
40
40
  - !ruby/object:Gem::Version
41
41
  version: '2.5'
42
42
  - !ruby/object:Gem::Dependency
43
- name: grit
43
+ name: sinatra
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - '>='
47
47
  - !ruby/object:Gem::Version
48
- version: '2.5'
48
+ version: '1.4'
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - '>='
54
54
  - !ruby/object:Gem::Version
55
- version: '2.5'
55
+ version: '1.4'
56
56
  - !ruby/object:Gem::Dependency
57
- name: sinatra
57
+ name: rubypython
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
60
  - - '>='
61
61
  - !ruby/object:Gem::Version
62
- version: '1.4'
62
+ version: '0.5'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - '>='
68
68
  - !ruby/object:Gem::Version
69
- version: '1.4'
69
+ version: '0.5'
70
70
  - !ruby/object:Gem::Dependency
71
- name: rubypython
71
+ name: github-markdown
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
74
  - - '>='
75
75
  - !ruby/object:Gem::Version
76
76
  version: '0.5'
77
- type: :runtime
77
+ type: :development
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
81
  - - '>='
82
82
  - !ruby/object:Gem::Version
83
83
  version: '0.5'
84
+ - !ruby/object:Gem::Dependency
85
+ name: rubytest-cli
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - '>='
89
+ - !ruby/object:Gem::Version
90
+ version: '0'
91
+ type: :development
92
+ prerelease: false
93
+ version_requirements: !ruby/object:Gem::Requirement
94
+ requirements:
95
+ - - '>='
96
+ - !ruby/object:Gem::Version
97
+ version: '0'
84
98
  - !ruby/object:Gem::Dependency
85
99
  name: citron
86
100
  requirement: !ruby/object:Gem::Requirement