conan_deploy_stackato3 0.1.9 → 0.1.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWE1MDQ4MmEwNzU2Y2I5YWJkMTQ1MDViODUzZTYxMDQyZDk4YjI4ZQ==
+    NjA4NTkxYmQ5YzQ5ZWViNTc3NDdiYjNjNWVjOTFmOTBlZGZjMzEyMA==
   data.tar.gz: !binary |-
-    NzJlN2UxYTk0NjUyOTJlNDQ3ZWUwZWY5MDAzN2FjNTZiMzNjYzhiYQ==
+    OTg2Y2VjMjM4NmRjNDg0YWFhZmUwZmMwZjk0YzRmNjQzZTc3NjAzZg==
 SHA512:
   metadata.gz: !binary |-
-    NWY2Y2QxM2QxNjVjYjQxOGQ4OTY4ZTAwZjI5N2YxZjRiZmVmZmZhMDEwZDli
-    YzRlZGZiOWRhODIxNjZjNWEzNTFiZjM4MzVmYzgzMTZjYjAwMmRkZDdmZjIx
-    OWZkM2MzOTJlYTkxNTQ5OGZkZmRhODMzYjQxOGZmYTY0MzlkYWI=
+    ZjY2YmVjOWU2OWIyMWViMzgwOTdmZWY4Y2IzMDNjZjhmYTY1ZWM5MjNjNDBh
+    Mjk3ZTE2Mjk2MDYxNTNiZDc1MzAxOGM4N2NjZDI3MTVmNDgzMDJlYjkxMTUw
+    ODdkY2ZjY2EwMThlNjIyNWZjMzllNmQzYzg1NGRhZjIzM2VhNmU=
   data.tar.gz: !binary |-
-    NDVmNmRiODFlZTE5MzYxMGFhZDIxMDI0ZTY3YjAxNTRhYWZiZTc2Njk1ZDUz
-    Y2ZhMTUxZDAwNGMzMzVjMTNkNGEzMjM5M2ZhNjUwNzE3YzNhN2Q2NjYyMTEw
-    OTUyOWNkZDYwZWJkYmU1YmZiNWNlNTk4MmIyNzM4MWQ1NWI1NjE=
+    Y2M1YjU3M2JhNmIwYmUzZWZmMDQyMjM4NTYzNzhmZDZjNzliYTQxMTVhMGQx
+    MDE4ZmYxNDY5OThiZWU4ZDk4NTBhODlmODJjYWNhODQ5YjUwMDc3NDQ0NWVl
+    NmZlNTcwZDJkMDZlN2JmYzFlNWMxZjFlMzY3YTQwMmIxYzU0NzA=

data/bin/conan-stackato3

@@ -50,9 +50,9 @@ optparse = OptionParser.new do |o|
     end
   end
 
-  o.on('-a','--action [ACTION]', [:provision,:configure,:deploy,:bg_configure,:bg_deploy,:all,:bg_all],
+  o.on('-a','--action [ACTION]', [:provision,:configure,:deploy,:bg_deploy,:all,:bg_all],
     'The action(s) to perform. Either "provision" (default), "configure","deploy" or "all".',
-    ' Support for blue/green deployments use actions: "provision", "bg_configure", "bg_deploy",',
+    ' Support for blue/green deployments use actions: "provision", "configure", "bg_deploy",',
     ' or "bg_all".') do |action|
     if (action)
       options[:action] = action

data/lib/conan/deploy.rb

@@ -20,8 +20,6 @@ module Conan
         manifest.configure
       when :deploy
         manifest.deploy
-      when :bg_configure
-        manifest.bg_configure
       when :bg_deploy
         manifest.bg_deploy
       when :all
@@ -30,7 +28,7 @@ module Conan
         manifest.deploy
       when :bg_all
         manifest.provision
-        manifest.bg_configure
+        manifest.configure
         manifest.bg_deploy
 
       else

data/lib/conan/deployment.rb

@@ -64,7 +64,7 @@ class Deployment < HasOptions
   end
 
   def inactive_urls(app)
-    active_urls(app).map{ |url| "x.#{url}" }
+    active_urls(app).map{ |url| "x-#{url}" }
   end
 
   def manifest_url(app)

data/lib/conan/manifest.rb

@@ -50,12 +50,6 @@ class Manifest
     @current_pipeline.configure(@current_environment)
   end
 
-  def bg_configure
-    validateThatEnvironmentIsSelected
-    puts "Blue/green configure #{@current_environment.id} manifest files for #{@current_pipeline.id} pipeline"
-    @current_pipeline.configure(@current_environment, true)
-  end
-
   def paas
     paas_user = @options[:'paas-user'] || ENV['PAAS_USER']
     paas_pwd = @options[:'paas-password'] || ENV['PAAS_PASSWORD']

data/lib/conan/output.rb

@@ -77,7 +77,7 @@ class StackatoOutThingy < OutThingy
     end
   end
 
-  def writeConfiguration(app, deploy, bg=false)
+  def writeConfiguration(app, deploy)
     if (deploy.enabled?)
       target_dir = workingDir(app)
       templates_dir = File.join(target_dir, "deploy-templates")
@@ -98,8 +98,8 @@ class StackatoOutThingy < OutThingy
         # short-cuts
         :app_id => app.id,
         :deploy_base_name => deploy.name(app),
-        :deploy_name => bg ? deploy.unique_name(app) : deploy.name(app),
-        :deploy_urls => bg ? deploy.inactive_urls(app) : deploy.active_urls(app),
+        :deploy_name => deploy.name(app),
+        :deploy_urls => deploy.active_urls(app),
         :env => deploy.environment.id,
         :org => deploy.org,
         :ship => deploy.ship,

data/lib/conan/pipeline.rb

@@ -65,8 +65,8 @@ class Pipeline
     eachAppDeployment(environment) { |app, deploy| @output.writeArtifactMetadata(app, deploy) }
   end
 
-  def configure(environment, bg=false)
-    eachAppDeployment(environment) { |app, deploy| @output.writeConfiguration(app, deploy, bg) }
+  def configure(environment)
+    eachAppDeployment(environment) { |app, deploy| @output.writeConfiguration(app, deploy) }
   end
 
   def deploy(environment, paas, force=false)

data/lib/conan/stackato.rb

@@ -54,8 +54,14 @@ class Stackato
       shell_cmd("login", "--space #{space} --password '#{password}' #{username}")
     end
 
-    def push(manifest)
-      shell_cmd("push", "--manifest #{manifest} --no-prompt --reset --force-start --timeout 5m")
+    def push(manifest, name, urls=[])
+      args = "--manifest #{manifest} --no-prompt --reset --force-start --timeout 5m --as #{name}"
+
+      urls.each do |url|
+        args << " --url #{url}"
+      end
+
+      shell_cmd("push", args)
       puts(">> push complete")
     end
 
@@ -64,9 +70,17 @@ class Stackato
 
     end
 
+    def rename(old_app_name, new_app_name)
+      shell_cmd("rename", "#{old_app_name} #{new_app_name}")
+    end
+
     def map(app_name, url)
       shell_cmd("map", "#{app_name} #{url}")
     end
+
+    def unmap(app_name, url)
+      shell_cmd("unmap", "#{app_name} #{url}")
+    end
   end
   
   def initialize(paas_user, paas_password, paas_space, paas_manifest, dry_run=false)
@@ -113,11 +127,8 @@ class Stackato
       end
 
       puts "Pushing #{paas_app_name}"
-      @commands.push(@paas_manifest)
+      @commands.push(@paas_manifest, paas_app_name, deployment.active_urls(app))
 
-      deployment.active_urls(app).each do |url|
-        @commands.map(paas_app_name, url)
-      end
       puts "deploy complete"
     }
   end
@@ -125,18 +136,27 @@ class Stackato
   def bg_deploy(work_dir, app, deployment)
     puts ''
     Dir.chdir(work_dir){
-      raise RuntimeError.new "Blue/green deployment is not implemented for the stackato v3 client yet"
-      
-      # login(deployment.paas_target)
-
-      # push app
-
-      #if app.is_inactive_node_operational?
-        # switch (remap nodes)
-        # clean (delete inactive nodes)
-      #else
-        # raise RuntimeError.new "#{app}'s inactive node is not operational. Skipping switch and clean."
-      #end
+      login(deployment.paas_target)
+
+      active_app_name   = deployment.name(app)
+      inactive_app_name = active_app_name + "-inactive"
+
+      puts "Pushing inactive app: #{inactive_app_name}"
+      @commands.push(@paas_manifest, inactive_app_name, deployment.inactive_urls(app))
+
+      puts "Mapping active urls"
+      deployment.active_urls(app).each do |url|
+        @commands.map(inactive_app_name, url)
+      end
+
+      puts "Unmapping inactive urls"
+      deployment.inactive_urls(app).each do |url|
+        @commands.unmap(inactive_app_name, url)
+      end
+
+      puts "Cleaning up"
+      @commands.delete(active_app_name)
+      @commands.rename(inactive_app_name, active_app_name)
     }
   end
 end

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy_stackato3
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Mike Reardon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daphne_util