rightscale_selfservice 0.0.6 → 0.0.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDk4Mzg5NTVmNDMyMmNmNzJkYjRmMGZhODYzYWExZjBhNWM5NjlmZQ==
-  data.tar.gz: !binary |-
-    ZjMyYTE1ODk3OWNlNjMxMGNjODFjZWE3MDU1MjA1ZDhjMmNlYWMwNw==
+SHA1:
+  metadata.gz: 6a27c81874af64515d925677e91207745fce71bd
+  data.tar.gz: 43a671aa1c541a3d4f4464de7c12ed98141a87a8
 SHA512:
-  metadata.gz: !binary |-
-    ZDJjMTAwNTQyYWZhZmZiMDhiZjhmMDE2MWRiOWY4MjBlMjQyMjk0NTk1NWJl
-    NTg4ZTFlOGIzNWRmMzI0MWQ5N2RkZjgwOTBiYWI1M2EyZTIwMWRjYzEwYjU5
-    OTcyZDAxYzNhMDgyNGMyN2RlMzQ2MGNhMjc0Y2UzMmQ1YmJhMWE=
-  data.tar.gz: !binary |-
-    NTczMjBmOTUyNDBjZTAxODgyNWVjOGYzYmEzNDI5OWU3MWI5ZTEyNjQzNDRk
-    YmUxNDc5ZDdiNzQ1ZDIxZDc5ZGYxMDBkMWQwNjMzYmNhNGVkNTFiZmIwYzA2
-    OThiZTAxNzc3MDgwOTkxNjZhNTZjYmViMzgwODVlZWJkM2Q2ZWM=
+  metadata.gz: 803f07b64839affb10a1f86af38a3dfa506239e6009d4536d7871efe7b92c0a7808a2c5ab488599b64ae42f673d0cf221d55efabd17b45082165e5dd81d6a9e5
+  data.tar.gz: 8151278084ae6d0c821926a3c9ee86dd65ec0b2c12380ca757563175d2360f5b0fbb3656bb92c08295fbee3c37593ec04460fbd7a889cba883de9dcffb224620

data/lib/rightscale_selfservice/cli/execution.rb

@@ -41,6 +41,7 @@ module RightScaleSelfService
           shell = Thor::Shell::Color.new
           message = "Failed to list executions\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
           logger.error(shell.set_color message, :red)
+          exit 1
         end
       end
 
@@ -62,6 +63,7 @@ module RightScaleSelfService
           shell = Thor::Shell::Color.new
           message = "Failed to show execution id #{id}\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
           logger.error(shell.set_color message, :red)
+          exit 1
         end
       end
 

data/lib/rightscale_selfservice/cli/operation.rb

@@ -42,11 +42,12 @@ module RightScaleSelfService
           shell = Thor::Shell::Color.new
           message = "Failed to create operation \"#{operation_name}\" on execution id \"#{execution_id}\"\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
           logger.error(shell.set_color message, :red)
+          exit 1
         end
       end
 
       desc "list", "Lists all operations, optionally filtered by --filter and/or --property"
-      option :filter, :type => :array, :desc => "Filters to apply see (https://s3.amazonaws.com/rs_api_docs/selfservice/manager/index.html#/1.0/controller/V1::Controller::Operation/index)"
+      option :filter, :type => :array, :desc => "Filters to apply see (http://reference.rightscale.com/selfservice/manager/index.html#/1.0/controller/V1::Controller::Operation/index)"
       option :property, :type => :array, :desc => "When supplied, only the specified properties will be displayed. By default the entire response is supplied."
       def list()
         params = {}
@@ -68,6 +69,7 @@ module RightScaleSelfService
           shell = Thor::Shell::Color.new
           message = "Failed to list operations\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
           logger.error(shell.set_color message, :red)
+          exit 1
         end
       end
     end

data/lib/rightscale_selfservice/cli/template.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014 Ryan Geyer
+# Copyright (c) 2014-2016 Ryan Geyer
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -53,6 +53,7 @@ module RightScaleSelfService
           shell = Thor::Shell::Color.new
           message = "Failed to compile template\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
           logger.error(shell.set_color message, :red)
+          exit 1
         end
       end
 
@@ -65,9 +66,16 @@ module RightScaleSelfService
         template = RightScaleSelfService::Utilities::Template.preprocess(source_filepath)
         client = get_api_client()
 
-        matches = template.match(/^name\s*"(?<name>.*)"/)
-        tmp_file = matches["name"].gsub("/","-").gsub(" ","-")
-        name = matches["name"]
+        matches = template.match(/^name\s*['"](?<name>.*)['"]/)
+        if matches && matches.names.include?("name")
+          tmp_file = matches["name"].gsub("/","-").gsub(" ","-")
+          name = matches["name"]
+        else
+          shell = Thor::Shell::Color.new
+          message = "Unable to find the \"name\" property of the CAT. Make sure you have added the necessary header to your CAT file."
+          logger.error(shell.set_color message, :red)
+          return
+        end
 
         logger.info("Fetching a list of existing templates to see if \"#{name}\" exists...")
 
@@ -94,6 +102,7 @@ module RightScaleSelfService
           shell = Thor::Shell::Color.new
           message = "Failed to update or create template\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
           logger.error(shell.set_color message, :red)
+          exit 1
         ensure
           tmpfile.close!()
         end
@@ -113,25 +122,31 @@ module RightScaleSelfService
           response = client.designer.template.publish(publish_params)
           logger.info("Successfully published template.")
         rescue RestClient::ExceptionWithResponse => e
-          if e.http_code == 409 && @options["override"]
-            logger.warn("Template id \"#{template_id}\" has already been published, but --override was set so we'll try to publish again with the overridden_application_href parameter.")
-            begin
-              app_response = client.catalog.application.index()
-              applications = JSON.parse(app_response.body)
-              matching_apps = applications.select{|a| a["template_info"]["href"] == template_href}
-              if matching_apps == 0
-                logger.error(shell.set_color "Unable to find the published application for template id \"#{template_id}\"")
-              else
-                publish_params[:overridden_application_href] = matching_apps.first["href"]
-                retry
+          if e.http_code == 409
+            if @options["override"]
+              logger.warn("Template id \"#{template_id}\" has already been published, but --override was set so we'll try to publish again with the overridden_application_href parameter.")
+              begin
+                app_response = client.catalog.application.index()
+                applications = JSON.parse(app_response.body)
+                matching_apps = applications.select{|a| a["template_info"]["href"] == template_href}
+                if matching_apps == 0
+                  logger.error(shell.set_color "Unable to find the published application for template id \"#{template_id}\"")
+                else
+                  publish_params[:overridden_application_href] = matching_apps.first["href"]
+                  retry
+                end
+              rescue RestClient::ExceptionWithResponse => e
+                message = "Failed to get a list of existing published templates\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
+                logger.error(shell.set_color message, :red)
+                exit 1
               end
-            rescue RestClient::ExceptionWithResponse => e
-              message = "Failed to get a list of existing published templates\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
-              logger.error(shell.set_color message, :red)
+            else
+              logger.error("Template id \"#{template_id}\" has already been published, and --override was not set so it will not be over written. If you really want to replace the published template, simply specify --override when running this command.")
             end
           else
             message = "Failed to publish template\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
             logger.error(shell.set_color message, :red)
+            exit 1
           end
         end
       end
@@ -153,6 +168,7 @@ module RightScaleSelfService
           shell = Thor::Shell::Color.new
           message = "Failed to list templates\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
           logger.error(shell.set_color message, :red)
+          exit 1
         end
       end
 
@@ -178,6 +194,7 @@ module RightScaleSelfService
           shell = Thor::Shell::Color.new
           message = "Failed to create execution from template\n\n#{RightScaleSelfService::Api::Client.format_error(e)}"
           logger.error(shell.set_color message, :red)
+          exit 1
         end
       end
 

data/lib/rightscale_selfservice/utilities/template.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014 Ryan Geyer
+# Copyright (c) 2014-2016 Ryan Geyer
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -30,7 +30,7 @@ module RightScaleSelfService
       # @raise [Errno::ENOENT] If the file does not exist
       # @return [String] the content of the supplied file
       def self.file_to_str_and_validate(file)
-        cat_str = File.open(File.expand_path(file), 'r') { |f| f.read }
+        cat_str = File.open(File.expand_path(file), 'r') { |f| f.read.force_encoding('UTF-8') }
       end
 
       # Returns a de duped hash of files to include by recursively parsing and

metadata

@@ -1,55 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: rightscale_selfservice
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Ryan J. Geyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: logger-better
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 description: A rubygem with a buncha useful CLI bits for RightScale Self Service,
@@ -89,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: A rubygem with a buncha useful CLI bits for RightScale Self Service, including