apcera 0.1.6.6 → 0.1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 936f027a3af88048093ce9f9c12342d5cc26a429
-  data.tar.gz: 64f8df1ba938aa87930e80faa5af4e2b40daa59c
+  metadata.gz: 129f14024acd34b352504b6d62bc36f917b37544
+  data.tar.gz: 27adcbba8c4dc3577439353ff507fdd25c510127
 SHA512:
-  metadata.gz: 4bbab572fcd4550ad40d822683eae052e24881989fe653b6b49e23364905e32db6c1fd595d818d28f33418b3f25fc092cf69901e404656959f25706ed5de95bc
-  data.tar.gz: 9e5324071aefd0beffe475983757371f4f9659eed51445f7f5468827597776dbda8df81488d78f68fc100d47f60818908268bdea083d2946a544e491aae682b3
+  metadata.gz: 8d62aa17d5251cc5e3b528f4acc9fb7c173c8809cc48858d3a826997f45bee78d4414d580d84627dd0042bf02ab16a210b1f131be50721681b356d3caa92cb7f
+  data.tar.gz: 21e7c4256f32c6a1cf4ae9245954ff9a5a69b3a932b2c388c41047b3f43dae65eb805453820ca0212004b2a74f9a71778034b1234a3d961145f4df3a36c0f170

data/lib/apcera/version.rb

@@ -1,3 +1,3 @@
 module Apcera
-  VERSION = "0.1.6.6"
+  VERSION = "0.1.6.7"
 end

data/lib/apcera_api_helper.rb

@@ -22,7 +22,8 @@ class String
 end
 
 class ApceraAuth
-	
+	# Want to update this to check for HTTP_URI. If that is set, don't do ANY auth.
+	#
 	# These are the bare minimum
 	#
 	attr_reader :target
@@ -72,14 +73,7 @@ class ApceraAuth
 			
 				default = "http://demo.proveapcera.io"
 			
-				# This can also be set in the environment
-				#
-				if ENV.key?("APC_TARGET")
-					puts "WARNING: Using APC_TARGET from ENV"
-					value = ENV["APC_TARGET"]
-				else
-					value = prompt_for_value("Enter the domain name for the cluster [#{default}] : ").delete!("\n")
-				end
+				value = prompt_for_value("Enter the domain name for the cluster [#{default}] : ").delete!("\n")
 
 				if value == ""
 					value = default
@@ -104,6 +98,12 @@ class ApceraAuth
 		@base_api_url = "#{scheme}://#{@api_host}"
 		@base_auth_url = "#{scheme}://#{@auth_host}"
 		
+		# if the $HTTP_URI is set then we are in app_token mode, and auth is done.
+		#
+		if (ENV.key?("$HTTP_URI"))
+			puts "HTTP_URI is set [#{ENV.key("$HTTP_URI")}], app_token mode"
+		end
+		
 		if (target.nonblank? || bearer.nonblank?)
 			@bearer = bearer
 		else
@@ -213,9 +213,17 @@ class ApceraApiHelper
 		
 		Apcera.configure do |config|
 			config.scheme = apc_env.scheme
-			config.api_key['authorization'] = apc_env.token
-			config.api_key_prefix['authorization'] = apc_env.token_prefix
-
+			
+			# If we are using APP_TOKEN these won't be set
+			#
+	        if !apc_env.token.nil?
+	          config.api_key['authorization'] = apc_env.token
+	        end
+      
+	        if !apc_env.token_prefix.nil?
+	          config.api_key_prefix['authorization'] = apc_env.token_prefix
+	        end
+			
 			config.host = apc_env.api_host
 			config.base_path = '/v1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apcera
 version: !ruby/object:Gem::Version
-  version: 0.1.6.6
+  version: 0.1.6.7
 platform: ruby
 authors:
 - Jamie Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus