conan_deploy 0.0.14 → 0.0.15

data/lib/conan/stackato.rb

@@ -4,6 +4,7 @@ require 'json'
 class Stackato
 
   @@paas_token_file = File.join(Dir.tmpdir(), "token_#{Time.now.to_i}")
+  @@stackato_command = 'stackato'
 
   def initialize(paas_user, paas_password, trace=false, dry_run=false)
     @paas_user = paas_user
@@ -27,29 +28,30 @@ class Stackato
   def self.static_login(options)
     org = options[:'deploy-shipcloud'].split('-')[0]
     infra = options[:'deploy-shipcloud'].split('-')[1]
+
     puts "logging in at https://api.paas.#{infra}.#{org}.mtnsatcloud.com"
-    `stackato --target https://api.paas.#{infra}.#{org}.mtnsatcloud.com --token-file #{@@paas_token_file}`
-    `stackato login --user #{options[:'paas-user']} --password #{options[:'paas-password']} --token-file #{@@paas_token_file}`
+    @@stackato_command = "stackato --target https://api.paas.#{infra}.#{org}.mtnsatcloud.com --token-file #{@@paas_token_file}"
+    `#{@@stackato_command} login --user #{options[:'paas-user']} --password #{options[:'paas-password']}`
   end
 
   def self.unmap(app, domain)
     puts "[#{app.unique_name}] Unmapping #{domain}"
-    `stackato unmap #{app.unique_name} #{domain} --token-file #{@@paas_token_file}`
+    `#{@@stackato_command} unmap #{app.unique_name} #{domain}`
   end
 
   def self.map(app, domain)
     puts "[#{app.unique_name}] Mapping #{domain}"
-    `stackato map #{app.unique_name} #{domain} --token-file #{@@paas_token_file}`
+    `#{@@stackato_command} map #{app.unique_name} #{domain}`
   end
 
   def self.stop(app)
     puts "[#{app.unique_name}] Stopping"
-    `stackato stop #{app.unique_name} --token-file #{@@paas_token_file}`
+    `#{@@stackato_command} stop #{app.unique_name}`
   end
 
   def self.delete(app)
     puts "[#{app.unique_name}] Deleting"
-    `stackato delete #{app.unique_name} --token-file #{@@paas_token_file}`
+    `#{@@stackato_command} delete #{app.unique_name}`
   end
 
   def self.bg_switch(app)
@@ -66,7 +68,7 @@ class Stackato
 
   def self.find_old_versions(newly_deployed_app)
     old_apps = []
-    JSON.parse(`stackato apps --json --token-file #{@@paas_token_file}`).map do |app|
+    JSON.parse(`#{@@stackato_command} apps --json`).map do |app|
       if /#{Regexp.escape(newly_deployed_app.stackato_base_name)}/ =~ app["name"] and app["name"] != newly_deployed_app.unique_name
         old_app = newly_deployed_app.clone
         old_app.unique_name = app["name"]
@@ -136,7 +138,7 @@ class Stackato
       app_info = application_info(app, deployment)
       unless app_info.inactive_app_name.nil?
         puts "inactive app [#{deployment.name(app)}]. Deleting it."
-        `stackato delete #{deployment.name(app)}`
+        `#{@doit} #{@paas_cmd} delete #{deployment.name(app)}`
       end
 
       puts "Deploying inactive app #{deployment.name(app)}"

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daphne_util