statscloud 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46395a60038b7f3886bc4e79275fe98156940690f73acee7ab8061a28164e82e
-  data.tar.gz: dc1d83819866769fb18f48f732f5e8db2ed2d2c732c2929d949cbdc1f21de96d
+  metadata.gz: 453bc5a93478f283118f53760a2e4d317991430fe3c456099cf4bba6c60980ed
+  data.tar.gz: f92c79947fc8e0d8ce281e2ee53021aca4b5b256eb421dfb763f31520dfa5b7b
 SHA512:
-  metadata.gz: 016af1b77dd8c472abea59ec7737735581ae9e6b3ffdd7e9f1cd32bf6cc36d59ffd54219cd163a460fcbce5771433c333afb7847ebcc20ad11d518d420c80edd
-  data.tar.gz: 1c79fd2b558d124c645dc4c3f9e1f29082f2d83fd696ce5966a9c9e641d797f6f1a557cfac66c0c1a5518d20f8c44a4316fa68939d3fb58c61a1fba022bc8d1f
+  metadata.gz: f6570bb5634c9f84c47b8faad0d9c8fe0a38735cb5b82d84c0136bbacc5f48e4aaeb158f865991a2823ad332121849f3c15d4f4ee64f65dce23457c12aad549d
+  data.tar.gz: ba903954aa9544c4314e6e5ff933f5cb9d6ccb26a1f6069cac1c10816657d7dcc35e7275f67f1f2fdd4c32331bf2e7ccd8f53bcc1c76dbbf0c0caa84566d0fa0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    statscloud (1.1.0)
+    statscloud (1.1.1)
       crc32 (~> 1.0.1)
       eventmachine (~> 1.2)
       fileutils

data/lib/statscloud/cluster_client.rb

@@ -2,12 +2,15 @@
 
 require "rest-client"
 
-require_relative "./helpers/logger_helper"
-require_relative "./helpers/parsed_response_helper"
+require_relative "helpers/json_parser"
+require_relative "helpers/logger_helper"
+require_relative "helpers/cluster_client/parsed_response_helper"
+require_relative "errors/client_error"
 
 module StatsCloud
   # statscloud.io cluster-api service client.
   class ClusterClient
+    include StatsCloud::JsonParser
     include StatsCloud::LoggerHelper
 
     # Constructs cluster-api service client instance.
@@ -53,6 +56,10 @@ module StatsCloud
       body = body_hash_parameters(configuration)
       response = http_client.put(url, body.to_json, headers(token))
       get_parsed_response(response)
+    rescue RestClient::ExceptionWithResponse => error
+      error_info = convert_to_pretty_json(error.http_body)
+      logger($stdout).error error_info
+      raise statscloud_client_error(error_info)
     end
 
     # Schedules cluster to be undeployed.
@@ -109,6 +116,10 @@ module StatsCloud
       }
     end
 
+    def statscloud_client_error(message)
+      StatsCloud::ClientError.new(message)
+    end
+
     def get_parsed_response(response)
       StatsCloud::ParsedResponseHelper.new(response)
     end

data/lib/statscloud/helpers/{parsed_response_helper.rb → cluster_client/parsed_response_helper.rb}

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require "json"
+require_relative "../json_parser"
 
 module StatsCloud
   # This helper works to parse response from the server to convenient object.
   class ParsedResponseHelper
+    include StatsCloud::JsonParser
     # RestClient json-parsed response body.
     #
     # Type: *Hash*
@@ -21,15 +22,7 @@ module StatsCloud
     #   response from the cluster.
     def initialize(response)
       @code = response&.code
-      @body = parse_json(response.body)
-    end
-
-    private
-
-    def parse_json(json, default = nil)
-      JSON.parse(json)
-    rescue JSON::ParserError
-      default
+      @body = parse_json(response.body, nil)
     end
   end
 end

data/lib/statscloud/helpers/json_parser.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "json"
+
+module StatsCloud
+  # Json Parser helper.
+  module JsonParser
+    def parse_json(json, default = {})
+      json_service.parse(json)
+    rescue JSON::ParserError
+      default
+    end
+
+    def convert_to_pretty_json(json)
+      json_service.pretty_generate parse_json(json)
+    end
+
+    private
+
+    def json_service
+      JSON
+    end
+  end
+end

data/lib/statscloud/helpers/logger_helper.rb

@@ -6,9 +6,9 @@ module StatsCloud
   # This helper works to help log errors and info about StatsCloud service work.
   module LoggerHelper
     # Log information about work to standard output
-    def logger
+    def logger(output = default_output)
       file_utils.mkdir_p "log"
-      @logger ||= logger_service.new(File.join("log", "statscloud.log")).tap do |log|
+      @logger ||= logger_service.new(output).tap do |log|
         log.progname = "StatsCloud"
       end
     end
@@ -31,6 +31,10 @@ module StatsCloud
 
     attr_reader :last_error_log_at, :last_info_log_at
 
+    def default_output
+      File.join("log", "statscloud.log")
+    end
+
     def log_with_interval(type, last_log_at, message)
       logger.add(type, message) if can_log?(last_log_at)
     end

data/lib/statscloud/helpers/{statscloud_helper.rb → statscloud_client/statscloud_helper.rb}

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require "socket"
-require_relative "../errors/client_error"
+
+require_relative "../../errors/client_error"
 
 module StatsCloud
   # This helper configures StatsCloud::Client.

data/lib/statscloud/helpers/{socketio_helper.rb → statsmeter_client/socketio_helper.rb}

@@ -2,7 +2,7 @@
 
 require "statscloud.io-ruby-socket.io-client-simple"
 
-require_relative "logger_helper"
+require_relative "../logger_helper"
 
 module StatsCloud
   # This helper works to create socket connection.

data/lib/statscloud/statscloud_client.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 require_relative "version"
-require_relative "statsmeter_client"
 require_relative "cluster_client"
-require_relative "helpers/assets_helper"
-require_relative "helpers/logger_helper"
-require_relative "helpers/statscloud_helper"
+require_relative "statsmeter_client"
+
 require_relative "jobs/register_connection_job"
 
+require_relative "helpers/logger_helper"
+require_relative "helpers/statscloud_client/assets_helper"
+require_relative "helpers/statscloud_client/statscloud_helper"
+
 module StatsCloud
   # Module which implements StatsCloud framework support.
   class Client

data/lib/statscloud/statsmeter_client.rb

@@ -3,10 +3,10 @@
 require "crc32"
 require "eventmachine"
 
-require_relative "helpers/socketio_helper"
-require_relative "helpers/statsmeter_helper"
+require_relative "helpers/statsmeter_client/socketio_helper"
+require_relative "helpers/statsmeter_client/statsmeter_helper"
+require_relative "helpers/statsmeter_client/event_helper"
 require_relative "helpers/logger_helper"
-require_relative "helpers/event_helper"
 require_relative "helpers/plugins_helper"
 
 module StatsCloud

data/lib/statscloud/version.rb

@@ -4,5 +4,5 @@ module StatsCloud
   # version of statscloud-ruby-client.
   #
   # Type: *String*
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statscloud
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Roman Ovcharov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crc32
@@ -200,14 +200,15 @@ files:
 - lib/statscloud.rb
 - lib/statscloud/cluster_client.rb
 - lib/statscloud/errors/client_error.rb
-- lib/statscloud/helpers/assets_helper.rb
-- lib/statscloud/helpers/event_helper.rb
+- lib/statscloud/helpers/cluster_client/parsed_response_helper.rb
+- lib/statscloud/helpers/json_parser.rb
 - lib/statscloud/helpers/logger_helper.rb
-- lib/statscloud/helpers/parsed_response_helper.rb
 - lib/statscloud/helpers/plugins_helper.rb
-- lib/statscloud/helpers/socketio_helper.rb
-- lib/statscloud/helpers/statscloud_helper.rb
-- lib/statscloud/helpers/statsmeter_helper.rb
+- lib/statscloud/helpers/statscloud_client/assets_helper.rb
+- lib/statscloud/helpers/statscloud_client/statscloud_helper.rb
+- lib/statscloud/helpers/statsmeter_client/event_helper.rb
+- lib/statscloud/helpers/statsmeter_client/socketio_helper.rb
+- lib/statscloud/helpers/statsmeter_client/statsmeter_helper.rb
 - lib/statscloud/jobs/register_connection_job.rb
 - lib/statscloud/statscloud_client.rb
 - lib/statscloud/statsmeter_client.rb