feat(cp): support update flag when recursing #889

joshi-sh · 2018-09-18T06:04:58Z

Fixed cp -Ru ignoring -u, and added a test.

Fixes #808

nfischer · 2018-09-18T18:51:11Z

test/cp.js

@@ -451,6 +451,19 @@ test('-R implies -P', t => {
  });
 });

+test('-Ru no longer ignores -u', t => {


nit: -Ru respects the -u flag recursively

nfischer · 2018-09-18T18:53:05Z

test/cp.js

+test('-Ru no longer ignores -u', t => {
+  const [source, dest] = ['foo', 'bar'].map(s => `test/resources/cp/cp-Ru/${s}/file`);
+  // First, update the dest file
+  shell.touch(dest);


You also need to update the source directory to an older time stamp, right? Otherwise, we'll see race conditions in very-fresh checkouts.

In a later comment, you've mentioned checking file contents. That would resolve this issue as well.

Yeah, file contents is fine to use here as well.

nfischer · 2018-09-18T18:54:30Z

test/cp.js

@@ -451,6 +451,19 @@ test('-R implies -P', t => {
  });
 });

+test('-Ru no longer ignores -u', t => {
+  const [source, dest] = ['foo', 'bar'].map(s => `test/resources/cp/cp-Ru/${s}/file`);


You should copy to t.context.tmp. Treat test/resources/ as read-only.

test/cp.js

nfischer · 2018-09-18T23:35:22Z

@joshi-sh can you check the npm run gendocs warning?

joshi-sh · 2018-09-19T05:31:33Z

Running npm run gendocs on Ubuntu 16.04.3 on top of WSL with node v8.12.0 produces no errors

nfischer · 2018-09-19T21:47:44Z

@joshi-sh it might not be a docs issue, but there might be modified or extra files leftover after running tests + lint + generate docs. Seems to be v8.x.y specific.

nfischer

Most comments are optional, but I'd like to see if we can cleanup test setup.

nfischer · 2018-09-22T04:08:57Z

test/cp.js

+  const destFile = `${destDir}/file`;
+  [sourceDir, destDir].forEach(d => shell.mkdir('-p', d));
+  shell.ShellString('foo\n').to(sourceFile);
+  shell.ShellString('bar\n').to(destFile);


I would like to separate setup from test logic. Two (alternative) suggestions:

Instead of setting up at runtime, commit this directory structure under test/resources/, or

Add an empty line between setup code and test logic (possibly add a comment above such as // Setup code)

You'll need to continue modifying the time stamps at runtime, as you have here.

nfischer · 2018-09-22T04:11:31Z

test/cp.js

+  shell.ShellString('bar\n').to(destFile);
+  // Get the old mtime for dest
+  const oldTime = fs.statSync(destFile).mtimeMs;
+  // Send the old file to two days ago


nit: you can better document this by creating a constant TWO_DAYS_IN_MS.

You could then make this comment more descriptive: // Set the sourceFile to be older than destFile.

nfischer · 2018-09-22T04:12:20Z

test/cp.js

+  shell.touch('-m', oldTime + (2 * 24 * 60 * 60 * 1000), sourceFile);
+  // Now, copy the old dir to the new one
+  shell.cp('-Ru', sourceDir, destDir);
+  // Get the new mtime for dest


nit: I think this comment is leftover from a previous commit (you're not checking mtimes anymore)

nfischer · 2018-09-22T04:13:21Z

test/cp.js

+  const destDir = `${dir}/new`;
+  const destFile = `${destDir}/file`;
+  [sourceDir, destDir].forEach(d => shell.mkdir('-p', d));
+  shell.ShellString('foo\n').to(sourceFile);


nit: file contents could be more descriptive. How about source file contents and destination file contents?

nfischer · 2018-09-22T04:17:20Z

test/cp.js

@@ -451,6 +451,45 @@ test('-R implies -P', t => {
  });
 });

+test('-Ru respects the -u flag recursively (don\'t update newer file)', t => {


You might be able to replace this with a template literal to avoid escaping the apostrophe. I can't remember if our lint currently forbids this (see #788). If lint complains, just leave as-is.

nfischer · 2018-10-27T20:53:14Z

Running npm run gendocs on Ubuntu 16.04.3 on top of WSL with node v8.12.0 produces no errors

Fixed the issue in #896. Please rebase.

codecov-io · 2018-10-28T12:34:06Z

Codecov Report

Merging #889 into master will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##           master     #889   +/-   ##
=======================================
  Coverage   95.81%   95.81%           
=======================================
  Files          34       34           
  Lines        1266     1266           
=======================================
  Hits         1213     1213           
  Misses         53       53

Impacted Files	Coverage Δ
src/cp.js	`86.4% <100%> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2b3b781...f590747. Read the comment docs.

joshi-sh added 3 commits September 17, 2018 22:15

Propogate the -u option when copying recursively

c40496a

Added test for cp -Ru

4ca5694

Fixed lint errors

dface6c

nfischer changed the title ~~Issue 808~~ feat(cp): support update flag when recursing Sep 18, 2018

nfischer requested changes Sep 18, 2018

View reviewed changes

Better description of test case

8d5811d

joshi-sh added 3 commits September 20, 2018 00:14

Fixed test to check contents. Added test for succesful updates

3f2d0fd

Fixed undefined reference error

3283d5e

Fixed lint errors

ee59552

nfischer reviewed Sep 22, 2018

View reviewed changes

This was referenced Oct 10, 2018

Fix silent exec #892

Merged

Travis CI currently broken #893

Closed

joshi-sh added 4 commits October 28, 2018 04:43

Cleaned up comments and strings to make them more descriptive

cdb269f

Created constant for magic number (two days in ms)

d4c27fc

Merge branch 'master' into issue-808

0b1579b

Removed trailing spaces

f590747

nfischer approved these changes Nov 13, 2018

View reviewed changes

nfischer merged commit 18d8bbf into shelljs:master Nov 13, 2018

feat(cp): support update flag when recursing #889

feat(cp): support update flag when recursing #889

Uh oh!

Conversation

joshi-sh commented Sep 18, 2018 • edited by nfischer Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nfischer commented Sep 18, 2018

Uh oh!

joshi-sh commented Sep 19, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nfischer commented Sep 19, 2018

Uh oh!

nfischer left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nfischer commented Oct 27, 2018

Uh oh!

codecov-io commented Oct 28, 2018

Codecov Report

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

joshi-sh commented Sep 18, 2018 •

edited by nfischer

Loading

joshi-sh commented Sep 19, 2018 •

edited

Loading