sbfaulkner-astrovan 0.5.4 → 0.5.6

data/README.rdoc

@@ -28,7 +28,15 @@ This is my attempt.
 
 == CHANGES
 
-=== 0.5.3
+=== 0.5.6
+
+- support for specification of git and rake command paths
+
+=== 0.5.5
+
+- change working directory for rake tasks
+
+=== 0.5.4
 
 - handle github private repository urls
 
@@ -39,6 +47,8 @@ This is my attempt.
 - other commands (all using exec)
   - cp ?
   - mv ?
+- move magic vars into separate context to avoid collision with method names
+  - e.g. rake method and rake var collision forces access of environment[:rake] instead of self.rake
 
 == Legal
 

data/VERSION.yml

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

data/lib/astrovan/deploy.rb

@@ -20,18 +20,17 @@ module Astrovan
     def deploy(repository, options = {})
       original_environment = self.environment.dup
 
-      self.repository = repository
-      self.application = application = options[:application] || self.application || File.basename(parse_repository_uri(repository).path.split('/').last,".git")
+      self.environment.merge!(options)
 
-      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")
-      self.release_name = release_name = Time.now.utc.strftime("%Y%m%d%H%M%S")
-      self.releases_path = releases_path = File.join(deploy_to, 'releases')
-      self.release_path = release_path = File.join(releases_path, release_name)
-      self.env = options[:env] || self.env
-      self.rakefile = options[:rakefile] || self.rakefile
-      self.current_path = current_path = File.join(deploy_to, 'current')
+      self.repository = repository
+      self.application ||= File.basename(parse_repository_uri(repository).path.split('/').last,".git")
+      self.deploy_to ||= "/u/apps/#{application}"
+      self.shared_path = File.join(deploy_to, 'shared')
+      self.shared_repository = File.join(shared_path, "#{application}.git")
+      self.release_name = Time.now.utc.strftime("%Y%m%d%H%M%S")
+      self.releases_path = File.join(deploy_to, 'releases')
+      self.release_path = File.join(releases_path, release_name)
+      self.current_path = File.join(deploy_to, 'current')
 
       if block_given?
         yield
@@ -48,7 +47,13 @@ module Astrovan
     end
 
     # Create a symlink from a file or directory in the shared folder into the current release.
+    #
+    # Options:
+    # * +shared_path+ - specify the parent directory of the file or directory to be shared
+    # * +release_path+ - specify the parent directory to contain the shared file or directory
     def share(path, options = {})
+      shared_path = options[:shared_path] || self.shared_path
+      release_path = options[:release_path] || self.release_path
       symlink "#{shared_path}/#{path}", options.merge(:to => "#{release_path}/#{path}")
     end
 

data/lib/astrovan/exec.rb

@@ -6,6 +6,7 @@ module Astrovan
     #
     # Options:
     # * +on+ - specifies a subset of servers to run the command on.
+    # * +env+ - the initial environment for the remote server.
     def exec(command, options = {})
       session = session_for(options.delete(:on))
       begin

data/lib/astrovan/rake.rb

@@ -3,13 +3,14 @@ module Astrovan
     # Execute a rake task on the remote servers.
     #
     # Options:
+    # * +rake+ - path to rake tool. Default is 'rake'
     # * +rakefile+ - specify the path to a rakefile (if not in the default location)
     def rake(*tasks)
       options = tasks.last.is_a?(Hash) ? tasks.pop : {}
-      rake = 'rake'
-      rakefile = options.delete(:rakefile) || self.rakefile
+      rake = options[:rake] || self.environment[:rake]
+      rakefile = options[:rakefile] || self.rakefile
       rake << ' -f ' << rakefile if rakefile
-      exec "#{rake} #{tasks.join(' ')}", options
+      exec "cd #{current_path} && #{rake} #{tasks.join(' ')}", options
     end
 
     # Map one or more rake tasks to deployment methods.

data/lib/astrovan/session.rb

