Deployment reorg/refactor as groundwork for multi-language support #723

rwaldron · 2016-05-02T15:24:56Z

WIP

Deployment needs quite a bit of reorganization before any multi-language support can be considered. This PR will track the changes, ideally as each step in a single commit. I'm imposing a strict requirement that all changes must pass the existing tests with little or no changes to the tests (ie. no changes that will alter the operational outcome or semantics).

Much of the work entails:

Renaming operations to be less "script" specific.
- However, some cases will be to make an operation that's JS-specific more clearly that.
Eliminating vestigial code
Consolidating operations wherever possible.
Splitting up the current code in lib/tessel/deploy.js on a "generic or not" line.
Splitting up the current code in test/unit/deploy.js on a "generic or not" line.

I will update this list as notable work arises

Signed-off-by: Rick Waldron waldron.rick@gmail.com

johnnyman727 · 2016-05-02T19:13:33Z

lib/tessel/commands.js

+};
+
+module.exports.py = {
+  execute: (filepath, relpath) => ['python', filepath + relpath],


I've been pruning python related code for now since nobody is working on it.

This is just here as a placeholder.

johnnyman727 · 2016-05-02T19:24:14Z

@rwaldron this looks like a valuable endeavor.

I've was thinking that the only generic behavior that we should keep in deploy.js is transferring the tarball. We could also keep the logic that starts pushed scripts but it would need to be abstracted a bit to write one of a couple of options for the shell files that gets placed at /app/start so I'm not sure it's worth the common code path.

rwaldron · 2016-05-02T19:43:40Z

I've was thinking that the only generic behavior that we should keep in deploy.js is transferring the tarball.

Transferring, yes. Creating: no.

rwaldron · 2016-05-04T19:37:38Z

Unless we select a "default language", this is no longer possible:

t2 run .

johnnyman727 · 2016-05-04T20:01:49Z

we can't detect a Cargo.toml or Package.json?

rwaldron · 2016-05-04T20:15:47Z

we can't detect a Cargo.toml or Package.json?

I guess if we special case that scenario. :(

The reason this no longer is works is because the whole process needs to already know what language it wants by the time it gets to findProject, because there are specific considerations that findProject needs to account for, that are per-language.

rwaldron · 2016-05-04T20:20:02Z

...That still doesn't work. How does t2 run . know which of these python scripts is the entry point:

$ tree
.
├── README.md
├── __init__.py
├── blinky.py
├── setup.py
└── tessel.py

So...

__init__.py is empty
setup.py is some junk I made
Maybe blinky.py or tessel.py? No way to know.

rwaldron · 2016-05-04T21:23:33Z

@johnnyman727 Almost there. I did not implement Rust deployment, I'll leave that to you. I did implement your changes from findProject, those are in https://github.com/rwaldron/t2-cli/blob/deployment-reorg/lib/tessel/deployment/rust.js, which gets called from findProject. I believe you want to put the contents of this: https://github.com/tessel/t2-cli/pull/511/files#diff-191f4ebe176e9e816abc0445a664be98R272 into here: https://github.com/rwaldron/t2-cli/blob/deployment-reorg/lib/tessel/deployment/rust.js#L48-L50

rwaldron · 2016-05-04T22:28:49Z

@johnnyman727 ready for review.

johnnyman727 · 2016-05-05T11:29:56Z

@rwaldron I won't be able to review until Sunday but I am excited about it.

rwaldron · 2016-05-05T13:51:48Z

lib/tessel/deploy.js


 // Internal
 var commands = require('./commands');
-var deployLists = require('./deploy-lists');


Moved to specific language deployment module

rwaldron · 2016-05-05T13:53:17Z

lib/tessel/deploy.js

 var logs = require('../logs');
 var Preferences = require('../preferences');
 // Necessary to ensure that the next line has had the LOCAL_AUTH_PATH descriptor added.
 var provision = require('./provision'); // jshint ignore:line
 var Tessel = require('./tessel');

-var binaryModulesUsed = new Map();


Moved to lib/tessel/deployment/javascript.js

johnnyman727 · 2016-05-09T22:34:46Z

@rwaldron sorry, finally got time to take a look!

It looks great with a few minor issues as commented. I was able to reproduce your smoke tests and the path to adding Rust support is clear and logical. 👍

…mpleExec Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

…ecific deployment commands Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

…TestCode Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

…ipt" centric naming Internals - Renames setExecutablePermissions => chmod; Change signature: (filepath) => (permssion, filepath) Bindings (misc) - t => tessel APIs - Tessel.prototype.deployScript => Tessel.prototype.deploy - Tessel.prototype.restartScript => Tessel.prototype.restart - controller.deployScript => controller.deploy - controller.restartScript => controller.restart - (deploy|actions).runScript => (deploy|actions).run - (deploy|actions).pushScript => (deploy|actions).push Additionally: - Removes unused `script` argument at actions.run/actions.push callsites and defintion Tests: - Primarly updating names - Two cases update the expected arguments for the removal of the unused `script` argument Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

…-specific operations and data Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

…avascript.js Still more granular work to do, but this gets the split in. Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

- deployment.*.lists tests - move js specific stuff: test/unit/deploy => test/unit/deployment/javascript Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

rwaldron · 2016-05-11T18:15:01Z

@johnnyman727 all review notes are addressed and this has been rebased

johnnyman727 · 2016-05-11T18:29:55Z

test/unit/deployment/resolve-language.js

@@ -24,6 +24,7 @@ exports['deployment.resolveLanguage()'] = {

  jsInferred: function(test) {
    test.expect(4);
+    // Set the stub return value


Thanks for the helpful comments

johnnyman727 · 2016-05-11T18:30:32Z

Looks good! Let's merge this behemoth. (assuming Travis gives the green)

johnnyman727 · 2016-05-11T20:46:48Z

👏

rwaldron · 2016-05-11T20:46:59Z

🎉

wyze · 2016-05-11T20:47:14Z

🎉

tikurahul · 2016-05-12T15:16:59Z

@rwaldron Please take a bow. This is totally awesome.

rwaldron force-pushed the deployment-reorg branch 2 times, most recently from 0bff2bf to 0784308 Compare May 2, 2016 16:26

johnnyman727 reviewed May 2, 2016
View reviewed changes

rwaldron force-pushed the deployment-reorg branch 3 times, most recently from 3ef11e0 to 263dc0b Compare May 3, 2016 22:32

rwaldron mentioned this pull request May 4, 2016

t2 run/push: blacklist tessel module. Fixes gh-725 #726

Closed

rwaldron force-pushed the deployment-reorg branch from 263dc0b to f776ee5 Compare May 4, 2016 19:34

rwaldron force-pushed the deployment-reorg branch from 60ccaa0 to 72d2a34 Compare May 4, 2016 23:04

rwaldron reviewed May 5, 2016
View reviewed changes

rwaldron force-pushed the deployment-reorg branch from 924bce9 to f96a7c9 Compare May 5, 2016 13:52

rwaldron reviewed May 5, 2016
View reviewed changes

rwaldron force-pushed the deployment-reorg branch from 0b0da80 to 6d40555 Compare May 11, 2016 00:13

rwaldron added 19 commits May 11, 2016 14:03

(deploy reorg/refactor) Eliminate special remote command exec, use si…

1c6c7bb

…mpleExec Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) Consolidate tessel-app commands; make lang-sp…

870f5f0

…ecific deployment commands Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) Eliminate unused test parameter from deploy…

f031104

…TestCode Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) First round marking language specific and non…

43e269a

…-specific operations and data Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) Modern JS updates

f68525b

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) Fix require order

2174299

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) writeToFile => createShellScript

d02d5ca

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) outline silos for alternate langs

2dde386

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) Relocates all JS-centric code to deployment/j…

3369c1c

…avascript.js Still more granular work to do, but this gets the split in. Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) empty interfaces

b9a14e8

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) Reorganization in tests

d3e1db6

- deployment.*.lists tests - move js specific stuff: test/unit/deploy => test/unit/deployment/javascript Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) blacklist tessel module. Fixes tesselgh-725

a6d5863

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) refactor findProject to be language agnostic

782d734

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) t2 run . can infer language (JS and Rust only)

9a89a22

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) t2 run/push python.py end-to-end

947312b

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) shell scripts and pre-run operations

44a8379

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) cleanups

8d8f3bf

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

(deploy reorg/refactor) fixed per review notes

d09aba5

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

rwaldron force-pushed the deployment-reorg branch from 6d40555 to d09aba5 Compare May 11, 2016 18:14

johnnyman727 reviewed May 11, 2016
View reviewed changes

rwaldron merged commit 24fdd7d into tessel:master May 11, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Deployment reorg/refactor as groundwork for multi-language support #723

Deployment reorg/refactor as groundwork for multi-language support #723

rwaldron commented May 2, 2016 •

edited

johnnyman727 May 2, 2016

rwaldron May 2, 2016

johnnyman727 commented May 2, 2016

rwaldron commented May 2, 2016

rwaldron commented May 4, 2016

johnnyman727 commented May 4, 2016

rwaldron commented May 4, 2016

rwaldron commented May 4, 2016

rwaldron commented May 4, 2016

rwaldron commented May 4, 2016

johnnyman727 commented May 5, 2016

rwaldron May 5, 2016

rwaldron May 5, 2016

johnnyman727 commented May 9, 2016

rwaldron commented May 11, 2016

johnnyman727 May 11, 2016

johnnyman727 commented May 11, 2016 •

edited

johnnyman727 commented May 11, 2016

rwaldron commented May 11, 2016

wyze commented May 11, 2016

tikurahul commented May 12, 2016

Deployment reorg/refactor as groundwork for multi-language support #723

Deployment reorg/refactor as groundwork for multi-language support #723

Conversation

rwaldron commented May 2, 2016 • edited

johnnyman727 May 2, 2016

Choose a reason for hiding this comment

rwaldron May 2, 2016

Choose a reason for hiding this comment

johnnyman727 commented May 2, 2016

rwaldron commented May 2, 2016

rwaldron commented May 4, 2016

johnnyman727 commented May 4, 2016

rwaldron commented May 4, 2016

rwaldron commented May 4, 2016

rwaldron commented May 4, 2016

rwaldron commented May 4, 2016

johnnyman727 commented May 5, 2016

rwaldron May 5, 2016

Choose a reason for hiding this comment

rwaldron May 5, 2016

Choose a reason for hiding this comment

johnnyman727 commented May 9, 2016

rwaldron commented May 11, 2016

johnnyman727 May 11, 2016

Choose a reason for hiding this comment

johnnyman727 commented May 11, 2016 • edited

johnnyman727 commented May 11, 2016

rwaldron commented May 11, 2016

wyze commented May 11, 2016

tikurahul commented May 12, 2016

rwaldron commented May 2, 2016 •

edited

johnnyman727 commented May 11, 2016 •

edited