drupid 1.0.1 → 1.1.0

data/lib/drupid/extend/pathname.rb

@@ -1,4 +1,6 @@
-# Copyright (c) 2012 Lifepillar
+# -*- coding: ascii -*-
+
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/drupid/library.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,8 @@ module Drupid
     end
 
     def fetch
-      cached_location.rmtree if cached_location.exist?
+      debug "Cached location: #{cached_location}"
+      dont_debug { cached_location.rmtree if cached_location.exist? }
       super
     end
   end # Library

data/lib/drupid/makefile.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/drupid/patch.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +39,7 @@ module Drupid
     # Downloads the patch into the current directory.
     def fetch
       dst = Pathname.pwd+File.basename(@url.to_s)
+      blah "Fetching patch..."
       begin
         curl @url.to_s, '-o', dst
       rescue

data/lib/drupid/platform.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,10 +30,10 @@ module Drupid
     # or nil if this platform does not contain Drupal core.
     attr :drupal_project
     # The path for contrib modules and themes (e.g., 'sites/all'),
-    # relative to #path.
+    # relative to #local_path.
     attr_accessor :contrib_path
     # The path to the sites directory (default: 'sites'), relative
-    # relative to #path.
+    # relative to #local_path.
     attr :sites_dir
 
     # Creates a new platform object for the Drupal installation at the
@@ -50,7 +50,7 @@ module Drupid
     # Returns the version of Drupal core in this platform, or
     # nil if the version cannot be determined.
     def version
-      if @drupal_project and @drupal_project.has_version?
+      if (@drupal_project and @drupal_project.has_version?) or load_drupal_version
         return @drupal_project.version
       end
       return nil
@@ -134,13 +134,9 @@ module Drupid
 
     # Retrieves information about Drupal core in this platform.
     def analyze_drupal_core
+      debug 'Analyzing Drupal Core...'
       @drupal_project = nil
-      vers = Drupid::Drush.drupal_version(local_path)
-      if vers
-        core = vers.match(/(\d+)\./)[1].to_i
-        @drupal_project = Drupid::Project.new('drupal', core, vers)
-        @drupal_project.local_path = self.local_path
-      end   
+      load_drupal_version
     end
 
     # Extracts information about the projects in this platform.
@@ -230,5 +226,29 @@ module Drupid
       graph.write_to_graphic_file('svg')
     end
 
+  private
+
+  def load_drupal_version
+    # Drupal 7 stores VERSION in bootstrap.inc. Drupal 8 moved that to /core/includes.
+    bootstrap_files = ['core/includes/bootstrap.inc', 'includes/bootstrap.inc', 'modules/system/system.module']
+    bootstrap_files.each do |bf|
+      f = self.local_path+bf
+      next unless f.exist?
+      f.open('r').each_line do |l|
+        if l =~ /define.*'VERSION'.*'(.+)'/
+          v = $1
+          debug "Drupal version detected: #{v}"
+          core = v.match(/^(\d+)\./)[1].to_i
+          @drupal_project = Drupid::Project.new('drupal', core, v)
+          @drupal_project.local_path = self.local_path
+          debug "Drupal platform has version: #{@drupal_project.version} (core: #{@drupal_project.version.core})"
+          return true
+        end
+      end
+    end
+    debug "Unable to detect version of Drupal at #{self.local_path}"
+    return false
+  end
+
   end # Platform
 end # Drupid

data/lib/drupid/platform_project.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/drupid/project.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,6 +19,8 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+require 'nokogiri'
+require 'open-uri'
 
 module Drupid
 
@@ -272,6 +274,7 @@ module Drupid
       @version = vers ? Version.from_s(@core.to_s + '-' + vers) : nil
       @proj_type = ('drupal' == @name) ? 'drupal' : nil
       @info_file = nil
+      @release_xml = nil
     end
 
     # Returns true if a version is specified for this project, false otherwise.
