yell-adapters-gelf 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 677b6910aecfd33721a24f884185e2cf4e3a61a4
-  data.tar.gz: d58f6268acd53a1a99290cba4baf08aa37cc1b0d
+  metadata.gz: d170e814b9f170402881a84e5c6ffd9a64c74796
+  data.tar.gz: befca3e31f26195a816fc2ce640695491843da3d
 SHA512:
-  metadata.gz: 02a53e6a1cf49307ca6f408f7c51359606d8c25e3bceccd094ceb0570defb625e3cfad9fd2a88546ee81ca65e430a3cd5f478516e1c230cb6cc876ff7831b2bc
-  data.tar.gz: 237c36afe90050199475f04067333c290803452f82e7754eddd0399ff4b80d5928a41647ddee8d9fce5028bff27f2a663851141a49ff5a593f457fecbe960f7f
+  metadata.gz: 82dd0d73817bebc6424feb5fc9f87d9a27d3671e2a04dd2f0fbc1b510a2efba5a55e558b399a9425b5f0f592f7dd3a0a2e13a884abe79a718dd4ac21a53c9bc3
+  data.tar.gz: af493d023d91b85c82f4bf79b57c2a725ae073c6806dca46d2362ac96df05da84f6633667c9c4f2cf56fdd5d18e867e2d2930838b17d20bfe2ec78a0e648cdcd

data/.travis.yml

@@ -1,15 +1,15 @@
 language: ruby
 
-script: "rake"
+script: "rspec"
 
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.1
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  # - rbx-19mode
+  - rbx-2
   - ree
 
 notifications:

data/Gemfile

@@ -6,7 +6,8 @@ gemspec
 group :development, :test do
   gem "rake"
 
-  gem "rspec"
+  gem "rspec-core", '~> 2'
+  gem 'rspec-expectations', '~> 2'
   gem "rr"
 end
 

data/Rakefile

@@ -1,22 +1,2 @@
-$:.unshift( 'lib' )
-
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-# === RSpec
-begin
-  require 'rspec/core/rake_task'
-
-  desc "Run specs"
-  RSpec::Core::RakeTask.new do |t|
-    t.rspec_opts = %w(--color --format progress --order random)
-    t.ruby_opts = %w(-w)
-  end
-rescue LoadError
-  task :spec do
-    abort "`gem install rspec` in order to run tests"
-  end
-end
-
-task :default => :spec
+require "bundler/gem_tasks"
 

data/lib/yell/adapters/gelf.rb

@@ -49,13 +49,13 @@ module Yell #:nodoc:
         @sender = nil
         @uid = 0
 
-        self.facility = options.fetch(:facility, 'yell')
+        self.facility = Yell.__fetch__(options, :facility, :default => 'yell')
 
         # initialize the UDP Sender
-        self.host = options.fetch(:host, 'localhost')
-        self.port = options.fetch(:port, 12201)
+        self.host = Yell.__fetch__(options, :host, :default => 'localhost')
+        self.port = Yell.__fetch__(options, :port, :default => 12201)
 
-        self.max_chunk_size = options.fetch(:max_chunk_size, :wan)
+        self.max_chunk_size = Yell.__fetch__(options, :max_chunk_size, :default => :wan)
       end
 
       write do |event|
@@ -151,17 +151,17 @@ module Yell #:nodoc:
           when Hash
             message
           when Exception
-            { "short_message" => "#{message.class}: #{message.message}" }.tap do |m|
-              m.merge!( "long_message" => message.backtrace.join("\n") ) if message.backtrace
+            {"short_message" => "#{message.class}: #{message.message}"}.tap do |m|
+              m.merge!("long_message" => message.backtrace.join("\n")) if message.backtrace
             end
-          else { "short_message" => message.to_s }
+          else {"short_message" => message.to_s}
         end
       end
 
     end
 
-    register( :gelf, Yell::Adapters::Gelf )
-    register( :graylog2, Yell::Adapters::Gelf )
+    register(:gelf, Yell::Adapters::Gelf)
+    register(:graylog2, Yell::Adapters::Gelf)
 
   end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,8 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'yell-adapters-gelf'
 
-require 'rspec'
+require 'rspec/core'
+require 'rspec/expectations'
 require 'rr'
 
 RSpec.configure do |config|

data/spec/yell/adapters/gelf_spec.rb

@@ -27,22 +27,55 @@ describe Yell::Adapters::Gelf do
     its(:max_chunk_size) { should == 1420 }
   end
 
+  context :facility do
+    subject { adapter.facility }
+
+    context "from initialize options" do
+      let(:adapter) { Yell::Adapters::Gelf.new('facility' => 'facility') }
+
+      it { should == 'facility' }
+    end
+
+    context "from accessor" do
+      let(:adapter) { Yell::Adapters::Gelf.new }
+      before { adapter.facility = 'facility' }
+
+      it { should == 'facility' }
+    end
+  end
+
   context :host do
-    let(:adapter) { Yell::Adapters::Gelf.new }
     subject { adapter.host }
 
-    before { adapter.host = 'hostname' }
+    context "from initialize options" do
+      let(:adapter) { Yell::Adapters::Gelf.new('host' => 'hostname') }
+
+      it { should == 'hostname' }
+    end
+
+    context "from accessor" do
+      let(:adapter) { Yell::Adapters::Gelf.new }
+      before { adapter.host = 'hostname' }
 
-    it { should == 'hostname' }
+      it { should == 'hostname' }
+    end
   end
 
   context :port do
-    let(:adapter) { Yell::Adapters::Gelf.new }
     subject { adapter.port }
 
-    before { adapter.port = 1234 }
+    context "from initialize options" do
+      let(:adapter) { Yell::Adapters::Gelf.new('port' => 1234) }
+
+      it { should == 1234 }
+    end
+
+    context "from accessor" do
+      let(:adapter) { Yell::Adapters::Gelf.new }
+      before { adapter.port = 1234 }
 
-    it { should == 1234 }
+      it { should == 1234 }
+    end
   end
 
   context :max_chunk_size do
@@ -59,7 +92,7 @@ describe Yell::Adapters::Gelf do
       it { should == 8154 }
     end
 
-    context :other do
+    context 'other'do
       before { adapter.max_chunk_size = "1234" }
       it { should == 1234 }
     end
@@ -88,7 +121,13 @@ describe Yell::Adapters::Gelf do
       end
 
       it "should be zipped" do
-        datagrams[0][0..1].bytes.should == [0x78, 0x9C] # zlib header
+        expected = "\x78\x9c" # zlib header
+
+        if RUBY_VERSION[0, 1].to_i >= 2
+          expected = expected.b
+        end
+
+        datagrams[0][0..1].should == expected
       end
     end
 

data/yell-adapters-gelf.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "yell-adapters-gelf"
-  s.version     = "2.0.0"
+  s.version     = "2.0.1"
   s.authors     = ["Rudolf Schmidt"]
 
   s.homepage    = "http://rubygems.org/gems/yell"
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "yell", "~> 2.0"
+  s.add_runtime_dependency "yell", ">= 2.0.4", "< 3"
   s.add_runtime_dependency "json"
 end
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: yell-adapters-gelf
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Rudolf Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: yell
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Yell - Your Extensible Logging Library