"--drupal-project-rename" doesn't seem to work

I have the same problem with the latest version of HEAD. No worky.

This is fixed in HEAD?

I'm using Drush All versions-3.0

drush dl drupal-6.x --drupal-project-rename=demo
It works as expected. It is renamed to "demo"

drush dl drupal-6.x --drupal-project-rename=demo --package-handler=cvs
It doesn't work the renaming.

It has different errors with verbose mode on:

First time I run it:

cvs
Downloading release history from http://updates.drupal.org/release-history/drupal/6.x           
Executing: svn info '/mnt/vbox-shared/'                                                     
Downloading project drupal ...                                                                  
Undefined variable: path cvs.inc:95                                                   
Executing: cd /mnt/vbox-shared/ ; cvs -z6 -dPC                                         
-d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal update -r DRUPAL-6-19 drupal drupal
Checking out drupal was successful.                                                          
Project drupal (6.19) downloaded to /mnt/vbox-shared/drupal.               [success]
Command dispatch complete 

Second time (now there is a existing directory called "drupal" )
Note that error path cvs.inc:95

cvs
Downloading release history from http://updates.drupal.org/release-history/drupal/6.x           
Executing: svn info '/mnt/vbox-shared/'                                                     
Downloading project drupal ...                                                                  
Undefined variable: path cvs.inc:95                                                   
Executing: cd /mnt/vbox-shared/ ; cvs -z6 -dPC                                         
-d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal update -r DRUPAL-6-19 drupal drupal
Checking out drupal was successful.                                                          
Project drupal (6.19) downloaded to /mnt/vbox-shared/drupal.               [success]
Command dispatch complete 

The folder drupal is being cvs-updated when I didn't specify the folder "drupal",

--drupal-project-rename is only implemented for wget package handler. I'm working on cvs support.

Fixing to make --drupal-project-rename is not hard but is a bit hackish as there're several overlapping things here I want to address altogether:

1/

$ drush dl drupal
Project drupal (6.19) downloaded to /tmp/drupal-6.19/.

$ drush dl drupal --package-handler=cvs
Project drupal (6.19) downloaded to /tmp/drupal.

both behaviours are legitimate but both package handlers doesn't behave the same, as it could be expected. In my opinion cvs should checkout to drupal-6.19, you can always do --drupal-project-rename if prefer just `drupal`.

2/
drush package handlers should fetch each project to a tmp folder (as drush_make), untar, and move to destination a/o relocate afterwards. Currently it does a chdir to destination directory and works on it (cwd if no --destination). It can be harmful. Example: /var/www/drupal-6.19 is my rocking website. I want to create another site:

$ cd /var/www
$ drush dl drupal --drupal-project-rename=otherdrupal

What happen is:

a) drupal-6.19 has been downloaded and untarred over the preexisting site.
b) my rocking website is now at /var/www/otherdrupal

Also, working on current folder makes cvs package handler to update instead of check out because it detects drupal/CVS does exist. This is what @corbacho reports in #5.

3/
pm-download should warn if the destination folder already exists. Currently it's just ignored. Same for relocation.
So we need to warn the user at two times: before download/checkout if --destination a/o --drupal-project-rename OR after download/co if no --destination and relocation wanted.

4/
package handlers should receive the path to tmp folder to work in and the definitive directory name (that is the project name or --drupal-project-rename). pm-download can move to destination or relocate after the package handler had made its work.

5/
Code in wget.inc seems to reveal there was an attempt to implement this:

drush dl cck zen --cck-project-rename=cck_renamed --zen-project-rename=zen_renamed

I see it of interest in some cases:

drush dl basic cck-6.x-3.x-dev --basic-project-rename=mynewtheme --cck-project-rename=cck-3.x-multigroup

---

I'll work on all of this but 5/. Some feedback specially on that point will be appreciated.

awesome analysis Jonathan. Would be nice to get all that in drush, specially working on a temp folder to avoid surprises.

btw, the original issue was that --drupal-project-rename was not working with wget, but I think was fixed. I couldn't replicate that.

Looks like that rename code was last touched by Greg in #727436: drush dl drupal reports wrong directory path. The feature you describe in 5) looks quite exotic to me. I don't mind if we drop it. All the other points looks great.

@jonhattan is welcome to implement and commit #7

I'm working on this.

This is a big change. Attached patch to get feedback. I think still needs work on updatecode. not tested.

