toolmantim-bananajour 2.1.2 → 2.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/bin/bananajour +1 -1
  2. data/lib/bananajour/version.rb +1 -1
  3. data/sinatra/views/home.haml +253 -255
  4. metadata +1 -1
data/bin/bananajour CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
3
  require "rubygems"
4
- require "#{File.dirname(__FILE__)}/../lib/bananajour"
4
+ require (File.symlink?(__FILE__) ? "bananajour" : File.join(File.dirname(__FILE__), "/../lib/bananajour"))
5
5
 
6
6
  Thread.abort_on_exception = true
7
7
 
data/lib/bananajour/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Bananajour
2
- VERSION = '2.1.2'
2
+ VERSION = '2.1.3'
3
3
  end
data/sinatra/views/home.haml CHANGED
@@ -23,286 +23,284 @@
23
23
  Unpacking objects: 100% (3/3), done.
24
24
  To #{Bananajour.repositories_path.expand_path}/myproj.git
25
25
  * [new branch] master -> master
26
+
27
+ %style{:type => "text/css"}
28
+ :sass
29
+ .repository
30
+ :clear both
31
+ :background-color white
32
+ :-webkit-border-radius 10px
33
+ :-moz-border-radius 10px
34
+ :padding 7px 10px
35
+ :margin 10px 0
36
+ :position relative
37
+ :border 4px solid #ff0
38
+
39
+ a
40
+ :color #888
26
41
 
27
- - else
42
+ h2, p.uri
43
+ :margin 0
44
+ :display inline
28
45
 
29
- %style{:type => "text/css"}
30
- :sass
31
- .repository
32
- :clear both
33
- :background-color white
34
- :-webkit-border-radius 10px
35
- :-moz-border-radius 10px
36
- :padding 7px 10px
37
- :margin 10px 0
38
- :position relative
39
- :border 4px solid #ff0
46
+ h2
47
+ :color #333
48
+ :font-size 24px
49
+ p.uri
50
+ :color #666
51
+ :margin 5px 0
52
+ :font-size 12px
53
+
54
+ p.branches
55
+ :margin 5px 0
56
+ :font-size 12px
57
+
58
+ ul, li
59
+ :margin 0
60
+ :padding 0
61
+ :list-style none
40
62
 
63
+ p.readme
64
+ :margin 0 -5px 0 0
41
65
  a
42
- :color #888
43
-
44
- h2, p.uri
66
+ :float right
45
67
  :margin 0
46
- :display inline
47
-
48
- h2
49
- :color #333
50
- :font-size 24px
51
- p.uri
52
- :color #666
53
- :margin 5px 0
54
- :font-size 12px
55
-
56
- p.branches
57
- :margin 5px 0
58
- :font-size 12px
68
+ :text-transform uppercase
69
+ :font-size 10px
70
+ :font-weight bold
71
+ :color #999
72
+ :background-color #eee
73
+ :line-height 20px
74
+ :padding 0 5px
75
+ :text-decoration none
76
+ :-webkit-border-radius 2px
77
+ :-moz-border-radius 2px
78
+ &:hover
79
+ :color #666
80
+ :background-color #ddd
59
81
 
60
- ul, li
61
- :margin 0
62
- :padding 0
63
- :list-style none
64
-
65
- p.readme
66
- :margin 0 -5px 0 0
67
- a
68
- :float right
69
- :margin 0
70
- :text-transform uppercase
71
- :font-size 10px
82
+ h3
83
+ :margin 10px 0 0 0
84
+ :font-size 12px
85
+ :color #999
86
+ :text-transform uppercase
87
+
88
+ ul.network
89
+ :margin-top 5px
90
+ li
91
+ :line-height 1em
92
+ :min-height 16px
93
+ :padding-left 30px
94
+ :margin 10px 0
95
+ &.loading
96
+ :background transparent url('/loader.gif') no-repeat 4px center
97
+ a.name
98
+ :font-size 12px
72
99
  :font-weight bold
73
- :color #999
74
- :background-color #eee
75
- :line-height 20px
76
- :padding 0 5px
100
+ :color #666
101
+ :text-transform uppercase
77
102
  :text-decoration none
103
+ span.branches
104
+ :font-size 12px
105
+ :color #999
106
+ span.more
107
+ :float right
108
+ :width 15px
109
+ :height 15px
110
+ :color #fff
111
+ :background-color #ccc
112
+ :font-size 12px
113
+ :line-height 15px
114
+ :font-weight bold
78
115
  :-webkit-border-radius 2px
