sbfaulkner-astrovan 0.5.2 → 0.5.3

data/README.rdoc

@@ -26,9 +26,11 @@ This is my attempt.
       deploy 'git://github.com/sbfaulkner/scanty.git'
     end
 
-== NOTES
+== CHANGES
 
-- no block for deploy implies mkdir && update
+=== 0.5.3
+
+- handle github private repository urls
 
 == TODO
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 5
-:patch: 2
+:patch: 3

data/lib/astrovan/deploy.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Astrovan
   module Deploy
     # Deploy an application to the remote servers.
@@ -19,7 +21,8 @@ module Astrovan
       original_environment = self.environment.dup
 
       self.repository = repository
-      self.application = application = options[:application] || self.application || File.basename(URI.parse(repository).path.split('/').last,".git")
+      self.application = application = options[:application] || self.application || File.basename(parse_repository_uri(repository).path.split('/').last,".git")
+
       self.deploy_to = deploy_to = options[:deploy_to] || self.deploy_to || "/u/apps/#{application}"
       self.shared_path = shared_path = File.join(deploy_to, 'shared')
       self.shared_repository = shared_repository = File.join(shared_path, "#{application}.git")
@@ -48,5 +51,19 @@ module Astrovan
     def share(path, options = {})
       symlink "#{shared_path}/#{path}", options.merge(:to => "#{release_path}/#{path}")
     end
+
+  protected
+    def parse_repository_uri(uri)
+      # [user@]host.xz:/path/to/repo.git/
+      # [user@]host.xz:~user/path/to/repo.git/
+      # [user@]host.xz:path/to/repo.git
+      GIT_REGEXP = %r'^(?:(\w+)@)?((?:\w+.)*\w+):([/~]?[^/].+)$'
+
+      if uri =~ GIT_REGEXP
+        URI::Generic.new(nil, $1, $2, nil, nil, $3, nil, nil, nil)
+      else
+        URI.parse(uri)
+      end
+    end
   end
 end

data/lib/astrovan/update.rb

@@ -1,5 +1,3 @@
-require 'uri'
-
 module Astrovan
   module Update
     def update(options = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sbfaulkner-astrovan
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - S. Brent Faulkner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 -08:00
+date: 2009-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: []