@@ -289,6 +292,7 @@ module Drupid
     # The argument must be a String object or a Drupid::Version object.
     # For the syntax of the String argument, see Drupid::Version.
     def version=(new_version)
+      return @version = nil if new_version.nil?
       if new_version.is_a?(Version)
         temp_version = new_version
       elsif new_version.is_a?(String)
@@ -297,24 +301,65 @@ module Drupid
       else
         raise NotDrupalVersionError
       end
-      raise NotDrupalVersionError, "Incompatible version for project #{extended_name}: #{temp_version.long}" if temp_version.core != core
+      raise NotDrupalVersionError, "Incompatible version for project #{self.extended_name}: #{temp_version.long}" if temp_version.core != self.core
       @version = temp_version
     end
 
-    # Updates the version of this project to the latest recommended release;
-    # if no recommended release is available, tries to retrieve the version
-    # of the latest supported release; if no supported release is found, the version
-    # of this project is not modified.
-    # Raises an error if no release history for the project is found (presumably
-    # because no such project exists on drupal.org).
+    # Updates the version of this project to the latest (stable) release.
     #
-    # *Requires:* a network connection.
+    # Retrieves the release information for this project from http://updates.drupal.org.
+    #
+    # See also: Drupid::Project.best_release
     def update_version
-      v = recommended_release
-      v = supported_release unless v
-      if v
-        self.version = core.to_s + '-' + v
-        debug "Version updated: #{extended_name}"
+      self.fetch_release_history if @release_xml.nil?
+      return self.version unless @release_xml
+      version_list = []
+      version_nodes = @release_xml.xpath("/project/releases/release[status='published']/version")
+      version_nodes.each do |n|
+        v = n.child.to_s
+        # Remove version specifications that do not start with self.core.
+        # This seemingly superfluous test is needed because, for example,
+        # imce-7.x has a 'master' version (oh my!).
+        next if v !~ /^#{self.core.to_i}\./
+        v.sub!("#{self.core}-", '') unless self.drupal?
+        version_list.push(Version.new(self.core, v))
+      end
+      self.version = self.best_release(version_list)
+      debug "Version updated: #{extended_name}"
+    end
+
+    # Updates the download URL for the current version of this project.
+    #
+    # Retrieves the release information for this project from http://updates.drupal.org.
+    def update_download_url
+      self.fetch_release_history if @release_xml.nil?
+      return if @release_xml.nil?
+      if @release_xml.at_xpath('/project/releases/release/files/file/variant').nil?
+        variant = ''
+      else
+        variant = "[variant='profile-only']"
+      end
+      v = self.drupal? ? self.version.short : self.version.long
+      url_node = @release_xml.at_xpath("/project/releases/release[status='published'][version='#{v}']/files/file#{variant}/url")
+      if url_node.nil?
+        owarn "Could not get download URL from http://updates.drupal.org for #{extended_name}"
+      else
+        self.download_url = url_node.child.to_s
+      end
+    end
+
+    # Fetches the release history for this project from http://updates.drupal.org.
+    def fetch_release_history
+      begin
+        debug "Getting release history from http://updates.drupal.org/release-history/#{self.name}/#{self.core}"
+        dont_debug do
+          @release_xml = Nokogiri::XML(open("http://updates.drupal.org/release-history/#{self.name}/#{self.core}"))
+        end
+        debug "Release history retrieved"
+      rescue Exception
+        owarn "Could not get release history for #{self.extended_name}"
+        blah e
+        @release_xml = nil
       end
     end
 
@@ -437,39 +482,33 @@ module Drupid
     end
 
     def fetch
-      # Try to get the latest version if:
-      # (1) the project is not local;
-      # (2) it does not have a version already;
-      # (3) no download type has been explicitly given.
-      unless has_version? or download_url =~ /file:\/\// or download_type
-        update_version
+      if self.version.nil? and download_url.nil? and download_type.nil?
+        debug "Updating version of #{self.extended_name}"
+        self.update_version
       end
       # If the project has no version we fetch it even if it is cached.
       # If the project has a download type, we fetch it even if it is cached
       # (say the download type is 'git' and the revision is changed in the
       # makefile, then the cached project must be updated accordingly).
