trinidad_sandbox_extension 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    trinidad_sandbox_extension (0.4.2)
+    trinidad_sandbox_extension (1.0.1)
+      gitable
       grit
       haml
       json
@@ -14,16 +15,19 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.4)
     diff-lcs (1.1.2)
+    gitable (0.1.3)
+      addressable
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
     haml (3.0.25)
-    jruby-rack (1.0.7)
+    jruby-rack (1.0.6)
     json (1.5.1-java)
     mime-types (1.16)
     mocha (0.9.12)
-    rack (1.2.1)
+    rack (1.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -42,10 +46,10 @@ GEM
     sinatra-respond_to (0.6.0)
       sinatra (~> 1.1)
     tilt (1.2.2)
-    trinidad (1.0.5)
-      jruby-rack (>= 1.0.2)
-      trinidad_jars (>= 0.3.0)
-    trinidad_jars (1.0.0)
+    trinidad (1.1.1)
+      jruby-rack (>= 1.0.6)
+      trinidad_jars (>= 1.0.0)
+    trinidad_jars (1.0.1)
 
 PLATFORMS
   java

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.2 (2011-05-05)
+
+* Use gitable to find the right git repository url
+
 == 1.0.1 (2011-03-27)
 
 * Fix error rendering xml format

data/lib/trinidad_sandbox_extension.rb

@@ -6,7 +6,7 @@ require File.expand_path('../../trinidad-libs/trinidad-sandbox-extension', __FIL
 module Trinidad
   module Extensions
     class SandboxServerExtension < ServerExtension
-      VERSION = '1.0.1'
+      VERSION = '1.0.2'
 
       def configure(tomcat)
         opts = prepare_options
@@ -51,8 +51,6 @@ module Trinidad
 
         app_ctx.servlet_context.set_attribute('enable_default', boolean_option(opts[:enable_default]))
 
-        app_ctx.servlet_context.set_attribute('git_ssh', boolean_option(opts[:git_ssh]))
-
         app_ctx.servlet_context.set_attribute('readonly', boolean_option(opts[:readonly], false))
 
         app_ctx

data/lib/trinidad_sandbox_extension/app/helpers/context.rb

@@ -10,10 +10,6 @@ module Trinidad
           !!$servlet_context.getAttribute('enable_default')
         end
 
-        def git_ssh?
-          !!$servlet_context.getAttribute('git_ssh')
-        end
-
         def readonly?
           !!$servlet_context.get_attribute('readonly')
         end

data/lib/trinidad_sandbox_extension/app/helpers/deploy.rb

@@ -4,7 +4,7 @@ module Trinidad
       module Deploy
         require 'grit'
         require 'json'
-        require 'uri'
+        require 'gitable/uri'
         require 'fileutils'
 
         def deploy_from_form(params)
@@ -82,19 +82,11 @@ module Trinidad
         end
 
         def normalize_uri(url)
-          normalized = if git_ssh?
-            return url if url =~ /^git@/
-            uri = URI.parse(url)
-
-            "git@#{uri.host}#{uri.path.sub('/', ':')}"
-          end || url
-
-          normalized << '.git' unless normalized =~ /\.git$/
-          normalized
+          Gitable::URI.heuristic_parse(url).to_s
         end
 
         def path_from_repo(repo)
-          repo.split('/').last.sub('.git', '')
+          Gitable::URI.heuristic_parse(url).project_name
         end
 
         def valid_path?(path)

data/trinidad_sandbox_extension.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_sandbox_extension'
-  s.version           = '1.0.1'
-  s.date              = '2011-03-27'
+  s.version           = '1.0.2'
+  s.date              = '2011-05-05'
   s.rubyforge_project = 'trinidad_sandbox_extension'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('trinidad', '>=1.0.1')
   ['sinatra', 'sinatra-authorization', 'sinatra-respond_to', 
-    'sinatra-flash', 'haml', 'grit', 'json'].each do |dep|
+    'sinatra-flash', 'haml', 'grit', 'json', 'gitable'].each do |dep|
     s.add_dependency(dep)
   end
 

metadata

@@ -2,7 +2,7 @@
 name: trinidad_sandbox_extension
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 -07:00
+date: 2011-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -102,27 +102,38 @@ dependencies:
     type: :runtime
     version_requirements: *id008
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: gitable
     prerelease: false
     requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id010 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "2.2"
     type: :development
-    version_requirements: *id009
+    version_requirements: *id010
   - !ruby/object:Gem::Dependency 
     name: mocha
     prerelease: false
-    requirement: &id010 !ruby/object:Gem::Requirement 
+    requirement: &id011 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
     type: :development
-    version_requirements: *id010
+    version_requirements: *id011
 description: Sandox console for Trinidad. It allows to manage the applications deployed on Trinidad.
 email: calavera@apache.org
 executables: []