mqtt-sn-ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f0d1172be32ff8b6c6c5273269ff4f720557eb
-  data.tar.gz: 8bf5058605ef6eee4878f7479dea438503f5bdfe
+  metadata.gz: d8d215dd5f4e11c65675f57b7b4cf605f759931f
+  data.tar.gz: 8f9072ae324bd014b1051dc0dc7dddfdecf0e1ac
 SHA512:
-  metadata.gz: c44fb49055e484380ed709b8aae823ffcd5208855d28c6044d7216e876d2892f1c3540a46ea880b0e1d82be1f0f0e56fe6b8d1f2ee36c0403f64a42aba51d167
-  data.tar.gz: ca80dc72080307d9761dfc9444a2d44957ebd8c12cfeeda1e49f4824bb41b22814d4b0d7077553d3f0bfab706eba6b6bc8e365563dc44fddc8a3b342b6002daf
+  metadata.gz: 6bd5a86aecc7bc02622e1e6dd7d36b6e45de68f0c5322d7ed221da3a0d129033b0a34110092ac3d4ed8614a69b658ef466afe4fe237d5a0c3814fd1d3b10b695
+  data.tar.gz: 0bc34db03e72c227dc7faf9e4df00ecd10f8d03cdd6405378938a54a555ff31c4cb893cbfa1da62ac87dd15f3cf82acc3d3b068dd80fdc5a63576a5f68942e4e

data/bin/mqtt-sn-pub.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+# encode: UTF-8
+
+require "pp"
+require 'socket'
+require 'json'
+require 'optparse'
+if File.file? './lib/mqtt-sn-ruby.rb'
+  require './lib/mqtt-sn-ruby.rb'
+  puts "using local lib"
+else
+  require 'mqtt-sn-ruby'
+end
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: mqtt-sn-pub.rb [options]"
+
+  opts.on("-v", "--[no-]verbose", "Run verbosely (false)") do |v|
+    options[:verbose] = v
+  end
+  opts.on("-d", "--[no-]debug", "Produce Debug dump on console (false)") do |v|
+    options[:debug] = v
+  end
+  opts.on("-h", "--host host", "MQTT-SN Host to connect (localhost)") do |v|
+    options[:server] = v
+  end
+  opts.on("-p", "--port port", "MQTT-SN Port to connect (1883)") do |v|
+    options[:port] = v.to_i
+  end
+  opts.on("-q", "--qos level", "QoS level (0)") do |v|
+    options[:qos] = v.to_i
+  end
+  opts.on("-i", "--id id", "This client's id -- free choice (hostname-pid)") do |name|
+    options[:id] = name
+  end
+  opts.on("-m", "--msg msg", "Message to send (test_value)") do |msg|
+    options[:msg] = msg
+  end
+  opts.on("-t", "--topic topic", "Topic to use (test/message/123)") do |topic|
+    options[:topic] = topic
+  end
+end.parse!
+
+puts "MQTT-SN-PUB: #{options.to_json}"
+begin
+  sn=MqttSN.new options
+  sn.connect options[:id]
+  sn.publish options[:topic]||"test/message/123", options[:msg]||"test_value", qos: options[:qos]
+  puts "Sent ok."
+rescue SystemExit, Interrupt
+  puts "\nExiting after Disconnect\n"
+rescue => e
+  puts "\nError: '#{e}' -- Quit after Disconnect\n"
+end
+sn.disconnect
+
+puts "MQTT-SN-PUB Done."
+

data/bin/mqtt-sn-sub.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# encode: UTF-8
+
+require "pp"
+require 'socket'
+require 'json'
+require 'optparse'
+if File.file? './lib/mqtt-sn-ruby.rb'
+  require './lib/mqtt-sn-ruby.rb'
+  puts "using local lib"
+else
+  require 'mqtt-sn-ruby'
+end
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: mqtt-sn-sub.rb [options]"
+
+  opts.on("-v", "--[no-]verbose", "Run verbosely (false)") do |v|
+    options[:verbose] = v
+  end
+  opts.on("-d", "--[no-]debug", "Produce Debug dump on console (false)") do |v|
+    options[:debug] = v
+  end
+  opts.on("-h", "--host host", "MQTT-SN Host to connect (localhost)") do |v|
+    options[:server] = v
+  end
+  opts.on("-p", "--port port", "MQTT-SN Port to connect (1883)") do |v|
+    options[:port] = v.to_i
+  end
+  opts.on("-q", "--qos level", "QoS level (0)") do |v|
+    options[:qos] = v.to_i
+  end
+  opts.on("-i", "--id id", "This client's id -- free choice (hostname-pid)") do |name|
+    options[:id] = name
+  end
+  opts.on("-t", "--topic topic", "Topic to subscribe (test/message/123)") do |topic|
+    options[:topic] = topic
+  end
+end.parse!
+
+puts "MQTT-SN-SUB: #{options.to_json}"
+begin
+  sn=MqttSN.new options
+  sn.connect options[:id]
+  sn.subscribe options[:topic]||"test/message/123", qos: options[:qos] do |s,m|
+    if s==:sub_ack
+      puts "Subscribed Ok! Waiting for Messages!"
+    else
+      puts "Got Message: #{m}"
+    end
+  end
+  puts "Disconnected..."
+rescue SystemExit, Interrupt
+  puts "\nExiting after Disconnect\n"
+rescue => e
+  puts "\nError: '#{e}' -- Quit after Disconnect\n"
+end
+sn.disconnect
+
+puts "MQTT-SN-SUB Done."
+

