trinidad_sandbox_extension 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,7 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trinidad_sandbox_extension (0.4.2)
4
+ trinidad_sandbox_extension (1.0.1)
5
+ gitable
5
6
  grit
6
7
  haml
7
8
  json
@@ -14,16 +15,19 @@ PATH
14
15
  GEM
15
16
  remote: http://rubygems.org/
16
17
  specs:
18
+ addressable (2.2.4)
17
19
  diff-lcs (1.1.2)
20
+ gitable (0.1.3)
21
+ addressable
18
22
  grit (2.4.1)
19
23
  diff-lcs (~> 1.1)
20
24
  mime-types (~> 1.15)
21
25
  haml (3.0.25)
22
- jruby-rack (1.0.7)
26
+ jruby-rack (1.0.6)
23
27
  json (1.5.1-java)
24
28
  mime-types (1.16)
25
29
  mocha (0.9.12)
26
- rack (1.2.1)
30
+ rack (1.2.2)
27
31
  rspec (2.5.0)
28
32
  rspec-core (~> 2.5.0)
29
33
  rspec-expectations (~> 2.5.0)
@@ -42,10 +46,10 @@ GEM
42
46
  sinatra-respond_to (0.6.0)
43
47
  sinatra (~> 1.1)
44
48
  tilt (1.2.2)
45
- trinidad (1.0.5)
46
- jruby-rack (>= 1.0.2)
47
- trinidad_jars (>= 0.3.0)
48
- trinidad_jars (1.0.0)
49
+ trinidad (1.1.1)
50
+ jruby-rack (>= 1.0.6)
51
+ trinidad_jars (>= 1.0.0)
52
+ trinidad_jars (1.0.1)
49
53
 
50
54
  PLATFORMS
51
55
  java
@@ -1,3 +1,7 @@
1
+ == 1.0.2 (2011-05-05)
2
+
3
+ * Use gitable to find the right git repository url
4
+
1
5
  == 1.0.1 (2011-03-27)
2
6
 
3
7
  * Fix error rendering xml format
@@ -6,7 +6,7 @@ require File.expand_path('../../trinidad-libs/trinidad-sandbox-extension', __FIL
6
6
  module Trinidad
7
7
  module Extensions
8
8
  class SandboxServerExtension < ServerExtension
9
- VERSION = '1.0.1'
9
+ VERSION = '1.0.2'
10
10
 
11
11
  def configure(tomcat)
12
12
  opts = prepare_options
@@ -51,8 +51,6 @@ module Trinidad
51
51
 
52
52
  app_ctx.servlet_context.set_attribute('enable_default', boolean_option(opts[:enable_default]))
53
53
 
54
- app_ctx.servlet_context.set_attribute('git_ssh', boolean_option(opts[:git_ssh]))
55
-
56
54
  app_ctx.servlet_context.set_attribute('readonly', boolean_option(opts[:readonly], false))
57
55
 
58
56
  app_ctx
@@ -10,10 +10,6 @@ module Trinidad
10
10
  !!$servlet_context.getAttribute('enable_default')
11
11
  end
12
12
 
13
- def git_ssh?
14
- !!$servlet_context.getAttribute('git_ssh')
15
- end
16
-
17
13
  def readonly?
18
14
  !!$servlet_context.get_attribute('readonly')
19
15
  end
@@ -4,7 +4,7 @@ module Trinidad
4
4
  module Deploy
5
5
  require 'grit'
6
6
  require 'json'
7
- require 'uri'
7
+ require 'gitable/uri'
8
8
  require 'fileutils'
9
9
 
10
10
  def deploy_from_form(params)
@@ -82,19 +82,11 @@ module Trinidad
82
82
  end
83
83
 
84
84
  def normalize_uri(url)
85
- normalized = if git_ssh?
86
- return url if url =~ /^git@/
87
- uri = URI.parse(url)
88
-
89
- "git@#{uri.host}#{uri.path.sub('/', ':')}"
90
- end || url
91
-
92
- normalized << '.git' unless normalized =~ /\.git$/
93
- normalized
85
+ Gitable::URI.heuristic_parse(url).to_s
94
86
  end
95
87
 
96
88
  def path_from_repo(repo)
97
- repo.split('/').last.sub('.git', '')
89
+ Gitable::URI.heuristic_parse(url).project_name
98
90
  end
99
91
 
100
92
  def valid_path?(path)
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
13
13
  ## If your rubyforge_project name is different, then edit it and comment out
14
14
  ## the sub! line in the Rakefile
15
15
  s.name = 'trinidad_sandbox_extension'
16
- s.version = '1.0.1'
17
- s.date = '2011-03-27'
16
+ s.version = '1.0.2'
17
+ s.date = '2011-05-05'
18
18
  s.rubyforge_project = 'trinidad_sandbox_extension'
19
19
 
20
20
  ## Make sure your summary is short. The description may be as long
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
42
42
  ## that are needed for an end user to actually USE your code.
43
43
  s.add_dependency('trinidad', '>=1.0.1')
44
44
  ['sinatra', 'sinatra-authorization', 'sinatra-respond_to',
45
- 'sinatra-flash', 'haml', 'grit', 'json'].each do |dep|
45
+ 'sinatra-flash', 'haml', 'grit', 'json', 'gitable'].each do |dep|
46
46
  s.add_dependency(dep)
47
47
  end
48
48
 
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: trinidad_sandbox_extension
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.0.1
5
+ version: 1.0.2
6
6
  platform: ruby
7
7
  authors:
8
8
  - David Calavera
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-03-27 00:00:00 -07:00
13
+ date: 2011-05-05 00:00:00 -07:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -102,27 +102,38 @@ dependencies:
102
102
  type: :runtime
103
103
  version_requirements: *id008
104
104
  - !ruby/object:Gem::Dependency
105
- name: rspec
105
+ name: gitable
106
106
  prerelease: false
107
107
  requirement: &id009 !ruby/object:Gem::Requirement
108
+ none: false
109
+ requirements:
110
+ - - ">="
111
+ - !ruby/object:Gem::Version
112
+ version: "0"
113
+ type: :runtime
114
+ version_requirements: *id009
115
+ - !ruby/object:Gem::Dependency
116
+ name: rspec
117
+ prerelease: false
118
+ requirement: &id010 !ruby/object:Gem::Requirement
108
119
  none: false
109
120
  requirements:
110
121
  - - ">="
111
122
  - !ruby/object:Gem::Version
112
123
  version: "2.2"
113
124
  type: :development
114
- version_requirements: *id009
125
+ version_requirements: *id010
115
126
  - !ruby/object:Gem::Dependency
116
127
  name: mocha
117
128
  prerelease: false
118
- requirement: &id010 !ruby/object:Gem::Requirement
129
+ requirement: &id011 !ruby/object:Gem::Requirement
119
130
  none: false
120
131
  requirements:
121
132
  - - ">="
122
133
  - !ruby/object:Gem::Version
123
134
  version: "0"
124
135
  type: :development
125
- version_requirements: *id010
136
+ version_requirements: *id011
126
137
  description: Sandox console for Trinidad. It allows to manage the applications deployed on Trinidad.
127
138
  email: calavera@apache.org
128
139
  executables: []