em-mqtt 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b69ccbdb1c77d893629063eb6b1dad7ba31b2a19
+  data.tar.gz: 8d976bd448ee6d79247cb57153722a716f8bf1ab
+SHA512:
+  metadata.gz: 77873c2d327cb17e4b551162d766543479df3bf3284fb76ca105d41d47ca6bd454a34b58b22a474290ce497de8e53be3076bbc80b2b149421d6b0e08d34ac0ae
+  data.tar.gz: 3a9fdd5efcc5a74af4a93067f61e60297a18e3b08b20f1ac931a4ad3127088ae785dee6d56a2c97b3ec029b1f51742e1355f199f906e03d85372f7e5405ff80a

data/LICENSE.md

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+=====================
+
+Copyright (c) 2009-2013 Nicholas J Humfrey
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/NEWS.md

@@ -0,0 +1,17 @@
+EventMachine MQTT NEWS
+======================
+
+
+EventMachine MQTT Version 0.0.4 (2015-08-07)
+--------------------------------------------
+
+* Fix for using version 0.3 of MQTT gem
+* Added support for client authentication
+* Changed license from 'Ruby' to 'MIT'
+* Various other fixes and improvements
+
+
+EventMachine MQTT Version 0.0.1 (2012-02-04)
+--------------------------------------------
+
+* Initial Release.

data/{README → README.md}

@@ -11,7 +11,7 @@ Installing
 You may get the latest stable version from rubygems.org:
 
     $ gem install em-mqtt
-    
+
 It depends upon the mqtt gem to perform packet parsing and serialising.
 
 
@@ -19,8 +19,8 @@ Synopsis
 --------
 
     require 'rubygems'
-    require 'em-mqtt'
-    
+    require 'em/mqtt'
+
     # Publish example
     EventMachine.run do
       c = ClientConnection.connect('test.mosquitto.org')
@@ -48,6 +48,12 @@ Resources
 * GitHub Project: http://github.com/njh/ruby-em-mqtt
 * Documentation: http://rubydoc.info/gems/em-mqtt/frames
 
+License
+-------
+
+The em-mqtt gem is licensed under the terms of the MIT license.
+See the file LICENSE for details.
+
 
 Contact
 -------
@@ -55,4 +61,3 @@ Contact
 * Author:    Nicholas J Humfrey
 * Email:     njh@aelius.com
 * Home Page: http://www.aelius.com/njh/
-* License:   Distributes under the same terms as Ruby

data/lib/em/mqtt/client_connection.rb

@@ -4,33 +4,79 @@ class EventMachine::MQTT::ClientConnection < EventMachine::MQTT::Connection
 
   attr_reader :client_id
   attr_reader :keep_alive
-  attr_reader :clean_start
-  attr_reader :message_id
+  attr_reader :clean_session
+  attr_reader :username
+  attr_reader :password
+  attr_reader :packet_id
   attr_reader :ack_timeout
   attr_reader :timer
 
-  # FIXME: change this to optionally take hash of options
-  def self.connect(host=MQTT::DEFAULT_HOST, port=MQTT::DEFAULT_PORT, *args, &blk)
-    EventMachine.connect( host, port, self, *args, &blk )
+  # Connect to an MQTT server
+  #
+  # Examples:
+  #  ClientConnection.connect('localhost', 1883)
+  #  ClientConnection.connect(:host => 'localhost', :username => 'user', :password => 'pass')
+  #
+  def self.connect(*args, &blk)
+    hash = {
+      :host => 'localhost',
+      :port => MQTT::DEFAULT_PORT
+    }
+
+    i = 0
+    args.each do |arg|
+      if arg.is_a?(Hash)
+        hash.merge!(arg)
+      else
+        if i == 0
+          hash[:host] = arg
+        elsif i == 1
+          hash[:port] = arg
+        end
+        i += 1
+      end
+    end
+
+    ::EventMachine.connect( hash.delete(:host), hash.delete(:port), self, hash, &blk )
   end
 
-  def post_init
-    super
-    @state = :connecting
+  # Initialize connection
+  # @param args [Hash] Arguments for connection
+  # @option args [String] :client_id A unique identifier for this client
+  # @option args [Integer] :keep_alive How often to send keep-alive pings (in seconds)
+  # @option args [Boolean] :clean_session Start a clean session with server or resume old one (default true)
+  # @option args [String] :username Username to authenticate with the server
+  # @option args [String] :password Password to authenticate with the server
+  def initialize(args={})
     @client_id = MQTT::Client.generate_client_id
     @keep_alive = 10
-    @clean_start = true
-    @message_id = 0
+    @clean_session = true
+    @packet_id = 0
     @ack_timeout = 5
+    @username = nil
+    @password = nil
     @timer = nil
