Commit Graph

186 Commits

Author SHA1 Message Date
Stefan Scherer d394cffe49 Auto-detect shell on Windows
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-03 03:35:12 +01:00
David Gageot b935949c5e Merge pull request #2680 from dgageot/better-swarm-error
Better error when swarm is not started
2015-12-24 14:25:03 +01:00
David Gageot 89d9e2fe90 Close drivers on exit
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:44:42 +01:00
David Gageot 946712b1f7 Fix vet issues
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:30:50 +01:00
David Gageot 24a13af61e FIX #2653 docker-machine ls need to identify machine or cluster
Signed-off-by: David Gageot <david@gageot.net>
2015-12-23 18:09:24 +01:00
David Gageot 670c4808ed FIX #2663 reduce calls to the driver in ls
Signed-off-by: David Gageot <david@gageot.net>
2015-12-23 13:58:06 +01:00
David Gageot 1744bf4fd7 Fix Powershell env hints
Signed-off-by: David Gageot <david@gageot.net>
2015-12-22 15:18:09 +01:00
David Gageot e7e72c37d6 FIX #2655 Add quotes to the eval cmdline if there are spaces in the path
Signed-off-by: David Gageot <david@gageot.net>
2015-12-22 11:34:33 +01:00
David Gageot d977ec73af FIX #2643 Ignore empty ssh key
Signed-off-by: David Gageot <david@gageot.net>
2015-12-21 12:55:29 +01:00
David Gageot 906ac38d5a Merge pull request #2607 from askb/2595-dm-force-fails
Fixes #2595 remove fails when config.json is not found
2015-12-21 09:06:48 +01:00
Anil Belur 403b57437f Fixes #2595 `dm rm` fails when config.json is not found
This issue occurs when `api.Load()` fails while loading
the `config.json` file, in case the config file is not present.
Refactored the code to handled `-y` and `-f` as documented.
Now added UT for remove options.

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-19 12:01:41 +05:30
Jean-Laurent de Morlhon c279d0aba2 Default to cmd shell on windows
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-18 11:42:11 +01:00
Jean-Laurent de Morlhon c07067c7e4 Detect fish shell
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-17 16:43:59 +01:00
Jean-Laurent de Morlhon 854219d44a Clearer writer name
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-16 16:51:03 +01:00
Nathan LeClaire 06c97cfb17 Fix STDOUT and STDERR direction based on Log.* calls
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-15 18:01:42 -08:00
David Gageot f66655fd77 FIX #2280 prevent nil dereference
Signed-off-by: David Gageot <david@gageot.net>
2015-12-14 15:24:57 +01:00
Jean-Laurent de Morlhon 02dde087c9 Merge pull request #2552 from nathanleclaire/ls_timeout_nits
Aesthetic nitpicks on ls timeout
2015-12-11 10:55:40 +01:00
Jean-Laurent de Morlhon ac41fba24e Merge pull request #2541 from dougm/env-emacs
Add emacs support to env command
2015-12-11 09:37:06 +01:00
Nathan LeClaire 5358010229 Merge pull request #2526 from jeanlaurent/bugsnag
Monitor and report bug with bugsnag
2015-12-10 19:01:22 -08:00
Doug MacEachern 4e58bb9434 Add emacs support to env command
Signed-off-by: Doug MacEachern <dougm@vmware.com>
2015-12-10 15:29:14 -08:00
Nathan LeClaire 29ffc04cc9 Aesthetic nitpicks on ls timeout
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-10 13:25:13 -08:00
Jean-Laurent de Morlhon 4f0c24483b bugsnag integration
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-10 17:05:05 +01:00
Jean-Laurent de Morlhon 02c235b8b9 Fix #2534 and #1696
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-10 16:51:59 +01:00
Jean-Laurent de Morlhon f37a0290dd Add shell list to help command
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-09 09:46:03 +01:00
Anil Belur a2a9ebb078 Minor fix updating the sub-command rm usage with -f.
This is a follow up for #2349

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-08 16:55:54 +05:30
David Gageot be1d75f1c5 Merge pull request #2522 from dgageot/simplify-ls-tests
Simplify ls command tests
2015-12-08 10:50:19 +01:00
Jean-Laurent de Morlhon a729e3e2f6 Merge pull request #2464 from askb/2310_filter_engine_label
Fixes issue #2310 - docker-machine ls --filter with engine label
2015-12-08 10:36:21 +01:00
David Gageot aca111a373 Merge pull request #2489 from jeanlaurent/logrus
Replace custom logging system by logrus
2015-12-08 10:27:38 +01:00
David Gageot c421bb456e Simplify ls command tests
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 10:18:42 +01:00
Anil Belur 0b0373d436 Fixes issue #2310 - machine ls --filter with engine label
* Added a new members `Labels` to `FilterOptions struct`, and `EngineOptions` to
`HostListItem struct`. `HostListItems` is already being read from the file
store `config.json` which TestFilterHostsReturnSetLabel engine labels.

