morpheus-cli 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c20e792c2e9a6b6eacd2c3b68c6433f110e8d6e
-  data.tar.gz: 7f64833bddcfaab7163a159ba1f2bac6bc6be940
+  metadata.gz: 65706da7190d81081637401fa308e8660c736c23
+  data.tar.gz: e2fed380d8ad530ec634fffb8be5aa7b68935282
 SHA512:
-  metadata.gz: 3221c0b5eeeb5f3b99212e135e1d07e4a5f6ada0c69c0ffcd479aaf24e399efd1c72bb1b2a05ff2b3b1f4b11d8d3ee937ec20b1c7f6b2c2dc5ba687a82fe1c15
-  data.tar.gz: 9909b64c97552e1e7d2342d4edbb4e43a8bd657cf945e742207f9a2b0874342aa971112f86ad8b5c2d8bef70c3335cacca905fe61677cf15b62840568fdfa15f
+  metadata.gz: fd19b182093c82ab1db32af90a5d0cc59aed0e0acefdf797383a8d70a447036f018392659bf44027dd7408bd17d65d0231c774cabe54fd5da07ed6b6220911d3
+  data.tar.gz: 38abfa8301a1dd15e080768277dc2cc4cbf886a437bb969ac8f99ee6e32360f77582994eea65c4d5b5e21e10fc92a7d891e759ba586f39941784f758a54b11ed

data/lib/morpheus/api/deploy_interface.rb

@@ -1,5 +1,7 @@
 require 'json'
 require 'rest-client'
+require 'net/http/post/multipart'
+require 'mime/types'
 
 class Morpheus::DeployInterface < Morpheus::APIClient
 	def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
@@ -46,25 +48,21 @@ class Morpheus::DeployInterface < Morpheus::APIClient
 	end
 
 	def upload_file(id,path,destination=nil)
-		url = "#{@base_url}/api/deploy/#{id}/files"
+		url_string = "#{@base_url}/api/deploy/#{id}/files"
 		if !destination.empty?
-			url += "/#{destination}"
+			url_string += "/#{destination}"
 		end
 
-		headers = { :authorization => "Bearer #{@access_token}"}
+		url = URI.parse(url_string)
+		req = Net::HTTP::Post::Multipart.new url.path,
+		  "file" => UploadIO.new(File.new(path,'rb'), "image/jpeg", File.basename(path))
+
+		  req['Authorization'] = "Bearer #{@access_token}"
+		res = Net::HTTP.start(url.host, url.port) do |http|
+		  http.request(req)
+		end
 		
-		payload = nil
-		# TODO: Setup payload to be contents of file appropriately
-		response = RestClient::Request.execute(
-			method: :post,
-			url: url,
-            headers: headers,
-            timeout: nil,
-            payload: {
-            	multipart: true,
-            	file: File.new(path, 'rb')	
-        	})
-		JSON.parse(response.to_s)
+		res
 	end
 
 	def destroy(id)

data/lib/morpheus/cli/deploys.rb

@@ -96,6 +96,7 @@ class Morpheus::Cli::Deploys
 				evars << {name: key, value: value, export: false}
 			end
 			@instances_interface.create_env(instance_id,evars)
+			@instances_interface.restart(instance_id)
 		end
 		if deploy_args['options']
 			deploy_payload = {

data/lib/morpheus/cli/version.rb

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

data/morpheus-cli.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_dependency 'term-ansicolor', '~> 1.3.0'
   spec.add_dependency "rest-client", "~> 1.7"
+  spec.add_dependency 'multipart-post'
   spec.add_dependency "filesize"
+  spec.add_dependency 'mime-types'
   spec.add_dependency "table_print"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - David Estes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement