conan_deploy 0.0.2 → 0.0.3

data/lib/conan/manifest_builder.rb

@@ -10,19 +10,12 @@ require 'conan/stackato'
 require 'conan/newrelic'
 
 module ManifestBuilder
-  def self.build(options, pipeline_id, env_id, artifact_repo=nil, &block)    
+  def self.build(options, pipeline_id, env_id, artifact_repo=nil, outthingy=nil, &block)    
     manifest_dir = options[:directory]
     output_type = options[:format]
 
-
     artifact_repo ||= DefaultArtifactRepository.new
-
-    # this is a feature toggle to allow the current property file based impl to be migrated to the stackato output impl
-    if (output_type == :stackato)
-      outthingy = StackatoOutThingy.new(manifest_dir)
-    else
-      outthingy = PropertiesFileOutThingy.new(manifest_dir)
-    end
+    outthingy ||= StackatoOutThingy.new(manifest_dir)
     
     manifest = Manifest.new(options, artifact_repo, outthingy)
     manifest.instance_eval(&block)
@@ -459,6 +452,10 @@ class Deployment < HasOptions
     "#{app_id}-#{@environment.id}-#{@ship}"
   end
 
+  def unique_name(app_id)
+    "#{name(app_id)}-#{@randomid}"
+  end
+
   def dns_name(app_id)
     "#{@environment.id}.#{app_id}.#{@ship}.#{@org}.#{@@paas_domain}"
   end
@@ -467,9 +464,6 @@ class Deployment < HasOptions
     "#{@environment.id}.#{app_id}.#{@@paas_domain}"
   end  
 
-  def unique_name(app_id)
-    "#{name(app_id)}-#{@randomid}"
-  end
 
   def active_urls(app_id)
     [ dns_name(app_id), agnostic_dns_name(app_id) ]

data/lib/conan/output.rb

@@ -166,4 +166,4 @@ class PropertiesFileOutThingy < OutThingy
   def writeConfiguration(app, deploy)
     # noop
   end
-end
+end

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies: []
 description: Provision, configure, deploy and never hear da lamantation of da users
 email: michael.reardon@mtnsat.com