dashed 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf6c258a667ad13afa5024a783996c0a33e58ed
-  data.tar.gz: fd2a822b40c71af696495ea180556ad138011070
+  metadata.gz: fe157917d1366232d8d4eb8ce2351f1819492a07
+  data.tar.gz: cde3f601f4250ea923741956f5432c04a4bf15ae
 SHA512:
-  metadata.gz: 07d65b0d2380e80f0bcee109d8fd3cf2127fd7793421d3c7feda765c631cd4cd098fe0af878586b346d6548f94537551646a0650284fc86540bb3f9a677e525d
-  data.tar.gz: 1fae0fadf682f8191f1b7847ebc03eca01fe551e908f011958d1df81d1183be9ab4f66d86d205b11a12a0c58eb4289bacd7560fd86a35a1861d8a0851a806790
+  metadata.gz: 4a0ec1697645f7bdf3556c82173dbbf8fc730b04845b651f29a62949e8bfc6864253078b402e203dd862a920114cb11e7cbaf73a9118d6720e68908502ea7cd0
+  data.tar.gz: 23d0a912bad2803d10f3107deec64a59d9544bbc60c5cfc922a3e33dbcd2453f8d6cb1f4b0d400b6e823beab83b72d4e921d250c8274a363531a4ad5c09fd0c6

data/README.md

@@ -4,19 +4,32 @@ Dashed is a Ruby library for interacting with Amazon Dash button presses.
 
 ## Installation
 
-Just add `dashed` to your gemfile and then run `bundle install`.
+Just add `dashed` to your Gemfile and then run `bundle install`.
 
 Dashed has to be run with root permissions in order to listen to your network
 devices to pick up your dash button.
 
 ## Usage
 
+Dashed includes the `find_dash` executable which looks for Amazon Dash buttons
+based on their mac address. Once you've found your Dash buttons Mac Address you
+can get started.
+
+ex: `sudo find_dash dummylan0` where dummylan0 is the wifi interface to listen
+on. Ensure your Amazon Dash button is connected to the same network.
+
+Here is an example implementation:
+
 ```
-Dashed::Button.new("ff:ff:ff:ff:ff", "dummylan0") do
+Dashed::Button.new("ff:ff:ff:ff:ff", "dummylan0").on_press do
   puts "I was pressed!"
 end
 ```
 
+Please be aware that `on_press` blocks the execution of the current
+thread. If you don't want it to block please create the button in its own
+thread.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at

data/exe/find_dash

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'pcaprub'
+require_relative '../lib/dashed/packet'
+
+interface = ARGV[0]
+
+if interface
+  capture = PCAPRUB::Pcap.open_live(interface, 65535, true, 0)
+  capture.setfilter("arp")
+
+  capture.each_packet do |raw_packet|
+    packet = Dashed::Packet.new(raw_packet)
+    if packet.host_mac_address.start_with? "74:75"
+      puts "Potential Amazon Dash Button #{packet.host_mac_address}"
+    end
+  end
+else
+  puts "You must provide an interface"
+end

data/lib/dashed/button.rb

@@ -17,9 +17,9 @@ module Dashed
     end
 
     def on_press
-      capture.each_packet do |packet|
-        sender_mac = parse_arp_sender_mac(packet)
-        if sender_mac == mac_address && !duplicate_arp?
+      capture.each_packet do |raw_packet|
+        packet = Packet.new(raw_packet)
+        if packet.host_mac_address == mac_address && !duplicate_arp?
           @last_press = Time.now
           yield if block_given?
         end
@@ -38,14 +38,5 @@ module Dashed
     def duplicate_arp?
       last_press && (last_press - Time.now).abs < 45
     end
-
-    def parse_arp_sender_mac(packet)
-      arp = packet.
-        data.
-        unpack("C*").
-        map { |i| i.to_s(16) }.
-        map { |i| if i.length == 1 then "0#{i}" else i end}
-      arp.slice(6, 6).join(":")
-    end
   end
 end

data/lib/dashed/packet.rb

@@ -0,0 +1,19 @@
+module Dashed
+  class Packet
+    attr_reader :raw_packet
+
+    def initialize(raw_packet)
+      @raw_packet = raw_packet
+    end
+
+    def host_mac_address
+      raw_packet.
+        data.
+        unpack("C*").
+        map { |i| i.to_s(16) }.
+        map { |i| if i.length == 1 then "0#{i}" else i end}.
+        slice(6, 6).
+        join(":")
+    end
+  end
+end

data/lib/dashed/version.rb

@@ -1,3 +1,3 @@
 module Dashed
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dashed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Kenyon
@@ -57,7 +57,8 @@ description: Library for interacting with Amazon Dash buttons
 email:
 - kenyonj@gmail.com
 - blake@blakewilliams.me
-executables: []
+executables:
+- find_dash
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,8 +68,10 @@ files:
 - README.md
 - Rakefile
 - dashed.gemspec
+- exe/find_dash
 - lib/dashed.rb
 - lib/dashed/button.rb
+- lib/dashed/packet.rb
 - lib/dashed/version.rb
 homepage: https://github.com/kenyonj/dashed
 licenses: