walkon 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e98fa4a3f793072e126e54bb7885cc9ad4a11509
-  data.tar.gz: a613f716836c62e95d919db026bd3101395ffe62
+  metadata.gz: 3dd89fe98df5e1a8190fb561b248585b550b5b64
+  data.tar.gz: aaaca1c64f5c8f14e32cbe42e6d482cfe567d462
 SHA512:
-  metadata.gz: 94c888a21f894d3ec03066389834954bd53dc9da3bcff4b280e7d192b78a707a5a0066bbeb8d08adce83bd7305c4dfdb0b327c2a0c7fab3c121886767c1c00c5
-  data.tar.gz: 5b840b4c8e37048f83b8589ce8fc8d746737d182df1f05a6f866276bfba8a85dfdf446b8485359d35eece2b803eea504bda23009ad3ad4bd2e610ff76caa9bf5
+  metadata.gz: 30cc38a8b631df17479412c7ee84bd0c633bc14a9d855b70f8f0c6f806508f364375f74a7b3864aae9f8516b1f6d89319df1864355c26b0541d21b7fde4ab97a
+  data.tar.gz: e8d491fc4c29125883e785b532b0a6fa9f611e161be14af43d07e4195a08405ed5ef28674da45988fd90299052bcd0b4746157d855e1cffb17061e4bed1286ec

data/lib/walkon/daemon.rb

@@ -25,22 +25,17 @@ module Walkon
       loop { check_for_devices }
     end
 
+    private
     def check_for_devices
-      scanned_devices.each do |mac_address|
-        unless self.devices.include? mac_address
-          device = Device.new mac_address
-          play_entrance_music_for device
-          self.devices << Device.new(mac_address)
-        end
-      end
+      @devices = scanned_device_ess_ids.reject { |ess_id|
+        devices.include? ess_id
+      }.map { |ess_id|
+        Device.play! ess_id
+      }
     end
 
-    def scanned_devices
+    def scanned_device_ess_ids
       HciTool.scan
     end
-
-    def play_entrance_music_for device
-      device.entrance_music.play if device.has_entrance_music?
-    end
   end
 end

data/lib/walkon/device.rb

@@ -1,14 +1,26 @@
 require 'walkon/entrance_music'
 
-# Represents a single Bluetooth device in the building.
+# Represents a single Bluetooth device in the building. When HciTool
+# detects the device on the network, it plays the entrance music.
 
 module Walkon
   class Device
-    attr_reader :mac_address, :entrance_music
+    attr_reader :ess_id, :entrance_music
 
-    def initialize with_mac_address
-      @mac_address = with_mac_address
-      @entrance_music = EntranceMusic.new self
+    def initialize from_ess_id
+      @ess_id = from_ess_id
+      @entrance_music = EntranceMusic.new from_ess_id
+    end
+
+    def self.play! for_ess_id
+      device = new for_ess_id
+      device.play
+      device
+    end
+
+    def play
+      return unless has_entrance_music?
+      entrance_music.play
     end
 
     def has_entrance_music?

data/lib/walkon/entrance_music.rb

@@ -1,14 +1,11 @@
-require 'walkon/device'
-
 # Finds and plays the entrance music for a given device.
 
 module Walkon
   class EntranceMusic
-    attr_reader :device, :filename
+    attr_reader :filename
 
-    def initialize from_device
-      @device = from_device
-      @filename = "#{prefix}/#{@device.mac_address}.mp3"
+    def initialize with_file_name
+      @filename = "#{prefix}/#{with_file_name}.mp3"
     end
 
     def exists?
@@ -18,11 +15,13 @@ module Walkon
     alias present? exists?
 
     def play
-      return false unless exists?
-      `xmms #{filename}`
+      present? and play_track
+    end
+
+    def play_track
+      `xmms #{filename}` == ''
     end
 
-    private
     def prefix
       if Walkon.env == 'test'
         File.expand_path "../../../spec/fixtures/music", __FILE__

data/lib/walkon/hci_tool.rb

@@ -13,17 +13,23 @@ module Walkon
     end
 
     def scan
-      @results = scan_results.reduce([]) do |collection, line|
-        line.scan FOR_MAC_ADDRESS do |mac_address|
-          collection << mac_address.first
+      @results += scan_results_ess_ids
+      @results = @results.uniq
+      @results
+    end
+
+    private
+    def scan_results_ess_ids
+      each_line = /\A(..:..:..:..:..:..)\s(.*)\Z/
+      scan_results.reduce([]) do |collection, line|
+        line.scan each_line do |(mac_addr,ess_id)|
+          collection << ess_id.strip
         end
 
         collection
       end
     end
 
-    private
-    FOR_MAC_ADDRESS = /(..:..:..:..:..:..)/
     def scan_results
       `hcitool scan`.split "\n"
     end

data/lib/walkon/version.rb

@@ -1,3 +1,3 @@
 module Walkon
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/walkon/daemon_spec.rb

@@ -3,22 +3,28 @@ require 'walkon/daemon'
 
 module Walkon
   describe Daemon do
-    context "when a new device is detected" do
-      let(:mac_address) { "00:A1:5D:AB:B2:E9" }
+    it "runs the loop" do
+      expect(subject).to respond_to(:run)
+    end
 
+    it "starts from the command line" do
+      expect(subject.class).to respond_to(:start)
+    end
+
+    context "when a new device is detected" do
       before do
-        subject.stub(:scanned_devices) { [mac_address] }
-        subject.stub(:play_entrance_music_for) { |device| true }
-        subject.check_for_devices
+        allow(HciTool).to receive(:scan).and_return ['iPhone5']
+        allow(Device).to receive(:play!).and_return Device.new('iPhone5')
+        subject.send :check_for_devices
       end
 
-      it "adds the sample mac address to devices" do
-        expect(subject.devices.map(&:mac_address)).to include(mac_address)
+      it "adds the sample ess id to devices" do
+        expect(subject.devices.map(&:ess_id)).to include('iPhone5')
       end
 
       it "plays device's entrance music" do
         expect(subject.devices).to_not be_empty
-        device = subject.devices.select { |dev| dev.mac_address == mac_address }.first
+        device = subject.devices.first
         expect(device).to_not be_nil
         expect(device).to have_entrance_music
       end

data/spec/walkon/device_spec.rb

@@ -3,14 +3,25 @@ require 'walkon/device'
 
 module Walkon
   describe Device do
-    subject { Device.new '00:A1:5D:AB:B2:E9' }
+    subject { Device.new 'iPhone5' }
 
-    it "requires a mac address for identification" do
-      expect(subject.mac_address).to_not be_nil
+    it "requires a ess id for identification" do
+      expect(subject.ess_id).to_not be_nil
+      expect(subject.ess_id).to eq('iPhone5')
     end
 
-    it "uses mac address to find entrance music in configured dir" do
+    it "uses ess id to find entrance music in configured dir" do
       expect(subject).to have_entrance_music
     end
+
+    it "delegates to the entrance music to play" do
+      allow(subject.entrance_music).to receive(:play_track).and_return true
+      expect(subject.play).to eq(true)
+    end
+
+    it "does not play when no entrance music" do
+      allow(subject).to receive(:has_entrance_music?).and_return false
+      expect(subject.play).to_not eq(true)
+    end
   end
 end

data/spec/walkon/entrance_music_spec.rb

@@ -3,24 +3,43 @@ require 'walkon/entrance_music'
 
 module Walkon
   describe EntranceMusic do
-    let(:mac_address) { "00:A1:5D:AB:B2:E9" }
-    let(:device) do
-      dev = double :device
-      dev.stub(:mac_address) { mac_address }
-      dev
-    end
-    subject { EntranceMusic.new device }
+    subject { EntranceMusic.new 'iPhone5' }
 
-    before do
-      subject.stub(:play) { "" }
-    end
+    context "when the mp3 file is found" do
+      before do
+        allow(File).to receive(:exists?).with(subject.filename).and_return true
+      end
+
+      it "is considered to be present" do
+        expect(subject).to be_present
+      end
+
+      it "is considered to be existant" do
+        expect(subject).to be_exists
+      end
 
-    it "finds an mp3 file to play" do
-      expect(subject).to be_present
+      it "runs an xmms command to play the track" do
+        allow(subject).to receive(:play_track).and_return true
+        expect(subject.play).to eq(true)
+      end
     end
 
-    it "plays the mp3 file if found" do
-      expect(subject.play).to be_true
+    context "when the mp3 file is not found" do
+      before do
+        allow(File).to receive(:exists?).with(subject.filename).and_return false
+      end
+
+      it "is considered not present" do
+        expect(subject).to_not be_present
+      end
+
+      it "is considered non-existant" do
+        expect(subject).to_not be_exists
+      end
+
+      it "will not run the xmms command to play track" do
+        expect(subject.play).to eq(false)
+      end
     end
   end
 end

data/spec/walkon/hci_tool_spec.rb

@@ -2,25 +2,24 @@ require 'spec_helper'
 
 module Walkon
   describe HciTool do
-    let(:mac_address) { "00:A1:5D:AB:B2:E9" }
-    let(:sample_output) do
-      %(
-        Scanning....
-           #{mac_address}  Nokia 6600
-       ).split("\n")
+    let :results do
+      [
+        'Scanning...',
+        '00:A1:5D:AB:B2:E9 iPhone5'
+      ]
     end
 
     before do
-      subject.stub(:scan_results) { sample_output }
+      allow(subject).to receive(:scan_results).and_return results
     end
 
     it "starts with no results" do
       expect(subject.results).to be_empty
     end
 
-    it "finds mac addresses with a scan" do
+    it "finds ess ids with a scan" do
       expect(subject.scan).to_not be_empty
-      expect(subject.results.first).to eq(mac_address)
+      expect(subject.results.first).to eq('iPhone5')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: walkon
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ files:
 - lib/walkon/hci_tool.rb
 - lib/walkon/version.rb
 - lib/walkon.rb
-- spec/fixtures/music/00:A1:5D:AB:B2:E9.mp3
+- spec/fixtures/music/iPhone5.mp3
 - spec/spec_helper.rb
 - spec/walkon/daemon_spec.rb
 - spec/walkon/device_spec.rb
@@ -115,7 +115,7 @@ signing_key:
 specification_version: 4
 summary: Play your entrance music
 test_files:
-- spec/fixtures/music/00:A1:5D:AB:B2:E9.mp3
+- spec/fixtures/music/iPhone5.mp3
 - spec/spec_helper.rb
 - spec/walkon/daemon_spec.rb
 - spec/walkon/device_spec.rb