tamashii-agent 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5de4cba829b0eab020881898175c0dabd45f9a94
-  data.tar.gz: 1700db0dc1f111c39871a195a1fc82919ceef6a7
+  metadata.gz: 5e9ec90a332693cf4e81bc2c7425eca46d8dc7d2
+  data.tar.gz: 970f014149a4cf6f427e8217323414be5f80a744
 SHA512:
-  metadata.gz: d5eb697ea55e98cb2fc0dac672e2e4946bb7ba7388255120cc09e9c6cf116f64877df28fabbb7d1a01310494410d88142395e5b55813eefa6f81f54c6ca7f20b
-  data.tar.gz: 9d8d9ddd661cb0989a082b9dbba74cf5e645102eab9a8b7289ec8296330bcd937508bc8631ad233753f17cfcbc0d33da0bdd41dc67f1dda044362bcb1b9efa54
+  metadata.gz: 4b7035125ae4da75c9bae4cb2cca8b601a1215a57d0da0654195b7611607e11a2577b1e54fcdbe607b914edf29173aa360bb52e5a4e29f140e8cb650de7114a1
+  data.tar.gz: 99a438cc526180f5cf261f2a7f9582733251f9285cd6ed489e94bf388907efa1e409cbba77c1460ee513b1fed008ddf604c8ace5585e9692f8238af95b15c7c4

data/exe/tamashii-agent

@@ -22,12 +22,14 @@ OptionParser.new do |opts|
     File.open(SYSTEM_CONFIG_FILENAME, "w") do |f|
       f.write <<-EOS
 Tamashii::Agent::config do
-  manager_host "localhost"
-  manager_port 3000
+  use_ssl false
+  host "localhost"
+  port 3000
+  entry_point "/tamashii"
   log_file "/var/log/tamashii-agent.log"
-  log_level "info"
+  log_level :INFO
   auth_type :token
-  token "abc123"
+  token "SECRET_TOKEN"
 end
       EOS
     end
@@ -75,7 +77,7 @@ begin
   when :token
     raise LoadError.new("Token authorization require to set token") if config.token.nil?
   end
-  agent = Tamashii::Agent::Master.new(config.manager_host, config.manager_port)
+  agent = Tamashii::Agent::Master.new
 
 
   Signal.trap("TERM") do

data/lib/tamashii/agent/buzzer.rb

@@ -1,14 +1,20 @@
 require 'tamashii/agent/component'
 require 'tamashii/agent/event'
-require 'tamashii/agent/adapter/buzzer'
 
 module Tamashii
   module Agent
     class Buzzer < Component
-      def initialize(master)
+      def initialize(name, master, options = {})
         super
-        @buzzer = Adapter::Buzzer.object
-        logger.debug "Using buzzer instance: #{@buzzer.class}"
+        @buzzer = initialize_device
+      end
+
+      def default_device_name
+        'Dummy'
+      end
+
+      def get_device_class_name(device_name)
+        "Buzzer::#{device_name}"
       end
 
       def process_event(event)
@@ -28,7 +34,7 @@ module Tamashii
 
       def clean_up
         super
-        @buzzer.stop
+        @buzzer.shutdown
       end
     end
   end

data/lib/tamashii/agent/card_reader.rb

@@ -1,10 +1,7 @@
-require 'mfrc522'
 require 'concurrent'
 
 require 'tamashii/agent/component'
 require 'tamashii/agent/event'
-require 'tamashii/agent/adapter/card_reader'
-
 
 module Tamashii
   module Agent
@@ -12,10 +9,17 @@ module Tamashii
 
       ERROR_RESET_TIMER = 5
 
-      def initialize(master)
+      def initialize(name, master, options = {})
         super
-        @reader = Adapter::CardReader.object
-        logger.debug "Using card_reader instance: #{@reader.class}"
+        @reader = initialize_device
+      end
+
+      def default_device_name
+        'Dummy'
+      end
+
+      def get_device_class_name(device_name)
+        "CardReader::#{device_name}"
       end
 
       def reset_error_timer
@@ -49,27 +53,23 @@ module Tamashii
       end
 
       def handle_card
