Sort swarm services using natural sorting

[boaz0]

This is a follow-up to moby/moby#31638

- What I did

Use natural sorting to display swarm services in docker stack ls.

- How I did it

Import vbom.ml/util/sortorder and update Less(i, j int) bool

- How to verify it

Run unit test

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

[boaz0]

Should I add ./vendor/vbom.ml to this commit?

[aaronlehmann]

Yes, you would have to vendor the package.

[aaronlehmann]

Should this be done for nodes as well as services?

[thaJeztah]

@ripcurld0 if you're not sure how to; if you're on a Mac, these are the steps to vendor the package;

start a shell in a development container;

$ make -f docker.Makefile shell

inside the container, vendor the package;

$ vndr vbom.ml/util

2017/07/06 22:55:10 Collecting initial packages
2017/07/06 22:55:13 Download dependencies
2017/07/06 22:55:14 	Clone vbom.ml/util, revision 928aaa586d7718c70f4090ddf83f2b34c16fdc8d
2017/07/06 22:55:15 	Finished clone vbom.ml/util
2017/07/06 22:55:15 Dependencies downloaded. Download time: 1.039323695s
2017/07/06 22:55:15 Collecting all dependencies
2017/07/06 22:55:23 Clean vendor dir from unused packages
2017/07/06 22:55:25 Success
2017/07/06 22:55:25 Running time: 14.71871232s

Then, exit the container, and add the vendored package to your commit

[GordonTheTurtle]

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "natural_sort" git@github.com:ripcurld0/cli.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354047976
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

[boaz0]

@aaronlehmann probably yes. should I include it in this PR?

[aaronlehmann]

Sure.

[codecov-io]

Codecov Report

Merging #302 into master will increase coverage by 0.01%.
The diff coverage is 100%.

@@            Coverage Diff            @@
##           master    #302      +/-   ##
=========================================
+ Coverage   48.68%   48.7%   +0.01%     
=========================================
  Files         186     185       -1     
  Lines       12416   12168     -248     
=========================================
- Hits         6045    5926     -119     
+ Misses       5996    5875     -121     
+ Partials      375     367       -8

[thaJeztah]

left a comment 👍

[thaJeztah]

can you include this change in the same commit that adds the vendored code?

given that this is a new vendor, it's probably ok as well to just squash your commits (for updating vendors we usually keep it in a separate commit, but perhaps it's ok to do everything in a single one to not complicate things)

[boaz0]

done 👣

[thaJeztah]

Reading on my phone - not a full review, just a note 😄

[thaJeztah]

Just realized this is something we should be aware of - depending for what we use this library (IIRC, some object types in docker allow emoji etc )

[thaJeztah]

Objects that currently accept non-ascii characters (that I'm aware of);

• networks
• volumes using a volume-driver plugin

So for those we'd have to add some extra logic if we want to add natural sort

[aaronlehmann]

I don't believe this is a problem. It looks like the sort works fine with non-ascii characters, but the detection and special handling of digits only considers ASCII digits as opposed to other numerals (https://en.wikipedia.org/wiki/Numerals_in_Unicode).

[thaJeztah]

changes LGTM, but looks like you need to do a rebase, because you pulled in two unrelated commits.

Let me know if you need help doing so

[boaz0]

Honestly I have no idea how to remove these commits from the PR.

[boaz0]

I am closing these and opening a new PR.

[boaz0]

Opened #315

[thaJeztah]

Most likely the extra commits were introduced when you rebased and your "upstream" was out of date.

My usual steps are ("upstream" pointing to "docker/cli" and "origin" pointing to "my-fork/cli");

git fetch upstream -v; git fetch origin -v; git rebase upstream/master

After that, force-push to by branch

git push -f origin

[boaz0]

I wish I knew it. Thanks a lot for the tip, though.