capistrano-utils 0.0.4 → 0.0.5

data/capistrano-utils.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'capistrano-utils'
   gem.require_paths = ['lib']
-  gem.version       = '0.0.4'
+  gem.version       = '0.0.5'
 
   gem.add_dependency 'rake'
-  gem.add_dependency 'capistrano'
+  gem.add_dependency 'capistrano', '>= 2.12.0'
 end

data/lib/capistrano/ext/git.rb

@@ -1,9 +1,3 @@
-require 'capistrano/ext/helpers'
-
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort 'capistrano/ext/contao requires capistrano 2'
-end
-
 Capistrano::Configuration.instance(:must_exist).load do
   set :repository,
     fetch(:project_repository, `git remote show -n origin | grep 'URL' | awk '{print $3}' | head -n 1`.strip)

data/lib/capistrano/ext/helpers.rb

@@ -1,10 +1,6 @@
 require 'digest/sha1'
 require 'highline'
 
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort 'capistrano/ext/helpers requires capistrano 2'
-end
-
 Capistrano::Configuration.instance(:must_exist).load do
   # Taken from the capistrano code.
   def _cset(name, *args, &block)
@@ -30,63 +26,50 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
-  # Return an array of arrays of files to link
-  #
-  # @param [String] Absolute path to folder from which to link
-  # @param [String] Absolute path to folder to which to link
-  # @return [Array]
-  def exhaustive_list_of_files_to_link(from, to)
+  # Deeply link files from a folder to another
+  def deep_link(from, to)
     script = <<-END
-exhaustive_list_of_files_to_link() {
-  files="";
-
-  for f in `ls -A1 ${1}`; do
-    file="${2}/${f}";
-    f="${1}/${f}";
-    if [ -e "${file}" ]; then
-      files="${files} `exhaustive_list_of_files_to_link ${f} ${file}`";
-    else
-      files="${files} ${f}:${file}";
-    fi;
-  done;
-  echo "${files}";
-};
+      exhaustive_list_of_files_to_link() {
+        files="";
+
+        for file in `ls -A1 ${1}`; do
+          dest_file="${2}/${file}";
+          file="${1}/${file}";
+          if [ -e "${dest_file}" ]; then
+            files="${files} `exhaustive_list_of_files_to_link ${file} ${dest_file}`";
+          else
+            files="${files} ${file}:${dest_file}";
+          fi;
+        done;
+        echo "${files}";
+      };
+
+      files=`exhaustive_list_of_files_to_link '#{from}' '#{to}'`;
+      for file in ${files}; do
+        ln -s "`echo "${file}" | cut -d: -f1`" \
+          "`echo "${file}" | cut -d: -f2`";
+      done;
     END
 
-    script << "exhaustive_list_of_files_to_link '#{from}' '#{to}';"
-
-    begin
-      files = capture(script).strip.split(' ')
-      files.map {|f| f.split(':')}
-    rescue Capistrano::CommandError
-      abort "Unable to get files list"
-    end
+    run script
   end
 
-  def link_files(path, files = {})
-    files.each do |f|
-      file_name = f.dup.gsub(/\//, '_')
-      unless remote_file_exists?("#{path}/#{file_name}")
-        begin
-          run <<-CMD
-            #{try_sudo} cp -a #{latest_release}/#{f} #{path}/#{file_name}
-          CMD
-        rescue Capistrano::CommandError
-          if remote_file_exists?("#{latest_release}/#{f}.default")
-            run <<-CMD
-              #{try_sudo} cp #{latest_release}/#{f}.default #{path}/#{file_name}
-            CMD
-          else
-            run <<-CMD
-              #{try_sudo} touch #{path}/#{file_name}
-            CMD
-            logger.info "WARNING: You should edit '#{path}/#{file_name}' or re-create it as a folder if that's your intention."
-          end
-        end
-      end
+  # Link all items
+  def link_items(from, to)
+    script = <<-END
+      symlink_all_shared_items() {
+        for file in `ls -A1 ${1}`; do
+          dest_file="${2}/`echo "${file}" | tr ',' '/'`";
+          file="${1}/${file}";
+          mkdir -p "`dirname "${dest_file}"`";
+          ln -nsf "${file}" "${dest_file}";
+        done;
+      };
+
+      symlink_all_shared_items '#{from}' '#{to}';
+    END
 
-      link_file File.join(path, file_name), File.join(fetch(:latest_release), f)
-    end
+    run script
   end
 
   def gen_pass( len = 8 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-utils
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
 description: Capistrano small recipes and methods
 email:
 - wael.nasreddine@gmail.com
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2247547276093644561
+      hash: -3673788544776060832
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23