capistrano-scm-local 0.1.6 → 0.1.7

data/capistrano-scm-local.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-scm-local"
-  gem.version       = '0.1.6'
+  gem.version       = '0.1.7'
   gem.authors       = ["Boris Gorbylev"]
   gem.email         = ["ekho@ekho.name"]
   gem.description   = %q{Capistrano extension for deploying form local directory}

data/lib/capistrano/scm-local.rb

@@ -9,55 +9,56 @@ require 'tmpdir'
 require 'fileutils'
 
 class Capistrano::Local < Capistrano::SCM
-  module DefaultStrategy
+  module PlainStrategy
     def check
       puts repo_url
       test! " [ -e #{repo_url} ] "
     end
 
     def release
+      file_list = Dir.glob(File.join(repo_url, '*')).concat(Dir.glob(File.join(repo_url, '.[^.]*')))
+
       on release_roles :all, in: :parallel do |host|
-      file_list = Dir.glob(repo_url + '/*').concat(Dir.glob(repo_url + '/.[^.]*'))
-      file_list.each { |r| upload! r, release_path, recursive: true }
+        file_list.each { |r| upload! r, release_path, recursive: true }
+      end
     end
   end
-end
 
-module ArchiveStrategy
-  def check
-    test! " [ -e #{repo_url} ] "
-  end
+  module ArchiveStrategy
+    def check
+      test! " [ -e #{repo_url} ] "
+    end
 
-  def release
-    archive = ''
-    # preparing archive
-    run_locally do
-      archive = fetch(:tmp_dir, Dir::tmpdir()) + '/' + fetch(:application, 'distr') + "-#{release_timestamp}.tar.gz"
-      unless File.exists?(archive)
-        if File.directory?(repo_url) || !File.fnmatch('*.tar.gz', repo_url)
-          Dir.chdir(repo_url) do
-            Minitar.pack('.', Zlib::GzipWriter.new(File.open(archive, 'wb')))
+    def release
+      archive = ''
+      # preparing archive
+      run_locally do
+        archive = fetch(:tmp_dir, Dir::tmpdir()) + '/' + fetch(:application, 'distr') + "-#{release_timestamp}.tar.gz"
+        unless File.exists?(archive)
+          if File.directory?(repo_url) || !File.fnmatch('*.tar.gz', repo_url)
+            Dir.chdir(repo_url) do
+              Minitar.pack('.', Zlib::GzipWriter.new(File.open(archive, 'wb')))
+            end
+          else
+            FileUtils.cp(repo_url, archive)
           end
-        else
-          FileUtils.cp(repo_url, archive)
         end
       end
-    end
 
-    # uploading and unpacking
-    on release_roles :all, in: :parallel do |host|
-    upload! archive, releases_path, verbose: false
-    remote_archive = File.join(releases_path, File.basename(archive))
-    execute :tar, 'xzf', remote_archive, '-C', release_path
-    execute :rm, '-f', remote_archive
-  end
+      # uploading and unpacking
+      on release_roles :all, in: :parallel do |host|
+        upload! archive, releases_path, verbose: false
+        remote_archive = File.join(releases_path, File.basename(archive))
+        execute :tar, 'xzf', remote_archive, '-C', release_path
+        execute :rm, '-f', remote_archive
+      end
 
-  # removing archive
-  run_locally do
-    execute :rm, '-f', archive
+      # removing archive
+      run_locally do
+        execute :rm, '-f', archive
+      end
+    end
   end
 end
-end
-end
 
 set :capistrano_local_archive, Capistrano::Local::ArchiveStrategy

data/lib/capistrano/tasks/scm-local.rake

@@ -1,9 +1,9 @@
 namespace :local do
 
   def local_strategy
-    strategies = {:default=>Capistrano::Local::DefaultStrategy, :archive=>Capistrano::Local::ArchiveStrategy}
+    strategies = {:plain=>Capistrano::Local::PlainStrategy, :archive=>Capistrano::Local::ArchiveStrategy}
 
-    m = fetch(:local_strategy ? :local_strategy : :default)
+    m = fetch(:local_strategy ? :local_strategy : :archive)
     unless m.is_a?(Module)
       abort "Invalid local_strategy: " + m.to_s unless strategies.include?(m)
       m = strategies[m]
@@ -28,4 +28,10 @@ namespace :local do
     end
     local_strategy.release
   end
+
+  desc 'Read revision from REVISION file if exists'
+  task :set_current_revision do
+    revision_file = File.join(repo_url, 'REVISION')
+    set :current_revision, File.exist?(revision_file) ? File.read(revision_file).strip : 'UNKNOWN'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-local
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors: