@@ -47,6 +47,7 @@ func NewCmdCancelBuild(fullName string, f *clientcmd.Factory, out io.Writer) *co

 	cmd.Flags().Bool("dump-logs", false, "Specify if the build logs for the cancelled build should be shown.")

 	cmd.Flags().Bool("restart", false, "Specify if a new build should be created after the current build is cancelled.")

+	//cmdutil.AddOutputFlagsForMutation(cmd)

 	return cmd

 }

@@ -107,6 +108,10 @@ func RunCancelBuild(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, arg

 	}

 	glog.V(2).Infof("Build %s was cancelled.", buildName)

+	// mapper, typer := f.Object()

+	// resourceMapper := &resource.Mapper{ObjectTyper: typer, RESTMapper: mapper, ClientMapper: f.ClientMapperForCommand()}

+	// shortOutput := cmdutil.GetFlagString(cmd, "output") == "name"

+

 	// Create a new build with the same configuration.

 	if cmdutil.GetFlagBool(cmd, "restart") {

 		request := &buildapi.BuildRequest{

@@ -118,8 +123,19 @@ func RunCancelBuild(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, arg

 		}

 		glog.V(2).Infof("Restarted build %s.", buildName)

 		fmt.Fprintf(out, "%s\n", newBuild.Name)

+		// fmt.Fprintf(out, "%s\n", newBuild.Name)

+		// info, err := resourceMapper.InfoForObject(newBuild)

+		// if err != nil {

+		// 	return err

+		// }

+		//cmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, "restarted")

 	} else {

 		fmt.Fprintf(out, "%s\n", build.Name)

+		// info, err := resourceMapper.InfoForObject(build)

+		// if err != nil {

+		// 	return err

+		// }

+		// cmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, "cancelled")

 	}

 	return nil

 }

@@ -303,7 +303,9 @@ func RunEnv(f *clientcmd.Factory, in io.Reader, out io.Writer, cmd *cobra.Comman

 			continue

 		}

 		info.Refresh(obj, true)

-		fmt.Fprintf(out, "%s/%s\n", info.Mapping.Resource, info.Name)

+

+		shortOutput := cmdutil.GetFlagString(cmd, "output") == "name"

+		cmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, "updated")

 	}

 	if failed {

 		return errExit

@@ -67,7 +67,7 @@ func NewCmdProcess(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.

 	cmd.Flags().BoolP("parameters", "", false, "Do not process but only print available parameters")

 	cmd.Flags().StringP("labels", "l", "", "Label to set in all resources for this template")

-	cmd.Flags().StringP("output", "o", "json", "Output format. One of: describe|json|yaml|template|templatefile.")

+	cmd.Flags().StringP("output", "o", "json", "Output format. One of: describe|json|yaml|name|template|templatefile.")

 	cmd.Flags().Bool("raw", false, "If true output the processed template instead of the template's objects. Implied by -o describe")

 	cmd.Flags().String("output-version", "", "Output the formatted object with the given version (default api-version).")

 	cmd.Flags().StringP("template", "t", "", "Template string or path to template file to use when -o=template or -o=templatefile.  The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]")

@@ -85,7 +85,7 @@ func NewCmdRollback(fullName string, f *clientcmd.Factory, out io.Writer) *cobra

 	cmd.Flags().BoolVar(&opts.IncludeStrategy, "change-strategy", false, "Include the previous deployment's strategy in the rollback")

 	cmd.Flags().BoolVar(&opts.IncludeScalingSettings, "change-scaling-settings", false, "Include the previous deployment's replicationController replica count and selector in the rollback")

 	cmd.Flags().BoolVarP(&opts.DryRun, "dry-run", "d", false, "Instead of performing the rollback, describe what the rollback will look like in human-readable form")

-	cmd.Flags().StringVarP(&opts.Format, "output", "o", "", "Instead of performing the rollback, print the updated deployment configuration in the specified format (json|yaml|template|templatefile)")

+	cmd.Flags().StringVarP(&opts.Format, "output", "o", "", "Instead of performing the rollback, print the updated deployment configuration in the specified format (json|yaml|name|template|templatefile)")

 	cmd.Flags().StringVarP(&opts.Template, "template", "t", "", "Template string or path to template file to use when -o=template or -o=templatefile.")

 	cmd.Flags().IntVar(&opts.DesiredVersion, "to-version", 0, "A config version to rollback to. Specifying version 0 is the same as omitting a version (the version will be auto-detected). This option is ignored when specifying a deployment.")

@@ -100,6 +100,8 @@ func NewCmdStartBuild(fullName string, f *clientcmd.Factory, in io.Reader, out i

 	cmd.Flags().String("git-post-receive", "", "The contents of the post-receive hook to trigger a build")

 	cmd.Flags().String("git-repository", "", "The path to the git repository for post-receive; defaults to the current directory")

+

+	// cmdutil.AddOutputFlagsForMutation(cmd)

 	return cmd

 }

@@ -113,9 +115,6 @@ func RunStartBuild(f *clientcmd.Factory, in io.Reader, out io.Writer, cmd *cobra

 	fromFile := cmdutil.GetFlagString(cmd, "from-file")

 	fromDir := cmdutil.GetFlagString(cmd, "from-dir")

 	fromRepo := cmdutil.GetFlagString(cmd, "from-repo")

-	//shortOutput := false

-

-	//mapper, _ := f.Object()

 	switch {

 	case len(webhook) > 0:

@@ -190,8 +189,15 @@ func RunStartBuild(f *clientcmd.Factory, in io.Reader, out io.Writer, cmd *cobra

 		}

 	}

-	//cmdutil.PrintSuccess(mapper, shortOutput, out, "Build", newBuild.Name, "started")

 	fmt.Fprintln(out, newBuild.Name)

+	// mapper, typer := f.Object()

+	// resourceMapper := &resource.Mapper{ObjectTyper: typer, RESTMapper: mapper, ClientMapper: f.ClientMapperForCommand()}

+	// info, err := resourceMapper.InfoForObject(newBuild)

+	// if err != nil {

+	// 	return err

+	// }

+	// shortOutput := cmdutil.GetFlagString(cmd, "output") == "name"

+	// cmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, "started")

 	var (

 		wg      sync.WaitGroup

@@ -23,7 +23,8 @@ type Bulk struct {

 func NewPrintNameOrErrorAfter(mapper meta.RESTMapper, short bool, operation string, out, errs io.Writer) func(*resource.Info, error) {

 	return func(info *resource.Info, err error) {

 		if err == nil {

-			cmdutil.PrintSuccess(mapper, false, out, info.Mapping.Kind, info.Name, operation)

+			//cmdutil.PrintSuccess(mapper, short, out, info.Mapping.Resource, info.Name, operation)

+			cmdutil.PrintSuccess(mapper, short, out, info.Mapping.Kind, info.Name, operation)

 		} else {

 			fmt.Fprintf(errs, "error: %v\n", err)

 		}

@@ -24,12 +24,12 @@ oc get secret json-with-extension yml-with-extension

 echo "resource-builder: ok"

 oc get pods --match-server-version

-oc create -f examples/hello-openshift/hello-pod.json

+[ "$(oc create -f examples/hello-openshift/hello-pod.json 2>&1 | grep 'pod "hello-openshift" created')" ]

 oc describe pod hello-openshift

 oc delete pods hello-openshift

 echo "pods: ok"

-oc create -f examples/hello-openshift/hello-pod.json

+[ "$(oc create -f examples/hello-openshift/hello-pod.json -o name 2>&1 | grep 'pod/hello-openshift')" ]

 tryuntil oc label pod/hello-openshift acustom=label # can race against scheduling and status updates

 [ "$(oc describe pod/hello-openshift | grep 'acustom=label')" ]

 tryuntil oc annotate pod/hello-openshift foo=bar # can race against scheduling and status updates

@@ -55,6 +55,6 @@ echo "start-build: ok"

 oc cancel-build "${started}" --dump-logs --restart

 echo "cancel-build: ok"

-oc delete is/ruby-20-centos7-buildcli

-oc delete bc/ruby-sample-build-validtag

-oc delete bc/ruby-sample-build-invalidtag

+[ "$(oc delete is/ruby-20-centos7-buildcli | grep 'imagestream "ruby-20-centos7-buildcli" deleted')" ]

+[ "$(oc delete bc/ruby-sample-build-validtag -o name | grep 'buildconfig/ruby-sample-build-validtag')" ]

+[ "$(oc delete bc/ruby-sample-build-invalidtag | grep 'buildconfig "ruby-sample-build-invalidtag" deleted')" ]

@@ -14,6 +14,7 @@ oc get deploymentConfigs

 oc get dc

 oc create -f test/integration/fixtures/test-deployment-config.json

 oc describe deploymentConfigs test-deployment-config

+[ "$(oc get dc -o name | grep 'deploymentconfig/test-deployment-config')" ]

 [ "$(oc describe dc test-deployment-config | grep 'deploymentconfig=test-deployment-config')" ]

 [ "$(oc env dc/test-deployment-config --list | grep TEST=value)" ]

 [ ! "$(oc env dc/test-deployment-config TEST- --list | grep TEST=value)" ]

@@ -72,7 +72,9 @@ oc get template ruby-helloworld-sample

 [ "$(oc new-app --search mysql --param=FOO=BAR 2>&1 | grep "can't be used")" ]

 oc delete imageStreams --all

 # check that we can create from the template without errors

-oc new-app ruby-helloworld-sample -l app=helloworld

+[ "$(oc new-app ruby-helloworld-sample -l app=helloworld 2>&1 | grep 'Service "frontend" created')" ]

+oc delete all -l app=helloworld

+[ "$(oc new-app ruby-helloworld-sample -l app=helloworld -o name 2>&1 | grep 'Service/frontend')" ]

 oc delete all -l app=helloworld

 # create from template with code explicitly set is not supported

 [ ! "$(oc new-app ruby-helloworld-sample~git@github.com/mfojtik/sinatra-app-example)" ]