Permalink
Browse files

Merge pull request #5 from MarkMenard/master

Patch to Resolve Namespace Conflict with the amqp Gem
  • Loading branch information...
2 parents 05c24f3 + 52bfb17 commit 194270de316b88ca5d56110968b8c0e4c82607af @famoseagle committed Aug 3, 2011
View
@@ -5,7 +5,7 @@
Gem::Specification.new do |s|
s.name = %q{carrot}
- s.version = "0.8.1"
+ s.version = "0.8.2"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Amos Elliston"]
@@ -23,14 +23,14 @@ Gem::Specification.new do |s|
"Rakefile",
"VERSION.yml",
"carrot.gemspec",
- "lib/amqp/buffer.rb",
- "lib/amqp/exchange.rb",
- "lib/amqp/frame.rb",
- "lib/amqp/header.rb",
- "lib/amqp/protocol.rb",
- "lib/amqp/queue.rb",
- "lib/amqp/server.rb",
- "lib/amqp/spec.rb",
+ "lib/carrot/amqp/buffer.rb",
+ "lib/carrot/amqp/exchange.rb",
+ "lib/carrot/amqp/frame.rb",
+ "lib/carrot/amqp/header.rb",
+ "lib/carrot/amqp/protocol.rb",
+ "lib/carrot/amqp/queue.rb",
+ "lib/carrot/amqp/server.rb",
+ "lib/carrot/amqp/spec.rb",
"lib/carrot.rb",
"lib/examples/simple_pop.rb",
"protocol/amqp-0.8.json",
View
@@ -8,14 +8,14 @@ module AMQP
end
$:.unshift File.expand_path(File.dirname(File.expand_path(__FILE__)))
-require 'amqp/spec'
-require 'amqp/buffer'
-require 'amqp/exchange'
-require 'amqp/frame'
-require 'amqp/header'
-require 'amqp/queue'
-require 'amqp/server'
-require 'amqp/protocol'
+require 'carrot/amqp/spec'
+require 'carrot/amqp/buffer'
+require 'carrot/amqp/exchange'
+require 'carrot/amqp/frame'
+require 'carrot/amqp/header'
+require 'carrot/amqp/queue'
+require 'carrot/amqp/server'
+require 'carrot/amqp/protocol'
class Carrot
@logging = false
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 194270d

Please sign in to comment.