-      if has_version? and !download_type and cached_location.exist?
-        @local_path = cached_location
-        debug "#{extended_name} is cached"
+      if self.has_version? and self.download_type.nil? and self.cached_location.exist?
+        @local_path = self.cached_location
+        debug "#{self.extended_name} is cached"
       else
-        blah "Fetching #{extended_name}"
-        if download_type
-          if download_url
-            src = download_url
-          elsif 'git' == download_type # Download from git.drupal.org
-            src = "http://git.drupal.org/project/#{name}.git"
-          else
-            raise "No download URL specified for #{extended_name}" unless download_url
-          end
-        else
-          src = extended_name
+        blah "Fetching #{self.extended_name}"
+        if 'git' == self.download_type and self.download_url.nil?
+          self.download_url = "http://git.drupal.org/project/#{name}.git"
         end
-        downloader = Drupid.makeDownloader src, cached_location.dirname.to_s, cached_location.basename.to_s, download_specs.merge({:type => download_type})
+        self.update_download_url if self.download_url.nil?
+        raise "No download URL specified for #{self.extended_name}" unless self.download_url
+        downloader = Drupid.makeDownloader  self.download_url.to_s,
+                                            self.cached_location.dirname.to_s,
+                                            self.cached_location.basename.to_s,
+                                            self.download_specs.merge({:type => download_type})
         downloader.fetch
         downloader.stage
         @local_path = downloader.staged_path
       end
-      reload_project_info unless drupal?
+      self.reload_project_info unless self.drupal?
     end
 
     # Returns the relative path where this project should be installed
@@ -529,34 +568,20 @@ module Drupid
       super(tgt, args)
     end
 
