logasm-jruby 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d979fabe79cb012160eae9358e7ebb15122ee58715d36c2d19d3a983413f1962
-  data.tar.gz: fd5391fc22692e4a82528bc43863a9ce4a93fa854e0826fcfb56371c0b6c178d
+SHA1:
+  metadata.gz: 14fecade8cd7eaad205f870b2804b42957a97631
+  data.tar.gz: 6467f487b9fe16dcd1160b25353fc095e0b06c52
 SHA512:
-  metadata.gz: 575d5e5f7ea14be165321542d33561d8405be7b3b653f22c3a88e6be359a29fcf4916ce0c0fbe6a2324edd02e7c659a3f8d663ffef6f79cdbfedc0c356a63fba
-  data.tar.gz: a9b53672c3b49f420fe55327fdd1ece358580cb6787ae0bfddddcaa98cb6f076b0ab4d72d814b010f0a0494299214c1513ba5fa0bf8cadd6aec096febfa1873e
+  metadata.gz: 829d9ee61dc428c7a015382f83e21b9573132a767041452face65e6894883fcddee0061057f74f88c66bf84f12243154269271913af77c8572b66b9904f4b1e2
+  data.tar.gz: dce7495e8bf93781746bfcb27d845b9592fd0b3479221502305c6d9b03ae2041b0b7c21e1c47a8b3bf1f6975778197b0bf67c8bd80bc54f3bfa56d2868907e08

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
   - jruby

data/lib/logasm/adapters/stdout_json_adapter.rb

@@ -5,12 +5,13 @@ class Logasm
         @level = level
         @service_name = service_name
         @application_name = Utils.application_name(service_name)
+        @mutex = Mutex.new if RUBY_ENGINE == "jruby"
       end
 
       def log(level, metadata = {})
         if meets_threshold?(level)
           message = Utils.build_event(metadata, level, @application_name)
-          STDOUT.puts(Utils.generate_json(message))
+          print_line(Utils.generate_json(message))
         end
       end
 
@@ -39,6 +40,21 @@ class Logasm
       def meets_threshold?(level)
         LOG_LEVELS.index(level.to_s) >= @level
       end
+
+      # puts is atomic in MRI starting from 2.5.0
+      if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.5.0"
+        def print_line(str)
+          $stdout.puts(str)
+        end
+      elsif RUBY_ENGINE == "jruby"
+        def print_line(str)
+          @mutex.synchronize { $stdout.write(str + "\n") }
+        end
+      else
+        def print_line(str)
+          $stdout.write(str + "\n")
+        end
+      end
     end
   end
 end

data/logasm.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
     gem.name = 'logasm'
   end
 
-  gem.version       = '1.2.0'
+  gem.version       = '1.2.1'
   gem.authors       = ["Salemove"]
   gem.email         = ["support@salemove.com"]
   gem.description   = %q{It's logasmic}

data/spec/adapters/stdout_json_adapter_spec.rb

@@ -8,6 +8,19 @@ describe Logasm::Adapters::StdoutJsonAdapter do
   let(:info_level_code) { 1 }
   let(:info_level) { Logasm::Adapters::LOG_LEVELS[info_level_code] }
 
+  let(:stdout) { StringIO.new }
+
+  around do |example|
+    old_stdout = $stdout
+    $stdout = stdout
+
+    begin
+      example.call
+    ensure
+      $stdout = old_stdout
+    end
+  end
+
   describe '#log' do
     context 'when below threshold' do
       let(:adapter) { described_class.new(debug_level_code, service_name) }
@@ -23,9 +36,9 @@ describe Logasm::Adapters::StdoutJsonAdapter do
           .and_return(event)
       end
 
-      it 'sends serialized event to STDOUT' do
-        expect(STDOUT).to receive(:puts).with(serialized_event)
+      it 'sends serialized event to $stdout' do
         adapter.log(info_level, metadata)
+        expect(output).to eq serialized_event + "\n"
       end
     end
 
@@ -35,9 +48,15 @@ describe Logasm::Adapters::StdoutJsonAdapter do
       let(:service_name) { 'my-service' }
 
       it 'does not log the event' do
-        expect(STDOUT).to_not receive(:puts)
         adapter.log(debug_level, metadata)
+        expect(output).to be_empty
       end
     end
   end
+
+  private
+
+  def output
+    stdout.string
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logasm-jruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Salemove
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: What description said