sbfaulkner-astrovan 0.5.0 → 0.5.2

data/README.rdoc

@@ -35,10 +35,8 @@ This is my attempt.
 - stdin handling for exec
 - stdout/stderr handling for exec
 - other commands (all using exec)
-  - share (smart wrapper arouncd symlink?)
   - cp ?
   - mv ?
-- documentation
 
 == Legal
 

data/VERSION.yml

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

data/lib/astrovan/deploy.rb

@@ -28,19 +28,13 @@ module Astrovan
       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')
 
       if block_given?
         yield
       else
-        # TODO: consider moving directory setup outside of update
-        dirs = [deploy_to, releases_path, shared_path]
-        # TODO: these shared children are rails specific... come up with another plan
-        # shared_children = %w(system log pids)
-        # dirs += shared_children.map { |d| File.join(shared_path, d) }
-        mkdir(dirs, options)
-
+        mkdir deploy_to, releases_path, shared_path, options
         update options
-
       end
     rescue => e
       # TODO: rollback
@@ -49,5 +43,10 @@ module Astrovan
     ensure
       self.environment.replace original_environment
     end
+
+    # Create a symlink from a file or directory in the shared folder into the current release.
+    def share(path, options = {})
+      symlink "#{shared_path}/#{path}", options.merge(:to => "#{release_path}/#{path}")
+    end
   end
 end

data/lib/astrovan/update.rb

@@ -6,6 +6,7 @@ module Astrovan
       shared_repository = self.shared_repository
       repository = self.repository
       release_path = self.release_path
+      current_path = self.current_path
 
       # TODO: do we need branch support, submodule config, etc?
       exec <<-END, options
@@ -19,6 +20,8 @@ module Astrovan
         git clone #{shared_repository} #{release_path}
       END
 
+      symlink release_path, options.merge(:to => current_path)
+
       yield if block_given?
     rescue => e
       # TODO: rollback

data/lib/astrovan/util.rb

@@ -34,7 +34,7 @@ module Astrovan
       # flatten, so that arrays of paths can be passed as arguments
       paths = paths.flatten.join(' ')
       # TODO: consider using sudo?
-      exec "ln -sf #{path} #{to}", options
+      exec "ln -sf #{paths} #{to}", options
     end
   end
 end

data/test/util_test.rb

@@ -58,6 +58,8 @@ class UtilTest < Test::Unit::TestCase
     using 'astrovan.local', :password => ENV['PASSWORD'], :path => @path, :target => target do
       symlink path, :to => target
     end
+    assert File.exist?(target)
+    assert File.symlink?(target)
     assert_equal data, File.open(target) { |f| f.gets.chomp }
   end
 

metadata

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