-    # Returns the version of the latest recommended release of this project
-    # as a string, or nil if no recommended release can be found
-    # or the project does not exist at drupal.org.
-    #
-    # *Requires:* a network connection.
-    #
-    # See also: Drupid::Drush.pm_releases, Drupid::Project.supported_release
-    def recommended_release
-      output = Drush.pm_releases(name + '-' + core.to_s)
-      return unless output =~ /RELEASES FOR/
-      rl = Drush.recommended_release(output)
-      return rl.sub(/^#{core}-/, '') if rl
-      return nil
-    end
 
-    # Returns the version of the latest supported release
-    # as a string, or nil if no supported release can be found
-    # or the project does not exist at drupal.org.
-    #
-    # *Requires:* a network connection.
-    #
-    # See also: Drupid::Drush.pm_releases, Drupid::Project.recommended_release
-    def supported_release
-      output = Drush.pm_releases(name + '-' + core.to_s)
-      return nil unless output =~ /RELEASES FOR/
-      rl = Drush.supported_release(output)
-      return rl.sub(/^#{core}-/, '') if rl
-      return nil
+    # Returns the "best" version among those in the given list.
+	  # Returns the current version of the project when version_list is empty.
+    def best_release version_list
+      if self.has_version? # Exclude releases older than the current one
+        version_list = version_list.select { |v| v >= self.version }
+      end
+      return self.version if version_list.empty?
+      stable_releases = version_list.select { |v| v.stable? }
+      if stable_releases.empty?
+        version_list.max { |a,b| a.better b }
+      else
+        stable_releases.max { |a,b| a.better b }
+      end
     end
 
   end # Project

data/lib/drupid/updater.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2012 Lifepillar
+# Copyright (c) 2012-2013 Lifepillar
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -36,11 +36,12 @@ module Drupid
 
     # Creates a new updater for a given makefile and a given platform.
     # For multisite platforms, optionally specify a site to synchronize.
-    def initialize(makefile, platform, site_name = nil)
+    def initialize(makefile, platform, options = { :site => nil, :force => false })
       @makefile = makefile
       @platform = platform
-      @site = site_name
+      @site = options[:site]
       @log = Log.new
+      @force_changes = options[:force]
       #
       @libraries_paths = Array.new
       @core_projects = Array.new
@@ -210,10 +211,20 @@ module Drupid
       pending_delete = @platform.project_names - processed
       pending_delete.each do |p|
         proj = platform.get_project(p)
-        if proj.installed?(site)
-          log.error "#{proj.extended_name} cannot be deleted because it is installed"
-        end
         log.action(DeleteAction.new(platform, proj))
+        if which('drush').nil?
+          if @force_changes
+            owarn "Forcing deletion."
+          else
+            log.error "#{proj.extended_name}: use --force to force deletion or install Drush >=6.0."
+          end
+        elsif proj.installed?(site)
+          if @force_changes
+            owarn "Deleting an installed/enabled project."
+          else
+            log.error "#{proj.extended_name} cannot be deleted because it is installed"
+          end
+        end
       end
     end
 
@@ -243,26 +254,35 @@ module Drupid
         if @platform.local_path + new_path != platform_project.local_path
           log.action(MoveAction.new(@platform, platform_project, new_path))
           if (@platform.local_path + new_path).exist?
-            log.error("#{new_path} already exists. Use --force to overwrite.")
+            if @force_changes
+              owarn "Overwriting existing path: #{new_path}"
+            else
+              log.error("#{new_path} already exists. Use --force to overwrite.")
+            end
           end
         end
         # Compare versions and log suitable actions
         _compare_versions project, platform_project
-
-      # If analyzing the platform does not detect the project (e.g., Fusion),
-      # we try to see if the directory exists where it is supposed to be.
-      elsif (@platform.local_path + @platform.dest_path(project)).exist?
-        begin
-          platform_project = PlatformProject.new(@platform, @platform.local_path + @platform.dest_path(project))
-        rescue => ex
-          log.error("#{platform_project.relative_path} exists, but cannot be analyzed: #{ex}")
-          log.action(UpdateProjectAction.new(@platform, project))
+      else
+        # If analyzing the platform does not allow us to detect the project (e.g., Fusion),
+        # we try to see if the directory exists where it is supposed to be.
+        proj_path = @platform.local_path + @platform.dest_path(project)
+        if proj_path.exist?
+          begin
+            platform_project = PlatformProject.new(@platform, proj_path)
+            _compare_versions project, platform_project
+          rescue => ex
+            log.action(UpdateProjectAction.new(@platform, project))
+            if @force_changes
+              owarn "Overwriting existing path: #{proj_path}"
+            else
+              log.error("#{proj_path} exists, but was not recognized as a project (use --force to overwrite it): #{ex}")
+            end
+          end
+        else # new project
+          log.action(InstallProjectAction.new(@platform, project))
         end
-        _compare_versions project, platform_project
-      else # new project
-        log.action(InstallProjectAction.new(@platform, project))
       end
-
       return (not has_makefile)
     end
 
@@ -308,7 +328,7 @@ module Drupid
           odie "Failed to verify the integrity of library #{lib.extended_name}: #{ex}"
         end
         if diff.empty?
-          log.notice("[OK]      #{lib.extended_name} (#{relpath})")
+          log.notice("#{Tty.white}[OK]#{Tty.reset}  #{lib.extended_name} (#{relpath})")
         else
           log.action(UpdateLibraryAction.new(platform, lib))
           log.notice(diff.join("\n"))
@@ -337,6 +357,29 @@ module Drupid
       @derivative_builds.clear
     end
 
+    # Updates Drupal's database using <tt>drush updatedb</tt>.
+    # If #site is defined, then updates only the specified site; otherwise,
+    # iterates over all Platform#site_names and updates each one in turn.
+    #
+    # Returns true upon success, false otherwise.
+    def updatedb
+      ohai "Updating Drupal database..."
+      blah "Platform: #{self.platform.local_path}"
+      res = true
+      site_list = (self.site) ? [self.site] : self.platform.site_names
+      site_list.each do |s|
+        site_path = self.platform.sites_path + s
+        debug "Site path: #{site_path}"
+        unless site_path.exist?
+          debug "Skipping #{site_path} because it does not exist."
+          next
+        end
+        blah "Updating site: #{s}"
+        res = Drush.updatedb(site_path) && res
+      end
+      return res
+    end
+
   private
 
     # Returns true if the given component is successfully cached and patched;
@@ -372,25 +415,43 @@ module Drupid
         end
         p = (makefile_project.drupal?) ? '' : ' (' + (platform.contrib_path + makefile_project.target_path).to_s + ')'
         if diff.empty?
-          @log.notice("[OK]      #{platform_project.extended_name}#{p}")
+          @log.notice("#{Tty.white}[OK]#{Tty.reset}  #{platform_project.extended_name}#{p}")
         elsif makefile_project.has_patches?
           log.action(update_action)
           log.notice "#{makefile_project.extended_name}#{p} will be patched"
           log.notice(diff.join("\n"))
         else
-          log.error("#{platform_project.extended_name}#{p}: mismatch with cached copy:\n" + diff.join("\n"))
           log.action(update_action)
+          if @force_changes
+            owarn "Mismatch with cached copy: overwriting local copy."
+          else
+            log.error("#{platform_project.extended_name}#{p}: mismatch with cached copy:\n" + diff.join("\n"))
+          end
         end
       when 1 # upgrade
         log.action(update_action)
       when -1 # downgrade
-        log.action(update_action)
-        if platform_project.drupal?
+        log.action(UpdateProjectAction.new(platform, makefile_project, :downgrade => true))
+        if which('drush').nil?
+          if @force_changes
+            owarn "Forcing downgrade."
+          else
+            log.error("#{platform_project.extended_name}: use --force to downgrade or install Drush >=6.0.")
+          end
+        elsif platform_project.drupal?
           if @platform.bootstrapped?
-            log.error("#{platform_project.extended_name} cannot be downgraded because it is bootstrapped")
+            if @force_changes
+              owarn "Downgrading a bootstrapped Drupal platform."
+            else
+              log.error("#{platform_project.extended_name} cannot be downgraded because it is bootstrapped (use --force to override)")
+            end
           end
         elsif platform_project.installed?(site)
-          log.error("#{platform_project.extended_name}#{p} must be uninstalled before downgrading")
+          if @force_changes
+            owarn "Downgrading an installed/enabled project."
+          else
+            log.error("#{platform_project.extended_name}#{p} must be uninstalled before downgrading (use --force to override)")
+          end
         end
       when nil # One or both projects have no version
         # Check whether the content of the projects is consistent
@@ -400,12 +461,16 @@ module Drupid
           odie "Failed to verify the integrity of #{component.extended_name}: #{ex}"
         end
         if diff.empty?
-          log.notice("[OK]      #{platform_project.extended_name}#{p}")
+          log.notice("#{Tty.white}[OK]#{Tty.reset}  #{platform_project.extended_name}#{p}")
         else
           log.action(update_action)
           log.notice(diff.join("\n"))
           if platform_project.has_version? and (not makefile_project.has_version?)
-            log.error("Cannot upgrade #{makefile_project.name} from known version to unknown version")
+            if @force_changes
+              owarn "Upgrading #{makefile_project.name} to unknown version."
+            else
+              log.error("Cannot upgrade #{makefile_project.name} from known version to unknown version")
+            end
           end
         end
       end
@@ -453,7 +518,7 @@ module Drupid
       # Adds an error message to the log.
       def error(msg)
         @errors << msg
-        puts @errors.last
+        ofail @errors.last
       end
 
       # Returns true if this log contains error messages;
@@ -465,7 +530,7 @@ module Drupid
       # Adds a warning to the log.
       def warning(msg)
         @warnings << msg
-        puts @warnings.last
+        owarn @warnings.last
       end
 
       def warnings?
@@ -523,17 +588,19 @@ module Drupid
 
 
     class UpdateProjectAction < AbstractAction
-      def initialize(p, proj)
+      def initialize p, proj, opts = { :downgrade => false }
         raise "#{proj.extended_name} does not exist locally" unless proj.exist?
         raise "Unknown type for #{proj.extended_name}" unless proj.proj_type
-        super
+        @downgrade = opts[:downgrade]
+        super(p, proj)
       end
 
       def msg
+        label = 'Update'
         if old_project = platform.get_project(component.name)
-          "#{Tty.blue}[Update]#{Tty.white}  #{old_project.extended_name} => #{component.extended_name}#{Tty.reset} (#{platform.dest_path(component)})"
+          "#{Tty.blue}[#{label}]#{Tty.white}  #{component.name}: #{old_project.version.long} => #{component.version.long}#{Tty.reset} (#{platform.dest_path(component)})"
         else
-          "#{Tty.blue}[Update]#{Tty.white} #{component.extended_name}#{Tty.reset} (#{platform.dest_path(component)})"
+          "#{Tty.blue}[#{label}]#{Tty.white}  #{component.name}: => #{component.version.long}#{Tty.reset} (#{platform.dest_path(component)})"
         end
       end
 
@@ -572,8 +639,7 @@ module Drupid
         args << '--delete'
         component.ignore_paths.each { |p| args << "--exclude=#{p}" }
         dst_path = platform.local_path + platform.dest_path(component)
-        debug "Pathname.mkpath may raise harmless exceptions"
-        dst_path.mkpath unless dst_path.exist?
+        dont_debug { dst_path.mkpath }
         args << component.local_path.to_s + '/'
         args << dst_path.to_s + '/'
         begin
@@ -616,8 +682,7 @@ module Drupid
         args << '--delete'
         component.ignore_paths.each { |p| args << "--exclude=#{p}" }
         dst_path = platform.local_path + platform.contrib_path + component.target_path
-        debug "Pathname.mkpath may raise harmless exceptions"
-        dst_path.mkpath unless dst_path.exist?
+        dont_debug { dst_path.mkpath }
         args << component.local_path.to_s + '/'
         args << dst_path.to_s + '/'
         begin
@@ -631,7 +696,7 @@ module Drupid
 
     class InstallLibraryAction < UpdateLibraryAction
       def msg
-        "#{Tty.blue}[Install]#{Tty.white} Library #{component.extended_name}#{Tty.reset} (#{platform.contrib_path + component.target_path})"
+        "#{Tty.blue}[Install]#{Tty.white}  Library #{component.extended_name}#{Tty.reset} (#{platform.contrib_path + component.target_path})"
       end
     end
   
@@ -648,10 +713,10 @@ module Drupid
           debug "Moving #{component.local_path} to #{dst}"
           if dst.exist?
             debug "#{dst} already exists, it will be deleted"
-            dst.rmtree
+            dont_debug { dst.rmtree }
           end
-          dst.parent.mkpath
-          FileUtils.mv component.local_path.to_s, dst.to_s
+          dont_debug { dst.parent.mkpath }
+          dont_debug { FileUtils.mv component.local_path.to_s, dst.to_s }
         else
           blah "Cannot move #{component.local_path.relative_path_from(platform.local_path)}\n" +
             "(It does not exist any longer)"
@@ -661,14 +726,15 @@ module Drupid
 
       def msg
         src = component.local_path.relative_path_from(platform.local_path)
-        "#{Tty.blue}[Move]#{Tty.reset}    From #{src} to #{@destination}"
+        "#{Tty.blue}[Move]#{Tty.white}    #{component.extended_name}:#{Tty.reset} #{src} => #{@destination}"
       end
     end # MoveAction
 
 
     class DeleteAction < AbstractAction
       def fire!
-        component.local_path.rmtree if component.local_path.exist?
+        debug "Deleting #{component.local_path}"
+        dont_debug { component.local_path.rmtree if component.local_path.exist? }
         @pending = false
       end