Bump version to 0.17.0

.travis.yml

@@ -7,6 +7,7 @@ go:
 install:
 - set -e
 - curl -fsSL "https://cli.run.pivotal.io/stable?release=linux64-binary" | tar -C "$GOPATH/bin" -xz cf
+- bin/setup
 script:
 - test -z "$(bin/format | tee >(cat >&2))"
 - bin/test -nodes=2 -compilers=2

README.md

@@ -165,33 +165,33 @@ applications:
 
 ### From a Downloaded Release
 ```bash
-$ ./cflocal-v0.16.0-macos
-Plugin successfully installed. Current version: 0.16.0
+$ ./cflocal-v0.17.0-macos
+Plugin successfully installed. Current version: 0.17.0
 ```
 ***Or***
 ```bash
-$ cf install-plugin cflocal-0.16.0-macos
+$ cf install-plugin cflocal-0.17.0-macos
 Attention: Plugins are binaries written by potentially untrusted authors.
 Install and use plugins at your own risk.
-Do you want to install the plugin cflocal-0.16.0-macos? [yN]: y
+Do you want to install the plugin cflocal-0.17.0-macos? [yN]: y
 Installing plugin cflocal...
 OK
-Plugin cflocal 0.16.0 successfully installed.
+Plugin cflocal 0.17.0 successfully installed.
 ```
 
 ### From the Community Plugin Repository
 ```bash
 $ cf install-plugin cflocal
 Searching CF-Community for plugin cflocal...
-Plugin cflocal 0.16.0 found in: CF-Community
+Plugin cflocal 0.17.0 found in: CF-Community
 Attention: Plugins are binaries written by potentially untrusted authors.
 Install and use plugins at your own risk.
 Do you want to install the plugin cflocal? [yN]: y
 Starting download of plugin binary from repository CF-Community...
  14.35 MiB / 14.35 MiB [=====================================] 100.00% 2s
 Installing plugin cflocal...
 OK
-Plugin cflocal 0.16.0 successfully installed.
+Plugin cflocal 0.17.0 successfully installed.
 ```
 Note: This version is occasionally out of date.
 

VERSION

@@ -1 +1 @@
-0.16.0
+0.17.0

bin/setup

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+cd $(dirname "${BASH_SOURCE[0]}")/..
+
+pushd vendor/code.cloudfoundry.org/cli
+  ./bin/generate-language-resources
+popd

cf/cmd/stage_test.go

@@ -119,6 +119,7 @@ var _ = Describe("Stage", func() {
 						Expect(config.BuildpackZips["ab534bf201740a2fa7300aa175acd98c"].Out(buildpackZipOut2)).To(Succeed())
 						Expect(buildpackZipOut2.String()).To(Equal("some-buildpack-zip-tw"))
 						Expect(config.AppDir).To(Equal("some-abs-app-dir"))
+						Expect(config.ForceDetect).To(BeTrue())
 						Expect(config.RSync).To(BeTrue())
 						Expect(config.Color("some-text")).To(Equal(color.GreenString("some-text")))
 						Expect(config.AppConfig).To(Equal(&local.AppConfig{

local/stager.go

@@ -122,16 +122,23 @@ func (s *Stager) buildContainerConfig(config *AppConfig, buildpackMD5s []string,
 		detect     bool
 	)
 	if config.Buildpack == "" && len(config.Buildpacks) == 0 {
-		s.UI.Output("Buildpack: will detect")
 		buildpacks = Buildpacks.names()
 		detect = true
 	} else if len(config.Buildpacks) > 0 {
-		s.UI.Output("Buildpacks: %s", strings.Join(config.Buildpacks, ", "))
 		buildpacks = config.Buildpacks
 	} else {
-		s.UI.Output("Buildpack: %s", config.Buildpack)
 		buildpacks = []string{config.Buildpack}
 	}
+	detect = detect || forceDetect
+	if detect {
+		s.UI.Output("Buildpack: will detect")
+	} else {
+		var plurality string
+		if len(buildpacks) > 1 {
+			plurality = "s"
+		}
+		s.UI.Output("Buildpack%s: %s", plurality, strings.Join(buildpacks, ", "))
+	}
 
 	// TODO: fill with real information -- get/set container limits
 	vcapApp, err := json.Marshal(&vcapApplication{
@@ -195,7 +202,7 @@ func (s *Stager) buildContainerConfig(config *AppConfig, buildpackMD5s []string,
 		Entrypoint: strslice.StrSlice{
 			"/bin/bash", "-c", scriptBuf.String(),
 			strings.Join(buildpacks, ","),
-			strconv.FormatBool(!(detect || forceDetect)),
+			strconv.FormatBool(!detect),
 		},
 	}, nil
 }