Update docs and tests.

Author: dlorenc

README.md

@@ -41,42 +41,31 @@ To use `container-diff analyze` to perform analysis on a single image, you need
 
 ```
 container-diff analyze <img>     [Run default analyzers]
-container-diff analyze <img> --types=history  [History]
-container-diff analyze <img> --types=file  [File System]
-container-diff analyze <img> --types=pip  [Pip]
-container-diff analyze <img> --types=apt  [Apt]
-container-diff analyze <img> --types=node  [Node]
-container-diff analyze <img> --types=apt,node  [Apt and Node]
-# --types=<analyzer1>,<analyzer2>,<analyzer3>,...
+container-diff analyze <img> --type=history  [History]
+container-diff analyze <img> --type=file  [File System]
+container-diff analyze <img> --type=pip  [Pip]
+container-diff analyze <img> --type=apt  [Apt]
+container-diff analyze <img> --type=node  [Node]
+container-diff analyze <img> --type=apt --type=node  [Apt and Node]
+# --type=<analyzer1> --type=<analyzer2> --type=<analyzer3>,...
 ```
 
 To use container-diff to perform a diff analysis on two images, you need two Docker images (in the form of an ID, tarball, or URL from a repo). Once you have those images, you can run any of the following differs:
 ```
 container-diff diff <img1> <img2>     [Run all differs]
-container-diff diff <img1> <img2> --types=history  [History]
-container-diff diff <img1> <img2> --types=file  [File System]
-container-diff diff <img1> <img2> --types=pip  [Pip]
-container-diff diff <img1> <img2> --types=apt  [Apt]
-container-diff diff <img1> <img2> --types=node  [Node]
+container-diff diff <img1> <img2> --type=history  [History]
+container-diff diff <img1> <img2> --type=file  [File System]
+container-diff diff <img1> <img2> --type=pip  [Pip]
+container-diff diff <img1> <img2> --type=apt  [Apt]
+container-diff diff <img1> <img2> --type=node  [Node]
 ```
 
 You can similarly run many analyzers at once:
 
 ```
-container-diff diff <img1> <img2> --types=history,apt,node
+container-diff diff <img1> <img2> --type=history --type=apt --type=node
 ```
 
-All of the analyzer flags with their long versions can be seen below:
-
-| Differ                    | Short flag | Long Flag  |
-| ------------------------- |:----------:| ----------:|
-| File system diff          | -f         | --file     |
-| History                   | -d 	 | --history  |
-| npm installed packages    | -n 	 | --node     |
-| pip installed packages    | -p 	 | --pip      |
-| apt-get installed packages| -a 	 | --apt      |
-
-
 ## Image Sources
 
 container-diff supports Docker images located in both a local Docker daemon and a remote registry. To explicitly specify a local image, use the `daemon://` prefix on the image name; similarly, for an explicitly remote image, use the `remote://` prefix.
@@ -236,7 +225,7 @@ Tarballs provided directly to the tool must be in the Docker format (i.e. have a
 ## Example Run
 
 ```
-$ container-diff diff gcr.io/google-appengine/python:2017-07-21-123058 gcr.io/google-appengine/python:2017-06-29-190410 --types=apt,node,pip
+$ container-diff diff gcr.io/google-appengine/python:2017-07-21-123058 gcr.io/google-appengine/python:2017-06-29-190410 --type=apt --type=node --type=pip
 
 -----AptDiffer-----
 

tests/integration_test.go

@@ -97,83 +97,83 @@ func TestDiffAndAnalysis(t *testing.T) {
 			subcommand:   "diff",
 			imageA:       diffBase,
 			imageB:       diffModified,
-			differFlags:  []string{"--types=file"},
+			differFlags:  []string{"--type=file"},
 			expectedFile: "file_diff_expected.json",
 		},
 		{
 			description:  "apt differ",
 			subcommand:   "diff",
 			imageA:       aptBase,
 			imageB:       aptModified,
-			differFlags:  []string{"--types=apt"},
+			differFlags:  []string{"--type=apt"},
 			expectedFile: "apt_diff_expected.json",
 		},
 		{
 			description:  "node differ",
 			subcommand:   "diff",
 			imageA:       nodeBase,
 			imageB:       nodeModified,
-			differFlags:  []string{"--types=node"},
+			differFlags:  []string{"--type=node"},
 			expectedFile: "node_diff_order_expected.json",
 		},
 		{
 			description:  "multi differ",
 			subcommand:   "diff",
 			imageA:       multiBase,
 			imageB:       multiModified,
-			differFlags:  []string{"--types=node,pip,apt"},
+			differFlags:  []string{"--type=node", "--type=pip","--type=apt"},
 			expectedFile: "multi_diff_expected.json",
 		},
 		{
 			description:  "multi differ local",
 			subcommand:   "diff",
 			imageA:       multiBaseLocal,
 			imageB:       multiModifiedLocal,
-			differFlags:  []string{"--types=node,pip,apt"},
+			differFlags:  []string{"--type=node", "--type=pip","--type=apt"},
 			expectedFile: "multi_diff_expected.json",
 		},
 		{
 			description:  "history differ",
 			subcommand:   "diff",
 			imageA:       diffBase,
 			imageB:       diffModified,
-			differFlags:  []string{"--types=history"},
+			differFlags:  []string{"--type=history"},
 			expectedFile: "hist_diff_expected.json",
 		},
 		{
 			description:  "apt sorted differ",
 			subcommand:   "diff",
 			imageA:       aptBase,
 			imageB:       aptModified,
-			differFlags:  []string{"--types=apt", "-o"},
+			differFlags:  []string{"--type=apt", "-o"},
 			expectedFile: "apt_sorted_diff_expected.json",
 		},
 		{
 			description:  "apt analysis",
 			subcommand:   "analyze",
 			imageA:       aptModified,
-			differFlags:  []string{"--types=apt"},
+			differFlags:  []string{"--type=apt"},
 			expectedFile: "apt_analysis_expected.json",
 		},
 		{
 			description:  "file sorted analysis",
 			subcommand:   "analyze",
 			imageA:       diffModified,
-			differFlags:  []string{"--types=file", "-o"},
+			differFlags:  []string{"--type=file", "-o"},
 			expectedFile: "file_sorted_analysis_expected.json",
 		},
 		{
 			description:  "pip analysis",
 			subcommand:   "analyze",
 			imageA:       pipModified,
-			differFlags:  []string{"--types=pip"},
+			differFlags:  []string{"--type=pip"},
 			expectedFile: "pip_analysis_expected.json",
 		},
 		{
 			description:  "node analysis",
 			subcommand:   "analyze",
 			imageA:       nodeModified,
-			differFlags:  []string{"--types=node"},
+			differFlags:  []string{"--type=node"},
 			expectedFile: "node_analysis_expected.json",
 		},
 	}