@@ -16,10 +16,15 @@ module Astrovan
     #:stopdoc:
     DEFAULTS = {
       :application => nil,
+      :current_path => nil,
       :deploy_to => nil,
       :env => nil,
+      :git => 'git',
       :password => nil,
+      :rake => 'rake',
       :rakefile => nil,
+      :release_path => nil,
+      :shared_path => nil,
       :username => nil
     }
     #:startdoc:

data/lib/astrovan/update.rb

@@ -1,21 +1,27 @@
 module Astrovan
   module Update
+    # Update the application from git, then create a symlink to the current release.
+    #
+    # Options:
+    # * +git+ - path to git tool. Default is 'git'
     def update(options = {})
       shared_repository = self.shared_repository
       repository = self.repository
       release_path = self.release_path
       current_path = self.current_path
 
+      git  = options[:git] || self.git
+
       # TODO: do we need branch support, submodule config, etc?
       exec <<-END, options
         if [ -d '#{shared_repository}' ]
         then
           cd #{shared_repository} &&
-          git fetch #{repository}
+          #{git} fetch #{repository}
         else
-          git clone --bare #{repository} #{shared_repository}
+          #{git} clone --bare #{repository} #{shared_repository}
         fi &&
-        git clone #{shared_repository} #{release_path}
+        #{git} clone #{shared_repository} #{release_path}
       END
 
       symlink release_path, options.merge(:to => current_path)

data/test/deploy_test.rb

@@ -1,9 +1,11 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class DeployTest < Test::Unit::TestCase
+  GIT = `which git`.chomp
+
   def test_should_deploy
     using 'astrovan.local', :password => ENV['PASSWORD'] do
-      deploy 'git://github.com/adamwiggins/scanty.git', :env => { :PATH => '$PATH:/usr/local/git/bin' }
+      deploy 'git://github.com/adamwiggins/scanty.git', :git => GIT
     end
   end
 

data/test/rake_test.rb

@@ -1,19 +1,17 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class RakeTest < Test::Unit::TestCase
-  def setup
-    @rakefile = File.expand_path(File.join(File.dirname(__FILE__),'rake_test.rake'))
-  end
+  CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
 
   def test_should_run_rake_task
-    using 'astrovan.local', :password => ENV['PASSWORD'], :rakefile => @rakefile do
+    using 'astrovan.local', :password => ENV['PASSWORD'], :current_path => CURRENT_PATH, :rakefile => 'rake_test.rake' do
       rake 'succeed'
     end
   end
 
   def test_should_fail_when_rake_task_fails
     assert_raise(RuntimeError) do
-      using 'astrovan.local', :password => ENV['PASSWORD'], :rakefile => @rakefile do
+      using 'astrovan.local', :password => ENV['PASSWORD'], :current_path => CURRENT_PATH, :rakefile => 'rake_test.rake' do
         rake 'fail'
       end
     end
@@ -21,7 +19,7 @@ class RakeTest < Test::Unit::TestCase
 
   def test_should_fail_when_rake_task_not_defined
     assert_raise(RuntimeError) do
-      using 'astrovan.local', :password => ENV['PASSWORD'], :rakefile => @rakefile do
+      using 'astrovan.local', :password => ENV['PASSWORD'], :current_path => CURRENT_PATH, :rakefile => 'rake_test.rake' do
         rake 'undefined'
       end
     end

data/test/update_test.rb

@@ -1,9 +1,11 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class UpdateTest < Test::Unit::TestCase
+  GIT = `which git`.chomp
+
   def test_should_update
     using 'astrovan.local', :password => ENV['PASSWORD'] do
-      deploy 'git://github.com/adamwiggins/scanty.git', :env => { :PATH => '$PATH:/usr/local/git/bin' } do
+      deploy 'git://github.com/adamwiggins/scanty.git', :git => GIT do
         update
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sbfaulkner-astrovan
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors: 
 - S. Brent Faulkner