capistrano 3.0.0.pre14 → 3.0.0

data/lib/capistrano/configuration/servers.rb

@@ -1,4 +1,5 @@
 require 'set'
+require_relative 'servers/role_filter'
 module Capistrano
   class Configuration
     class Servers
@@ -40,17 +41,21 @@ module Capistrano
         servers.find_all { |server| server.has_role? role}
       end
 
-      def fetch_roles(names, options)
-        if Array(names).flatten.map(&:to_sym).include?(:all)
-          filter(servers, options)
-        else
-          role_servers = Array(names).flat_map { |name| fetch name }.uniq
-          filter(role_servers, options)
-        end
+      def fetch_roles(required, options)
+        filter_roles = RoleFilter.for(required, available_roles)
+        select(servers_with_roles(filter_roles), options)
+      end
+
+      def servers_with_roles(roles)
+        roles.flat_map { |role| fetch role }.uniq
+      end
+
+      def select(servers, options)
+        servers.select { |server| server.select?(options) }
       end
 
-      def filter(servers, options)
-        Filter.new(servers, options).filtered_servers
+      def available_roles
+        servers.flat_map { |server| server.roles_array }.uniq
       end
 
       def servers
@@ -60,48 +65,6 @@ module Capistrano
       def extract_options(array)
         array.last.is_a?(::Hash) ? array.pop : {}
       end
-
-      class Filter
-        def initialize(servers, options)
-          @servers, @options = servers, options
-        end
-
-        def filtered_servers
-          if servers_with_filter.any?
-            servers_with_filter
-          else
-            fail I18n.t(:filter_removes_all_servers, scope: :capistrano, filter: key || '(no filter)' )
-          end
-        end
-
-        private
-        attr_reader :options, :servers
-
-        def servers_with_filter
-          @servers_with_filter ||= servers.select(&filter)
-        end
-
-        def key
-          options[:filter] || options[:select]
-        end
-
-        def filter_option
-          key || all
-        end
-
-        def filter
-          if filter_option.respond_to?(:call)
-            filter_option
-          else
-            lambda { |server| server.fetch(filter_option) }
-          end
-        end
-
-        def all
-          lambda { |server| :all }
-        end
-
-      end
     end
   end
 end

data/lib/capistrano/configuration/servers/role_filter.rb

@@ -0,0 +1,86 @@
+module Capistrano
+  class Configuration
+    class Servers
+      class RoleFilter
+
+        def initialize(required, available)
+          @required, @available = required, available
+        end
+
+        def self.for(required, available)
+          new(required, available).roles
+        end
+
+        def roles
+          if required.include?(:all)
+            available
+          else
+            required.select { |name| available.include? name }
+          end
+        end
+
+        private
+
+        def required
+          Array(@required).flat_map(&:to_sym)
+        end
+
+        def available
+          if role_filter.any?
+            role_filter
+          else
+            @available
+          end
+        end
+
+        def role_filter
+          env_filter | configuration_filter
+        end
+
+        def configuration_filter
+          ConfigurationFilter.new.roles
+        end
+
+        def env_filter
+          EnvFilter.new.roles
+        end
+
+        class ConfigurationFilter
+
+          def roles
+            if filter
+              Array(filter.fetch(:roles, [])).map(&:to_sym)
+            else
+              []
+            end
+          end
+
+          def config
+            Configuration.env
+          end
+
+          def filter
+            config.fetch(:filter) || config.fetch(:select)
+          end
+        end
+
+
+        class EnvFilter
+
+          def roles
+            if filter
+              filter.split(',').map(&:to_sym)
+            else
+              []
+            end
+          end
+
+          def filter
+            ENV['ROLES']
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/capistrano/defaults.rb

@@ -11,11 +11,3 @@ set :log_level, :debug
 
 set :pty, true
 
-namespace :deploy do
-  task :ensure_stage do
-    unless stage_set?
-      puts t(:stage_not_set)
-      exit 1
-    end
-  end
-end

data/lib/capistrano/dsl.rb

@@ -32,7 +32,7 @@ module Capistrano
     end
 
     def rollback_log_message
-      t(:rollback_log_message, user: local_user, release: release_timestamp)
+      t(:rollback_log_message, user: local_user, release: fetch(:rollback_timestamp))
     end
 
     def local_user

