conan_deploy_stackato3 0.1.3 → 0.1.4

data/lib/conan/stackato.rb

@@ -1,5 +1,6 @@
 require 'rest_client'
 require 'json'
+require 'open3'
 
 class Stackato
 
@@ -10,9 +11,12 @@ class Stackato
     def initialize(target, dry_run=false)
       @target = target
       @dry_run = dry_run
+      v = get_version
+      puts(v)
+      raise "Stackato 3.1.* required. Found #{v}" unless v =~ /\(3\.1\.[0-9]+\)/
     end
 
-    def shell_cmd(stackato_cmd, args)
+    def shell_cmd(stackato_cmd, args, ignoreErrs=false)
       base_args = "--target #{@target} --token-file #{@@token_file}"
 
       cmd = "#{@@executable} #{stackato_cmd} #{base_args} #{args}"
@@ -20,20 +24,42 @@ class Stackato
       if @dry_run
         puts "Dry-run, skipping execution of command: #{cmd}"
       else
-        system(cmd)
+        # output, err, status = Open3.capture3(cmd)
+        #  raise "Stackato error: #{err}" unless (ignoreErrs||status.success?)
+        #  output
+        Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
+          while line = stdout_err.gets
+            puts line
+          end
+
+          exit_status = wait_thr.value
+          unless ignoreErrs || exit_status.success?
+            abort "Stackato #{stackato_cmd} failed: #{stdout_err.read}"
+          end
+        end
       end
     end
 
+    def get_version    
+      begin
+        v, err, status = Open3.capture3("#{@@executable} version")
+        abort "Stackato error: #{err}" unless status.success?        
+        v
+      rescue Exception => e
+        abort "Failed to invoke Stackato client: #{e}"
+      end    
+    end    
+
     def login(username, password, space)
       shell_cmd("login", "--space #{space} --password '#{password}' #{username}")
     end
 
     def push(manifest)
-      shell_cmd("push", "--manifest #{manifest} --no-prompt --reset")
+      shell_cmd("push", "--manifest #{manifest} --no-prompt --reset --timeout 15m")
     end
 
     def delete(app_name)
-      shell_cmd("delete", "--no-prompt #{app_name}")
+      shell_cmd("delete", "--no-prompt #{app_name}", true)
     end
 
     def map(app_name, url)

data/lib/conan/templates.rb

@@ -10,10 +10,14 @@ module Templates
     Dir.glob(File.join(templates_dir, '*.erb')) do |template|      
       target_file = File.join(output_dir, File.basename(template)[0..-5])
       eruby = Erubis::Eruby.new(File.read(template))
-      if (File.exist? target_file)
-        Tempfile.open(File.basename template) { |t|
-          t.write(eruby.evaluate(context))
-          t.rewind        
+      if (File.exist? target_file)        
+        Tempfile.open(File.basename template) { |t|          
+          begin
+            t.write(eruby.evaluate(context))
+            t.rewind            
+          rescue Exception => e
+            abort "Failed to evaluate #{template} template: #{e}"
+          end
           if (FileUtils.identical? t.path, target_file)
             puts "-- No change from: #{File.basename template} => #{target_file}"
           else            

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy_stackato3
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
+  prerelease: 
 platform: ruby
 authors:
 - Mike Reardon
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daphne_util
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -32,7 +35,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - bin/conan-stackato3
 - lib/conan/application.rb
 - lib/conan/application_helper.rb
@@ -52,27 +54,30 @@ files:
 - lib/conan/stackato.rb
 - lib/conan/templates.rb
 - lib/conan/version.rb
+- README.md
 homepage: http://github.com/MTNSatelliteComm/conan/README.md
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Conan da Deployer
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTZiNWQ1NjU2YWZlNGQ0YjU0MTViMGI1YjlmMjFhMzhlYTdjZDhkYw==
-  data.tar.gz: !binary |-
-    YTJkMDk5NWVjYTQ3NzZmZDBiYmZiMGMzNDIwYWQ0Y2U4MTVjMzhmNg==
-SHA512:
-  metadata.gz: !binary |-
-    ZjFmYmI1YjgxODRkZWVkNmZhOGViYzY4NzI3Y2I1NmEyMTlkNTgxNjZjZjY0
-    MmU5MGZkNjgyOTVlN2YwYzE5YWZlZWExNWQ3NDYwZjZjNDNkODM1MTVkNThl
-    YTNhZTYwMjlhM2Q1YzE1YmRhMjc3ODliNjExZTM1MTYyNjc5ZTY=
-  data.tar.gz: !binary |-
-    NzNmN2ZlOWI4OTY0OTY1Y2RlMzU5MDgxYTQxZDU2MWQ3MGI3OTMzNTdiN2Zl
-    MGU3NWNkYzU5YzAxZDMxOWNkMDg2YTYzZTY4Y2MyODBlZTkyMjRmNzk2NjQy
-    Y2RiNzU4Y2JkNDg0NzY5OWI4MTgxNGUzNzY3NTIwZmNmZjM5ZTE=