pcf_blue_green 0.43.321 → 0.43.385

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba1bf6639569be57f41b5c6a701015c6cc1ca98
-  data.tar.gz: 6bf1c8f234de59a63fa3237eff8ad79adaa8a1eb
+  metadata.gz: 46a22c4a6130c52a6b2362ca7efed366c78436bb
+  data.tar.gz: 1372fadd027d5490edcfdcb9422b183e4495ca02
 SHA512:
-  metadata.gz: cd419302de77eb2b6a4b11897eaba8672e21ef78ab69fef5fc9c625cbe24a1a87178936221a85d2111473321e025a638ad8a230d19e312511253fe88993aecd6
-  data.tar.gz: c5fcb0e11743c09a54b9779dbbf803de01c740d9470991b432b923a8b474aa996de92620979ee7945118f31de239d82152d7c934214bc225e5b40273a65d9d6d
+  metadata.gz: b31817248bcf3534fc8efa62b500e6110e385ac8a0a95492f28bc620e9880f60c0cf78dde12d21dbfc2f972ec062c262205e372d2fccc856dce4a06d0117b409
+  data.tar.gz: 3a9f7c6a5804e47c330243c05f54ef2c7a6ed4e59ca2dd54e304b8eb8f3304576806e6a604430009c3cc60a55c228d395909571ce0c5cb4af8c61686af5bbd02

data/lib/pcf_blue_green.rb

@@ -130,7 +130,7 @@ module PcfBlueGreen
 
     def routes_stdout(entity)
       routes_url = entity['routes_url']
-      app_routes_cmd = "cf curl #{routes_url}?results-per-page=100"
+      app_routes_cmd = "cf curl #{routes_url}"
       app_routes_shell = Mixlib::ShellOut.new(app_routes_cmd)
       app_routes_shell.run_command
       JSON.parse(app_routes_shell.stdout)
@@ -146,7 +146,7 @@ module PcfBlueGreen
 
     def login
       puts "Logging in to #{@url}"
-      cf_login = "cf login -a #{@url} -u #{@user} -p '#{@pass}' -o #{@org} -s '#{@space}' #{@login_options} > /dev/null"
+      cf_login = "cf login -a #{@url} -u #{@user} -p '#{@pass}' -o #{@org} -s #{@space} #{@login_options} > /dev/null"
       cmd = "#{cf_login}"
       shell = Mixlib::ShellOut.new(cmd)
       shell.run_command

data/lib/pcf_blue_green/version.rb

@@ -1,3 +1,3 @@
 module PcfBlueGreen
-  VERSION = "0.43.321"
+  VERSION = "0.43.385"
 end

data/lib/shared-deploy-functions.sh

@@ -33,7 +33,7 @@ function announce-success {
 
 function run-cmd {
   echo -e "\n\n${Cya}${@}${RCol}\n"
-  "$@"
+  $@
 }
 
 function set-ruby {
@@ -56,7 +56,7 @@ function cf-setup {
   run-cmd cf api ${cf_api} --skip-ssl-validation
   set +x
   cf auth ${cf_user} ${cf_password}
-  run-cmd cf target -o ${cf_org} -s "${cf_space}"
+  run-cmd cf target -o ${cf_org} -s ${cf_space}
 }
 
 function cf-push {
@@ -69,6 +69,7 @@ function cf-push {
 function check-health {
   local app_url=$1
   announce-task "Checking health"
+  sleep 180
   maitenance_enabled=$(echo $(cf curl '/v2/apps' -X GET -H 'Content-Type: application/x-www-form-urlencoded' -d "q=name:$cf_app" | jq '.resources[0].entity.environment_json.MAINTENANCE_ENABLED'))
   maitenance_enabled=$(echo ${maitenance_enabled//\"} | awk '{ print tolower($1) }')
   if [ $maitenance_enabled == "true" ] ; then
@@ -117,25 +118,13 @@ function remove-blue {
 }
 
 function get-domain {
-  if [ -z ${domain+x} ]; then
-    arr=($cf_space)
-    num=$(($(echo ${#arr[@]}) + 2))
-    export domain=$(cf routes | grep ${cf_app} | awk -v env_var="$num" '{print $'$num'}' | grep "^apps\\." | tail -1)
-    announce-task "Domain is ${domain}"
-  else
-    announce-task "app Domain is ${domain}"
-  fi
+  export domain=$(cf routes | grep ${cf_app} | awk '{print $3}' | grep "^apps\\." | tail -1)
+  announce-task "Domain is ${domain}"
 }
 
-function join { local IFS="$1"; shift; echo "$*"; }
-
 function prep-green {
   blue=${cf_app}
-  arr=($cf_space)
-  space="$(join - ${arr[@]})"
-  space="$(echo "${space//_/$'-'}")"
-  export green="${cf_app}-${space}-g"
-  echo "exported green: ${green}"
+  export green="${cf_app}-${cf_space}-g"
   if [ -z ${cf_manifest+x }]; then
     generate-manifest
   else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pcf_blue_green
 version: !ruby/object:Gem::Version
-  version: 0.43.321
+  version: 0.43.385
 platform: ruby
 authors:
 - Pawel Bardzinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-08 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.5.3
 signing_key: 
 specification_version: 4
 summary: gem encapsualting blue-green bash script