conan_deploy 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY4ZWNhNGU2MmRmZGY1YmY0OWI0ZDNhZjBmZTBjYzMyMzQ0MTJmNA==
+    ZmVlYmE0YzJmYjFhZjUyNWIxNDM0MWM5MWJhMzgzMWZiNGUzNDQzZg==
   data.tar.gz: !binary |-
-    ZDBmNzgzNzc3YzYzZDc3YzY2ZjMzMjdkZDlkZjI1MDE4ZTM5NDEzNQ==
+    ZmFmNWIzNDA0NDM5NTQ3NDE3OWM1ZmQ3MWZkOWQzZjA5Yzk5MDg3Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZjAwZWU1MjdkMjJiMjBhNjMxODZjNzU1OTFhZWEyYmI3N2RiYWI5ZjUzZmNm
-    ODc2YTViZGE4ZjA5ZjVjMGFlNzkwYjIwOTQzNDQ4NmUyMmVhYWEyNDMyZTE1
-    NGUzNGJkNTlkNTU0MTE3Y2ZhZmJkNTU4NTMyMWU2ZWIxNThkODI=
+    NGU2OWU4OWI0MDIxOGUwZTdhY2U3YzE1MGUyZTNjM2EyZjAwMWNiNjc5ODY3
+    ZGFiYzA2MjAwZTE5YTFlYTIxODFhMmU3YjA3MGVjNzE1ZmY3NWUwNTkwYzY2
+    ZGNlYTlhZmYzM2Y5MTdmMGRiMTRmNGU0YTc3ZmM1NWViY2RhMTA=
   data.tar.gz: !binary |-
-    MDVmN2I4ZjViMTQ1MjIwODZlYjNiMWJkOTc0YjhiMDQzODQ0MWI0YWE2ZGNm
-    ZDJmNWQwZDliMjlhMmE4ZTdkMGJiOTc0MzI2NjNlYTJiNWUzNGM2MDQ4NGYy
-    ZGNhNjlhOTU5OGJhNTU2ZTBhM2Y1NDliZWI2NWIxNjM0ZDhhMGQ=
+    NjBiMDBkZWYwMDc1NDJlMTI1YTI0ZTM1Y2UzNmE0YjliN2UzOThjNWVlMGE2
+    MTQ4YjcxYTNlNzRlY2RhNTliZDgxMjgwNWY2ZjZhODQ0YTcyZWI1YTcyOWI2
+    YjA3OTUxMzk4NzgwNDQ5ZWFiOWE5MmFjODY1MzExNGYwNzA0ZGM=

data/lib/conan/manifest_builder.rb

@@ -159,14 +159,14 @@ class Pipeline
     @options = options    
   end
 
-  def app(app_id, project_name, platform_type)
+  def app(app_id, project_name, platform_type, url_segment=nil)
     if (@options[:'deploy-app-name'].nil?) || (@options[:'deploy-app-name'] == app_id.to_s)
       puts "No app specified, or we matched the specified app: #{@options[:'deploy-app-name']}"
       @apps[app_id] = case platform_type
         when :jvm
-          JvmApp.new(app_id, project_name, @artifact_repo)
+          JvmApp.new(app_id, project_name, @artifact_repo, url_segment)
         when :rails_zip
-          RailsZipApp.new(app_id, project_name, @artifact_repo)
+          RailsZipApp.new(app_id, project_name, @artifact_repo, url_segment)
         else
           raise "unknown platform type: #{platform_type}"
         end
@@ -223,14 +223,14 @@ class Pipeline
       if (force)
         paas.deploy(work_dir, app, deploy, true)
       else
-        paas.deploy(work_dir, app, deploy) unless app.isDeployedAt(deploy.manifest_url(app.id))
+        paas.deploy(work_dir, app, deploy) unless app.isDeployedAt(deploy.manifest_url(app))
       end
     }  
   end
 
   def bg_deploy(environment, paas, force=false)
     eachAppDeployment(environment) { |app, deploy|
-      if (force or !app.isDeployedAt(deploy.manifest_url(app.id)))        
+      if (force or !app.isDeployedAt(deploy.manifest_url(app)))        
         paas.bg_deploy(@output.workingDir(app), app, deploy)
       end
     }  
@@ -238,7 +238,7 @@ class Pipeline
 
   def is_inactive_node_healthy?(environment, paas)
     eachAppDeployment(environment) { |app, deploy|
-      response = ApiHelper.healthcheck(deploy.inactive_healthcheck_url(app.id), 60)
+      response = ApiHelper.healthcheck(deploy.inactive_healthcheck_url(app), 60)
 
       if(response.code != 200)
         puts "Healthcheck failed for inactive (Blue) node. Here is the entire response: #{response.inspect}"
@@ -271,11 +271,12 @@ end
 
 class Application
 
-  attr_accessor :id, :platform_type, :group_id, :artifact_id, :version, :extension, :sha1, :artifact_meta_data
+  attr_accessor :id, :platform_type, :group_id, :artifact_id, :version, :extension, :sha1, :artifact_meta_data, :url_segment
 
-  def initialize(id, project_name, platform_type)
+  def initialize(id, project_name, platform_type, url_segment=nil)
     @id = id
-    @platform_type = platform_type  
+    @platform_type = platform_type 
+    @url_segment = url_segment || id
     mvn_id = project_name.split(':')
     @group_id = mvn_id[0]
     @artifact_id = mvn_id[1] 
@@ -380,8 +381,8 @@ end
 class JvmApp < Application
   attr_accessor :sha1, :artifact_repo
 
-  def initialize(id, project_name, artifact_repo)
-    super(id, project_name, :jvm)
+  def initialize(id, project_name, artifact_repo, url_segment=nil)
+    super(id, project_name, :jvm, url_segment)
     @sha1 = nil
     @artifact_repo = artifact_repo
   end
@@ -396,8 +397,8 @@ end
 class RailsZipApp < Application
   attr_accessor :sha1, :artifact_repo
 
-  def initialize(id, project_name, artifact_repo)
-    super(id, project_name, :rails_zip)
+  def initialize(id, project_name, artifact_repo, url_segment=nil)
+    super(id, project_name, :rails_zip, url_segment)
     @sha1 = nil
     @artifact_repo = artifact_repo
   end
@@ -449,7 +450,7 @@ class Deployment < HasOptions
 
   @@paas_domain = 'mtnsatcloud.com'
 
-  attr_accessor :environment, :org, :ship, :shipcloud, :app_ids, :facility_id
+  attr_accessor :environment, :org, :ship, :shipcloud, :app_ids, :facility_id, :additional_mappings
 
   def initialize(environment, org, ship)
     # inherit options from the environment
@@ -460,6 +461,7 @@ class Deployment < HasOptions
     @ship = ship
     @shipcloud = "#{org}-#{ship}"
     @app_ids = []
+    @additional_mappings = []
     @facility_id = nil
     @enabled = true
     @randomid = SecureRandom.hex(3)
@@ -472,6 +474,12 @@ class Deployment < HasOptions
   def facility(facility_id)
     @facility_id = facility_id
   end
+  
+  def hostnames(*hostnames)
+    hostnames.each do |hostname| 
+      @additional_mappings.push(hostname) unless hostname.empty?
+    end 
+  end
 
   def enabled(b)
     @enabled = b
@@ -481,41 +489,40 @@ class Deployment < HasOptions
     @enabled
   end
 
-  def name(app_id)
-    "#{app_id}-#{@environment.id}-#{@ship}"
+  def name(app)
+    "#{app.id}-#{@environment.id}-#{@ship}"
   end
 
-  def unique_name(app_id)
-    "#{name(app_id)}-#{@randomid}"
+  def unique_name(app)
+    "#{name(app)}-#{@randomid}"
   end
 
-  def dns_name(app_id)
-    "#{@environment.id}.#{app_id}.#{@ship}.#{@org}.#{@@paas_domain}"
+  def dns_name(app)
+    "#{@environment.id}.#{app.url_segment}.#{@ship}.#{@org}.#{@@paas_domain}"
   end
 
-  def agnostic_dns_name(app_id)
-    "#{@environment.id}.#{app_id}.#{@@paas_domain}"
+  def agnostic_dns_name(app)
+    "#{@environment.id}.#{app.url_segment}.#{@@paas_domain}"
   end  
 
-
-  def active_urls(app_id)
-    [ dns_name(app_id), agnostic_dns_name(app_id) ]
+  def active_urls(app)
+    [ dns_name(app), agnostic_dns_name(app) ] + @additional_mappings
   end
 
-  def inactive_urls(app_id)
-    ["inactive.#{dns_name(app_id)}"]
+  def inactive_urls(app)
+    active_urls(app).map{ |url| "inactive.#{url}" }
   end
 
-  def manifest_url(app_id)
-    "http://#{dns_name(app_id)}/status/manifest"
+  def manifest_url(app)
+    "http://#{dns_name(app)}/status/manifest"
   end
 
-  def active_healthcheck_url(app_id)
-    "http://#{dns_name(app_id)}/status/healthcheck"
+  def active_healthcheck_url(app)
+    "http://#{dns_name(app)}/status/healthcheck"
   end
 
-  def inactive_healthcheck_url(app_id)
-    "http://inactive.#{dns_name(app_id)}/status/healthcheck"
+  def inactive_healthcheck_url(app)
+    "http://inactive.#{dns_name(app)}/status/healthcheck"
   end
 
   def paas_target

data/lib/conan/output.rb

@@ -97,9 +97,9 @@ class StackatoOutThingy < OutThingy
 
         # short-cuts          
         :app_id => app.id,
-        :deploy_base_name => deploy.name(app.id),
-        :deploy_name => bg ? deploy.unique_name(app.id) : deploy.name(app.id),
-        :deploy_urls => bg ? deploy.inactive_urls(app.id) : deploy.active_urls(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),
         :env => deploy.environment.id,
         :org => deploy.org,
         :ship => deploy.ship,

data/lib/conan/stackato.rb

@@ -29,7 +29,7 @@ class Stackato
     Dir.chdir(work_dir){      
       login(deployment.paas_target)
 
-      paas_app_name = deployment.name(app.id)
+      paas_app_name = deployment.name(app)
       appCreate = ->(cmd) {
         c = "#{@doit} #{@paas_cmd} --manifest #{@paas_manifest} --no-prompt #{cmd} --no-start"
         system(c) or raise "Stackato #{cmd} failed: #{c}"
@@ -84,7 +84,7 @@ class Stackato
       app_info = application_info(app, deployment)
       raise "Please remove inactive app '#{app_info.inactive_app_name}' before proceeding." unless app_info.inactive_app_name.nil?
 
-      puts "Deploying inactive app #{deployment.name(app.id)}"    
+      puts "Deploying inactive app #{deployment.name(app)}"    
       c = "#{@doit} #{@paas_cmd} --manifest #{@paas_manifest} --no-prompt push"
       system(c) or raise "Stackato push failed: #{c}"
     }
@@ -100,8 +100,8 @@ class Stackato
       return
     end
 
-    active_urls = deployment.active_urls(app.id)
-    inactive_urls = deployment.inactive_urls(app.id)
+    active_urls = deployment.active_urls(app)
+    inactive_urls = deployment.inactive_urls(app)
 
     appUrlOp = ->(cmd, paas_app_name, url) {
       c = "#{@doit} #{@paas_cmd} #{cmd} #{paas_app_name} #{url}"
@@ -140,9 +140,9 @@ class Stackato
     list_json = `#{@paas_cmd} list --json`
     raise "Stackato list failed" if !$?.success?
 
-    base_name = deployment.name(app.id)
-    active_urls = deployment.active_urls(app.id)
-    inactive_urls = deployment.inactive_urls(app.id)
+    base_name = deployment.name(app)
+    active_urls = deployment.active_urls(app)
+    inactive_urls = deployment.inactive_urls(app)
 
     StackatoApplicationInfo.new(list_json, base_name, active_urls, inactive_urls)
   end

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mike Reardon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daphne_util