data/lib/capistrano/dsl/env.rb

@@ -6,8 +6,8 @@ module Capistrano
         env.configure_backend
       end
 
-      def fetch(key, default=nil)
-        env.fetch(key, default)
+      def fetch(key, default=nil, &block)
+        env.fetch(key, default, &block)
       end
 
       def any?(key)
@@ -23,6 +23,10 @@ module Capistrano
         env.set(key, value)
       end
 
+      def delete(key)
+        env.delete(key)
+      end
+
       def ask(key, value)
         env.ask(key, value)
       end

data/lib/capistrano/dsl/paths.rb

@@ -20,7 +20,11 @@ module Capistrano
       end
 
       def release_path
-        releases_path.join(release_timestamp)
+        fetch(:release_path, current_path)
+      end
+
+      def set_release_path(timestamp=now)
+        set(:release_path, releases_path.join(timestamp))
       end
 
       def repo_url
@@ -52,9 +56,8 @@ module Capistrano
         deploy_path.join('revisions.log')
       end
 
-      def release_timestamp
-        fetch(:rollback_release_timestamp,
-              env.timestamp.strftime("%Y%m%d%H%M%S"))
+      def now
+        env.timestamp.strftime("%Y%m%d%H%M%S")
       end
 
       def asset_timestamp

data/lib/capistrano/dsl/task_enhancements.rb

@@ -11,5 +11,43 @@ module Capistrano
         invoke(post_task)
       end
     end
+
+    def remote_file(task)
+      target_roles = task.delete(:roles) { :all }
+      define_remote_file_task(task, target_roles)
+    end
+
+    def define_remote_file_task(task, target_roles)
+      Rake::Task.define_task(task) do |t|
+        prerequisite_file = t.prerequisites.first
+        file = shared_path.join(t.name)
+
+        on roles(target_roles) do
+          unless test "[ -f #{file} ]"
+            info "Uploading #{prerequisite_file} to #{file}"
+            upload! File.open(prerequisite_file), file
+          end
+        end
+
+      end
+    end
+
+    def ensure_stage
+      Rake::Task.define_task(:ensure_stage) do
+        unless stage_set?
+          puts t(:stage_not_set)
+          exit 1
+        end
+      end
+    end
+
+    def tasks_without_stage_dependency
+      stages + default_tasks
+    end
+
+    def default_tasks
+      %w{install}
+    end
+
   end
 end

data/lib/capistrano/hg.rb

@@ -0,0 +1 @@
+load File.expand_path("../tasks/hg.rake", __FILE__)

data/lib/capistrano/i18n.rb

