conan_deploy_stackato3 0.1.12 → 0.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZmRhODU4YTY3N2JhMmU5OWI0NTBlNmRhMGUwNmU3MTRmN2MyMmU2MA==
5
+ data.tar.gz: !binary |-
6
+ NzkyYTFhYTQ3NDlhZTg5YTQ3ZTdhZjg1ODA3NGUwZWFhMjQ3ODZkYw==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ NmYxZTJiOTNkZWE3Nzc5YjU2YzY4NDY1ZjhhYjcwZWNhNWI3YjU4N2JiMzQ1
10
+ ZTVmNzI1MzQ5Zjc5YTI4OTA0ZTAyMTViZmU0ODFlYWYzMDZkMGQ1MTdlNjUw
11
+ MzljODBmYjIxMjgyMDEzMzRhMDdiNThmNWY2NjBkNDI2OTdhNWI=
12
+ data.tar.gz: !binary |-
13
+ NzdmYjRhMDVlOTA5MmI3OTdjNmMzNWM4ZTIzMmQ2ZmM1OWU1OGJiYjc5MTc1
14
+ M2MyYmQyMTcwNjZjYzBmYzdmNzdkZGM4YjMzYmYzMjZjNjFkMjNlNTNlYWMw
15
+ YzM0NWVlMzRmZDQxOTI2YTAxYWU1YWUyMDg3NjgyOTAzNDcxNmI=
data/bin/conan-stackato3 CHANGED
@@ -79,6 +79,10 @@ optparse = OptionParser.new do |o|
79
79
  options[:'paas-manifest'] = manifest
80
80
  end
81
81
 
82
+ o.on('-e','--paas-executable [EXECUTABLE]', 'Specify the stackato executable to use, default is "stacakto-3.1.1"' ) do |executable|
83
+ options[:'paas-executable'] = executable
84
+ end
85
+
82
86
  o.on('-F','--force-deploy', 'Force deployment to bypass version checks.' ) do
83
87
  options[:'force-deploy'] = true
84
88
  end
@@ -55,9 +55,10 @@ class Manifest
55
55
  paas_pwd = @options[:'paas-password'] || ENV['PAAS_PASSWORD']
56
56
  paas_space = @options[:'paas-space'] || ENV['PAAS_SPACE']
57
57
  paas_manifest = @options[:'paas-manifest'] || ENV['PAAS_MANIFEST']
58
+ paas_executable = @options[:'paas-executable'] || ENV['PAAS_EXECUTABLE']
58
59
  dry_run = @options[:'dry-run'] || false
59
60
 
60
- Stackato.new(paas_user, paas_pwd, paas_space, paas_manifest, dry_run)
61
+ Stackato.new(paas_user, paas_pwd, paas_space, paas_manifest, paas_executable, dry_run)
61
62
  end
62
63
 
63
64
  def deploy
@@ -5,10 +5,10 @@ require 'open3'
5
5
  class Stackato
6
6
 
7
7
  class Commands
8
- @@executable = "stackato-3.1.1"
9
8
  @@token_file = File.join(Dir.tmpdir(), "token_#{Time.now.to_i}")
10
9
 
11
- def initialize(target, dry_run=false)
10
+ def initialize(executable, target, dry_run=false)
11
+ @executable = executable
12
12
  @target = target
13
13
  @dry_run = dry_run
14
14
  v = get_version
@@ -19,7 +19,7 @@ class Stackato
19
19
  def shell_cmd(stackato_cmd, args, ignoreErrs=false)
20
20
  base_args = "--target #{@target} --token-file #{@@token_file}"
21
21
 
22
- cmd = "#{@@executable} #{stackato_cmd} #{base_args} #{args}"
22
+ cmd = "#{@executable} #{stackato_cmd} #{base_args} #{args}"
23
23
  puts(">>> #{cmd}")
24
24
  if @dry_run
25
25
  puts "Dry-run, skipping execution of command: #{cmd}"
@@ -42,7 +42,7 @@ class Stackato
42
42
 
43
43
  def get_version
44
44
  begin
45
- v, err, status = Open3.capture3("#{@@executable} version")
45
+ v, err, status = Open3.capture3("#{@executable} version")
46
46
  abort "Stackato error: #{err}" unless status.success?
47
47
  v
48
48
  rescue Exception => e
@@ -83,11 +83,12 @@ class Stackato
83
83
  end
84
84
  end
85
85
 
86
- def initialize(paas_user, paas_password, paas_space, paas_manifest, dry_run=false)
86
+ def initialize(paas_user, paas_password, paas_space, paas_manifest, paas_executable, dry_run=false)
87
87
  @paas_user = paas_user
88
88
  @paas_password = paas_password
89
89
  @paas_space = paas_space
90
90
  @paas_manifest = paas_manifest || "stackato.yml"
91
+ @paas_executable = paas_executable || "stackato-3.1.1"
91
92
  @dry_run = dry_run
92
93
  end
93
94
 
@@ -95,7 +96,7 @@ class Stackato
95
96
  # login only one time per target, and only one target at a time
96
97
  if (@session != paas_target)
97
98
  @session = paas_target
98
- @commands = Commands.new(paas_target, @dry_run)
99
+ @commands = Commands.new(@paas_executable, paas_target, @dry_run)
99
100
  unless @paas_user.nil?
100
101
  @commands.login(@paas_user, @paas_password, @paas_space)
101
102
  end
data/lib/conan/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Conan
2
- VERSION = "0.1.12"
2
+ VERSION = "0.1.13"
3
3
  end
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conan_deploy_stackato3
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.12
5
- prerelease:
4
+ version: 0.1.13
6
5
  platform: ruby
7
6
  authors:
8
7
  - Mike Reardon
@@ -10,12 +9,11 @@ authors:
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2014-12-05 00:00:00.000000000 Z
12
+ date: 2014-12-17 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: daphne_util
17
16
  requirement: !ruby/object:Gem::Requirement
18
- none: false
19
17
  requirements:
20
18
  - - '='
21
19
  - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
23
21
  type: :runtime
24
22
  prerelease: false
25
23
  version_requirements: !ruby/object:Gem::Requirement
26
- none: false
27
24
  requirements:
28
25
  - - '='
29
26
  - !ruby/object:Gem::Version
@@ -35,48 +32,47 @@ executables:
35
32
  extensions: []
36
33
  extra_rdoc_files: []
37
34
  files:
35
+ - README.md
38
36
  - bin/conan-stackato3
39
- - lib/conan/pipeline.rb
40
37
  - lib/conan/application.rb
41
- - lib/conan/rails_zip_app.rb
42
- - lib/conan/jvm_app.rb
38
+ - lib/conan/application_helper.rb
43
39
  - lib/conan/deploy.rb
44
- - lib/conan/manifest.rb
45
40
  - lib/conan/deployment.rb
41
+ - lib/conan/environment.rb
42
+ - lib/conan/has_options.rb
43
+ - lib/conan/jvm_app.rb
44
+ - lib/conan/manifest.rb
45
+ - lib/conan/manifest_builder.rb
46
46
  - lib/conan/newrelic.rb
47
47
  - lib/conan/options.rb
48
48
  - lib/conan/output.rb
49
- - lib/conan/application_helper.rb
49
+ - lib/conan/pipeline.rb
50
+ - lib/conan/rails_zip_app.rb
51
+ - lib/conan/repository.rb
50
52
  - lib/conan/stackato.rb
51
- - lib/conan/has_options.rb
52
53
  - lib/conan/templates.rb
53
- - lib/conan/manifest_builder.rb
54
- - lib/conan/repository.rb
55
- - lib/conan/environment.rb
56
54
  - lib/conan/version.rb
57
- - README.md
58
55
  homepage: http://github.com/MTNSatelliteComm/conan/README.md
59
56
  licenses: []
57
+ metadata: {}
60
58
  post_install_message:
61
59
  rdoc_options: []
62
60
  require_paths:
63
61
  - lib
64
62
  required_ruby_version: !ruby/object:Gem::Requirement
65
- none: false
66
63
  requirements:
67
64
  - - ! '>='
68
65
  - !ruby/object:Gem::Version
69
66
  version: '0'
70
67
  required_rubygems_version: !ruby/object:Gem::Requirement
71
- none: false
72
68
  requirements:
73
69
  - - ! '>='
74
70
  - !ruby/object:Gem::Version
75
71
  version: '0'
76
72
  requirements: []
77
73
  rubyforge_project:
78
- rubygems_version: 1.8.24
74
+ rubygems_version: 2.4.4
79
75
  signing_key:
80
- specification_version: 3
76
+ specification_version: 4
81
77
  summary: Conan da Deployer
82
78
  test_files: []