mqtt-homie 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e92a85d38e5d824f9e40a7afe8ec0bbe51f4a7a483d01fa66ee7765812b5939
-  data.tar.gz: 56356ede9f137963ff41f26a7cc046e0223c647cec0da5703a57da165f4337ac
+  metadata.gz: e325ebb1aedaf50aef04bd62e84b8cb2107561f87f8aa71a9f5f037cc4d5a006
+  data.tar.gz: 4847fede7e1dcb105f4a869073c0a6a807cbcc0c6927059cf6465ed0f7794831
 SHA512:
-  metadata.gz: d019acaf6ec7b635bfc50eb53be9d185b40a80926f74b36dbfbd8770ed2325d480cf27e05bf6eaeb5f37007c97ad60d4b5385e27aaba4657074409b9fd21e7ad
-  data.tar.gz: cb4c85f3c03ea59b28a7f9ecda820a7d03a3f6f1e77cc8e2abde98daabcd21f0dea0bbdda3c9d76939c03b5e4fd80546762928a49de2e586465f62576670b69b
+  metadata.gz: 4b705eadfb0777b0f79f15a32965419bbfcfe2695dba3101c44a61680e38a9e58bbe634673f37f347213608099f7b13e8841e592135918899255c50bef4a0604
+  data.tar.gz: dd9f77fc45d35d87a3d514cc18ecef672f84fb94b8a7b218e5f52dddbf2132be2f87028338cf26446bc0a45a44d6e924484cb540483bafa83c1181e2c1983859

data/Gemfile.lock

