hula 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05fa96e3b4c99ec177ffb0fd9c2cb45ca42e1637
-  data.tar.gz: 86cec64924a6562dbb1201e45cd3a5934153934c
+  metadata.gz: 7c29bfa90e4fa55109dbad00d8389c432e1c3ced
+  data.tar.gz: 8e426bad601bc2a135e68d05e5e066c186d33915
 SHA512:
-  metadata.gz: 1b8cdb8c457e45c13ec6b0962fbd2f0fcaa902671c8be99146e584b3211d7171994bac5c4bc905466a05138a3f322d8af25707e104e27e0375f15eaa28640183
-  data.tar.gz: 6079ae32452fdec05fbf7d7de0c73efb7d938ad09dec95cdf46148aa24d12a2ac7fa404ef005982ac5dffd4c25e26040ba77b0d0d2d63a503647f188eb180115
+  metadata.gz: 06a3bfcea1e42846a7ae1d87ac719b6ace1eb1f13c64506769ee4ef6b1a62b1d6f9807660bd52ea61cab1c4d5f086602bd724d4d2f04b0127a24926360a0e01f
+  data.tar.gz: 8f71da5ca2c955035bbeeaf7a7ba9068d72476e0b7c7ff172fd313425e6fa7a9704365155acbaa45e12ad893d224152bd5ab747985c754513f606d3a0226573c

data/lib/hula/bosh_director.rb

@@ -27,7 +27,9 @@ module Hula
       password:,
       manifest_path: nil,
       command_runner: CommandRunner.new,
-      logger: default_logger
+      logger: default_logger,
+      certificate_path: nil,
+      env_login: false
     )
       @target_url            = target_url
       @username              = username
@@ -35,6 +37,8 @@ module Hula
       @default_manifest_path = manifest_path
       @command_runner        = command_runner
       @logger                = logger
+      @certificate_path      = certificate_path
+      @env_login             = env_login
 
       target_and_login
     end
@@ -178,7 +182,8 @@ module Hula
 
     private
 
-    attr_reader :target_url, :username, :password, :command_runner, :logger
+    attr_reader :target_url, :username, :password, :command_runner, :logger,
+      :certificate_path, :env_login
 
     def job_properties(job_name)
       if manifest.has_key?('instance_groups')
@@ -219,9 +224,21 @@ module Hula
     end
 
     def target_and_login
-      run_bosh("target #{target_url}")
+      target_cmd = "target #{target_url}"
+      if certificate_path
+        target_cmd = "--ca-cert #{certificate_path} #{target_cmd}"
+      end
+
+      run_bosh(target_cmd)
       run_bosh("deployment #{default_manifest_path}") if default_manifest_path?
-      run_bosh("login #{username} #{password}")
+
+      if not env_login
+        run_bosh("login #{username} #{password}")
+      else
+        if not ENV.has_key? 'BOSH_CLIENT' or not ENV.has_key? 'BOSH_CLIENT_SECRET'
+          raise 'BOSH_CLIENT and BOSH_CLIENT_SECRET must both be set in the ENV'
+        end
+      end
     end
 
     def run_bosh(cmd)

data/lib/hula/version.rb

@@ -9,5 +9,5 @@
 #
 
 module Hula
-  VERSION = '0.9.2'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hula
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Will Pragnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler