stoor 0.1.11 → 0.1.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +7 -0
  2. data/bin/stoor +3 -7
  3. data/config.ru +3 -4
  4. data/lib/stoor/config.rb +5 -3
  5. data/lib/stoor/version.rb +1 -1
  6. metadata +8 -21
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 560301f4ccc36ac78e8be795a0618f8073bf5d42
4
+ data.tar.gz: bd30f1099df8ce5625848399670c55c3238e9dc6
5
+ SHA512:
6
+ metadata.gz: 189c9563b553da8cf8ebb1df74057fd35e79f32162f5ac03acd3773a9050afabc2d10b47561870cc69aa573c29f955d4ac7b693a63c33305d7bb0f9d99b5ab58
7
+ data.tar.gz: bb374fd1370e6e17de4a3443ed76df7a69c9c2eed30ae823c4115e997464ca11b728d92bc34bd06c6dbae5eec3840bbf510c397ce013cd12c0b15b6f721a958d
data/bin/stoor CHANGED
@@ -2,14 +2,10 @@
2
2
 
3
3
  require 'thin'
4
4
 
5
- dirname = File.dirname(__FILE__)
6
- env_key = dirname.split(File::SEPARATOR).last.upcase
5
+ ENV['STOOR_RUNNING_VIA_CMD'] = 'y'
6
+ ENV['STOOR_WIKI_PATH'] ||= '.'
7
7
 
8
- config_ru = File.expand_path(File.join(dirname, '..', 'config.ru'))
9
-
10
- ENV["#{@env_key}_WIKI_PATH"] ||= '.'
11
-
12
- ARGV.unshift config_ru
8
+ ARGV.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'config.ru'))
13
9
  ARGV.unshift '-R'
14
10
  ARGV.unshift 'start'
15
11
  Thin::Runner.new(ARGV).run!
data/config.ru CHANGED
@@ -10,17 +10,16 @@ require 'rack/null_logger'
10
10
 
11
11
  ENV['RACK_ENV'] ||= 'development'
12
12
 
13
- config = Stoor::Config.new(__FILE__)
13
+ config = Stoor::Config.new(__FILE__, ENV['STOOR_RUNNING_VIA_CMD'])
14
14
 
15
15
  domain = config.env('DOMAIN') || 'localhost'
16
16
  secret = config.env('SECRET') || 'stoor'
17
17
  expire_after = (config.env('EXPIRE_AFTER') || '3600').to_i
18
18
 
19
-
20
- gollum_path = config.env('WIKI_PATH') || File.expand_path(File.dirname(__FILE__))
19
+ gollum_path = config.env('WIKI_PATH') || config.dirname
21
20
 
22
21
  config.dump_env
23
- config.log "gollum_path = #{gollum_path}"
22
+ config.log "gollum_path: #{gollum_path}"
24
23
 
25
24
  if message = config.repo_missing?(gollum_path)
26
25
  puts message
data/lib/stoor/config.rb CHANGED
@@ -2,8 +2,8 @@ require 'logger'
2
2
 
3
3
  module Stoor
4
4
  class Config
5
- def initialize(file)
6
- @file = file
5
+ def initialize(file, running_via_cmd)
6
+ @file, @running_via_cmd = file, running_via_cmd
7
7
  end
8
8
 
9
9
  def dirname
@@ -15,7 +15,9 @@ module Stoor
15
15
  end
16
16
 
17
17
  def env_prefix
18
- @env_prefix ||= dirname.split(File::SEPARATOR).last.upcase
18
+ @env_prefix ||= begin
19
+ @running_via_cmd ? 'STOOR' : dirname.split(File::SEPARATOR).last.upcase
20
+ end
19
21
  end
20
22
 
21
23
  def env(token)
data/lib/stoor/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Stoor
2
- VERSION = '0.1.11'
2
+ VERSION = '0.1.12'
3
3
  end
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: stoor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.11
5
- prerelease:
4
+ version: 0.1.12
6
5
  platform: ruby
7
6
  authors:
8
7
  - John G. Norman
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-11-09 00:00:00.000000000 Z
11
+ date: 2014-03-10 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: thin
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: gollum
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - ~>
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - ~>
44
39
  - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: sinatra_auth_github
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - ~>
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - ~>
60
53
  - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: warden-github
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - ~>
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :development
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - ~>
76
67
  - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: rack-test
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
73
  - - ~>
84
74
  - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
86
76
  type: :development
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
80
  - - ~>
92
81
  - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: rspec
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - ~>
100
88
  - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
102
90
  type: :development
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - ~>
108
95
  - !ruby/object:Gem::Version
@@ -146,28 +133,27 @@ files:
146
133
  homepage: https://github.com/jgn/stoor
147
134
  licenses:
148
135
  - MIT
136
+ metadata: {}
149
137
  post_install_message:
150
138
  rdoc_options:
151
139
  - --charset=UTF-8
152
140
  require_paths:
153
141
  - lib
154
142
  required_ruby_version: !ruby/object:Gem::Requirement
155
- none: false
156
143
  requirements:
157
- - - ! '>='
144
+ - - '>='
158
145
  - !ruby/object:Gem::Version
159
146
  version: '0'
160
147
  required_rubygems_version: !ruby/object:Gem::Requirement
161
- none: false
162
148
  requirements:
163
- - - ! '>='
149
+ - - '>='
164
150
  - !ruby/object:Gem::Version
165
151
  version: '0'
166
152
  requirements: []
167
153
  rubyforge_project:
168
- rubygems_version: 1.8.23
154
+ rubygems_version: 2.0.3
169
155
  signing_key:
170
- specification_version: 3
156
+ specification_version: 4
171
157
  summary: Front-end for Gollum
172
158
  test_files:
173
159
  - spec/lib/stoor/git_config_spec.rb
@@ -175,3 +161,4 @@ test_files:
175
161
  - spec/lib/stoor/transform_content_spec.rb
176
162
  - spec/repo.rb
177
163
  - spec/spec_helper.rb
164
+ has_rdoc: