pcf_blue_green 0.32 → 0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8adcf8eeaa5e7d24dada0ee75e1700c28673db84
-  data.tar.gz: 0b64fa9c0e835cde3a9a64519c6259dafa8cc810
+  metadata.gz: 0a4f4f1981b3ac479f39115d0e3578dedc5664aa
+  data.tar.gz: 5bcc132d664993edec39483667b5d2007bac015e
 SHA512:
-  metadata.gz: 4559b483bf50ddb99c7d051f822a9bcb85fa03e10ff0d164b2afc8eeaa1bdaf386c1698c76b05e5754cf8a367d14ccd7ac81b270bdb32f79a17c6993c3d40e46
-  data.tar.gz: 6cda3ffb2f288100e56a4e77ea53346b46a2cfe7e0d936298bff69a91fce84f4c1f56a506fabbd40254c2cc73b0a2ff0d58b5254a7a55bd3b98a3fafcaf4f564
+  metadata.gz: e569d397e4a7af8c782ee8415f20b1b0a51bdea1c1b5c20e552dd58600ed27f2f98b4d37abb6ef703dd19c2ef21413e2930328f12456398ec9a6e509c36e8eaf
+  data.tar.gz: a2c71b0849421aa4f3890d1652d04771ebe43b60e596839eca2aeb01bbbdab1c18771072f2aa8342528b9a794b930b309bd9b45cd7d54273e7b3fd1a87865bd5

data/lib/pcf_blue_green.rb

@@ -22,6 +22,12 @@ module PcfBlueGreen
       @space = space
       @login_options = @options[:login]
       login if call_login
+      cmd = "echo $(gem which pcf_blue_green)"
+      shell = Mixlib::ShellOut.new(cmd)
+      shell.run_command
+      gem_path = shell.stdout
+      sdf_path = gem_path.gsub("pcf_blue_green.rb\n", "shared-deploy-functions.sh")
+      @source_cmd = "source \'#{sdf_path}\'"
     end
 
     def cleanup_blue
@@ -36,11 +42,11 @@ module PcfBlueGreen
       puts "cf_app is #{ENV['cf_app']}"
       puts "green is #{ENV['green']}"
 
-      puts cf_routes_output
       mapped_routes = []
 
       if ENV['handle_all_paths']
         cmd = "#{cf_routes_output} | tail -n +4 | awk  '($5==ENVIRON[\"cf_app\"]) {print $3\" -n \"$2 \" --path \"substr($4,2) }' |  xargs -n 5 #{map_route_command} #{ENV['green']}"
+        puts cmd
         shell = Mixlib::ShellOut.new(cmd)
         shell.run_command
         unless shell.stderr.empty?
@@ -50,6 +56,7 @@ module PcfBlueGreen
         mapped_routes += shell.stdout.split("\n")
       end
       cmd = "#{cf_routes_output} | tail -n +4  | awk  '($4==ENVIRON[\"cf_app\"]) {print $3\" -n \" $2}' |  xargs -n 3 #{map_route_command} #{ENV['green']}"
+      puts cmd
       shell = Mixlib::ShellOut.new(cmd)
       shell.run_command
       unless shell.stderr.empty?
@@ -57,8 +64,8 @@ module PcfBlueGreen
         raise PcfBlueGreen::CleanupBlueFailed
       end
       mapped_routes += shell.stdout.split("\n")
-
-      mapped_routes
+      puts "Mappped routes: #{mapped_routes.uniq.join(',  ')} "
+      mapped_routes.uniq.join(",\n")
     end
 
     private

data/lib/pcf_blue_green/version.rb

@@ -1,3 +1,3 @@
 module PcfBlueGreen
-  VERSION = "0.32"
+  VERSION = "0.33"
 end

data/spec/pcf_blue_green_spec.rb

@@ -31,7 +31,7 @@ describe PcfBlueGreen do
         @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
         @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/simple_routes.txt')
         @pcf_blue_green.stub(:map_route_command).and_return('echo')
-        expect(expected_routes).to eq(@pcf_blue_green.remap_routes.uniq.join(",\n"))
+        expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
       end
 
       it "it doesn't re-map routes with a path. Also doesn't re-map routes for other applications. Even with the same hostname" do
@@ -60,7 +60,7 @@ customapp-app-space-green apps.prod.domain.com -n otherapp}
         @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
         @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/custom_routes.txt')
         @pcf_blue_green.stub(:map_route_command).and_return('echo')
-        expect(expected_routes).to eq(@pcf_blue_green.remap_routes.uniq.join(",\n"))
+        expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
       end
     end
 
@@ -95,7 +95,7 @@ customapp-app-space-green apps.prod.domain.com -n otherapp}
         @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
         @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/custom_routes.txt')
         @pcf_blue_green.stub(:map_route_command).and_return('echo')
-        expect(expected_routes).to eq(@pcf_blue_green.remap_routes.uniq.join(",\n"))
+        expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
       end
       it "re-maps application routes including paths" do
 
@@ -129,7 +129,7 @@ second-app-app-space-green apps.prod.domain.com.com -n second-app}
        @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
        @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/custom_routes_domain_host.txt')
        @pcf_blue_green.stub(:map_route_command).and_return('echo')
-       expect(expected_routes).to eq(@pcf_blue_green.remap_routes.uniq.join(",\n"))
+       expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
      end
 
      it "re-maps application routes including paths. Also true for custom domain and host" do
@@ -160,7 +160,7 @@ third-app-app-space-green apps.prod.otherdomain.com -n third-app-other-host}
       @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
       @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/custom_routes_domain_host.txt')
       @pcf_blue_green.stub(:map_route_command).and_return('echo')
-      expect(expected_routes).to eq(@pcf_blue_green.remap_routes.uniq.join(",\n"))
+      expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
     end
    end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pcf_blue_green
 version: !ruby/object:Gem::Version
-  version: '0.32'
+  version: '0.33'
 platform: ruby
 authors:
 - Pawel Bardzinski