79
116
  :-moz-border-radius 2px
117
+ :text-align center
118
+ :cursor pointer
80
119
  &:hover
81
- :color #666
82
- :background-color #ddd
83
-
84
- h3
85
- :margin 10px 0 0 0
86
- :font-size 12px
87
- :color #999
88
- :text-transform uppercase
89
-
90
- ul.network
91
- :margin-top 5px
92
- li
93
- :line-height 1em
94
- :min-height 16px
95
- :padding-left 30px
96
- :margin 10px 0
97
- &.loading
98
- :background transparent url('/loader.gif') no-repeat 4px center
99
- a.name
100
- :font-size 12px
101
- :font-weight bold
102
- :color #666
103
- :text-transform uppercase
120
+ :background-color #aaa
121
+ :color #fff
122
+ p.message
123
+ :font-size 12px
124
+ :margin 2px 0 5px 1px
125
+ a
126
+ :color #333
104
127
  :text-decoration none
105
- span.branches
106
- :font-size 12px
128
+ &:hover
129
+ :text-decoration underline
130
+ span.meta
131
+ :font-size 10px
107
132
  :color #999
108
- span.more
109
- :float right
110
- :width 15px
111
- :height 15px
112
- :color #fff
113
- :background-color #ccc
114
- :font-size 12px
115
- :line-height 15px
133
+ em.branch
116
134
  :font-weight bold
117
- :-webkit-border-radius 2px
118
- :-moz-border-radius 2px
119
- :text-align center
120
- :cursor pointer
121
- &:hover
122
- :background-color #aaa
123
- :color #fff
124
- p.message
125
- :font-size 12px
126
- :margin 2px 0 5px 1px
127
- a
128
- :color #333
129
- :text-decoration none
130
- &:hover
131
- :text-decoration underline
132
- span.meta
133
- :font-size 10px
134
- :color #999
135
- em.branch
136
- :font-weight bold
137
- :font-style normal
138
- :color #666
139
- img.gravatar
140
- :float left
141
- :margin-left -30px
142
- :margin-top 2px
143
-
144
- img.gravatar
145
- :width 20px
146
- :height 20px
135
+ :font-style normal
136
+ :color #666
137
+ img.gravatar
138
+ :float left
139
+ :margin-left -30px
140
+ :margin-top 2px
141
+
142
+ img.gravatar
143
+ :width 20px
144
+ :height 20px
145
+
146
+ .projects, .people
147
+ :float left
148
+ :width 48%
149
+ :background-color #fff
150
+ :border 4px solid #ff0
151
+ :-webkit-border-radius 10px
152
+ :-moz-border-radius 10px
153
+ :margin-top 10px
147
154
 
148
- .projects, .people
149
- :float left
150
- :width 48%
151
- :background-color #fff
152
- :border 4px solid #ff0
153
- :-webkit-border-radius 10px
154
- :-moz-border-radius 10px
155
- :margin-top 10px
156
-
157
- h2
158
- :margin 0
159
- :text-align center
160
- :font-size 16px
161
- :line-height 28px
162
- :background-color #ff0
163
- :color #960
164
- :text-transform uppercase
155
+ h2
156
+ :margin 0
157
+ :text-align center
158
+ :font-size 16px
159
+ :line-height 28px
160
+ :background-color #ff0
161
+ :color #960
162
+ :text-transform uppercase
165
163
 
166
- h3
167
- :margin 0 0 5px 0
168
-
169
- ul, li
170
- :margin 0
171
- :padding 0
172
- :list-style none
173
-
174
- > ul
175
- :font-size 12px
176
- :margin 10px
177
- > li
178
- :margin-bottom 10px
179
- li li
180
- :margin-right 0.2em
181
- a
182
- :color #000
164
+ h3
165
+ :margin 0 0 5px 0
183
166
 
184
- .projects
185
- ul li
186
- ul, li
187
- :display inline
167
+ ul, li
168
+ :margin 0
169
+ :padding 0
170
+ :list-style none
171
+
172
+ > ul
173
+ :font-size 12px
174
+ :margin 10px
175
+ > li
176
+ :margin-bottom 10px
177
+ li li
178
+ :margin-right 0.2em
188
179
  a
189
- :white-space nowrap
180
+ :color #000
190
181
 
191
- .people
192
- :margin-left 10px
193
- ul
194
- li
195
- :float left
196
- :width 50%
197
- :margin-bottom 5px
198
- a
199
- :text-decoration none
200
- .name
201
- :text-decoration underline
202
- img
203
- :vertical-align middle
204
-
205
- .local .repository
206
- :border-color #980
207
-
208
- - for repository in @my_repositories
209
- - repository_id = repository.html_friendly_name
210
- - heads = repository.grit_repo.heads
182
+ .projects
183
+ ul li
184
+ ul, li
185
+ :display inline
186
+ a
187
+ :white-space nowrap
211
188
 
212
- .repository{:id => repository_id, 'data-name' => repository.name}
189
+ .people
190
+ :margin-left 10px
191
+ ul
192
+ li
193
+ :float left
194
+ :width 50%
195
+ :margin-bottom 5px
196
+ a
197
+ :text-decoration none
198
+ .name
199
+ :text-decoration underline
200
+ img
201
+ :vertical-align middle
202
+
203
+ .local .repository
204
+ :border-color #980
205
+
206
+ - for repository in @my_repositories
207
+ - repository_id = repository.html_friendly_name
208
+ - heads = repository.grit_repo.heads
209
+
210
+ .repository{:id => repository_id, 'data-name' => repository.name}
213
211
 
214
- - if repository.readme_file && !local?
215
- %p.readme
216
- %a{:href => "/#{repository.name}/readme"} Readme
212
+ - if repository.readme_file && !local?
213
+ %p.readme
214
+ %a{:href => "/#{repository.name}/readme"} Readme
217
215
 
218
- %h2
219
- &= repository.name
216
+ %h2
217
+ &= repository.name
220
218
 
221
- %p.uri&= repository.uri
219
+ %p.uri&= repository.uri
222
220
 
223
- - unless local?
224
- %p.branches
225
- %strong Branches:
226
- = heads.map {|h| h.name}.join(", ")
227
- %ul.commits
228
- - for commit in repository.recent_commits
229
- %li
230
- %img.gravatar{:src => commit.author.gravatar_uri}
231
- %p.message
232
- %a{:href => "/#{repository.html_friendly_name}/#{commit.id}"}&= commit.short_message
233
- %span.meta
234
- - if head = heads.find {|h| h.commit == commit}
235
- \-
236
- %em.branch= head.name
237
- \~
238
- &= time_ago_in_words(commit.committed_date).gsub("about ","")
239
- ago by
240
- &= commit.author
241
- - else
242
- %ul.network
243
- - for repo in @repository_browser.repositories_similar_to(repository)
244
- %li.loading{'data-json-uri' => repo.json_uri}
245
- %a.name{:href => "#{repo.person.uri}##{repo.html_friendly_name}"}= repo.person.name
221
+ - unless local?
222
+ %p.branches
223
+ %strong Branches:
224
+ = heads.map {|h| h.name}.join(", ")
225
+ %ul.commits
226
+ - for commit in repository.recent_commits
227
+ %li
228
+ %img.gravatar{:src => commit.author.gravatar_uri}
229
+ %p.message
230
+ %a{:href => "/#{repository.html_friendly_name}/#{commit.id}"}&= commit.short_message
231
+ %span.meta
232
+ - if head = heads.find {|h| h.commit == commit}
233
+ \-
234
+ %em.branch= head.name
235
+ \~
236
+ &= time_ago_in_words(commit.committed_date).gsub("about ","")
237
+ ago by
238
+ &= commit.author
239
+ - else
240
+ %ul.network
241
+ - for repo in @repository_browser.repositories_similar_to(repository)
242
+ %li.loading{'data-json-uri' => repo.json_uri}
243
+ %a.name{:href => "#{repo.person.uri}##{repo.html_friendly_name}"}= repo.person.name
246
244
 
247
- - if local?
248
- :javascript
249
- $(function() {
250
- $("ul.network li").each(function() {
251
- var repoLi = $(this);
252
- $.getJSON(repoLi.attr("data-json-uri") + "?callback=?", function(data) {
253
- repoLi.removeClass("loading");
254
- $("<img class='gravatar'/>").attr("src", data.bananajour.gravatar).prependTo(repoLi);
255
- $("<span class='branches' />").text(data.heads.join(", ")).appendTo(repoLi);
256
- $('<span class="more">+</span>')
257
- .click(function() {
258
- if ($(this).text() == "+") {
259
- repoLi.find(".message").show();
260
- $(this).text("-");
261
- } else {
262
- repoLi.find(".message").each(function(i) {
263
- if (i != 0) $(this).hide();
264
- });
265
- $(this).text("+");
266
- }
267
- })
268
- .appendTo(repoLi);
269
- $(data.recent_commits).each(function(i) {
270
- var commit = this;
271
- var message = $("<p class='message'/>").html(
272
- $("<a/>").attr("href", data.bananajour.uri + data.html_friendly_name + "/" + commit.id).text(commit.message)
273
- ).appendTo(repoLi).append(
274
- $("<span class='meta'/>")
275
- .append($("<em class='branch'/>").text(commit.head && (" - " + commit.head)))
276
- .append(" ~ " + commit.committed_date_pretty + " by " + commit.author.name)
277
- .appendTo(repoLi)
278
- )
279
- if (i != 0) message.hide();
280
- });
245
+ - if local?
246
+ :javascript
247
+ $(function() {
248
+ $("ul.network li").each(function() {
249
+ var repoLi = $(this);
250
+ $.getJSON(repoLi.attr("data-json-uri") + "?callback=?", function(data) {
251
+ repoLi.removeClass("loading");
252
+ $("<img class='gravatar'/>").attr("src", data.bananajour.gravatar).prependTo(repoLi);
253
+ $("<span class='branches' />").text(data.heads.join(", ")).appendTo(repoLi);
254
+ $('<span class="more">+</span>')
255
+ .click(function() {
256
+ if ($(this).text() == "+") {
257
+ repoLi.find(".message").show();
258
+ $(this).text("-");
259
+ } else {
260
+ repoLi.find(".message").each(function(i) {
261
+ if (i != 0) $(this).hide();
262
+ });
263
+ $(this).text("+");
264
+ }
265
+ })
266
+ .appendTo(repoLi);
267
+ $(data.recent_commits).each(function(i) {
268
+ var commit = this;
269
+ var message = $("<p class='message'/>").html(
270
+ $("<a/>").attr("href", data.bananajour.uri + data.html_friendly_name + "/" + commit.id).text(commit.message)
271
+ ).appendTo(repoLi).append(
272
+ $("<span class='meta'/>")
273
+ .append($("<em class='branch'/>").text(commit.head && (" - " + commit.head)))
274
+ .append(" ~ " + commit.committed_date_pretty + " by " + commit.author.name)
275
+ .appendTo(repoLi)
276
+ )
277
+ if (i != 0) message.hide();
281
278
  });
282
279
  });
283
280
  });
284
-
285
- .projects
286
- - if @other_repos_by_name.empty?
287
- %h2 No other projects
288
- - else
289
- %h2= pluralize @other_repos_by_name.length, "Other Project", "Other Projects"
290
- %ul
291
- - for repo_name in @other_repos_by_name.keys.sort
292
- %li
293
- %h3&= repo_name
294
- %ul
295
- - for repo in @other_repos_by_name[repo_name].sort_by {|r| r.person.name}
296
- %li
297
- %a{:href => repo.web_uri}&= repo.person.name
298
- .people
299
- - if @people.empty?
300
- %h2 No other bananas
301
- - else
302
- %h2= pluralize @people.length, "Other Banana", "Other Bananas"
303
- %ul
304
- - for person in @people
305
- %li
306
- %a{:href => person.uri}
307
- %img.gravatar{:src => person.gravatar}
308
- %span.name&= person.name
281
+ });
282
+
283
+ .projects
284
+ - if @other_repos_by_name.empty?
285
+ %h2 No other projects
286
+ - else
287
+ %h2= pluralize @other_repos_by_name.length, "Other Project", "Other Projects"
288
+ %ul
289
+ - for repo_name in @other_repos_by_name.keys.sort
290
+ %li
291
+ %h3&= repo_name
292
+ %ul
293
+ - for repo in @other_repos_by_name[repo_name].sort_by {|r| r.person.name}
294
+ %li
295
+ %a{:href => repo.web_uri}&= repo.person.name
296
+ .people
297
+ - if @people.empty?
298
+ %h2 No other bananas
299
+ - else
300
+ %h2= pluralize @people.length, "Other Banana", "Other Bananas"
301
+ %ul
302
+ - for person in @people
303
+ %li
304
+ %a{:href => person.uri}
305
+ %img.gravatar{:src => person.gravatar}
306
+ %span.name&= person.name
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: toolmantim-bananajour
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.2
4
+ version: 2.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tim Lucas