@@ -576,7 +576,9 @@ Create a new build configuration

 [options="nowrap"]

 ----

-  # Create a build config based on the source code in the current git repository (with a public remote) and a Docker image

+

+  # Create a build config based on the source code in the current git repository (with a public

+  # remote) and a Docker image

   $ openshift cli new-build . --docker-image=repo/langimage

   # Create a NodeJS build config based on the provided [image]~[source code] combination

@@ -588,8 +590,8 @@ Create a new build configuration

   # Create a build config using a Dockerfile specified as an argument

   $ openshift cli new-build -D $'FROM centos:7\nRUN yum install -y httpd'

-  # Create a build config from a remote repository and add custom environment variables into resulting image

-  $ openshift cli new-build https://github.com/openshift/ruby-hello-world --env=RACK_ENV=development

+  # Create a build config from a remote repository and add custom environment variables

+  $ openshift cli new-build https://github.com/openshift/ruby-hello-world RACK_ENV=development

 ----

 ====

@@ -490,18 +490,36 @@ func handleRunError(c *cobra.Command, err error, fullName string) error {

 			err = errs.Errors()[0]

 		}

 	}

-	if e, ok := err.(newcmd.ErrRequiresExplicitAccess); ok {

-		return fmt.Errorf("installing %q requires that you grant the image access to run with your credentials; if you trust the provided image, include the flag --grant-install-rights", e.Match.Value)

+	switch t := err.(type) {

+	case newcmd.ErrRequiresExplicitAccess:

+		return fmt.Errorf("installing %q requires that you grant the image access to run with your credentials; if you trust the provided image, include the flag --grant-install-rights", t.Match.Value)

+	case newapp.ErrNoMatch:

+		return fmt.Errorf(`%[1]v

+

+The '%[2]s' command will match arguments to the following types:

+

+  1. Images tagged into image streams in the current project or the 'openshift' project

+     - if you don't specify a tag, we'll add ':latest'

+  2. Images in the Docker Hub, on remote registries, or on the local Docker engine

+  3. Templates in the current project or the 'openshift' project

+  4. Git repository URLs or local paths that point to Git repositories

+

+--allow-missing-images can be used to point to an image that does not exist yet

+or is only on the local system.

+

+See '%[2]s' for examples.

+`, t, c.Name())

 	}

-	if err == errNoTokenAvailable {

+	switch err {

+	case errNoTokenAvailable:

 		// TODO: improve by allowing token generation

 		return fmt.Errorf("to install components you must be logged in with an OAuth token (instead of only a certificate)")

-	}

-	if err == newcmd.ErrNoInputs {

+	case newcmd.ErrNoInputs:

 		// TODO: suggest things to the user

 		return cmdutil.UsageError(c, newAppNoInput, fullName)

+	default:

+		return err

 	}

-	return err

 }

 func printHumanReadableQueryResult(r *newcmd.QueryResult, out io.Writer, fullName string) error {

@@ -12,6 +12,7 @@ import (

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

+	newapp "github.com/openshift/origin/pkg/generate/app"

 	newcmd "github.com/openshift/origin/pkg/generate/app/cmd"

 )

@@ -30,7 +31,9 @@ remote repository that the server can see.

 Once the build configuration is created a new build will be automatically triggered.

 You can use '%[1]s status' to check the progress.`

-	newBuildExample = `  # Create a build config based on the source code in the current git repository (with a public remote) and a Docker image

+	newBuildExample = `

+  # Create a build config based on the source code in the current git repository (with a public

+  # remote) and a Docker image

   $ %[1]s new-build . --docker-image=repo/langimage

   # Create a NodeJS build config based on the provided [image]~[source code] combination

@@ -42,8 +45,25 @@ You can use '%[1]s status' to check the progress.`

   # Create a build config using a Dockerfile specified as an argument

   $ %[1]s new-build -D $'FROM centos:7\nRUN yum install -y httpd'

-  # Create a build config from a remote repository and add custom environment variables into resulting image

-  $ %[1]s new-build https://github.com/openshift/ruby-hello-world --env=RACK_ENV=development`

+  # Create a build config from a remote repository and add custom environment variables

+  $ %[1]s new-build https://github.com/openshift/ruby-hello-world RACK_ENV=development`

+

+	newBuildNoInput = `You must specify one or more images, image streams, or source code locations to create a build.

+

+To build from an existing image stream tag or Docker image, provide the name of the image and

+the source code location:

+

+  $ %[1]s new-build openshift/nodejs-010-centos7~https://github.com/openshift/nodejs-ex.git

+

+If you only specify the source repository location (local or remote), the command will look at

+the repo to determine the type, and then look for a matching image on your server or on the

+default Docker registry.

+

+  $ %[1]s new-build https://github.com/openshift/nodejs-ex.git

+

+will look for an image called "nodejs" in your current project, the 'openshift' project, or

+on the Docker Hub.

+`

 )

 // NewCmdNewBuild implements the OpenShift cli new-build command

@@ -110,16 +130,7 @@ func RunNewBuild(fullName string, f *clientcmd.Factory, out io.Writer, in io.Rea

 	}

 	result, err := config.RunBuilds()

 	if err != nil {

-		if errs, ok := err.(errors.Aggregate); ok {

-			if len(errs.Errors()) == 1 {

-				err = errs.Errors()[0]

-			}

-		}

-		if err == newcmd.ErrNoInputs {

-			// TODO: suggest things to the user

-			return cmdutil.UsageError(c, "You must specify one or more images, image streams and source code locations to create a build configuration.")

-		}

-		return err

+		return handleBuildError(c, err, fullName)

 	}

 	if err := setLabels(config.Labels, result); err != nil {

 		return err

@@ -146,3 +157,38 @@ func RunNewBuild(fullName string, f *clientcmd.Factory, out io.Writer, in io.Rea

 	return nil

 }

+

+func handleBuildError(c *cobra.Command, err error, fullName string) error {

+	if err == nil {

+		return nil

+	}

+	if errs, ok := err.(errors.Aggregate); ok {

+		if len(errs.Errors()) == 1 {

+			err = errs.Errors()[0]

+		}

+	}

+	switch t := err.(type) {

+	case newapp.ErrNoMatch:

+		return fmt.Errorf(`%[1]v

+

+The '%[2]s' command will match arguments to the following types:

+

+  1. Images tagged into image streams in the current project or the 'openshift' project

+     - if you don't specify a tag, we'll add ':latest'

+  2. Images in the Docker Hub, on remote registries, or on the local Docker engine

+  3. Git repository URLs or local paths that point to Git repositories

+

+--allow-missing-images can be used to point to an image that does not exist yet

+or is only on the local system.

+

+See '%[2]s' for examples.

+`, t, c.Name())

+	}

+	switch err {

+	case newcmd.ErrNoInputs:

+		// TODO: suggest things to the user

+		return cmdutil.UsageError(c, newBuildNoInput, fullName)

+	default:

+		return err

+	}

+}

@@ -554,7 +554,6 @@ func (c *AppConfig) ensureHasSource(components app.ComponentReferences, reposito

 				}

 			}

 		}