data/lib/mqtt-sn-ruby.rb

@@ -49,6 +49,7 @@ class MqttSN
       @server=hash[:server]||"127.0.0.1"
       @port=hash[:port]||1883
       @debug=hash[:debug]
+      @verbose=hash[:verbose]
       @state=:inited
       @will_topic=nil
       @will_msg=nil
@@ -61,13 +62,9 @@ class MqttSN
       @t=Thread.new do
         recv_thread
       end
-      puts "opened ok"
-      pp @s
   end
 
-  def close
-    proc { puts "DESTROY OBJECT #{bar}" }
-  end
+
 
   def hexdump data
     raw=""
@@ -90,15 +87,20 @@ class MqttSN
     hexdump msg
   end
 
-  
   def send type,hash={},&block
-    puts ""
+    puts ""  if @verbose
     if @state!=:connected and type!=:connect and type!=:will_topic  and type!=:will_msg
-      raise "Error: Cannot #{type} while unconnected, send :connect first!"
+      if type==:disconnect
+        return #already disconnected.. nothing to do
+      else
+        raise "Error: Cannot #{type} while unconnected, send :connect first!"
+      end
     end
     case type
     when :connect
-      raise "Need :id, it is required at :connect!" if not hash[:id]
+      if not hash[:id]
+        hash[:id]="xxx"
+      end
       flags=0 
       flags+=CLEAN_FLAG if hash[:clean]
       flags+=RETAIN_FLAG if hash[:retain]
@@ -213,7 +215,7 @@ class MqttSN
       end
       raw=send_packet p
       hash[:raw]=raw if @debug
-      puts "send:#{@id} #{type},#{hash.to_json}"
+      puts "send:#{@id} #{type},#{hash.to_json}" if @verbose
       timeout=hash[:timeout]||Tretry
      retries=0
       if hash[:expect]
@@ -346,7 +348,7 @@ class MqttSN
       else
         raise "Error:#{@id} Register topic #{topic} failed!"
       end
-      pp @topics
+      #pp @topics
     end
     @topics[topic]
   end
@@ -435,7 +437,7 @@ class MqttSN
           topic=r[6,len-6]
           m={type: :register, topic_id: topic_id, msg_id: msg_id, topic: topic,status: :ok}
           @topics[topic]=m[:topic_id]
-          pp @topics
+          #pp @topics
           send :register_ack,topic_id: topic_id, msg_id: msg_id, return_code: 0
           done=true
         when REGACK_TYPE
@@ -471,7 +473,7 @@ class MqttSN
         if @debug and m
           m[:raw]=hexdump r
         end
-        puts "got :#{@id} #{m.to_json}"
+        puts "got :#{@id} #{m.to_json}"  if @verbose
         if not done
           @iq<<m if m
         end

data/test.rb

@@ -49,6 +49,7 @@ sn2.publish "eka/4","2perkkule0",qos: 0
 sn2.publish "eka/5","2perkkule1rrrr",qos: 1, retain: true
 sn2.publish "eka/6","2perkkule2",qos: 2
 sn2.disconnect
+sn2=nil
 
 #puts "----------------- sleep"
 #sn2.goto_sleep 4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ari Siitonen
@@ -13,10 +13,14 @@ dependencies: []
 description: Ruby toolkit for MQTT-SN, compatible with RSMB, command line tools and
   API
 email: jalopuuverstas@gmail.com
-executables: []
+executables:
+- mqtt-sn-pub.rb
+- mqtt-sn-sub.rb
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/mqtt-sn-pub.rb
+- bin/mqtt-sn-sub.rb
 - lib/mqtt-sn-ruby.rb
 - test.rb
 homepage: https://github.com/arisi/mqtt-sn-ruby