kinetic_sdk 0.1.1 → 1.0.0

data/lib/kinetic_sdk/discussions/lib/messages.rb

@@ -20,7 +20,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_message(discussion_id, message, headers=default_jwt_headers)
       payload = message_content(message)
-      info("Adding a message to the #{discussion_id} Discussion")
+      @logger.info("Adding a message to the #{discussion_id} Discussion")
       post("#{@api_url}/discussions/#{discussion_id}/messages", payload, headers)
     end
 
@@ -46,7 +46,7 @@ module KineticSdk
     def add_message_with_attachments(discussion_id, properties={}, headers=default_jwt_headers)
       payload = message_content(properties['message'])
       payload["attachments"] = properties['attachments']
-      info("Adding a message to the #{discussion_id} Discussion")
+      @logger.info("Adding a message to the #{discussion_id} Discussion")
       post_multipart("#{@api_url}/discussions/#{discussion_id}/messages", payload, headers)
     end
 
@@ -57,7 +57,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_messages(discussion_id, params={}, headers=default_jwt_headers)
-      info("Finding messages in the #{discussion_id} Discussion")
+      @logger.info("Finding messages in the #{discussion_id} Discussion")
       get("#{@api_url}/discussions/#{discussion_id}/messages", params, headers)
     end
 
@@ -69,7 +69,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_message(discussion_id, message_id, params={}, headers=default_jwt_headers)
-      info("Finding the #{message_id} message in the #{discussion_id} Discussion")
+      @logger.info("Finding the #{message_id} message in the #{discussion_id} Discussion")
       get("#{@api_url}/discussions/#{discussion_id}/messages/#{message_id}", params, headers)
     end
 
@@ -93,7 +93,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def update_message(discussion_id, message_id, message, headers=default_jwt_headers)
       payload = message_content(message)
-      info("Updating the #{message_id} message in the #{discussion_id} Discussion")
+      @logger.info("Updating the #{message_id} message in the #{discussion_id} Discussion")
       put("#{@api_url}/discussions/#{discussion_id}/messages/#{message_id}", payload, headers)
     end
 
@@ -118,7 +118,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def update_message_with_attachments(discussion_id, message_id, message, attachments=[], headers=header_bearer_auth)
       payload = { "message" => message_content(message).to_json, "attachments" => attachments }
-      info("Updating the #{message_id} message in the #{discussion_id} Discussion")
+      @logger.info("Updating the #{message_id} message in the #{discussion_id} Discussion")
       post_multipart("#{@api_url}/discussions/#{discussion_id}/messages/#{message_id}", payload, headers)
     end
 
@@ -137,7 +137,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def download_message_attachment(discussion_id, message_id, document_id, filename, params={}, headers=header_bearer_auth)
-      info("Downloading the #{filename} file attachment in the #{discussion_id} Discussion")
+      @logger.info("Downloading the #{filename} file attachment in the #{discussion_id} Discussion")
       get("#{@api_url}/discussions/#{discussion_id}/messages/#{message_id}/files/#{document_id}/#{filename}", params, headers)
     end
 
@@ -164,7 +164,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication
     def export_message_attachment(discussion_id, message_id, document_id, filename, params={}, headers=header_bearer_auth)
       raise StandardError.new "An export directory must be defined to export a file attachment." if @options[:export_directory].nil?
-      info("Exporting the #{filename} file attachment in the #{discussion_id} Discussion")
+      @logger.info("Exporting the #{filename} file attachment in the #{discussion_id} Discussion")
       # Create the export directory if it doesn't yet exist
       export_dir = FileUtils::mkdir_p(File.join(@options[:export_directory], discussion_id, "files", message_id))
       export_file = File.join(export_dir, filename)

data/lib/kinetic_sdk/discussions/lib/meta.rb

@@ -6,7 +6,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def app_version(headers=header_accept_json)
-      info("Retrieving Discussions application version.")
+      @logger.info("Retrieving Discussions application version.")
       get("#{@api_url}/version", {}, headers)
     end
 

data/lib/kinetic_sdk/discussions/lib/participants.rb

@@ -9,7 +9,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_participant(discussion_id, username, headers=default_jwt_headers)
       payload = { "username" => username }