* Modified `parseFilters()` and added new `func matchesLabel(`) which compares
the one or more label values provided as input.

* Also the changes include added tests for UT and integration.
Note: Have kept `--filter label=<key>=<value>` syntax which is similar to
`docker images --filter` to keep the usability consistent.

review comments from @dgageot

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-08 10:15:31 +05:30
Nathan LeClaire ed8ed5f14e Revise SSH help flow and add 'docker-machine ssh' test
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-07 13:07:57 -08:00
Jean-Laurent de Morlhon 4792177b11 Logrus Machine Logger
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 18:36:48 +01:00
Jean-Laurent de Morlhon 2e79f67e93 Cleanup stdout/stderr log initialization
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01:00
Jean-Laurent de Morlhon 109bea4151 Extract interface and Remove log.print
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01:00
David Gageot 3612c55677 Add version to machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-12-03 16:27:42 +01:00
Anil Belur 2d71dc77dc This is a follow up for PR #2473
Now the returned `err` is being checked to ensure its `Nil`

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-03 09:13:44 +05:30
Nathan LeClaire 98a1c8c159 Merge pull request #2473 from askb/2451_key_filter_case
Fixes #2451 - ensures ls filters `<key>` and `<value>` works case-insensitive
2015-12-02 15:42:12 -08:00
Jean-Laurent de Morlhon f9f886f529 Display driver in error without crashing
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-02 18:27:21 +01:00
Anil Belur 22cacbf152 Fixes #2451 ensure filters `<key>` and `<value>` work when case-insensitive
Added unit tests to verify filters

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-02 22:15:03 +05:30
Anil Belur 77fba72d13 Fixes #2349 - rm get user confirmation before proceeding further
* adds new flag `-y` prompting for user confirmation before removal
* Modified existing integration tests to work with the fix #2349.
* Added tests for checking user confirmation, updated the test cases use sub-shell with `|`
* Updated the reference docs for rm sub-command

incorporated changes by @dgageot, @jeanlaurent and @nathanleclaire

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-02 09:17:33 +05:30
Jean-Laurent de Morlhon 75fd2cdac0 Fix for #2415
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-01 17:09:40 +01:00
Nathan LeClaire f7ea3d9f19 Merge pull request #2434 from dgageot/check-after-create
Check machine after create
2015-11-30 16:24:43 -08:00
David Gageot 643b7349f7 Remove duplicated FakeApi
Signed-off-by: David Gageot <david@gageot.net>
2015-11-30 18:30:00 +01:00
David Gageot faaac3df8c FIX 2444 Command scp being called twice
Signed-off-by: David Gageot <david@gageot.net>
2015-11-28 11:59:43 +01:00
David Gageot 0c12b7dbc1 Check machine after create
Signed-off-by: David Gageot <david@gageot.net>
2015-11-27 09:43:34 +01:00
David Gageot cfe3972d18 Minor
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 14:13:52 +01:00
David Gageot 518e3b8bde Rename to rawDriver
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 14:08:09 +01:00
David Gageot 00f62150b4 FIX nil pointer dereference in machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 08:53:09 +01:00
David Gageot 6a1993664d FIX #1619 Timeout test for machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 08:49:56 +01:00
David Gageot 89fcca2879 Increase coverage of machine ls tests
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 08:48:07 +01:00