dolt 0.6.1 → 0.6.2

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 (3) hide show
  1. data/dolt.gemspec +1 -1
  2. data/lib/dolt/sinatra/actions.rb +7 -7
  3. metadata +143 -147
data/dolt.gemspec CHANGED
@@ -11,7 +11,7 @@ end
11
11
 
12
12
  Gem::Specification.new do |s|
13
13
  s.name = "dolt"
14
- s.version = "0.6.1"
14
+ s.version = "0.6.2"
15
15
  s.authors = ["Christian Johansen"]
16
16
  s.email = ["christian@gitorious.org"]
17
17
  s.homepage = "http://gitorious.org/gitorious/dolt"
data/lib/dolt/sinatra/actions.rb CHANGED
@@ -48,9 +48,9 @@ module Dolt
48
48
 
49
49
  def blob(repo, ref, path, options = { :template => :blob, :content_type => "text/html" })
50
50
  actions.blob(repo, ref, path) do |err, data|
51
- return error(err, repo, ref) if !err.nil?
51
+ next error(err, repo, ref) if !err.nil?
52
52
  blob = data[:blob]
53
- return redirect(tree_url(repo, ref, path)) if !blob.is_a?(Rugged::Blob)
53
+ next redirect(tree_url(repo, ref, path)) if !blob.is_a?(Rugged::Blob)
54
54
  response["Content-Type"] = options[:content_type]
55
55
  tpl_options = options[:template_options] || {}
56
56
  body(renderer.render(options[:template], data, tpl_options))
@@ -59,9 +59,9 @@ module Dolt
59
59
 
60
60
  def tree(repo, ref, path)
61
61
  actions.tree(repo, ref, path) do |err, data|
62
- return error(err, repo, ref) if !err.nil?
62
+ next error(err, repo, ref) if !err.nil?
63
63
  tree = data[:tree]
64
- return redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
64
+ next redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
65
65
  response["Content-Type"] = "text/html"
66
66
  body(renderer.render(:tree, data))
67
67
  end
@@ -69,7 +69,7 @@ module Dolt
69
69
 
70
70
  def blame(repo, ref, path)
71
71
  actions.blame(repo, ref, path) do |err, data|
72
- return error(err, repo, ref) if !err.nil?
72
+ next error(err, repo, ref) if !err.nil?
73
73
  response["Content-Type"] = "text/html"
74
74
  body(renderer.render(:blame, data))
75
75
  end
@@ -77,7 +77,7 @@ module Dolt
77
77
 
78
78
  def history(repo, ref, path, count)
79
79
  actions.history(repo, ref, path, count) do |err, data|
80
- return error(err, repo, ref) if !err.nil?
80
+ next error(err, repo, ref) if !err.nil?
81
81
  response["Content-Type"] = "text/html"
82
82
  body(renderer.render(:commits, data))
83
83
  end
@@ -85,7 +85,7 @@ module Dolt
85
85
 
86
86
  def refs(repo)
87
87
  actions.refs(repo) do |err, data|
88
- return error(err, repo, ref) if !err.nil?
88
+ next error(err, repo, ref) if !err.nil?
89
89
  response["Content-Type"] = "application/json"
90
90
  body(renderer.render(:refs, data, :layout => nil))
91
91
  end
metadata CHANGED
@@ -1,177 +1,184 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: dolt
3
- version: !ruby/object:Gem::Version
4
- hash: 5
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.6.2
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 6
9
- - 1
10
- version: 0.6.1
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Christian Johansen
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-10-05 00:00:00 +02:00
19
- default_executable:
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
12
+ date: 2012-10-05 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: libdolt
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
25
17
  none: false
26
- requirements:
18
+ requirements:
27
19
  - - ~>
28
- - !ruby/object:Gem::Version
29
- hash: 3
30
- segments:
31
- - 0
32
- version: "0"
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
33
22
  type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
36
- name: thin
37
23
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: thin
32
+ requirement: !ruby/object:Gem::Requirement
39
33
  none: false
40
- requirements:
34
+ requirements:
41
35
  - - ~>
42
- - !ruby/object:Gem::Version
43
- hash: 7
44
- segments:
45
- - 1
46
- - 4
47
- version: "1.4"
36
+ - !ruby/object:Gem::Version
37
+ version: '1.4'
48
38
  type: :runtime
49
- version_requirements: *id002
50
- - !ruby/object:Gem::Dependency
51
- name: sinatra
52
39
  prerelease: false
53
- requirement: &id003 !ruby/object:Gem::Requirement
40
+ version_requirements: !ruby/object:Gem::Requirement
54
41
  none: false
55
- requirements:
42
+ requirements:
56
43
  - - ~>
57
- - !ruby/object:Gem::Version
58
- hash: 1
59
- segments:
60
- - 1
61
- version: "1"
44
+ - !ruby/object:Gem::Version
45
+ version: '1.4'
46
+ - !ruby/object:Gem::Dependency
47
+ name: sinatra
48
+ requirement: !ruby/object:Gem::Requirement
49
+ none: false
50
+ requirements:
51
+ - - ~>
52
+ - !ruby/object:Gem::Version
53
+ version: '1'
62
54
  type: :runtime
63
- version_requirements: *id003
64
- - !ruby/object:Gem::Dependency
65
- name: async_sinatra
66
55
  prerelease: false
67
- requirement: &id004 !ruby/object:Gem::Requirement
56
+ version_requirements: !ruby/object:Gem::Requirement
68
57
  none: false
69
- requirements:
58
+ requirements:
70
59
  - - ~>
71
- - !ruby/object:Gem::Version
72
- hash: 1
73
- segments:
74
- - 1
75
- version: "1"
60
+ - !ruby/object:Gem::Version
61
+ version: '1'
62
+ - !ruby/object:Gem::Dependency
63
+ name: async_sinatra
64
+ requirement: !ruby/object:Gem::Requirement
65
+ none: false
66
+ requirements:
67
+ - - ~>
68
+ - !ruby/object:Gem::Version
69
+ version: '1'
76
70
  type: :runtime
77
- version_requirements: *id004
78
- - !ruby/object:Gem::Dependency
79
- name: tiltout
80
71
  prerelease: false
81
- requirement: &id005 !ruby/object:Gem::Requirement
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ~>
76
+ - !ruby/object:Gem::Version
77
+ version: '1'
78
+ - !ruby/object:Gem::Dependency
79
+ name: tiltout
80
+ requirement: !ruby/object:Gem::Requirement
82
81
  none: false
83
- requirements:
82
+ requirements:
84
83
  - - ~>
85
- - !ruby/object:Gem::Version
86
- hash: 1
87
- segments:
88
- - 1
89
- version: "1"
84
+ - !ruby/object:Gem::Version
85
+ version: '1'
90
86
  type: :runtime
91
- version_requirements: *id005
92
- - !ruby/object:Gem::Dependency
93
- name: json
94
87
  prerelease: false
95
- requirement: &id006 !ruby/object:Gem::Requirement
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: '1'
94
+ - !ruby/object:Gem::Dependency
95
+ name: json
96
+ requirement: !ruby/object:Gem::Requirement
96
97
  none: false
97
- requirements:
98
+ requirements:
98
99
  - - ~>
99
- - !ruby/object:Gem::Version
100
- hash: 1
101
- segments:
102
- - 1
103
- version: "1"
100
+ - !ruby/object:Gem::Version
101
+ version: '1'
104
102
  type: :runtime
105
- version_requirements: *id006
106
- - !ruby/object:Gem::Dependency
107
- name: minitest
108
103
  prerelease: false
109
- requirement: &id007 !ruby/object:Gem::Requirement
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ~>
108
+ - !ruby/object:Gem::Version
109
+ version: '1'
110
+ - !ruby/object:Gem::Dependency
111
+ name: minitest
112
+ requirement: !ruby/object:Gem::Requirement
110
113
  none: false
111
- requirements:
114
+ requirements:
112
115
  - - ~>
113
- - !ruby/object:Gem::Version
114
- hash: 3
115
- segments:
116
- - 2
117
- - 0
118
- version: "2.0"
116
+ - !ruby/object:Gem::Version
117
+ version: '2.0'
119
118
  type: :development
120
- version_requirements: *id007
121
- - !ruby/object:Gem::Dependency
122
- name: em-minitest-spec
123
119
  prerelease: false
124
- requirement: &id008 !ruby/object:Gem::Requirement
120
+ version_requirements: !ruby/object:Gem::Requirement
125
121
  none: false
126
- requirements:
122
+ requirements:
127
123
  - - ~>
128
- - !ruby/object:Gem::Version
129
- hash: 13
130
- segments:
131
- - 1
132
- - 1
133
- version: "1.1"
124
+ - !ruby/object:Gem::Version
125
+ version: '2.0'
126
+ - !ruby/object:Gem::Dependency
127
+ name: em-minitest-spec
128
+ requirement: !ruby/object:Gem::Requirement
129
+ none: false
130
+ requirements:
131
+ - - ~>
132
+ - !ruby/object:Gem::Version
133
+ version: '1.1'
134
134
  type: :development
135
- version_requirements: *id008
136
- - !ruby/object:Gem::Dependency
137
- name: rake
138
135
  prerelease: false
139
- requirement: &id009 !ruby/object:Gem::Requirement
136
+ version_requirements: !ruby/object:Gem::Requirement
140
137
  none: false
141
- requirements:
138
+ requirements:
142
139
  - - ~>
143
- - !ruby/object:Gem::Version
144
- hash: 25
145
- segments:
146
- - 0
147
- - 9
148
- version: "0.9"
140
+ - !ruby/object:Gem::Version
141
+ version: '1.1'
142
+ - !ruby/object:Gem::Dependency
143
+ name: rake
144
+ requirement: !ruby/object:Gem::Requirement
145
+ none: false
146
+ requirements:
147
+ - - ~>
148
+ - !ruby/object:Gem::Version
149
+ version: '0.9'
149
150
  type: :development
150
- version_requirements: *id009
151
- - !ruby/object:Gem::Dependency
152
- name: mocha
153
151
  prerelease: false
154
- requirement: &id010 !ruby/object:Gem::Requirement
155
- none: false
156
- requirements:
157
- - - ">="
158
- - !ruby/object:Gem::Version
159
- hash: 3
160
- segments:
161
- - 0
162
- version: "0"
152
+ version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
154
+ requirements:
155
+ - - ~>
156
+ - !ruby/object:Gem::Version
157
+ version: '0.9'
158
+ - !ruby/object:Gem::Dependency
159
+ name: mocha
160
+ requirement: !ruby/object:Gem::Requirement
161
+ none: false
162
+ requirements:
163
+ - - ! '>='
164
+ - !ruby/object:Gem::Version
165
+ version: '0'
163
166
  type: :development
164
- version_requirements: *id010
167
+ prerelease: false
168
+ version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
170
+ requirements:
171
+ - - ! '>='
172
+ - !ruby/object:Gem::Version
173
+ version: '0'
165
174
  description: Dolt serves git trees and syntax highlighted blobs
166
- email:
175
+ email:
167
176
  - christian@gitorious.org
168
- executables:
177
+ executables:
169
178
  - dolt
170
179
  extensions: []
171
-
172
180
  extra_rdoc_files: []
173
-
174
- files:
181
+ files:
175
182
  - ./.gitmodules
176
183
  - ./Gemfile
177
184
  - ./Gemfile.lock
@@ -213,39 +220,28 @@ files:
213
220
  - vendor/ui/test/tree-history-test.js
214
221
  - vendor/ui/test/url-template-test.js
215
222
  - bin/dolt
216
- has_rdoc: true
217
223
  homepage: http://gitorious.org/gitorious/dolt
218
224
  licenses: []
219
-
220
225
  post_install_message:
221
226
  rdoc_options: []
222
-
223
- require_paths:
227
+ require_paths:
224
228
  - lib
225
- required_ruby_version: !ruby/object:Gem::Requirement
229
+ required_ruby_version: !ruby/object:Gem::Requirement
226
230
  none: false
227
- requirements:
228
- - - ">="
229
- - !ruby/object:Gem::Version
230
- hash: 3
231
- segments:
232
- - 0
233
- version: "0"
234
- required_rubygems_version: !ruby/object:Gem::Requirement
231
+ requirements:
232
+ - - ! '>='
233
+ - !ruby/object:Gem::Version
234
+ version: '0'
235
+ required_rubygems_version: !ruby/object:Gem::Requirement
235
236
  none: false
236
- requirements:
237
- - - ">="
238
- - !ruby/object:Gem::Version
239
- hash: 3
240
- segments:
241
- - 0
242
- version: "0"
237
+ requirements:
238
+ - - ! '>='
239
+ - !ruby/object:Gem::Version
240
+ version: '0'
243
241
  requirements: []
244
-
245
242
  rubyforge_project: dolt
246
- rubygems_version: 1.4.2
243
+ rubygems_version: 1.8.23
247
244
  signing_key:
248
245
  specification_version: 3
249
246
  summary: Dolt serves git trees and syntax highlighted blobs
250
247
  test_files: []
251
-