-      info("Participant #{username} joining the #{discussion_id} Discussion")
+      @logger.info("Participant #{username} joining the #{discussion_id} Discussion")
       post("#{@api_url}/discussions/#{discussion_id}/participants", payload, headers)
     end
 
@@ -20,7 +20,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_participant(discussion_id, username, headers=header_bearer_auth)
-      info("Participant #{username} is leaving the #{discussion_id} Discussion")
+      @logger.info("Participant #{username} is leaving the #{discussion_id} Discussion")
       delete("#{@api_url}/discussions/#{discussion_id}/participants/#{encode(username)}", headers)
     end
 
@@ -31,7 +31,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_participants(discussion_id, params={}, headers=default_jwt_headers)
-      info("Finding Participants in the #{discussion_id} Discussion")
+      @logger.info("Finding Participants in the #{discussion_id} Discussion")
       get("#{@api_url}/discussions/#{discussion_id}/participants", params, headers)
     end
 
@@ -43,7 +43,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_participant(discussion_id, username, params={}, headers=default_jwt_headers)
-      info("Finding the #{username} Participant in the #{discussion_id} Discussion")
+      @logger.info("Finding the #{username} Participant in the #{discussion_id} Discussion")
       get("#{@api_url}/discussions/#{discussion_id}/participants/#{encode(username)}", params, headers)
     end
 
@@ -56,7 +56,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def update_participant(discussion_id, username, properties={}, headers=default_jwt_headers)
-      info("Updating the #{username} Participant in the #{discussion_id} Discussion")
+      @logger.info("Updating the #{username} Participant in the #{discussion_id} Discussion")
       put("#{@api_url}/discussions/#{discussion_id}/participants/#{encode(username)}", properties, headers)
     end
 

data/lib/kinetic_sdk/discussions/lib/related_items.rb

@@ -10,7 +10,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_related_item(discussion_id, type, key, headers=default_jwt_headers)
       payload = {"type": type, "key": key}
-      info("Adding a related item of type #{type} and key #{key} to the #{discussion_id} Discussion")
+      @logger.info("Adding a related item of type #{type} and key #{key} to the #{discussion_id} Discussion")
       post("#{@api_url}/discussions/#{discussion_id}/relatedItems", payload, headers)
     end
 
@@ -22,7 +22,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_related_item(discussion_id, type, key, headers=header_bearer_auth)
-      info("Deleting related item of type #{type} and key #{key} from the #{discussion_id} Discussion")
+      @logger.info("Deleting related item of type #{type} and key #{key} from the #{discussion_id} Discussion")
       delete("#{@api_url}/discussions/#{discussion_id}/relatedItems/#{encode(type)}/#{encode(key)}", payload, headers)
     end
 
@@ -33,7 +33,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_related_items(discussion_id, params={}, headers=default_jwt_headers)
-      info("Finding related items in the #{discussion_id} Discussion")
+      @logger.info("Finding related items in the #{discussion_id} Discussion")
       get("#{@api_url}/discussions/#{discussion_id}/relatedItems", params, headers)
     end
 
@@ -46,7 +46,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is bearer authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_related_item(discussion_id, type, key, params={}, headers=default_jwt_headers)
-      info("Finding the related item of type #{type} and key #{key} in the #{discussion_id} Discussion")
+      @logger.info("Finding the related item of type #{type} and key #{key} in the #{discussion_id} Discussion")
       get("#{@api_url}/discussions/#{discussion_id}/relatedItems/#{encode(type)}/#{encode(key)}", params, headers)
     end
 

data/lib/kinetic_sdk/discussions/lib/websockets.rb

@@ -47,18 +47,18 @@ module KineticSdk
 
 
     def ws_writer(ws, msg)
-      info("Websocket send message: #{msg}")
+      @logger.info("Websocket send message: #{msg}")
       ws.send(msg)
     end
 
     def ws_reader(ws, send_msg=nil)
       ws.read do |msg|
-        info("Websocket read: #{msg}")
+        @logger.info("Websocket read: #{msg}")
         o = JSON.parse(msg)
         if ("error$".match(o['event']))
-          info("Websocket failure: #{o['payload']}")
+          @logger.info("Websocket failure: #{o['payload']}")
         elsif (o['event'] == "participant:updated")
-          info("Websocket close: EOF")
+          @logger.info("Websocket close: EOF")
           ws.close(1000, "EOF")
           break
         else
@@ -72,19 +72,19 @@ module KineticSdk
 
     def ws_client(message)
       write_thread = nil
-      info("Websocket connecting to #{@topics_ws_server}")
+      @logger.info("Websocket connecting to #{@topics_ws_server}")
       Kontena::Websocket::Client.connect(@topics_ws_server) do |ws|
-        info("Websocket connected to #{ws.url}")
+        @logger.info("Websocket connected to #{ws.url}")
         write_thread = Thread.new {
           ws_writer(ws, identify_msg())
         }
         ws_reader(ws, message)
-        info("Websocket client closed connection with code #{ws.close_code}: #{ws.close_reason}")
+        @logger.info("Websocket client closed connection with code #{ws.close_code}: #{ws.close_reason}")
       end
     rescue Kontena::Websocket::CloseError => e
-      info(e)
+      @logger.info(e)
     rescue Kontena::Websocket::Error => e
-      info(e)
+      @logger.info(e)
     ensure
       if write_thread
         write_thread.kill

data/lib/kinetic_sdk/filehub/filehub-sdk.rb

@@ -10,7 +10,7 @@ module KineticSdk
     # Include the KineticHttpUtils module
     include KineticSdk::Utils::KineticHttpUtils
 
-    attr_reader :api_url, :username, :options, :password, :server, :version
+    attr_reader :api_url, :username, :options, :password, :server, :version, :logger
 
     # Initalize the FileHub SDK with the web server URL and configuration user
     # credentials, along with any custom option values.
@@ -28,8 +28,11 @@ module KineticSdk
     # @option opts [String] :password the password for the user
     # @option opts [Hash<Symbol, Object>] :options ({}) optional settings
     #
-    #   * :log_level (String) (_defaults to: off_) level of logging - off | info | debug | trace
-    #   * :max_redirects (Fixnum) (_defaults to: 10_) maximum number of redirects to follow
+    #   * :gateway_retry_limit (FixNum) (_defaults to: 5_) max number of times to retry a bad gateway
+    #   * :gateway_retry_delay (Float) (_defaults to: 1.0_) number of seconds to delay before retrying a bad gateway
+    #   * :log_level (String) (_defaults to: off_) level of logging - off | error | warn | info | debug
+    #   * :log_output (String) (_defaults to: STDOUT_) where to send output - STDOUT | STDERR
+    #   * :max_redirects (Fixnum) (_defaults to: 5_) maximum number of redirects to follow
     #   * :ssl_ca_file (String) full path to PEM certificate used to verify the server
     #   * :ssl_verify_mode (String) (_defaults to: none_) - none | peer
     #
@@ -69,6 +72,11 @@ module KineticSdk
 
       # process any individual options
       @options = options.delete(:options) || {}
+      # setup logging
+      log_level = @options[:log_level] || @options["log_level"]
+      log_output = @options[:log_output] || @options["log_output"]
+      @logger = KineticSdk::Utils::KLogger.new(log_level, log_output)
+
       @username = options[:username]
       @password = options[:password]
       @server = options[:app_server_url].chomp('/')

data/lib/kinetic_sdk/filehub/lib/access_keys.rb

@@ -11,7 +11,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_access_key(slug, payload, headers=default_headers)
-      info("Adding Access Key for Filestore \"#{slug}\"")
+      @logger.info("Adding Access Key for Filestore \"#{slug}\"")
       post("#{@api_url}/filestores/#{slug}/access-keys", payload, headers)
     end
 
@@ -22,7 +22,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_access_key(slug, id, headers=default_headers)
-      info("Deleting Access Key #{id} for Filestore \"#{slug}\"")
+      @logger.info("Deleting Access Key #{id} for Filestore \"#{slug}\"")
       delete("#{@api_url}/filestores/#{slug}/access-keys/#{id}", headers)
     end
 
@@ -33,7 +33,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_access_keys(slug, params={}, headers=default_headers)
-      info("Finding Access Keys for Filestore \"#{slug}\"")
+      @logger.info("Finding Access Keys for Filestore \"#{slug}\"")
       get("#{@api_url}/filestores/#{slug}/access-keys", params, headers)
     end
 
@@ -45,7 +45,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_access_key(slug, id, params={}, headers=default_headers)
-      info("Finding Access Key \"#{id}\" for Filestore \"#{slug}\"")
+      @logger.info("Finding Access Key \"#{id}\" for Filestore \"#{slug}\"")
       get("#{@api_url}/filestores/#{slug}/access-keys/#{id}", params, headers)
     end
 
@@ -59,7 +59,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def update_access_key(slug, id, payload, headers=default_headers)
-      info("Updating Access Key \"#{id}\" for Filestore \"#{slug}\"")
+      @logger.info("Updating Access Key \"#{id}\" for Filestore \"#{slug}\"")
       put("#{@api_url}/filestores/#{slug}/access-keys/#{id}", payload, headers)
     end
 

data/lib/kinetic_sdk/filehub/lib/filestores.rb

@@ -12,7 +12,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_filestore(payload, headers=default_headers)
-      info("Adding Filestore \"#{payload['name']}\" with slug \"#{payload['slug']}\"")
+      @logger.info("Adding Filestore \"#{payload['name']}\" with slug \"#{payload['slug']}\"")
       post("#{@api_url}/filestores", payload, headers)
     end
 
@@ -22,7 +22,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_filestore(slug, headers=default_headers)
-      info("Deleting Filestore \"#{slug}\"")
+      @logger.info("Deleting Filestore \"#{slug}\"")
       delete("#{@api_url}/filestores/#{slug}", headers)
     end
 
@@ -32,7 +32,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_filestores(params={}, headers=default_headers)
-      info("Find Filestores")
+      @logger.info("Find Filestores")
       get("#{@api_url}/filestores", params, headers)
     end
 
@@ -43,7 +43,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_filestore(slug, params={}, headers=default_headers)
-      info("Finding Filestore \"#{slug}\"")
+      @logger.info("Finding Filestore \"#{slug}\"")
       get("#{@api_url}/filestores/#{slug}", params, headers)
     end
 
@@ -59,7 +59,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def update_filestore(slug, payload, headers=default_headers)
-      info("Updating Filestore \"#{slug}\"")
+      @logger.info("Updating Filestore \"#{slug}\"")
       put("#{@api_url}/filestores/#{slug}", payload, headers)
     end
 

data/lib/kinetic_sdk/task/lib/access_keys.rb

@@ -26,7 +26,8 @@ module KineticSdk
     #     add_access_key()
     #
     def add_access_key(access_key={}, headers=default_headers)
-      info("Adding access key " + (access_key.has_key?('identifier') ? access_key['identifier'] : ""))
+      @logger.info("Adding access key " + (access_key.has_key?('identifier') ? access_key['identifier'] : ""))
+      access_key["secret"] = "SETME" if access_key["secret"].nil?
       post("#{@api_url}/access-keys", access_key, headers)
     end
 
@@ -36,7 +37,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_access_key(identifier, headers=header_basic_auth)
-      info("Deleting access key \"#{identifier}\"")
+      @logger.info("Deleting access key \"#{identifier}\"")
       delete("#{@api_url}/access-keys/#{encode(identifier)}", headers)
     end
 
@@ -45,19 +46,46 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_access_keys(headers=header_basic_auth)
-      info("Deleting all access keys")
+      @logger.info("Deleting all access keys")
       (find_access_keys(headers).content["accessKeys"] || []).each do |access_key|
         delete("#{@api_url}/access_keys/#{encode(access_key['identifier'])}", headers)
       end
     end
 
+    # Export all access keys to :identifier.json file in export_directory/access-keys
+    #
+    # @param headers [Hash] hash of headers to send, default is basic authentication
+    # @return nil
+    def export_access_keys(headers=header_basic_auth)
+      raise StandardError.new "An export directory must be defined to export access keys." if @options[:export_directory].nil?
+      response = find_access_keys
+      access_keys_dir = FileUtils::mkdir_p(File.join(@options[:export_directory], "access-keys"))
+      (response.content["accessKeys"] || []).each do |access_key|
+        access_key_file = File.join(access_keys_dir, "#{access_key['identifier'].slugify}.json")
+        write_object_to_file(access_key_file, access_key)
+      end
+    end
+
+    # Import all access keys from :identifier.json file in export_directory/access-keys
+    #
+    # @param headers [Hash] hash of headers to send, default is basic authentication
+    # @return nil
+    def import_access_keys(headers=default_headers)
+      raise StandardError.new "An export directory must be defined to import access keys from." if @options[:export_directory].nil?
+      @logger.info("Importing all Access Keys in Export Directory")
+      Dir["#{@options[:export_directory]}/access-keys/*.json"].sort.each do |file|
+        access_key = JSON.parse(File.read(file))
+        add_access_key(access_key, headers)
+      end
+    end
+
     # Find all access keys
     #
     # @param params [Hash] Query parameters that are added to the URL, such as +include+
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_access_keys(params={}, headers=header_basic_auth)
-      info("Finding all access keys")
+      @logger.info("Finding all access keys")
       get("#{@api_url}/access-keys", params, headers)
     end
 
@@ -68,7 +96,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_access_key(identifier, params={}, headers=default_headers)
-      info("Finding access key \"#{identifier}\"")
+      @logger.info("Finding access key \"#{identifier}\"")
       get("#{@api_url}/access-keys/#{encode(identifier)}", params, headers)
     end
 
@@ -79,14 +107,14 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     #
-    # Exammple
+    # Example
     #
     #     update_identifier("X54DLNU", {
     #       "description": "Updated access key"
     #     })
     #
     def update_access_key(identifier, body={}, headers=default_headers)
-      info("Updating the \"#{identifier}\" access key")
+      @logger.info("Updating the \"#{identifier}\" access key")
       put("#{@api_url}/access-keys/#{encode(identifier)}", body, headers)
     end
 

data/lib/kinetic_sdk/task/lib/categories.rb

@@ -11,7 +11,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_category(category, headers=default_headers)
-      info("Add category \"#{category['name']}\"")
+      @logger.info("Add category \"#{category['name']}\"")
       post("#{@api_url}/categories", category, headers)
     end
 
@@ -21,7 +21,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_category(name, headers=header_basic_auth)
-      info("Deleting Category \"#{name}\"")
+      @logger.info("Deleting Category \"#{name}\"")
       delete("#{@api_url}/categories/#{encode(name)}", headers)
     end
 
@@ -30,7 +30,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def delete_categories(headers=header_basic_auth)
-      info("Deleting all categories")
+      @logger.info("Deleting all categories")
       (find_categories(headers).content["categories"] || []).each do |category|
         delete_category(category['name'], headers)
       end
@@ -44,14 +44,14 @@ module KineticSdk
     #   - +policyRules+ - array of policy rule names associated to the category
     #   - +trees+ - array of tree (routine) definitionIds associated to the category
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return nil
     def export_category(category, headers=header_basic_auth)
       raise StandardError.new "An export directory must be defined to export a category." if @options[:export_directory].nil?
       if category.is_a? String
         response = find_category(category, { "include" => "handlers,trees,policyRules" }, headers)
         category = response.content
       end
-      info("Exporting category \"#{category['name']}\" to #{@options[:export_directory]}.")
+      @logger.info("Exporting category \"#{category['name']}\" to #{@options[:export_directory]}.")
       # Create the category directory if it doesn't yet exist
       category_dir = FileUtils::mkdir_p(File.join(@options[:export_directory], "categories"))
       category_file = File.join(category_dir, "#{category['name'].slugify}.json")
@@ -63,13 +63,13 @@ module KineticSdk
 
       # write the file
       File.write(category_file, JSON.pretty_generate(category))
-      info("Exported category: #{category['name']} to #{category_file}")
+      @logger.info("Exported category: #{category['name']} to #{category_file}")
     end
 
     # Export Categories
     #
     # @param headers [Hash] hash of headers to send, default is basic authentication
-    # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
+    # @return nil
     def export_categories(headers=header_basic_auth)
       raise StandardError.new "An export directory must be defined to export categories." if @options[:export_directory].nil?
       (find_categories({ "include" => "handlers,trees,policyRules" }).content["categories"] || []).each do |category|
@@ -77,13 +77,26 @@ module KineticSdk
       end
     end
 
+    # Import Categories
+    #
+    # @param headers [Hash] hash of headers to send, default is basic authentication
+    # @return nil
+    def import_categories(headers=default_headers)
+      raise StandardError.new "An export directory must be defined to import categories from." if @options[:export_directory].nil?
+      @logger.info("Importing all Categories in Export Directory")
+      Dir["#{@options[:export_directory]}/categories/*.json"].sort.each do |file|
+        category = JSON.parse(File.read(file))
+        add_category(category, headers)
+      end
+    end
+
     # Find all categories
     #
     # @param params [Hash] Query parameters that are added to the URL, such as +include+
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_categories(params={}, headers=header_basic_auth)
-      info("Finding all categories")
+      @logger.info("Finding all categories")
       get("#{@api_url}/categories", params, headers)
     end
 
@@ -94,7 +107,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def find_category(name, params={}, headers=header_basic_auth)
-      info("Finding Category \"#{name}\"")
+      @logger.info("Finding Category \"#{name}\"")
       get("#{@api_url}/categories/#{encode(name)}", params, headers)
     end
 
@@ -104,13 +117,13 @@ module KineticSdk
     # @param body [Hash] the updated property values
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
-    # 
+    #
     # Example
     #
     #     update_category("Foo", { "name" => "Bar" })
     #
     def update_category(original_name, body={}, headers=default_headers)
-      info("Updating Category \"#{original_name}\"")
+      @logger.info("Updating Category \"#{original_name}\"")
       put("#{@api_url}/categories/#{encode(original_name)}", body, headers)
     end
 
@@ -123,7 +136,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_handler_to_category(handler_id, category_name, headers=default_headers)
       body = { "definitionId" => handler_id }
-      info("Adding handler \"#{handler_id}\" to category \"#{category_name}\"")
+      @logger.info("Adding handler \"#{handler_id}\" to category \"#{category_name}\"")
       post("#{@api_url}/categories/#{encode(category_name)}/handlers", body, headers)
     end
 
@@ -134,7 +147,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def remove_handler_from_category(handler_id, category_name, headers=default_headers)
-      info("Removing handler \"#{handler_id}\" from category \"#{category_name}\"")
+      @logger.info("Removing handler \"#{handler_id}\" from category \"#{category_name}\"")
       delete("#{@api_url}/categories/#{encode(category_name)}/handlers/#{encode(handler_id)}", headers)
     end
 
@@ -146,7 +159,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_routine_to_category(routine_id, category_name, headers=default_headers)
       body = { "definitionId" => routine_id }
-      info("Adding routine \"#{routine_id}\" to category \"#{category_name}\"")
+      @logger.info("Adding routine \"#{routine_id}\" to category \"#{category_name}\"")
       post("#{@api_url}/categories/#{encode(category_name)}/routines", body, headers)
     end
 
@@ -157,7 +170,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def remove_routine_from_category(routine_id, category_name, headers=default_headers)
-      info("Removing routine \"#{routine_id}\" from category \"#{category_name}\"")
+      @logger.info("Removing routine \"#{routine_id}\" from category \"#{category_name}\"")
       delete("#{@api_url}/categories/#{encode(category_name)}/routines/#{encode(routine_id)}", headers)
     end
 
@@ -170,7 +183,7 @@ module KineticSdk
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def add_policy_rule_to_category(policy_rule_type, policy_rule_name, category_name, headers=default_headers)
       body = { "type" => policy_rule_type, "name" => policy_rule_name }
-      info("Adding policy rule \"#{policy_rule_type} - #{policy_rule_name}\" to category \"#{category_name}\"")
+      @logger.info("Adding policy rule \"#{policy_rule_type} - #{policy_rule_name}\" to category \"#{category_name}\"")
       post("#{@api_url}/categories/#{encode(category_name)}/policyRules", body, headers)
     end
 
@@ -182,7 +195,7 @@ module KineticSdk
     # @param headers [Hash] hash of headers to send, default is basic authentication and accept JSON content type
     # @return [KineticSdk::Utils::KineticHttpResponse] object, with +code+, +message+, +content_string+, and +content+ properties
     def remove_policy_rule_from_category(policy_rule_type, policy_rule_name, category_name, headers=default_headers)
-      info("Removing policy rule \"#{policy_rule_type} - #{policy_rule_name}\" from category \"#{category_name}\"")
+      @logger.info("Removing policy rule \"#{policy_rule_type} - #{policy_rule_name}\" from category \"#{category_name}\"")
       delete("#{@api_url}/categories/#{encode(category_name)}/policyRules/#{encode(policy_rule_type)}/#{encode(policy_rule_name)}", headers)
     end