-        # read card
-        return false unless @reader.picc_request(MFRC522::PICC_REQA)
-
-        begin
-          uid, sak = @reader.picc_select
-          process_uid(uid.join("-"))
-          reset_error_timer
-        rescue CommunicationError, UnexpectedDataError => e
-          logger.error "Error when selecting card: #{e.message}"
-          set_error_timer
-        rescue => e
-          logger.error "GemError when selecting card: #{e.message}"
+        uid = @reader.poll_uid
+        case uid
+        when nil
+          return false
+        when :error
           set_error_timer
+          return false
+        else
+          process_uid(uid)
+          reset_error_timer
+          return true
         end
-        @reader.picc_halt
-        true
       end
 
       def process_uid(uid)
         logger.info "New card detected, UID: #{uid}"
-        @master.send_event(Event.new(Event::CARD_DATA, uid))
+        @master.send_event(Event.new(Event::CARD_DATA, uid.join('-')))
       end
 
       # override

data/lib/tamashii/agent/common.rb

@@ -3,6 +3,31 @@ require 'tamashii/agent/common/loggable'
 module Tamashii
   module Agent
     module Common
+
+      def self.load_device_class(device_class_name)
+        full_class_name = 'Tamashii::Agent::Device::' + device_class_name 
+        load_class(full_class_name)
+      end
+
+      def self.load_class(class_name)
+        path = get_class_path(class_name)
+        require path
+        Module.const_get(class_name)
+      end
+
+      def self.get_class_path(class_name)
+        string_underscore(class_name)
+      end
+
+      def self.string_underscore(original)
+        word = original.dup
+        word.gsub!(/::/, '/')
+        word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+        word.tr!("-", "_")
+        word.downcase!
+        word
+      end
     end
   end
 end

data/lib/tamashii/agent/component.rb

@@ -7,8 +7,12 @@ module Tamashii
     class Component
       include Common::Loggable
 
-      def initialize(master)
+      class LoadDeviceError < RuntimeError; end
+
+      def initialize(name, master, options = {})
+        @name = name
         @master = master
+        @options = options
         @event_queue = Queue.new
       end
 
@@ -30,7 +34,7 @@ module Tamashii
       end
 
       def restart_current_component_async
-        @master.send_event(Event.new(Event::RESTART_COMPONENT, self.class))
+        @master.send_event(Event.new(Event::RESTART_COMPONENT, @name))
       end
 
       def process_event(event)
@@ -47,7 +51,7 @@ module Tamashii
       end
       
       def stop
-        logger.info "Stopping component"
+        logger.info "Stopping component #{@name}"
         stop_threads
         clean_up
       end
@@ -73,6 +77,37 @@ module Tamashii
           end
         end
       end
+
+      def initialize_device
+        device_name = @options[:device] || default_device_name
+        logger.info "Using device: #{device_name}"
+        get_device_instance(device_name)
+      rescue => e
+        logger.error "Error when loading device: #{e.message}"
+        e.backtrace.each {|msg| logger.error msg}
+        logger.error "Fallback to default: #{default_device_name}"
+        load_default_device
+      end
+
+      def get_device_instance(device_name)
+        klass = Common.load_device_class(get_device_class_name(device_name))
+        klass.new(self, @options)
+      end
+
+      def load_default_device
+        logger.info "loading default device: #{default_device_name}"
+        get_device_instance(default_device_name)
+      rescue => e
+        raise LoadDeviceError, "Unable to load device: #{e.message}"
+      end
+
+      def default_device_name
+        raise NotImplementedError
+      end
+
+      def get_device_class_name(device_name)
+        raise NotImplementedError
+      end
     end
   end
 end

data/lib/tamashii/agent/config.rb

@@ -5,12 +5,11 @@ module Tamashii
     class Config < Tamashii::Config
       AUTH_TYPES = [:none, :token]
 
+      register :default_components, {networking: {class_name: :Networking, options: {}}}
       register :connection_timeout, 3
 
       register :localtime, "+08:00"
 
-      register :lcd_path, '/dev/i2c-1'
-      register :lcd_address, 0x27
       register :lcd_animation_delay, 1
 
 
