airport_events 0.0.2 → 0.1.0

data/README.md

@@ -41,11 +41,11 @@ require 'airport_events'
 # Create a new Watcher instance and set up some event listeners.
 watcher = AirportEvents::Watcher.new
 
-watcher.bind :connected do |ssid, date|
+watcher.on :connected do |ssid, date|
   puts "Connected to #{ssid} on #{date}"
 end
 
-watcher.bind :disconnected do |date|
+watcher.on :disconnected do |date|
   puts "Disconnected on #{date}"
 end
 

data/Versionfile

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby
+
+automate_git
+
+read_version do
+  contents = File.read File.join(Dir.pwd, "lib/airport_events/version.rb")
+  instance_eval(contents)
+  AirportEvents::VERSION
+end
+
+write_version do |currentVersion, nextVersion|
+  contents = File.read File.join(Dir.pwd, "lib/airport_events/version.rb")
+  contents = contents.sub(currentVersion.to_s, nextVersion.to_s)
+
+  File.open(File.join(Dir.pwd, "lib/airport_events/version.rb"), 'w') do |file| 
+    file.write contents
+  end
+end
+
+# after :version do |currentVersion|
+#   system("gem build airport_events.gemspec")
+# end

data/lib/airport_events.rb

@@ -1,14 +1,14 @@
-require_relative 'airport_events/event_dispatcher'
+require_relative 'airport_events/publisher'
 require_relative 'airport_events/airport'
 require_relative 'airport_events/kernel_log_parser'
 require_relative 'airport_events/logger'
 
 module AirportEvents
   class Watcher
-    include EventDispatcher
+    include Publisher
 
     def start
-      Airport.ensure_airport_command
+      Airport.ensure_airport_command!
 
       if Airport.connected?
         connected DateTime.now
@@ -18,23 +18,27 @@ module AirportEvents
 
       @kernel_log_parser = KernelLogParser.new
 
-      @kernel_log_parser.bind :connected do |date|
+      @kernel_log_parser.subscribe :connected do |date|
         connected date
       end
 
-      @kernel_log_parser.bind :disconnected do |date|
+      @kernel_log_parser.subscribe :disconnected do |date|
         disconnected date
       end
     end
 
+    def on event, &blk
+      subscribe event, &blk
+    end
+
     private 
 
     def connected date
-      trigger :connected, Airport.ssid, date
+      publish :connected, Airport.ssid, date
     end
 
     def disconnected date
-      trigger :disconnected, date
+      publish :disconnected, date
     end
 
   end

data/lib/airport_events/airport.rb

@@ -2,7 +2,7 @@ module AirportEvents
   class Airport
     INFO_COMMAND = "airport -I 2>&1"
 
-    def self.ensure_airport_command
+    def self.ensure_airport_command!
       run_info_command
       unless $?.exitstatus == 0
         raise "Fatal: the 'airport' command is not in PATH. Run 'airport-log enable_airport' for instructions."

data/lib/airport_events/kernel_log_parser.rb

@@ -3,7 +3,7 @@ require 'date'
 
 module AirportEvents
   class KernelLogParser
-    include EventDispatcher
+    include Publisher
 
     def initialize
       Thread.new do
@@ -14,7 +14,7 @@ module AirportEvents
           log.tail do |line| 
 
             if event = match_event(line)
-              trigger event, DateTime.strptime(line[0..15], '%b %d %H:%M:%S')
+              publish event, DateTime.strptime(line[0..15], '%b %d %H:%M:%S')
             end
           end
         end

data/lib/airport_events/logger.rb

@@ -12,11 +12,11 @@ module AirportEvents
 
       watcher = AirportEvents::Watcher.new
       
-      watcher.bind :connected do |ssid, date|
+      watcher.on :connected do |ssid, date|
         connected ssid, date
       end
 
-      watcher.bind :disconnected do |date|
+      watcher.on :disconnected do |date|
         disconnected date
       end
 

data/lib/airport_events/publisher.rb

@@ -0,0 +1,31 @@
+module AirportEvents
+  module Publisher
+
+    module InstanceMethods
+      def subscribe(event, &blk)
+        if subscribers[event].nil?
+          subscribers[event] = Array.new
+        end
+
+        subscribers[event].push blk
+      end
+
+      def publish(event, *args)
+        unless subscribers[event].nil?
+          subscribers[event].each do |blk|
+            blk.call *args
+          end
+        end
+      end
+
+      def subscribers
+        @subscribers ||= Hash.new
+      end
+    end
+
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+
+  end
+end

data/lib/airport_events/version.rb

@@ -1,3 +1,3 @@
 module AirportEvents
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/spec/airport_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe AirportEvents::Publisher do
+
+  it 'should throw and exception when the airport command is not in path' do
+
+    expect {
+      $?.exitstatus = 1
+      ::AirportEvents::Airport.ensure_airport_command!
+    }.to raise_error
+
+  end
+
+end

data/spec/publisher_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+describe AirportEvents::Publisher do
+
+  class Dog
+    include AirportEvents::Publisher
+  end
+
+  before(:each) do
+    @dog = Dog.new
+  end
+
+  it "should accept listeners" do
+    @dog.subscribe :bark do |dBm| end
+    @dog.subscribe :wag do |freq| end
+
+    expect(
+      [ @dog.subscribers[:bark], 
+        @dog.subscribers[:wag]   ].collect{|subscriber| subscriber != nil}.length 
+    ).to eq(2)
+
+  end
+
+end

metadata

@@ -1,119 +1,123 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: airport_events
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.1.0
 platform: ruby
-authors:
+authors: 
 - Jonathan Pettersson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 2.13.0
-- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.17.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 0.17.0
-- !ruby/object:Gem::Dependency
-  name: file-tail
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.12
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: file-tail
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 1.0.12
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Detect and log changes in WiFi network associations on MacOS. Utilizing
-  the official, but hidden 'airport' command.
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+description: Detect and log changes in WiFi network associations on MacOS. Utilizing the official, but hidden 'airport' command.
 email: jonathan@spacetofu.com
-executables:
+executables: 
 - airport-log
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
 - README.md
 - Rakefile
+- Versionfile
 - airport_events.gemspec
 - bin/airport-log
 - lib/airport_events.rb
 - lib/airport_events/airport.rb
-- lib/airport_events/event_dispatcher.rb
 - lib/airport_events/kernel_log_parser.rb
 - lib/airport_events/logger.rb
+- lib/airport_events/publisher.rb
 - lib/airport_events/version.rb
+- spec/airport_spec.rb
 - spec/fixtures/airport.sample.txt
 - spec/fixtures/kernel.log.sample
+- spec/kernel_log_parser_spec.rb
+- spec/logger_spec.rb
+- spec/publisher_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jpettersson/airport_events
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A MacOS specific library to receive WiFi related events
-test_files:
+test_files: 
+- spec/airport_spec.rb
 - spec/fixtures/airport.sample.txt
 - spec/fixtures/kernel.log.sample
+- spec/kernel_log_parser_spec.rb
+- spec/logger_spec.rb
+- spec/publisher_spec.rb
 - spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 47d41f6753ff18dd14d43e0fde4d204b792c5138
-  data.tar.gz: edd71ac189400ea7cd79bf1aa4318845d960bc74
-SHA512:
-  metadata.gz: 0de2ac852c75c2b4240c27c45c5fe3510afc4f8ca8ea6298b410bf0bea3da5b2d3bd1fc1e2b74f669ba197a7fd0df27f95c7ffda497ca1ce9b34f44d25706179
-  data.tar.gz: e6e7f6e5831f3408b197fb43d7e20af41256ffb0aa76e764597d4f7a4ebd87b7094fe975640d57410fefd88343825272064c18bdab7d81f6f580b61587ace2fb

data/lib/airport_events/event_dispatcher.rb

@@ -1,36 +0,0 @@
-module AirportEvents
-  module EventDispatcher
-
-    module InstanceMethods
-      def bind(event, &blk)
-        if observers[event].nil?
-          observers[event] = Array.new
-        end
-
-        observers[event].push blk
-      end
-
-      # TODO: unbind
-      #def unbind
-      #
-      #end
-
-      def trigger(event, *args)
-        unless observers[event].nil?
-          observers[event].each do |blk|
-            blk.call *args
-          end
-        end
-      end
-
-      def observers
-        @observers ||= Hash.new
-      end
-    end
-
-    def self.included(base)
-      base.send :include, InstanceMethods
-    end
-
-  end
-end