Summary of changes:
* + verbosity for drush help dl.
* supress trailing slashes.
* refactor destination lookup / relocation.
* --destination check moved to pm_download_validate().
* change hook adjust_download_destination to download_destination_alter. Simplified.
* do the work in a tmp directory and move to really final destination at the end (after "relocation").
* if destination exists ask the user to overwrite.
* some logic moved ot of wget package-handler (dodgy name, drupal-project-rename).
* handle edge cases as dl translation or profile variant core from cvs.
* fix #909008: Project drupal contains 39 cores.

I took a look at the code and that looks good to me. Nice code comments and sensible flow. Should we test pm-download now or does that untested too?

pm-download was ready to test. pm-updatecode doesn't seem to be affected by this changes.

I tested pm-download even more and found some glitches:
* install profiles: by default we were downloading the core variant even if in a drupal root. So I've put some validation.
* translations. It worked fine before this patch. Now that we work on a tmp dir it is a special case.

Overall, this patch looks very good. The functional changes really make sense.

+++ drush.api.php	10 Oct 2010 18:00:55 -0000
@@ -165,11 +165,13 @@
+ * ¶

Minor: Trailing white-space (also elsewhere in this patch).

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -77,7 +77,14 @@
+If a destination is not explicitly provided, it will defaults to a directory based on the project type:

"If no destination is provided, then it depends on the project type:"

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -192,10 +199,10 @@
-      'drush dl' => 'Download latest version of Drupal core.',
...
+      'drush dl' => 'Download latest stable version of Drupal core.',

I think the added "stable" is incorrect -- it downloads the latest recommended release, AFAIK.

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -206,7 +213,7 @@
-      '--drupal-project-rename' => 'Alternate name for "drupal" directory when downloading drupal project.',
+      '--drupal-project-rename' => 'Alternate name for "drupal-x.y" directory when downloading Drupal project. If this option is present but empty, the alternate name will be "drupal".',

The second sentence can be shortened to

'Defaults to "drupal".'

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -994,28 +1001,26 @@
-    @drush_op('mkdir', $destination, 0777, TRUE);
+    drush_mkdir($destination);

Circumvents the --simulate flag.

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -1302,203 +1291,296 @@
+ * Implement drush_COMMAND_init().
...
+ * Implementation of drush_COMMAND_validate().

Should be

"Implements [hook-name]."

(i.e., third-person form)

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -1302,203 +1291,296 @@
+ * pm-download can operate on any bootstrap level but it's preferred to work
+ * on highests available. So here we do.

"highests" looks odd. "So here we do." can be removed. Also, it would be good to document why this is preferred.

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -1302,203 +1291,296 @@
+  // Validate a/o enforce --variant to a sane default.

"a/o" is a very uncommon abbreviation, and in general, an "and/or" construct usually means that something can be expressed in a simpler way. E.g.,

"Validate --variant or enforce a sane default."

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -1302,203 +1291,296 @@
+    // Get release history. Don't rely on UPDATE_DEFAULT_URL since perhaps we are not fully bootstrapped.

All code comments should wrap at 80 chars. See http://drupal.org/node/1354 for documentation standards. (also many times elsewhere in this patch)

+++ commands/pm/pm.drush.inc	10 Oct 2010 18:00:56 -0000
@@ -1579,3 +1661,73 @@
+  // Nothing to say about translations or theme engines.
+  else {
+  }
+}

That looks a bit odd. It's better to move the information about the special case into the phpDoc description of the function.

Powered by Dreditor.

Much more testing here. New patch with fixes for updatecode and some corrections pointed by sun. Note: --simulate is not circumvented as this command finally relies on drush_shell_exec that is --simulate aware.

Will take a coffee, review again and commit this in some minutes.

committed.

+++ commands/pm/updatecode.pm.inc	12 Oct 2010 11:48:55 -0000
@@ -226,6 +229,9 @@
 function _pm_update_move_files($src_dir, $dest_dir, $skip_list, $remove_conflicts = TRUE) {
+  print "_pm_update_move_files($src_dir, $dest_dir \n";
+  var_dump($skip_list);
+  var_dump($remove_conflicts);

ugh :)

Powered by Dreditor.

It was actually fixed in #17_validate :)

http://drupalcode.org/viewvc/drupal/contributions/modules/drush/commands...

Thanks for this patch jonhattan. Good work. I tested --drupal-project-rename with --package-handler=cvs and worked smoothly. Nice message:

Project drupal contains: [success]
- 1 profile: default
- 6 themes: pushbutton, minnelli, garland, marvin, chameleon,
bluemarine
- 33 modules: user, upload, ...

How was managing drupal before drush? :)