@@ -14,11 +14,11 @@ en = {
   written_file:                'create %{file}',
   question:                    'Please enter %{key}: |%{default_value}|',
   keeping_releases:            'Keeping %{keep_releases} of %{releases} deployed releases on %{host}',
+  no_old_releases:             'No old releases (keeping newest %{keep_releases}) on %{host}',
   linked_file_does_not_exist:  'linked file %{file} does not exist on %{host}',
   mirror_exists:               "The repository mirror is at %{at}",
   revision_log_message:        'Branch %{branch} deployed as release %{release} by %{user}',
   rollback_log_message:        '%{user} rolled back to release %{release}',
-  filter_removes_all_servers:  'Your filter `%{filter}` would remove all matching servers',
   console: {
     welcome:  'capistrano console - enter command to execute on %{stage}',
     bye:      'bye'

data/lib/capistrano/setup.rb

@@ -1,10 +1,15 @@
 include Capistrano::DSL
 
-load 'capistrano/defaults.rb'
+namespace :load do
+  task :defaults do
+    load 'capistrano/defaults.rb'
+  end
+end
 
 stages.each do |stage|
   Rake::Task.define_task(stage) do
-    load "config/deploy.rb"
+    invoke 'load:defaults'
+    load 'config/deploy.rb'
     load "config/deploy/#{stage}.rb"
     load "capistrano/#{fetch(:scm)}.rb"
     set(:stage, stage.to_sym)
@@ -13,5 +18,4 @@ stages.each do |stage|
   end
 end
 
-
 require 'capistrano/dotfile'

data/lib/capistrano/tasks/deploy.rake

@@ -4,7 +4,7 @@ namespace :deploy do
     invoke 'deploy:check'
   end
 
-  task :updating do
+  task :updating => :new_release_path do
     invoke "#{scm}:create_release"
     invoke 'deploy:symlink:shared'
   end
@@ -35,6 +35,7 @@ namespace :deploy do
     invoke "#{scm}:check"
     invoke 'deploy:check:directories'
     invoke 'deploy:check:linked_dirs'
+    invoke 'deploy:check:make_linked_dirs'
     invoke 'deploy:check:linked_files'
   end
 
@@ -53,12 +54,19 @@ namespace :deploy do
         execute :mkdir, '-pv', linked_dirs(shared_path)
       end
     end
+    
+    desc 'Check directories of files to be linked exist in shared'
+    task :make_linked_dirs do
+      next unless any? :linked_files
+      on roles :app do |host|
+        execute :mkdir, '-pv', linked_file_dirs(shared_path)
+      end
+    end
 
     desc 'Check files to be linked exist in shared'
     task :linked_files do
       next unless any? :linked_files
       on roles :app do |host|
-        execute :mkdir, '-pv', linked_file_dirs(shared_path)
         linked_files(shared_path).each do |file|
           unless test "[ -f #{file} ]"
             error t(:linked_file_does_not_exist, file: file, host: host)
@@ -129,9 +137,15 @@ namespace :deploy do
       releases = capture(:ls, '-x', releases_path).split
       if releases.count >= fetch(:keep_releases)
         info t(:keeping_releases, host: host.to_s, keep_releases: fetch(:keep_releases), releases: releases.count)
-        directories = (releases - releases.last(fetch(:keep_releases))).map { |release|
-          releases_path.join(release) }.join(" ")
-        execute :rm, '-rf', directories
+        directories = (releases - releases.last(fetch(:keep_releases)))
+        if directories.any?
+          directories_str = directories.map do |release|
+            releases_path.join(release)
+          end.join(" ")
+          execute :rm, '-rf', directories_str
+        else
+          info t(:no_old_releases, host: host.to_s, keep_releases: fetch(:keep_releases))
+        end
       end
     end
   end
@@ -162,13 +176,29 @@ namespace :deploy do
   end
 
   desc 'Revert to previous release timestamp'
-  task :revert_release do
+  task :revert_release => :rollback_release_path do
     on roles(:all) do
-      last_release = capture(:ls, '-xr', releases_path).split[1]
-      set(:rollback_release_timestamp, last_release)
-      set(:branch, last_release)
       set(:revision_log_message, rollback_log_message)
     end
   end
 
+  task :new_release_path do
+    set_release_path
+  end
+
+  task :last_release_path do
+    on roles(:all) do
+      last_release = capture(:ls, '-xr', releases_path).split[1]
+      set_release_path(last_release)
+    end
+  end
+
+  task :rollback_release_path do
+    on roles(:all) do
+      last_release = capture(:ls, '-xr', releases_path).split[1]
+      set_release_path(last_release)
+      set(:rollback_timestamp, last_release)
+    end
+  end
+
 end

data/lib/capistrano/tasks/framework.rake

@@ -44,8 +44,6 @@ namespace :deploy do
   task :finished do
   end
 
-  before :starting, :ensure_stage
-
   desc 'Rollback to previous release.'
   task :rollback do
     %w{ starting started

data/lib/capistrano/tasks/git.rake

@@ -18,7 +18,7 @@ namespace :git do
     fetch(:branch)
     on roles :all do
       with git_environmental_variables do
-        execute :git, :'ls-remote', repo_url
+        exit 1 unless test :git, :'ls-remote', repo_url
       end
     end
   end
@@ -52,11 +52,8 @@ namespace :git do
     on roles :all do
       with git_environmental_variables do
         within repo_path do
-          execute :git, :clone, '--branch', fetch(:branch),               \
-            '--depth 1',                                                  \
-            '--recursive',                                                \
-            '--no-hardlinks',                                             \
-            repo_path, release_path
+          execute :mkdir, '-p', release_path
+          execute :git, :archive, fetch(:branch), '| tar -x -C', release_path
         end
       end
     end