morpheus-cli 2.10.0 → 2.10.1

data/lib/morpheus/formatters.rb

@@ -37,8 +37,15 @@ def format_local_date(dt, options={})
   format_dt(dt, {local: true, format: "%x"}.merge(options))
 end
 
-# returns
 def format_dt_as_param(dt)
   dt = dt.getutc
   format_dt(dt, {format: "%Y-%m-%d %X"})
 end
+
+def display_appliance(name, url)
+  "#{name} - #{url}"
+end
+
+def iso8601(dt)
+  dt.instance_of(Time) ? dt.iso8601 : "#{dt}"
+end

data/lib/morpheus/logging.rb

@@ -5,7 +5,7 @@ require 'logger'
 #
 module Morpheus::Logging
 
-  DEFAULT_LOG_LEVEL = ENV['DEBUG'] ? Logger::DEBUG : Logger::INFO  
+  DEFAULT_LOG_LEVEL = ENV['DEBUG'] ? Logger::DEBUG : Logger::INFO
 
   @@log_level = DEFAULT_LOG_LEVEL
   @@logger = nil

data/lib/morpheus/rest_client.rb

@@ -6,16 +6,28 @@ module Morpheus
 
     class << self
 
-      def execute(options)
-        opts = options.merge({})
+      def user_agent
+        if !@user_agent
+          begin
+            @user_agent = "morpheus-cli #{Morpheus::Cli::VERSION}"
+            @user_agent = "#{@user_agent} (#{::RestClient::Platform.architecture}) #{::RestClient::Platform.ruby_agent_version}"
+          rescue => e
+          end
+        end
+        return @user_agent
+      end
 
+      def execute(options)
+        opts = {timeout: 30}.merge(options)
         unless ssl_verification_enabled?
           opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
         end
 
+        opts[:headers] ||= {}
+        opts[:headers][:user_agent] ||= self.user_agent
+
         ::RestClient::Request.execute opts
       end
-      
       def post(url, payload)
         execute url: url, payload: payload, method: :post
       end
@@ -34,15 +46,12 @@ module Morpheus
 
       private
 
+      # unused eh?
       def build_request_args(url, method, payload)
-        args = {url: url,
-                method: method,
-                payload: payload}
-
+        args = {url: url, method: method, payload: payload}
         unless ssl_verification_enabled?
           args[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
         end
-        
         args
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - David Estes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,8 +143,8 @@ files:
 - lib/morpheus/api/api_client.rb
 - lib/morpheus/api/app_templates_interface.rb
 - lib/morpheus/api/apps_interface.rb
+- lib/morpheus/api/auth_interface.rb
 - lib/morpheus/api/clouds_interface.rb
-- lib/morpheus/api/custom_instance_types.rb
 - lib/morpheus/api/custom_instance_types_interface.rb
 - lib/morpheus/api/dashboard_interface.rb
 - lib/morpheus/api/deploy_interface.rb
@@ -162,6 +162,7 @@ files:
 - lib/morpheus/api/security_group_rules_interface.rb
 - lib/morpheus/api/security_groups_interface.rb
 - lib/morpheus/api/servers_interface.rb
+- lib/morpheus/api/setup_interface.rb
 - lib/morpheus/api/task_sets_interface.rb
 - lib/morpheus/api/tasks_interface.rb
 - lib/morpheus/api/users_interface.rb
@@ -169,15 +170,18 @@ files:
 - lib/morpheus/api/whoami_interface.rb
 - lib/morpheus/cli.rb
 - lib/morpheus/cli/accounts.rb
+- lib/morpheus/cli/alias_command.rb
 - lib/morpheus/cli/app_templates.rb
 - lib/morpheus/cli/apps.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
 - lib/morpheus/cli/clouds.rb
+- lib/morpheus/cli/config_file.rb
 - lib/morpheus/cli/credentials.rb
 - lib/morpheus/cli/dashboard_command.rb
 - lib/morpheus/cli/deployments.rb
 - lib/morpheus/cli/deploys.rb
+- lib/morpheus/cli/error_handler.rb
 - lib/morpheus/cli/groups.rb
 - lib/morpheus/cli/hosts.rb
 - lib/morpheus/cli/instance_types.rb
@@ -189,9 +193,11 @@ files:
 - lib/morpheus/cli/login.rb
 - lib/morpheus/cli/logout.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
+- lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/print_helper.rb
 - lib/morpheus/cli/mixins/provisioning_helper.rb
 - lib/morpheus/cli/mixins/whoami_helper.rb
+- lib/morpheus/cli/option_parser.rb
 - lib/morpheus/cli/option_types.rb
 - lib/morpheus/cli/recent_activity_command.rb
 - lib/morpheus/cli/remote.rb

data/lib/morpheus/api/custom_instance_types.rb

@@ -1,55 +0,0 @@
-require 'json'
-require 'morpheus/rest_client'
-
-class Morpheus::CustomInstanceTypesInterface < Morpheus::APIClient
-	def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-		@access_token = access_token
-		@refresh_token = refresh_token
-		@base_url = base_url
-		@expires_at = expires_at
-	end
-
-	def get(id)
-    url = "#{@base_url}/api/custom-instance-types"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 10, headers: headers, verify_ssl:false)
-    JSON.parse(response.to_s)
-  end
-
-	def list(options={})
-    url = "#{@base_url}/api/custom-instance-types"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
-    response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 10, headers: headers, verify_ssl:false)
-    JSON.parse(response.to_s)
-  end
-
-  def create(options)
-    url = "#{@base_url}/api/custom-instance-types"
-    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    response = Morpheus::RestClient.execute(method: :post, url: url,
-                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
-    JSON.parse(response.to_s)
-  end
-
-  def update(id, options)
-    url = "#{@base_url}/api/custom-instance-types/#{id}"
-    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    response = Morpheus::RestClient.execute(method: :put, url: url,
-                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
-    JSON.parse(response.to_s)
-  end
-
-  def destroy(id)
-    url = "#{@base_url}/api/custom-instance-types/#{id}"
-    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    response = Morpheus::RestClient.execute(method: :delete, url: url,
-                            timeout: 10, headers: headers, verify_ssl:false)
-    JSON.parse(response.to_s)
-  end
-
-end