em-mqtt 0.0.2 → 0.0.3

data/bin/em-mqtt

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
-
-$:.unshift File.dirname(__FILE__)+'/../lib'
-
 require 'rubygems'
-require 'em-mqtt'
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", 'lib')))
+require 'em/mqtt'
 
 EventMachine::MQTT::Server.new(ARGV).run

data/lib/em/mqtt.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'eventmachine'
+require 'logger'
+require 'mqtt'
+
+require "em/mqtt/version"
+
+module EventMachine::MQTT
+
+  autoload :ClientConnection, 'em/mqtt/client_connection'
+  autoload :Connection,       'em/mqtt/connection'
+  autoload :Server,           'em/mqtt/server'
+  autoload :ServerConnection, 'em/mqtt/server_connection'
+
+end

data/lib/{em-mqtt → em/mqtt}/client_connection.rb

@@ -52,9 +52,9 @@ class EventMachine::MQTT::ClientConnection < EventMachine::MQTT::Connection
     @receive_callback = block
   end
 
-  def receive_msg(message)
+  def receive_msg(packet)
     # Alternatively, subclass this method
-    @receive_callback.call(message) unless @receive_callback.nil?
+    @receive_callback.call(packet) unless @receive_callback.nil?
   end
 
   def unbind

data/lib/{em-mqtt → em/mqtt}/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module MQTT
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/em_mqtt_version_spec.rb

@@ -1,7 +1,6 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'spec_helper'
-require 'em-mqtt'
 
 describe EventMachine::MQTT do
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: em-mqtt
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nicholas J Humfrey
@@ -15,134 +14,91 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-16 00:00:00 Z
+date: 2013-04-10 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mqtt
+  name: eventmachine
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 0
         - 8
         version: 0.0.8
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
+  name: mqtt
+  requirement: *id002
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
+        - 14
+        version: 1.0.14
+  name: bundler
+  requirement: *id003
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 7
         - 2
         version: 0.7.2
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
+  name: yard
+  requirement: *id004
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
         - 7
         version: 0.8.7
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
+  requirement: *id005
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 2
         - 6
         - 0
         version: 2.6.0
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
-        version: 0.10.0
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rspec
+  requirement: *id006
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  type: :development
-  version_requirements: *id008
 description: This gem adds MQTT (Message Queue Telemetry Transport) protocol support to EventMachine.
 email: njh@aelius.com
 executables: 
@@ -156,15 +112,14 @@ files:
 - COPYING
 - GPL
 - NEWS
-- lib/em-mqtt/client.rb.new.rb
-- lib/em-mqtt/client_connection.rb
-- lib/em-mqtt/connection.rb
-- lib/em-mqtt/server.rb
-- lib/em-mqtt/server_connection.rb
-- lib/em-mqtt/version.rb
-- lib/em-mqtt.rb
-- spec/em_mqtt_version_spec.rb
-- bin/em-mqtt
+- lib/em/mqtt/client.rb.new.rb
+- lib/em/mqtt/client_connection.rb
+- lib/em/mqtt/connection.rb
+- lib/em/mqtt/server.rb
+- lib/em/mqtt/server_connection.rb
+- lib/em/mqtt/version.rb
+- lib/em/mqtt.rb
+has_rdoc: true
 homepage: http://github.com/njh/ruby-em-mqtt
 licenses: 
 - Ruby
@@ -174,30 +129,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: MQTT for EventMachine
 test_files: 
 - spec/em_mqtt_version_spec.rb
-has_rdoc: 

data/lib/em-mqtt.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'eventmachine'
-require 'logger'
-require 'mqtt'
-
-require "em-mqtt/version"
-
-module EventMachine::MQTT
-
-  autoload :ClientConnection, 'em-mqtt/client_connection'
-  autoload :Connection,       'em-mqtt/connection'
-  autoload :Server,           'em-mqtt/server'
-  autoload :ServerConnection, 'em-mqtt/server_connection'
-
-end