@@ -37,6 +36,18 @@ module Tamashii
           Tamashii::Client.config.send(method_name, *args)
         end
       end
+
+      def add_component(name, class_name, options = {},  &block)
+        self.components[name] = {class_name: class_name, options: options, block: block}  
+      end
+
+      def remove_component(name)
+        self.components.delete(name)
+      end
+
+      def components
+        @components ||= self.default_components.clone
+      end
     end
   end
 end

data/lib/tamashii/agent/device/buzzer/base.rb

@@ -0,0 +1,26 @@
+require 'tamashii/agent/common'
+require 'tamashii/agent/device/device_base'
+
+module Tamashii
+  module Agent
+    module Device
+      module Buzzer
+        class Base < DeviceBase
+          include Common::Loggable
+
+          def play_ok
+            raise NotImplementedError, "play_ok"
+          end
+
+          def play_no
+            raise NotImplementedError, "play_no"
+          end
+
+          def play_error
+            raise NotImplementedError, "play_error"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/agent/device/buzzer/dummy.rb

@@ -0,0 +1,32 @@
+require 'tamashii/agent/device/buzzer/base'
+
+module Tamashii
+  module Agent
+    module Device
+      module Buzzer
+        class Dummy < Base
+          def initialize(*args)
+            super
+            logger.debug "Initialized"
+          end
+
+          def play_ok
+            logger.debug "Played: OK"
+          end
+
+          def play_no
+            logger.debug "Played: No"
+          end
+
+          def play_error
+            logger.debug "Played: Error"
+          end
+
+          def shutdown
+            logger.debug "Stopped"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/agent/device/buzzer/gpio_buzzer.rb

@@ -0,0 +1,89 @@
+require 'pi_piper'
+require 'tamashii/agent/device/buzzer/base'
+
+module Tamashii
+  module Agent
+    module Device
+      module Buzzer
+        class GpioBuzzer < Base
+
+          DEFAULT_PIN = 18
+          SHORT_PLAY_TIME = 0.2
+          LONG_PLAY_TIME = 0.5
+          REPEAT_INTERVAL = 0.1
+          LOW_FREQ = 0.7
+
+          def initialize(*args)
+            super
+            setup_pwm
+          end
+
+          def shutdown
+            stop
+          end
+
+          def play_ok
+            play_repeat_short(1)
+          end
+
+          def play_no
+            play_repeat_short(3)
+          end
+
+          def play_error
+            play_repeat_long(3)
+          end
+
+          private
+
+          def stop
+            @pwm.off
+          end
+
+          def setup_pwm
+            unless pin = @options[:pin]
+              logger.warn "No GPIO pin given. Using default: #{DEFAULT_PIN}"
+              pin = DEFAULT_PIN
+            end
+            @pwm = PiPiper::Pwm.new pin: pin #, mode: :markspace
+            @pwm.off
+            @pwm.value = 1.0
+          end
+
+          def play(value = 1.0)
+            @pwm.value = value
+            @pwm.on
+          end
+
+          def play_short(value = 1.0)
+            play_time(SHORT_PLAY_TIME,value)
+          end
+
+          def play_long(value = 1.0)
+            play_time(LONG_PLAY_TIME,value)
+          end
+
+          def play_time(time, value = 1.0)
+            play(value)
+            sleep time
+            stop
+          end
+
+          def play_repeat_short(repeat, repeat_interval = REPEAT_INTERVAL)
+            repeat.times do
+              play_short
+              sleep repeat_interval
+            end
+          end
+
+          def play_repeat_long(repeat, repeat_interval = REPEAT_INTERVAL)
+            repeat.times do
+              play_long
+              sleep repeat_interval
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/agent/device/card_reader/base.rb

@@ -0,0 +1,16 @@
+require 'tamashii/agent/device/device_base'
+
+module Tamashii
+  module Agent
+    module Device
+      module CardReader
+        class Base < DeviceBase
+          def poll_uid
+            raise NotImplementedError, "poll_uid"
+          end
+        end
+      end
+    end
+  end
+end
+