morpheus-cli 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec2a0c7f7c355d73f29610ee9ce39ba75a8aa2ef
-  data.tar.gz: 5459548b4682698ffdd9def0761c1f9c0afb0d3d
+  metadata.gz: 2c20e792c2e9a6b6eacd2c3b68c6433f110e8d6e
+  data.tar.gz: 7f64833bddcfaab7163a159ba1f2bac6bc6be940
 SHA512:
-  metadata.gz: 37f0bf316ee216eb9b0a1709f9eef19ee9f08029cc7675dc088112ee05a369f554ef9ffd80341ad95589eae987de06868f235176a19de95cccc1478adcd5f8a8
-  data.tar.gz: 6e7c76c946b1cd791b24fe036c63ca0dfb271bda465a166ede5e9c7a4889653eeb59d655ff9c04d4f3638548475b703be71a845815b0b9d617332bb76c93e52f
+  metadata.gz: 3221c0b5eeeb5f3b99212e135e1d07e4a5f6ada0c69c0ffcd479aaf24e399efd1c72bb1b2a05ff2b3b1f4b11d8d3ee937ec20b1c7f6b2c2dc5ba687a82fe1c15
+  data.tar.gz: 9909b64c97552e1e7d2342d4edbb4e43a8bd657cf945e742207f9a2b0874342aa971112f86ad8b5c2d8bef70c3335cacca905fe61677cf15b62840568fdfa15f

data/lib/morpheus/api/deploy_interface.rb

@@ -51,7 +51,7 @@ class Morpheus::DeployInterface < Morpheus::APIClient
 			url += "/#{destination}"
 		end
 
-		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		headers = { :authorization => "Bearer #{@access_token}"}
 		
 		payload = nil
 		# TODO: Setup payload to be contents of file appropriately
@@ -59,6 +59,7 @@ class Morpheus::DeployInterface < Morpheus::APIClient
 			method: :post,
 			url: url,
             headers: headers,
+            timeout: nil,
             payload: {
             	multipart: true,
             	file: File.new(path, 'rb')	
@@ -83,7 +84,7 @@ class Morpheus::DeployInterface < Morpheus::APIClient
 			end
 		end
 		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-		response = RestClient::Request.execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+		response = RestClient::Request.execute(method: :post, url: url, headers: headers, timeout: nil, payload: payload.to_json)
 		JSON.parse(response.to_s)
 	end
 end

data/lib/morpheus/cli/deploys.rb

@@ -42,7 +42,7 @@ class Morpheus::Cli::Deploys
 			return
 		end
 
-		instance_results = @instances_interface.get(name: deploy_args[:name])
+		instance_results = @instances_interface.get(name: deploy_args['name'])
 		if instance_results['instances'].empty?
 			puts "Instance not found by name #{args[0]}"
 			return
@@ -90,7 +90,13 @@ class Morpheus::Cli::Deploys
 		end
 
 		deploy_payload = {}
-
+		if deploy_args['env']
+			evars = []
+			deploy_args['env'].each_pair do |key, value| 
+				evars << {name: key, value: value, export: false}
+			end
+			@instances_interface.create_env(instance_id,evars)
+		end
 		if deploy_args['options']
 			deploy_payload = {
 				appDeploy: {
@@ -98,6 +104,7 @@ class Morpheus::Cli::Deploys
 				}
 			}
 		end
+
 		print cyan, bold, "Deploying to Servers...", reset, "\n"
 		@deploy_interface.deploy(deployment_id,deploy_payload)
 		print cyan, bold, "Deploy Successful!", reset, "\n"

data/lib/morpheus/cli/instances.rb

@@ -229,7 +229,7 @@ class Morpheus::Cli::Instances
 				envs += env_results['readOnlyEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") ? "********" : v, :export => true}}
 			end
 			tp envs, :name, :value, :export
-			print "\n" ,cyan, bold, "Importad Envs\n","==================", "\n\n", reset, cyan
+			print "\n" ,cyan, bold, "Imported Envs\n","==================", "\n\n", reset, cyan
 			 imported_envs = env_results['importedEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") ? "********" : v}}
 			 tp imported_envs
 			print reset, "\n"

data/lib/morpheus/cli/version.rb

@@ -1,5 +1,5 @@
 module Morpheus
   module Cli
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - David Estes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler