Avoid Bundler type errors

lib/nats/ext/json.rb

@@ -2,5 +2,6 @@
   require 'yajl'
   require 'yajl/json_gem'
 rescue LoadError
+  require 'rubygems'
   require 'json'
 end

lib/nats/server.rb

@@ -10,7 +10,7 @@
 require 'fileutils'
 require 'pp'
 
-module NATS
+module NATSD
 
   # Subscriber
   Subscriber = Struct.new(:conn, :subject, :sid)
@@ -23,7 +23,7 @@ class << self
       alias debug_flag? :debug_flag
       alias trace_flag? :trace_flag
 
-      def version; "nats server version #{NATS::VERSION}" end
+      def version; "nats server version #{NATSD::VERSION}" end
 
       def host; @options[:addr]  end
       def port; @options[:port]  end
@@ -53,7 +53,7 @@ def setup(argv)
           require 'rubygems'
           require 'daemons'
           # These log messages visible to controlling TTY
-          log "Starting #{NATS::APP_NAME} version #{NATS::VERSION} on port #{NATS::Server.port}"
+          log "Starting #{NATSD::APP_NAME} version #{NATSD::VERSION} on port #{NATSD::Server.port}"
           log "Switching to daemon mode"
           Daemons.daemonize(:app_name => APP_NAME, :mode => :exec)
         end
@@ -252,16 +252,16 @@ def fast_uuid
 end
 
 def log(*args)
-  args.unshift(Time.now) if NATS::Server.log_time
+  args.unshift(Time.now) if NATSD::Server.log_time
   pp args.compact
 end
 
 def debug(*args)
-  log *args if NATS::Server.debug_flag?
+  log *args if NATSD::Server.debug_flag?
 end
 
 def trace(*args)
-  log *args if NATS::Server.trace_flag?
+  log *args if NATSD::Server.trace_flag?
 end
 
 def log_error(e=$!)
@@ -272,26 +272,26 @@ def shutdown
   puts
   log 'Server exiting..'
   EM.stop
-  FileUtils.rm(NATS::Server.pid_file) if NATS::Server.pid_file
+  FileUtils.rm(NATSD::Server.pid_file) if NATSD::Server.pid_file
   exit
 end
 
 ['TERM','INT'].each { |s| trap(s) { shutdown } }
 
 # Do setup
-NATS::Server.setup(ARGV.dup)
+NATSD::Server.setup(ARGV.dup)
 
 # Event Loop
 
 EM.run {
 
-  log "Starting #{NATS::APP_NAME} version #{NATS::VERSION} on port #{NATS::Server.port}"
+  log "Starting #{NATSD::APP_NAME} version #{NATSD::VERSION} on port #{NATSD::Server.port}"
 
   begin
     EM.set_descriptor_table_size(32768) # Requires Root privileges    
-    EventMachine::start_server(NATS::Server.host, NATS::Server.port, NATS::Connection)
+    EventMachine::start_server(NATSD::Server.host, NATSD::Server.port, NATSD:Connection)
   rescue => e
-    log "Could not start server on port #{NATS::Server.port}"
+    log "Could not start server on port #{NATSD::Server.port}"
     log_error
     exit
   end

lib/nats/server/const.rb

@@ -1,4 +1,4 @@
-module NATS
+module NATSD
 
   VERSION  = "0.2.7"
   APP_NAME = 'nats-server'

lib/nats/server/options.rb

@@ -2,7 +2,7 @@
 require 'optparse'
 require 'yaml'
 
-module NATS
+module NATSD
   class Server
 
     class << self
@@ -43,7 +43,7 @@ def parser
           opts.separator "Common options:"
 
           opts.on_tail("-h", "--help", "Show this message")                             { puts opts; exit }
-          opts.on_tail('-v', '--version', "Show version")                               { puts NATS::Server.version; exit }
+          opts.on_tail('-v', '--version', "Show version")                               { puts NATSD::Server.version; exit }
           opts.on_tail("-D", "--debug", "Set debugging on")                             { @options[:debug] = true }
           opts.on_tail("-V", "--trace", "Set tracing on of raw protocol")               { @options[:trace] = true }
         end

nats.gemspec

@@ -2,7 +2,7 @@ require './lib/nats/server/const.rb'
 
 spec = Gem::Specification.new do |s|
   s.name = 'nats'
-  s.version = NATS::VERSION
+  s.version = NATSD::VERSION
   s.date = '2010-10-31'
   s.summary = 'Simple Publish-Subscribe Messaging System'
   s.homepage = "http://github.com/derekcollison/nats"
@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
 
   s.require_paths = ['lib']
   s.bindir = 'bin'
-  s.executables = [NATS::APP_NAME]
+  s.executables = [NATSD::APP_NAME]
 
   s.files = [
     "COPYING",