conan_deploy_stackato3 0.1.12 → 0.1.13

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmRhODU4YTY3N2JhMmU5OWI0NTBlNmRhMGUwNmU3MTRmN2MyMmU2MA==
+  data.tar.gz: !binary |-
+    NzkyYTFhYTQ3NDlhZTg5YTQ3ZTdhZjg1ODA3NGUwZWFhMjQ3ODZkYw==
+SHA512:
+  metadata.gz: !binary |-
+    NmYxZTJiOTNkZWE3Nzc5YjU2YzY4NDY1ZjhhYjcwZWNhNWI3YjU4N2JiMzQ1
+    ZTVmNzI1MzQ5Zjc5YTI4OTA0ZTAyMTViZmU0ODFlYWYzMDZkMGQ1MTdlNjUw
+    MzljODBmYjIxMjgyMDEzMzRhMDdiNThmNWY2NjBkNDI2OTdhNWI=
+  data.tar.gz: !binary |-
+    NzdmYjRhMDVlOTA5MmI3OTdjNmMzNWM4ZTIzMmQ2ZmM1OWU1OGJiYjc5MTc1
+    M2MyYmQyMTcwNjZjYzBmYzdmNzdkZGM4YjMzYmYzMjZjNjFkMjNlNTNlYWMw
+    YzM0NWVlMzRmZDQxOTI2YTAxYWU1YWUyMDg3NjgyOTAzNDcxNmI=

data/bin/conan-stackato3

@@ -79,6 +79,10 @@ optparse = OptionParser.new do |o|
     options[:'paas-manifest'] = manifest
   end
 
+  o.on('-e','--paas-executable [EXECUTABLE]', 'Specify the stackato executable to use, default is "stacakto-3.1.1"' ) do |executable|
+    options[:'paas-executable'] = executable
+  end  
+
   o.on('-F','--force-deploy', 'Force deployment to bypass version checks.' ) do
     options[:'force-deploy'] = true
   end

data/lib/conan/manifest.rb

@@ -55,9 +55,10 @@ class Manifest
     paas_pwd = @options[:'paas-password'] || ENV['PAAS_PASSWORD']
     paas_space = @options[:'paas-space'] || ENV['PAAS_SPACE']
     paas_manifest = @options[:'paas-manifest'] || ENV['PAAS_MANIFEST']
+    paas_executable = @options[:'paas-executable'] || ENV['PAAS_EXECUTABLE']
     dry_run = @options[:'dry-run'] || false
 
-    Stackato.new(paas_user, paas_pwd, paas_space, paas_manifest, dry_run)
+    Stackato.new(paas_user, paas_pwd, paas_space, paas_manifest, paas_executable, dry_run)
   end
 
   def deploy

data/lib/conan/stackato.rb

@@ -5,10 +5,10 @@ require 'open3'
 class Stackato
 
   class Commands
-    @@executable = "stackato-3.1.1"
     @@token_file = File.join(Dir.tmpdir(), "token_#{Time.now.to_i}")
 
-    def initialize(target, dry_run=false)
+    def initialize(executable, target, dry_run=false)
+      @executable = executable
       @target = target
       @dry_run = dry_run
       v = get_version
@@ -19,7 +19,7 @@ class Stackato
     def shell_cmd(stackato_cmd, args, ignoreErrs=false)
       base_args = "--target #{@target} --token-file #{@@token_file}"
 
-      cmd = "#{@@executable} #{stackato_cmd} #{base_args} #{args}"
+      cmd = "#{@executable} #{stackato_cmd} #{base_args} #{args}"
       puts(">>> #{cmd}")
       if @dry_run
         puts "Dry-run, skipping execution of command: #{cmd}"
@@ -42,7 +42,7 @@ class Stackato
 
     def get_version    
       begin
-        v, err, status = Open3.capture3("#{@@executable} version")
+        v, err, status = Open3.capture3("#{@executable} version")
         abort "Stackato error: #{err}" unless status.success?        
         v
       rescue Exception => e
@@ -83,11 +83,12 @@ class Stackato
     end
   end
   
-  def initialize(paas_user, paas_password, paas_space, paas_manifest, dry_run=false)
+  def initialize(paas_user, paas_password, paas_space, paas_manifest, paas_executable, dry_run=false)
     @paas_user = paas_user
     @paas_password = paas_password
     @paas_space = paas_space
     @paas_manifest = paas_manifest || "stackato.yml"
+    @paas_executable = paas_executable || "stackato-3.1.1"
     @dry_run = dry_run
   end
 
@@ -95,7 +96,7 @@ class Stackato
     # login only one time per target, and only one target at a time
     if (@session != paas_target)
       @session = paas_target
-      @commands = Commands.new(paas_target, @dry_run)
+      @commands = Commands.new(@paas_executable, paas_target, @dry_run)
       unless @paas_user.nil?
         @commands.login(@paas_user, @paas_password, @paas_space)
       end

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy_stackato3
 version: !ruby/object:Gem::Version
-  version: 0.1.12
-  prerelease: 
+  version: 0.1.13
 platform: ruby
 authors:
 - Mike Reardon
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-17 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
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -35,48 +32,47 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/conan-stackato3
-- lib/conan/pipeline.rb
 - lib/conan/application.rb
-- lib/conan/rails_zip_app.rb
-- lib/conan/jvm_app.rb
+- lib/conan/application_helper.rb
 - lib/conan/deploy.rb
-- lib/conan/manifest.rb
 - lib/conan/deployment.rb
+- lib/conan/environment.rb
+- lib/conan/has_options.rb
+- lib/conan/jvm_app.rb
+- lib/conan/manifest.rb
+- lib/conan/manifest_builder.rb
 - lib/conan/newrelic.rb
 - lib/conan/options.rb
 - lib/conan/output.rb
-- lib/conan/application_helper.rb
+- lib/conan/pipeline.rb
+- lib/conan/rails_zip_app.rb
+- lib/conan/repository.rb
 - lib/conan/stackato.rb
-- lib/conan/has_options.rb
 - lib/conan/templates.rb
-- lib/conan/manifest_builder.rb
-- lib/conan/repository.rb
-- lib/conan/environment.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: 1.8.24
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Conan da Deployer
 test_files: []