-		glog.V(4).Infof("ensureHasSource: %#v", components[0])

 	}

 	return nil

 }

@@ -362,7 +362,7 @@ func TestResolve(t *testing.T) {

 						},

 					},

 				})},

-			expectedErr: `no image or template matched "mysql:invalid`,

+			expectedErr: `no match for "mysql:invalid`,

 		},

 		{

 			name: "Successful mysql builder",

@@ -14,9 +14,9 @@ type ErrNoMatch struct {

 func (e ErrNoMatch) Error() string {

 	if len(e.qualifier) != 0 {

-		return fmt.Sprintf("no image or template matched %q: %s, specify allow-missing-images to use this image name.", e.value, e.qualifier)

+		return fmt.Sprintf("no match for %q: %s, specify --allow-missing-images to use this image name.", e.value, e.qualifier)

 	}

-	return fmt.Sprintf("no image or template matched %q, specify --allow-missing-images to use this image name.", e.value)

+	return fmt.Sprintf("no match for %q, specify --allow-missing-images to use this image name.", e.value)

 }

 // UsageError is the usage error message returned when no match is found.

@@ -89,7 +89,7 @@ oc delete all -l app=ruby

 [ "$(oc new-build mysql https://github.com/openshift/ruby-hello-world --binary 2>&1 | grep -F 'specifying binary builds and source repositories at the same time is not allowed')" ]

 # do not allow use of non-existent image (should fail)

-[ "$(oc new-app  openshift/bogusImage https://github.com/openshift/ruby-hello-world.git -o yaml 2>&1 | grep "no image or template matched")" ]

+[ "$(oc new-app  openshift/bogusImage https://github.com/openshift/ruby-hello-world.git -o yaml 2>&1 | grep "no match for")" ]

 # allow use of non-existent image (should succeed)

 [ "$(oc new-app  openshift/bogusImage https://github.com/openshift/ruby-hello-world.git -o yaml --allow-missing-images)" ]