Skip to content

Commit

Permalink
Merge pull request #9 from kevinzen/Fixed_circular_dependency_in_1_6_0
Browse files Browse the repository at this point in the history
Fixed circular dependency in 1 6 0
  • Loading branch information
Kyrremann committed Mar 10, 2016
2 parents f7d962a + 0108bc4 commit 9824855
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 38 deletions.
6 changes: 2 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
source 'https://rubygems.org'

gem 'jeweler'

# Specify dependencies in send_ncsa.gemspec
gemspec
gem 'jeweler', '~> 2.0', '>= 2.0.1'
gem 'rspec', '~> 3.4'
38 changes: 19 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
PATH
remote: .
specs:
send_nsca (0.6.0)
jeweler
send_nsca

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -52,17 +45,22 @@ GEM
multi_xml (~> 0.5)
rack (~> 1.2)
rack (1.5.2)
rake (10.3.2)
rake (10.5.0)
rdoc (4.1.1)
json (~> 1.4)
rspec (2.99.0)
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
rspec-core (2.99.2)
rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.99.3)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.4)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
thread_safe (0.3.4)
thread_safe (0.3.4-java)

Expand All @@ -71,6 +69,8 @@ PLATFORMS
ruby

DEPENDENCIES
jeweler
rspec (>= 1.2.9)
send_nsca!
jeweler (~> 2.0, >= 2.0.1)
rspec (~> 3.4)

BUNDLED WITH
1.11.2
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.0
0.6.1
25 changes: 11 additions & 14 deletions send_nsca.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
# stub: send_nsca 0.6.0 ruby lib
# stub: send_nsca 0.6.1 ruby lib

Gem::Specification.new do |s|
s.name = "send_nsca"
s.version = "0.6.0"
s.version = "0.6.1"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.require_paths = ["lib"]
s.authors = ["kevinzen", "kyrremann"]
s.date = "2015-05-18"
s.date = "2016-03-10"
s.description = "A pure ruby implementation of the send_nsca program for sending passive alerts to Nagios through NSCA."
s.email = "kbedell@gmail.com"
s.extra_rdoc_files = [
Expand All @@ -29,26 +29,23 @@ Gem::Specification.new do |s|
]
s.homepage = "http://github.com/kevinzen/send_nsca"
s.licenses = ["MIT"]
s.rubygems_version = "2.4.5"
s.rubygems_version = "2.4.8"
s.summary = "A ruby gem for sending passive alerts to Nagios through NSCA."
s.test_files = ["spec/send_nsca_spec.rb", "spec/spec_helper.rb", "spec/spec.opts"]
s.test_files = ["spec/send_nsca_spec.rb", "spec/spec.opts", "spec/spec_helper.rb"]

if s.respond_to? :specification_version then
s.specification_version = 4

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<jeweler>, [">= 0"])
s.add_runtime_dependency(%q<send_nsca>, [">= 0"])
s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
s.add_runtime_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
s.add_runtime_dependency(%q<rspec>, ["~> 3.4"])
else
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<send_nsca>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 1.2.9"])
s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
s.add_dependency(%q<rspec>, ["~> 3.4"])
end
else
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<send_nsca>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 1.2.9"])
s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
s.add_dependency(%q<rspec>, ["~> 3.4"])
end
end

0 comments on commit 9824855

Please sign in to comment.