@@ -1,41 +1,45 @@
-PATH
-  remote: .
-  specs:
-    mqtt-homie (0.1.0)
-      mqtt (~> 0.5)
-      sys-uname (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    ffi (1.11.1-x64-mingw32)
-    mqtt (0.5.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    sys-uname (1.0.4)
-      ffi (>= 1.0.0)
-
-PLATFORMS
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  mqtt-homie!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.0.2
+PATH
+  remote: .
+  specs:
+    mqtt-homie (0.1.0)
+      macaddr (~> 1.1)
+      mqtt (~> 0.5)
+      sys-uname (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    ffi (1.11.1-x64-mingw32)
+    macaddr (1.7.2)
+      systemu (~> 2.6.5)
+    mqtt (0.5.0)
+    rake (10.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.1)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    sys-uname (1.0.4)
+      ffi (>= 1.0.0)
+    systemu (2.6.5)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  mqtt-homie!
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.0.2

data/README.md

@@ -28,13 +28,11 @@ require 'rubygems'
 require 'mqtt/homie'
 
 # Set up a device, with a node and properties
-device = MQTT::Homie.device_builder(id: 'device', name: 'Device'
-        localip: '192.168.1.1',
-        mac: '80:1f:02:cc:15:dd'
-      ).node(id: "gate", name: "Front gate", type: "Gate")
-        .property(id: "state", name: "Gate state", enum: [:open, :closed, :opening, :closing], value: :closed)
-        .property(id: "position", name: "Gate position", datatype: :integer, unit: "%", value: 0)
-        .property(id: "command", name: "Send gate command", settable: true, enum: [:open, :close]).build
+device = MQTT::Homie.device_builder(id: 'device', name: 'Device')
+  .node(id: "gate", name: "Front gate", type: "Gate")
+  .property(id: "state", name: "Gate state", enum: [:open, :closed, :opening, :closing], value: :closed)
+  .property(id: "position", name: "Gate position", datatype: :integer, unit: "%", value: 0)
+  .property(id: "command", name: "Send gate command", settable: true, enum: [:open, :close]).build
 
 # Create a client and connect to a MQTT broker
 client = MQTT::Homie::Client.new(device: device, host: 'localhost')

data/lib/mqtt/homie.rb

@@ -1,27 +1,29 @@
-require "mqtt"
-require "mqtt/homie/version"
-
-module MQTT
-  module Homie
-    class Error < StandardError; end
-
-    class << self
-      attr_accessor :logger
-
-      def debug(message)
-        logger.debug(message) if logger
-      end
-
-      def device_builder(options = {})
-        MQTT::Homie::DeviceBuilder.new(options)
-      end
-    end
-  end
-end
-
-require "mqtt/homie/homie_object"
-require "mqtt/homie/property"
-require "mqtt/homie/node"
-require "mqtt/homie/device"
-require "mqtt/homie/client"
-require "mqtt/homie/device_builder"
+require "mqtt"
+require "mqtt/homie/version"
+
+module MQTT
+  module Homie
+    class Error < StandardError; end
+
+    class << self
+      attr_accessor :logger
+
+      def debug(message)
+        logger.debug(message) if logger
+      end
+
+      def device_builder(options = {})
+        MQTT::Homie::DeviceBuilder.new(options)
+      end
+    end
+  end
+end
+
+require "mqtt/homie/homie_attribute"
+require "mqtt/homie/homie_object"
+require "mqtt/homie/network"
+require "mqtt/homie/property"
+require "mqtt/homie/node"
+require "mqtt/homie/device"
+require "mqtt/homie/client"
+require "mqtt/homie/device_builder"

data/lib/mqtt/homie/client.rb

@@ -12,8 +12,17 @@ module MQTT
         @device = options[:device]
         @host = options[:host]
         @root_topic = options[:root_topic] || DEFAULT_ROOT_TOPIC
+
         raise "device required" unless @device
 
+        # next version of homie doesn't use stats or firmware details
+        @use_stats = true
+        if options[:develop]
+          @device.use_stats = false
+          @device.use_fw = false
+          @use_stats = false
+        end
+
         # observe all node properties so we can publish values when they change
         @device.nodes.each do |node|
           node.properties.each do |property|
@@ -30,12 +39,12 @@ module MQTT
         @client.connect
 
         publish(@device, topic)
-        publish_statistics
+        publish_statistics if @use_stats
 
         @threads = []
 
         # run a thread to publish statistics
-        @threads << Thread.new { run_statistics }
+        @threads << Thread.new { run_statistics } if @use_stats
 
         # run a thread to listen for settings
         @threads << Thread.new { run_set_listener }
@@ -106,7 +115,9 @@ module MQTT
       def run_statistics
         while !Thread.current[:done]
           publish_statistics
-          sleep @device.interval
+
+          # halve interval, if we miss a notification then we will be marked as offline
+          sleep @device.stats.interval / 2
         end
         debug("statistics thread exiting")
       end
@@ -121,7 +132,7 @@ module MQTT
       end
 
       def publish_statistics
-        publish(@device.statistics, topic + "/$stats")
+        publish(@device.stats, topic + "/$stats")
       end
 
       def publish_property_value(property)

data/lib/mqtt/homie/device.rb

@@ -1,31 +1,71 @@
 require "sys/uname"
+require "socket"
 
 module MQTT
   module Homie
     class Device < HomieObject
+      class << self
+        include Network
+      end
+
       HOMIE_VERSION = "3.0.1"
       DEFAULT_STAT_REFRESH = 60  # seconds
-      DEFAULT_IMPLEMENTATION = "mqtt-homie"
+      DEFAULT_IMPLEMENTATION = "mqtt-homie-#{VERSION}"
+
+      class Firmware < HomieObject
+        class << self
+          def default_fw_name
+            uname.sysname rescue uname.caption rescue "Unknown"
+          end
+
+          def default_fw_version
+            uname.release rescue uname.build_number rescue "Unknown"
+          end
+
+          def uname
+            @uname ||= Sys::Uname.uname
+          end
+        end
+
+        homie_attr :name, default: default_fw_name, required: true
+        homie_attr :version, default: default_fw_version, required: true
+      end
+
+      # statistics should be sent every interval seconds
+      # homie/device_id/$stats
+      class Statistics < HomieObject
+        homie_attr :interval, required: true, default: 60
+        homie_attr :boot_time, default: lambda { |i| Time.now }, hidden: true
+        homie_attr :signal, datatype: Integer
+        homie_attr :cputemp, datatype: Integer
+        homie_attr :cpuload, datatype: Float
+        homie_attr :battery, datatype: Integer
+        homie_attr :freeheap, datatype: Integer
+        homie_attr :supply, datatype: Float
+
+        def homie_attributes
+          super.merge("uptime" => (Time.now - @boot_time).to_i)
+        end
+      end
+
+      attr_reader :fw, :stats
+      attr_accessor :use_stats, :use_fw
 
-      attr_reader :nodes, :id, :mac, :fw_name, :fw_version, :name, :implementation, :interval
-      attr_accessor :state
+      homie_id
+      homie_attr :name, required: true
+      homie_attr :state, default: :init, required: true
+      homie_attr :nodes, datatype: Array, default: [], immutable: true
+      homie_attr :localip, default: default_localip, required: true
+      homie_attr :mac, default: default_mac, required: true
+      homie_attr :implementation, default: DEFAULT_IMPLEMENTATION
 
       def initialize(options = {})
         super(options)
-        @name = options[:name]
-        @start_time = Time.now
-        @interval = set(options, :interval, default: DEFAULT_STAT_REFRESH)
-        @nodes = set(options, :nodes, data_type: Array, default: [])
-        @state = :init
-        @localip = set(options, :localip, default: default_localip)
-        @mac = set(options, :mac, default: default_mac)
-        @implementation = set(options, :implementation, default: DEFAULT_IMPLEMENTATION)
-        @fw_name = set(options, :fw_name, default: default_fw_name)
-        @fw_version = set(options, :fw_version, default: default_fw_version)
-      end
+        @stats = Statistics.new(options)
+        @fw = Firmware.new(subhash(options, "fw_"))
 
-      def topic
-        @id
+        @use_stats = options.include?(:use_stats) ? options[:use_stats] : true
+        @use_fw = options.include?(:use_fw) ? options[:use_fw] : true
       end
 
       def node(id)
@@ -35,17 +75,15 @@ module MQTT
       # device attributes must be sent when connection to broker is established or re-established
       # homie/device_id/
       def homie_attributes
-        data = {
+        data = super.merge({
           "$homie" => HOMIE_VERSION,
-          "$name" => @name,
-          "$localip" => @localip,
-          "$mac" => @mac,
-          "$fw/name" => @fw_name || "mqtt-homie",
-          "$fw/version" => @fw_version || MQTT::Homie::VERSION,
-          "$nodes" => @nodes.collect { |i| i.id }.join(","),
-          "$implementation" => @implementation,
-          "$state" => @state.to_s,
-        }
+        })
+
+        data.merge!({
+          "$fw/name" => @fw.name,
+          "$fw/version" => @fw.version,
+        }) if @use_fw
+
         @nodes.each do |node|
           node.homie_attributes.each do |k, v|
             data[node.topic + "/" + k] = v
@@ -54,43 +92,16 @@ module MQTT
         data
       end
 
-      # statistics should be sent every INTERVAL seconds
-      # homie/device_id/$stats
-      def statistics
-        {
-          "uptime" => (Time.now - @start_time).to_i,
-          #"signal" => 100,  # TODO wifi signal strength
-          #"cputemp" => 0,
-          #"cpuload" => stats.load_average.one_minute,
-          #"battery" => 100,
-          #"freeheap" => stats.memory.free,
-          #"supply" => 5,
-          "interval" => @interval * 2,
-        }
-      end
-
-      def update(time, node)
-        # node value updated
-      end
-
-      def default_localip
-        nil # TODO
-      end
-
-      def default_mac
-        nil # TODO
-      end
-
-      def default_fw_name
-        uname.sysname rescue uname.caption rescue "Unknown"
-      end
-
-      def default_fw_version
-        uname.release rescue uname.build_number rescue "Unknown"
-      end
+      private
 
-      def uname
-        @uname ||= Sys::Uname.uname
+      def subhash(data, prefix)
+        result = {}
+        data.each do |key, value|
+          next unless key.to_s.start_with?(prefix)
+          key = key.to_s.sub(/^#{prefix}/, "")
+          result[key.to_sym] = value
+        end
+        result
       end
     end
   end

data/lib/mqtt/homie/homie_attribute.rb

@@ -0,0 +1,125 @@
+module MQTT
+  module Homie
+    module HomieAttribute
+      def self.included(base)
+        base.send :include, InstanceMethods
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def homie_attr(name, options = {})
+          # define accessors
+          attr_reader name
+
+          unless options[:immutable]
+            define_method("#{name}=") { |value| homie_attr_set(name, value) }
+          end
+
+          # record attribute data
+          @homie_attribute_list ||= []
+          @homie_attribute_list << [name.to_sym, options]
+        end
+
+        def homie_id
+          homie_attr :id, required: true, validate: lambda { |i| valid_id?(i) }, immutable: true, hidden: true
+        end
+
+        def homie_has_id?
+          !!homie_attr_list.detect { |i| i[0] == :id }
+        end
+
+        def homie_attr_list
+          @homie_attribute_list || []
+        end
+
+        def homie_attr_options(name)
+          data = homie_attr_list.find { |i| i[0] == name } || []
+          data[1] || {}
+        end
+      end
+
+      module InstanceMethods
+
+        # initialize all homie attributes from the given hash
+        def homie_attr_init(data = {})
+          self.class.homie_attr_list.each do |name, options|
+            #puts "name: #{name}, default: #{options[:default]}, options: #{options.inspect}"
+            value = data.include?(name) ? data[name] : options[:default]
+            value = value.call(self) if value.kind_of?(Proc)
+            homie_attr_set(name, value)
+          end
+        end
+
+        # set attribute without validation
+        def homie_attr_set!(name, value)
+          instance_variable_set("@#{name}", value)
+        end
+
+        # set attribute with validation
+        def homie_attr_set(name, value)
+          homie_attr_validate(name, value)
+          homie_attr_set!(name, value)
+        end
+
+        def homie_attributes
+          data = {}
+          # if this object has an id, it needs a $ attribute prefix.
+          # otherwise assume it is a hierarchical attribute like $stats/* or $fw/*
+          attrib_prefix = self.class.homie_has_id? ? "$" : ""
+          self.class.homie_attr_list.each do |name, options|
+            next if options[:hidden]
+            key = options[:topic] || (attrib_prefix + name.to_s)
+            value = instance_variable_get("@#{name}")
+            next if value == nil
+            data[key] = value.kind_of?(Array) ? value.collect { |i| i.id }.join(",") : value
+          end
+          data
+        end
+
+        # attribute validation
+        def homie_attr_validate(name, value)
+          options = self.class.homie_attr_options(name)
+
+          if value.nil?
+            required = options[:required]
+            required = required.call(self) if required.kind_of?(Proc)
+            raise "#{name} is required for #{object_type} #{@id}" if required
+          end
+
+          datatype = options[:datatype]
+          if datatype && !value.nil? && !datatype_match?(datatype, value)
+            raise "expected #{name} to be a #{datatype} for #{object_type} #{@id}"
+          end
+
+          enum = options[:enum]
+          if enum.kind_of?(Array) && !value.nil? && !enum.include?(value.to_sym)
+            raise "expected #{name} (#{value}) to be one of #{enum.join(",")}"
+          end
+        end
+
+        private
+
+        def object_type
+          self.class.name.split("::").last
+        end
+
+        def valid_id?(id)
+          id && id.kind_of?(String) && id.match(/^[-a-z0-9]+$/) && !id.start_with?("-")
+        end
+
+        def datatype_match?(datatype, value)
+          return value.kind_of?(datatype) if datatype.kind_of?(Class)
+          case datatype
+          when :boolean
+            return value == true || value == false
+          else
+            raise "unhandled datatype '#{datatype}'"
+          end
+          false
+        end
+
+        #@settable = !!set(options, :settable, default: false)
+      end
+    end
+  end
+end

data/lib/mqtt/homie/homie_object.rb

@@ -3,37 +3,15 @@ require "observer"
 module MQTT
   module Homie
     class HomieObject
-      attr_reader :id
+      include HomieAttribute
 
       def initialize(options = {})
-        @id = set(options, :id, required: true)
-        raise "invalid id" unless valid_id?
+        homie_attr_init(options)
       end
 
       def topic
         @id
       end
-
-      def homie_attributes
-        data = {}
-      end
-
-      private
-
-      def valid_id?
-        @id && @id.kind_of?(String) && @id.match(/^[-a-z0-9]+$/) && !@id.start_with?("-")
-      end
-
-      def set(options = {}, name, default: nil, required: false, enum: nil, data_type: nil)
-        value = options.include?(name) ? options[name] : default
-        raise "#{name} is required for #{object_type} #{@id}" if required && value.nil?
-        raise "expected #{name} to be a #{data_type} for #{object_type} #{@id}" if data_type && !value.kind_of?(data_type)
-        value
-      end
-
-      def object_type
-        self.class.name.split("::").last
-      end
     end
   end
 end

data/lib/mqtt/homie/network.rb

@@ -0,0 +1,42 @@
+require "macaddr"
+
+module MQTT
+  module Homie
+    module Network
+      def default_localip
+        addr = default_interface[:addresses][0] if default_interface
+        addr ? addr.ip_address : nil
+      end
+
+      def default_mac
+        (default_interface ? default_interface[:hwaddr] : nil) || Mac.addr
+      end
+
+      def default_interface
+        @default_interface ||= interfaces.values.find { |i| i[:default] }
+      end
+
+      def interfaces
+        @interfaces ||= begin
+          interfaces = {}
+          found = false
+          Socket.getifaddrs.each do |ifaddr|
+            ifname = ifaddr.name
+            data = interfaces[ifname] ||= { addresses: [] }
+            next unless addr = ifaddr.addr
+            data[:addresses].push addr if (addr.ipv4? || addr.ipv6?) && usable_address?(addr)
+            data[:hwaddr] = $1 if addr.inspect.match(/hwaddr=([0-9a-fA-F:]+)/)  # doesn't work on windows
+            data[:default] = true unless found
+            data[:name] = ifname
+            found = true
+          end
+          interfaces
+        end
+      end
+
+      def usable_address?(addr)
+        !(addr.ipv4_loopback? || addr.ipv6_loopback? || addr.ipv4_multicast? || addr.ipv6_linklocal?)
+      end
+    end
+  end
+end

data/lib/mqtt/homie/node.rb

@@ -1,25 +1,17 @@
 module MQTT
   module Homie
     class Node < HomieObject
-      attr_reader :name, :properties
-
-      def initialize(options = {})
-        super(options)
-        @name = set(options, :name, required: true)
-        @type = set(options, :type, required: true)
-        @properties = set(options, :properties, required: true, data_type: Array)
-      end
+      homie_id
+      homie_attr :name, required: true
+      homie_attr :type, required: true
+      homie_attr :properties, datatype: Array, required: true, immutable: true
 
       def property(id)
         @properties.find { |i| i.id == id }
       end
 
       def homie_attributes
-        data = {
-          "$name" => @name,
-          "$type" => @type,
-          "$properties" => @properties.collect { |i| i.id }.join(","),
-        }
+        data = super
 
         @properties.each do |p|
           p.homie_attributes.each do |k, v|

data/lib/mqtt/homie/property.rb

@@ -7,31 +7,32 @@ module MQTT
 
       DATA_TYPES = [:integer, :float, :boolean, :string, :enum, :color]
 
-      attr_reader :id, :name, :settable, :datatype, :unit, :retained, :format
+      homie_id
+      homie_attr :name, default: ""
+      homie_attr :settable, default: false, datatype: :boolean
+      homie_attr :retained, default: true, datatype: :boolean
+      homie_attr :datatype, default: :string, enum: DATA_TYPES, datatype: Symbol
+      homie_attr :unit, default: ""
+      homie_attr :format, required: lambda { |i| [:enum, :color].include?(i.datatype) }
+
       attr_reader :value
 
       def initialize(options = {})
-        super(options)
-
         options = options.dup
 
         # enum shortcut
         if enum = options.delete(:enum)
           options[:datatype] = :enum
-          options[:format] = enum.collect { |i| i.to_s }.join(',')
+          options[:format] = enum.collect { |i| i.to_s }.join(",")
         end
 
-        @name = set(options, :name, default: "")
-        @settable = !!set(options, :settable, default: false)
-        @retained = !!set(options, :retained, default: true)
-        @datatype = set(options, :datatype, default: :string, enum: DATA_TYPES).to_sym
-        @unit = set(options, :unit, default: "")
-        @format = set(options, :format, required: [:enum, :color].include?(@datatype))
+        super(options)
+
         @value = options[:value]
       end
 
       def value=(value)
-        # TODO: check value conforms to expected datatype and format
+        # TODO: check value conforms to expected datatype and format?
         if value != @value
           @value = value
           changed
@@ -42,18 +43,6 @@ module MQTT
       def settable?
         @settable
       end
-
-      def homie_attributes
-        data = {
-          "$name" => @name,
-          "$settable" => @settable,
-          "$datatype" => @datatype,
-          "$unit" => @unit,
-          "$format" => @format,
-          "$retained" => @retained,
-        }
-        data
-      end
     end
   end
 end

data/lib/mqtt/homie/version.rb

@@ -1,5 +1,5 @@
-module MQTT
-  module Homie
-    VERSION = "0.1.0"
-  end
-end
+module MQTT
+  module Homie
+    VERSION = "0.1.1"
+  end
+end

data/mqtt-homie.gemspec

@@ -1,36 +1,37 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "mqtt/homie/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "mqtt-homie"
-  spec.version = MQTT::Homie::VERSION
-  spec.authors = ["Andrew Williams"]
-  spec.email = ["sobakasu@gmail.com"]
-
-  spec.summary = %q{A ruby interface for creating a device conforming to the MQTT Homie convention.}
-  spec.homepage = "https://github.com/sobakasu/mqtt-homie"
-  spec.license = "MIT"
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/sobakasu/mqtt-homie"
-  spec.metadata["changelog_uri"] = "https://github.com/sobakasu/mqtt-homie/CHANGELOG"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-
-  spec.add_dependency "mqtt", "~> 0.5"
-  spec.add_dependency "sys-uname", "~> 1.0"
-end
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "mqtt/homie/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "mqtt-homie"
+  spec.version = MQTT::Homie::VERSION
+  spec.authors = ["Andrew Williams"]
+  spec.email = ["sobakasu@gmail.com"]
+
+  spec.summary = %q{A ruby interface for creating a device conforming to the MQTT Homie convention.}
+  spec.homepage = "https://github.com/sobakasu/mqtt-homie"
+  spec.license = "MIT"
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/sobakasu/mqtt-homie"
+  spec.metadata["changelog_uri"] = "https://github.com/sobakasu/mqtt-homie/CHANGELOG"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+
+  spec.add_dependency "mqtt", "~> 0.5"
+  spec.add_dependency "sys-uname", "~> 1.0"
+  spec.add_dependency "macaddr", "~> 1.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-homie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: macaddr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: 
 email:
 - sobakasu@gmail.com
@@ -102,7 +116,9 @@ files:
 - lib/mqtt/homie/client.rb
 - lib/mqtt/homie/device.rb
 - lib/mqtt/homie/device_builder.rb
+- lib/mqtt/homie/homie_attribute.rb
 - lib/mqtt/homie/homie_object.rb
+- lib/mqtt/homie/network.rb
 - lib/mqtt/homie/node.rb
 - lib/mqtt/homie/property.rb
 - lib/mqtt/homie/version.rb