IBM Cloud rebranding

Author: Christian Compton

.travis.yml

@@ -14,11 +14,11 @@ before_install:
   - gem install bundler
   - bundle install
   - bundle exec rake
-  - curl -fsSL https://clis.ng.bluemix.net/install/linux | sh
+  - curl -fsSL https://clis.cloud.ibm.com/install/linux | sh
   - ibmcloud login -a https://$BLUEMIX_REGION --apikey $BLUEMIX_APIKEY -s applications-ci -o $BLUEMIX_USER
   # Clone test repos
-  - git clone https://github.com/IBM-Bluemix/Kitura-Starter
-  - git clone -b bluemix-estado https://github.com/IBM-Bluemix/swift-helloworld.git
+  - git clone https://github.com/IBM-Cloud/Kitura-Starter
+  - git clone -b bluemix-estado https://github.com/IBM-Cloud/swift-helloworld.git
   - git clone https://$GHE_USER:[email protected]/IBM-Swift/credentials-buildpack-test.git
 
 script:

LICENSE

@@ -1,7 +1,7 @@
 Copyright (c) 2015, Kyle Fuller (original Heroku buildpack)
 Copyright (c) 2015, Dr Nic Williams (conversion to use Cloud Foundry packaging toolchain)
 All rights reserved.
-Copyright (c) 2016, IBM (customization to support deployment of Kitura-based applications to Bluemix)
+Copyright (c) 2016, IBM (customization to support deployment of Kitura-based applications to IBM Cloud)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -3,9 +3,9 @@
 IBM Cloud buildpack for Swift
 ===============================
 
-This is the IBM Cloud buildpack for Swift applications, powered by the Swift Package Manager (SPM). Though this buildpack was developed mainly for IBM Cloud and the sample commands use the IBM Cloud [command line](http://clis.ng.bluemix.net/ui/home.html), it can be used on any Cloud Foundry environment. This buildpack requires access to the Internet for downloading and installing several system level dependencies.
+This is the IBM Cloud buildpack for Swift applications, powered by the Swift Package Manager (SPM). Though this buildpack was developed mainly for IBM Cloud and the sample commands use the IBM Cloud [command line](https://clis.cloud.ibm.com/ui/home.html), it can be used on any Cloud Foundry environment. This buildpack requires access to the Internet for downloading and installing several system level dependencies.
 
-Check out the [Kitura-Starter](https://github.com/IBM-Bluemix/Kitura-Starter) for a fully working example of a Kitura-based server application that can be deployed to the IBM Cloud (or any Cloud Foundry environment).
+Check out the [Kitura-Starter](https://github.com/IBM-Cloud/Kitura-Starter) for a fully working example of a Kitura-based server application that can be deployed to the IBM Cloud (or any Cloud Foundry environment).
 
 Usage
 -----
@@ -128,8 +128,6 @@ warning: unable to rmdir Package-Builder: Directory not empty
        Cloning https://github.com/IBM-Swift/Swift-cfenv.git
        HEAD is now at 3486dcb Modified parseEnvVariable() method - using now environment variables if present regardless of isLocal boolean.
        Resolved version: 1.7.1
-       Cloning https://github.com/IBM-Bluemix/cf-deployment-tracker-client-swift.git
-       Resolved version: 0.4.1
        Compile CHTTPParser utils.c
        Compile CHTTPParser http_parser.c
        Compile Swift Module 'Socket' (3 sources)
@@ -140,7 +138,6 @@ warning: unable to rmdir Package-Builder: Directory not empty
        Compile Swift Module 'SSLService' (1 sources)
        Compile Swift Module 'CloudFoundryEnv' (7 sources)
        Compile Swift Module 'KituraNet' (28 sources)
-       Compile Swift Module 'CloudFoundryDeploymentTracker' (1 sources)
        Compile Swift Module 'Kitura' (40 sources)
        Compile Swift Module 'Kitura_Starter' (2 sources)
        Linking ./.build/release/Kitura-Starter
@@ -384,7 +381,7 @@ ibmcoud app env-unset <app_name> BP_DEBUG
 ```
 
 ### Installing Personal Package Archives
-The IBM Cloud buildpack for Swift does not support the installation of [Personal Package Archives](https://launchpad.net/ubuntu/+ppas) (PPAs). If your application requires the installation of one or more PPAs, we recommend using a different mechanism other than the IBM Cloud buildpack for Swift for provisioning your application to the IBM Cloud. For instance, you could use [Docker and Kubernetes](https://console.bluemix.net/docs/containers/container_index.html) to provision your Swift application to the IBM Cloud (in your `Dockerfile`, you would add the instructions for installing any necessary PPAs).
+The IBM Cloud buildpack for Swift does not support the installation of [Personal Package Archives](https://launchpad.net/ubuntu/+ppas) (PPAs). If your application requires the installation of one or more PPAs, we recommend using a different mechanism other than the IBM Cloud buildpack for Swift for provisioning your application to the IBM Cloud. For instance, you could use [Docker and Kubernetes](https://cloud.ibm.com/docs/containers/container_index.html) to provision your Swift application to the IBM Cloud (in your `Dockerfile`, you would add the instructions for installing any necessary PPAs).
 
 Admin tasks
 -----------

bin/compile.sh

@@ -36,7 +36,7 @@ SWIFT_BUILD_DIR=.build
 # If leveraging CACHE_DIR for tar files, then we'd need CACHED_ITEMS
 #CACHED_ITEMS=()
 
-# Apply Bluemix-specific environment configuration profile
+# Apply IBM Cloud-specific environment configuration profile
 $BP_DIR/lib/apply_env_profile.rb $BUILD_DIR
 
 source $BP_DIR/compile-extensions/lib/common
@@ -192,7 +192,7 @@ cd $BUILD_DIR
 status "Fetching Swift packages and parsing Package.swift files..."
 if [ $(is_swift_version_greater_or_equal_to 4.0) == "true" ]; then
   swift package resolve | indent
-else  
+else
   swift package fetch | indent
 fi
 PACKAGES_TO_INSTALL=($(set +o pipefail;find . -type f -name "Package.swift" | xargs egrep -r "Apt *\(" | sed -e 's/^.*\.Apt *( *" *//' -e 's/".*$//' | sort | uniq; set -o pipefail))

bin/detect.sh

@@ -29,7 +29,7 @@ source $BP_DIR/lib/common.sh
 if [[ -f $APP_DIR/Package.swift ]]; then
   swift_version="$(get_swift_version)"
   buildpack_version="$(cat $BP_DIR/VERSION)"
-  echo "IBM Bluemix buildpack for Swift (Swift: $swift_version, buildpack: $buildpack_version)" && exit 0
+  echo "IBM Cloud buildpack for Swift (Swift: $swift_version, buildpack: $buildpack_version)" && exit 0
 else
   echo "no" && exit 1
 fi

lib/apply_env_profile.rb

@@ -24,5 +24,5 @@
   log_env = !ENV['BP_LOG'].nil? && 'true'.casecmp(ENV['BP_LOG']).zero?
   EnvProfileApplier.new(build_dir, log_env).apply_env_profile
 rescue
-  puts '-----> WARN: Failed to apply Bluemix environment profiles'
+  puts '-----> WARN: Failed to apply IBM Cloud environment profiles'
 end