update file to use gem - tests passing

dmytro · Jan 9, 2013 · 8853cc7b192203c801fdefc3b98ea4bb73fdc831 · 8853cc7
1 parent 776d126
commit 8853cc7b192203c801fdefc3b98ea4bb73fdc831
Unified Split

Showing with 12 additions and 5 deletions.

+0 −3 .gitmodules

+3 −0 Gemfile

+8 −0 Gemfile.lock

+1 −1 lib/nagira/timed_parse.rb

+0 −1 lib/ruby-nagios
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "lib/ruby-nagios"]
-	path = lib/ruby-nagios
-	url = https://github.com/dmytro/ruby-nagios.git
diff --git a/Gemfile b/Gemfile
@@ -2,6 +2,9 @@ source 'http://rubygems.org'
 
 gem 'sinatra', '>= 1.3.1'
 
+gem 'ruby-nagios',
+    :git => 'https://github.com/dmytro/ruby-nagios.git',
+    :branch => 'merge_from_upstream'
 #
 # RSpec modules should be in all environments - to be able to test prod config
 # too
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/dmytro/ruby-nagios.git
+  revision: 82420f6f6eb312a971ff21072a2a55465a2eed78
+  branch: merge_from_upstream
+  specs:
+    ruby-nagios (0.0.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -88,6 +95,7 @@ DEPENDENCIES
   rspec-core
   rspec-expectations
   rspec-mocks
+  ruby-nagios!
   sinatra (>= 1.3.1)
   sinatra-contrib (>= 1.3.1)
   yard (~> 0.8)
diff --git a/lib/nagira/timed_parse.rb b/lib/nagira/timed_parse.rb
@@ -1,4 +1,4 @@
-require 'ruby-nagios/nagios'
+require 'nagios'
 
 module Nagios
   # Keep track of last parsed time and last changed time of the
diff --git a/lib/ruby-nagios b/lib/ruby-nagios