statscloud 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 453bc5a93478f283118f53760a2e4d317991430fe3c456099cf4bba6c60980ed
-  data.tar.gz: f92c79947fc8e0d8ce281e2ee53021aca4b5b256eb421dfb763f31520dfa5b7b
+SHA1:
+  metadata.gz: 09e53f93e0256bdb1d7cca10342ca813c3f24ca2
+  data.tar.gz: 8908fbe41125fdd6360e67a1f14abc2118ae7a55
 SHA512:
-  metadata.gz: f6570bb5634c9f84c47b8faad0d9c8fe0a38735cb5b82d84c0136bbacc5f48e4aaeb158f865991a2823ad332121849f3c15d4f4ee64f65dce23457c12aad549d
-  data.tar.gz: ba903954aa9544c4314e6e5ff933f5cb9d6ccb26a1f6069cac1c10816657d7dcc35e7275f67f1f2fdd4c32331bf2e7ccd8f53bcc1c76dbbf0c0caa84566d0fa0
+  metadata.gz: c5bd4090110b99032c7994729bae102d56a53b1479ff8ca0dad5e94ab3e2512a5ca8fa29b48cf20678048d78f3891f5c777c4f5f87b7bcd42c27f31b60f63e8d
+  data.tar.gz: 8c56520587fb19179306cd19dd52d49b3ad9ab5f964ef53b42ce7f013f40565b15c6cccbab964796f76f3ed1c39b384cfceff52afaf4179b3e965fcd72e3eb96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    statscloud (1.1.1)
+    statscloud (1.1.2)
       crc32 (~> 1.0.1)
       eventmachine (~> 1.2)
       fileutils
@@ -32,9 +32,9 @@ GEM
     httparty (0.16.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.2.0)
+    i18n (1.5.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
     json (2.1.0)
     leon (1.1.2)
     logger (1.3.0)
@@ -44,8 +44,8 @@ GEM
     minitest (5.11.3)
     multi_xml (0.6.0)
     netrc (0.11.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     rainbow (3.0.0)
@@ -87,7 +87,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
     websocket (1.2.8)
     websocket-client-simple (0.3.0)
       event_emitter
@@ -105,4 +105,4 @@ DEPENDENCIES
   statscloud!
 
 BUNDLED WITH
-   1.17.1
+   1.16.0

data/lib/generators/stats_cloud/install_generator.rb

@@ -19,7 +19,7 @@ module StatsCloud
 
     # Creates statscloud configuration file.
     def create_config_file
-      copy_file ".statscloud_template.yml", ".statscloud.yml"
+      copy_file "statscloud_template.yml", File.join("config", "statscloud.yml")
     end
   end
 end

data/lib/statscloud/helpers/statscloud_client/statscloud_helper.rb

@@ -12,7 +12,7 @@ module StatsCloud
     def initialize_values
       @config = {}
       @source_mappings = { metrics: [], admins: [], dashboards: [], alerts: [] }
-      update_config_file(".statscloud.yml")
+      update_config_file("statscloud.yml")
     end
 
     def generate_configuration(base_config)
@@ -49,7 +49,7 @@ module StatsCloud
     end
 
     def update_config_file(file)
-      @config_file = file
+      @config_file = rails_environment ? config_dir_file(file) : file
     end
 
     def config_token
@@ -57,7 +57,7 @@ module StatsCloud
     end
 
     def env
-      @env ||= @config["environment"] || ENV["RAILS_ENV"] || "default"
+      @env ||= @config["environment"] || rails_environment || "default"
     end
 
     def tags
@@ -89,6 +89,14 @@ module StatsCloud
       "statscloud.io support configured, dashboard URLs are \n#{(@cluster['grafanaDashboardsUrls'] || []).join("\n")}"
     end
 
+    def config_dir_file(file)
+      File.join("config", file)
+    end
+
+    def rails_environment
+      ENV["RAILS_ENV"]
+    end
+
     def statscloud_error(message)
       StatsCloud::ClientError.new(message)
     end

data/lib/statscloud/statsmeter_client.rb

@@ -64,12 +64,13 @@ module StatsCloud
     end
 
     # Connects to the server and starts periodic sending events.
-    def connect(register_connection_job)
+    def connect(register_connection_job = nil)
+      @register_connection_job ||= register_connection_job
       Thread.new do
         connect_client
         start_plugins
         flush_events_loop
-        register_connection_job.start
+        @register_connection_job&.start
       end
     end
 
@@ -143,7 +144,7 @@ module StatsCloud
         eventmachine.run do
           eventmachine.add_periodic_timer(0.5) do
             @mutex.synchronize do
-              flush_events if connected?
+              connected? ? flush_events : connect.join
             end
           end
         end

data/lib/statscloud/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statscloud
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Roman Ovcharov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crc32
@@ -213,8 +213,8 @@ files:
 - lib/statscloud/statscloud_client.rb
 - lib/statscloud/statsmeter_client.rb
 - lib/statscloud/version.rb
-- lib/templates/statscloud/.statscloud_template.yml
 - lib/templates/statscloud/statscloud_template.rb
+- lib/templates/statscloud/statscloud_template.yml
 - statscloud.gemspec
 homepage: https://statscloud.io
 licenses:
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: StatsCloud service.