+
+    if args.is_a?(Hash)
+      args.each_pair do |k,v|
+        instance_variable_set("@#{k}", v)
+      end
+    end
+  end
+
+  def post_init
+    super
+    @state = :connecting
   end
 
   def connection_completed
-    # Protocol name and version
+    # TCP socket established: send Connect packet
     packet = MQTT::Packet::Connect.new(
-      :clean_start => @clean_start,
+      :client_id => @client_id,
+      :clean_session => @clean_session,
       :keep_alive => @keep_alive,
-      :client_id => @client_id
+      :username => @username,
+      :password => @password
     )
 
     send_packet(packet)
@@ -71,11 +117,11 @@ class EventMachine::MQTT::ClientConnection < EventMachine::MQTT::Connection
     callback do
       send_packet(
         MQTT::Packet::Publish.new(
+          :id => next_packet_id,
           :qos => qos,
           :retain => retain,
           :topic => topic,
-          :payload => payload,
-          :message_id => @message_id.next
+          :payload => payload
         )
       )
     end
@@ -87,8 +133,8 @@ class EventMachine::MQTT::ClientConnection < EventMachine::MQTT::Connection
     callback do
       send_packet(
         MQTT::Packet::Subscribe.new(
-          :topics => topics,
-          :message_id => @message_id.next
+          :id => next_packet_id,
+          :topics => topics
         )
       )
     end
@@ -100,8 +146,8 @@ class EventMachine::MQTT::ClientConnection < EventMachine::MQTT::Connection
     callback do
       send_packet(
         MQTT::Packet::Unsubscribe.new(
-          :topics => topics,
-          :message_id => @message_id.next
+          :id => next_packet_id,
+          :topics => topics
         )
       )
     end
@@ -147,4 +193,8 @@ private
     set_deferred_success
   end
 
+  def next_packet_id
+    @packet_id += 1
+  end
+
 end

data/lib/em/mqtt/connection.rb

@@ -36,6 +36,7 @@ class EventMachine::MQTT::Connection < EventMachine::Connection
       @last_received = Time.now
       process_packet(@packet)
       @packet = nil
+      receive_data ''
     end
   end
 

data/lib/em/mqtt/server_connection.rb

@@ -6,7 +6,7 @@ class EventMachine::MQTT::ServerConnection < EventMachine::MQTT::Connection
   attr_accessor :client_id
   attr_accessor :last_packet
   attr_accessor :keep_alive
-  attr_accessor :message_id
+  attr_accessor :packet_id
   attr_accessor :subscriptions
 
   attr_reader :timer
@@ -21,7 +21,7 @@ class EventMachine::MQTT::ServerConnection < EventMachine::MQTT::Connection
     @state = :wait_connect
     @client_id = nil
     @keep_alive = 0
-    @message_id = 0
+    @packet_id = 0
     @subscriptions = []
     @timer = nil
     logger.debug("TCP connection opened")

data/lib/em/mqtt/version.rb

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

data/spec/em_mqtt_connection_spec.rb

@@ -0,0 +1,23 @@
+$:.unshift(File.dirname(__FILE__))
+
+require 'spec_helper'
+
+describe EventMachine::MQTT::Connection do
+
+  let(:signature) { double('signature') }
+  let(:subject) { EventMachine::MQTT::Connection.new(signature) }
+  let(:packet) { MQTT::Packet::Publish.new( :topic => 'test', :payload => 'hello world' ) }
+
+  describe "when receiving data" do
+    it "should parse packets" do
+      expect(subject).to receive(:process_packet).exactly(:once)
+      subject.receive_data packet.to_s
+    end
+
+    it "should handle multiple packets at once" do
+      expect(subject).to receive(:process_packet).exactly(:twice)
+      subject.receive_data [packet, packet].join
+    end
+  end
+
+end

data/spec/em_mqtt_version_spec.rb

@@ -6,17 +6,16 @@ describe EventMachine::MQTT do
 
   describe "version number" do
     it "should be defined as a constant" do
-      defined?(EventMachine::MQTT::VERSION).should == 'constant'
+      expect(defined?(EventMachine::MQTT::VERSION)).to eq('constant')
     end
 
     it "should be a string" do
-      EventMachine::MQTT::VERSION.should be_a(String)
+      expect(EventMachine::MQTT::VERSION).to be_a(String)
     end
- 
+
     it "should be in the format x.y.z" do
-      EventMachine::MQTT::VERSION.should =~ /^\d{1,2}\.\d{1,2}\.\d{1,2}$/
+      expect(EventMachine::MQTT::VERSION).to match(/^\d{1,2}\.\d{1,2}\.\d{1,2}$/)
     end
-  
-  end   
+  end
 
 end

metadata

@@ -1,153 +1,158 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-mqtt
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Nicholas J Humfrey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-10 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+date: 2015-08-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 8
-        version: 0.0.8
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mqtt
-  requirement: *id002
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 14
-        version: 1.0.14
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
-  name: yard
-  requirement: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: *id005
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: *id006
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
   prerelease: false
-description: This gem adds MQTT (Message Queue Telemetry Transport) protocol support to EventMachine.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This gem adds MQTT (Message Queue Telemetry Transport) protocol support
+  to EventMachine.
 email: njh@aelius.com
-executables: 
+executables:
 - em-mqtt
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- README
-- COPYING
-- GPL
-- NEWS
-- lib/em/mqtt/client.rb.new.rb
+files:
+- LICENSE.md
+- NEWS.md
+- README.md
+- bin/em-mqtt
+- lib/em/mqtt.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
+- spec/em_mqtt_connection_spec.rb
+- spec/em_mqtt_version_spec.rb
 homepage: http://github.com/njh/ruby-em-mqtt
-licenses: 
-- Ruby
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MQTT for EventMachine
-test_files: 
+test_files:
+- spec/em_mqtt_connection_spec.rb
 - spec/em_mqtt_version_spec.rb
+has_rdoc: 

data/COPYING

@@ -1,56 +0,0 @@
-ruby-em-mqtt is copyrighted free software by Nicholas J Humfrey <njh@aelius.com>.
-You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
-
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.

data/GPL

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

data/NEWS

@@ -1,8 +0,0 @@
-EventMachine MQTT NEWS
-======================
-
-
-EventMachine MQTT Version 0.0.1 (2012-02-04)
---------------------------------------------
-
-* Initial Release.

data/lib/em/mqtt/client.rb.new.rb

@@ -1,96 +0,0 @@
-# Client class for talking to an MQTT broker
-class MQTT::Client
-  attr_reader :remote_host    # Hostname of the remote broker
-  attr_reader :remote_port    # Port number of the remote broker
-  attr_accessor :keep_alive   # Time (in seconds) between pings to remote broker
-  attr_accessor :clean_start  # Set the 'Clean Start' flag when connecting?
-  attr_accessor :client_id    # Client Identifier
-  attr_accessor :ack_timeout  # Number of seconds to wait for acknowledgement packets
-
-  # Create a new MQTT Client instance
-  def initialize(remote_host=MQTT::DEFAULT_HOST, remote_port=MQTT::DEFAULT_PORT)
-    @remote_host = remote_host
-    @remote_port = remote_port
-    @keep_alive = 10
-    @clean_start = true
-    @client_id = nil
-    @ack_timeout = 5
-    @connection = nil
-  end
-
-  def self.connect(*args, &blk)
-    self.new(*args).connect(&blk)
-  end
-
-  # Connect to the MQTT broker
-  # A block must be given
-  def connect
-    #trap("INT") {EM.stop}
-
-    EventMachine.run do
-      @connection = MQTT::ClientConnection.connect(@remote_host, @remote_port)
-
-      # Stuff happens here
-      yield(self)
-
-      # Disconnect once all the other deferred callbacks
-      @connection.callback do
-        disconnect
-      end
-
-      puts "Finished initing run"
-    end
-  end
-
-  # Disconnect from the MQTT broker.
-  # If you don't want to say goodbye to the broker, set send_msg to false.
-  def disconnect(send_msg=true)
-    @connection.disconnect(send_msg) unless @connection.nil?
-  end
-
-  # Checks whether the client is connected to the broker.
-  def connected?
-    # FIXME: check if connection is connected
-    not @connection.nil?
-  end
-
-  # Publish a message on a particular topic to the MQTT broker.
-  def publish(topic, payload, retain=false, qos=0)
-    # FIXME: make sure @connection isn't nil
-    @connection.publish(topic, payload, retain, qos=0)
-  end
-
-  # Send a subscribe message for one or more topics on the MQTT broker.
-  # The topics parameter should be one of the following:
-  # * String: subscribe to one topic with QOS 0
-  # * Array: subscribe to multiple topics with QOS 0
-  # * Hash: subscribe to multiple topics where the key is the topic and the value is the QOS level
-  #
-  # For example:
-  #   client.subscribe( 'a/b' )
-  #   client.subscribe( 'a/b', 'c/d' )
-  #   client.subscribe( ['a/b',0], ['c/d',1] )
-  #   client.subscribe( 'a/b' => 0, 'c/d' => 1 )
-  #
-  def subscribe(*topics)
-    # FIXME: make sure @connection isn't nil
-    @connection.subscribe(*topics)
-  end
-
-  # Return the next message recieved from the MQTT broker.
-  # This method blocks until a message is available.
-  #
-  # The method returns the topic and message as an array:
-  #   topic,message = client.get
-  #
-  def get(*topics)
-    # FIXME: implement this
-  end
-
-  # Send a unsubscribe message for one or more topics on the MQTT broker
-  def unsubscribe(*topics)
-    # FIXME: make sure @connection isn't nil
-    @connection.unsubscribe(*topics)
-  end
-
-end