tamashii-agent 0.3.0 → 0.3.1

data/lib/tamashii/agent/master.rb

@@ -1,5 +1,5 @@
 require 'tamashii/agent/common'
-require 'tamashii/agent/connection'
+require 'tamashii/agent/networking'
 require 'tamashii/agent/lcd'
 require 'tamashii/agent/buzzer'
 require 'tamashii/agent/card_reader'
@@ -12,13 +12,10 @@ module Tamashii
     class Master < Component
 
       attr_reader :serial_number
-      attr_reader :host, :port
 
-      def initialize(host, port)
-        super(self)
+      def initialize
+        super(:master, self)
         logger.info "Starting Tamashii::Agent #{Tamashii::Agent::VERSION} in #{Config.env} mode"
-        @host = host
-        @port = port
         @serial_number = get_serial_number
         logger.info "Serial number: #{@serial_number}"
         create_components
@@ -43,30 +40,30 @@ module Tamashii
 
       def create_components
         @components = {}
-        create_component(Connection, self)
-        create_component(Buzzer, self)
-        create_component(LCD, self)
-        create_component(CardReader, self)
+        Config.components.each do |name, params|
+          create_component(name, params) 
+        end
       end
 
-      def create_component(class_name, *args)
-        c = class_name.new(*args)
-        logger.info "Starting component: #{class_name}"
+      def create_component(name, params)
+        klass = Agent.const_get(params[:class_name])
+        logger.info "Starting component #{name}:#{klass}"
+        c = klass.new(name, self, params[:options])
+        c.instance_eval(&params[:block]) if params[:block] 
         yield c if block_given?
         c.run
-        @components[class_name] = c
-        
-        c
+        @components[name] = c
       end
 
-      def restart_component(class_name)
-        if old_component = @components[class_name]
-          logger.info "Stopping component: #{class_name}"
+      def restart_component(name)
+        if old_component = @components[name]
+          params = Config.components[name]
+          logger.info "Stopping component: #{name}"
           old_component.stop # TODO: set timeout for stopping?
-          logger.info "Restarting component: #{class_name}"
-          create_component(class_name, self)
+          logger.info "Restarting component: #{name}"
+          create_component(name, params)
         else
-          logger.error "Rstart component failed: unknown component #{name}"
+          logger.error "Restart component failed: unknown component #{name}"
         end
       end
 
@@ -129,6 +126,7 @@ module Tamashii
         @components.each_value do |c|
           c.stop
         end
+        logger.info "Master stopped"
       end
 
 

data/lib/tamashii/agent/{connection.rb → networking.rb}

@@ -14,9 +14,9 @@ require 'tamashii/client'
 
 module Tamashii
   module Agent
-    class Connection < Component
+    class Networking < Component
 
-      autoload :RequestObserver, 'tamashii/agent/connection/request_observer'
+      autoload :RequestObserver, 'tamashii/agent/networking/request_observer'
 
       class RequestTimeoutError < RuntimeError; end
 
@@ -43,7 +43,7 @@ module Tamashii
       attr_reader :url
       attr_reader :master
 
-      def initialize(master)
+      def initialize(name, master, options = {})
         super
 
         self.reset
@@ -59,13 +59,13 @@ module Tamashii
       end
 
       def setup_resolver
-        env_data = {connection: self}
+        env_data = {networking: self, master: @master}
         Resolver.config do
           [Type::REBOOT, Type::POWEROFF, Type::RESTART, Type::UPDATE].each do |type|
             handle type,  Handler::System, env_data
           end
           [Type::LCD_MESSAGE, Type::LCD_SET_IDLE_TEXT].each do |type|
-            handle type,  Handler::LCD, env_data
+            handle type,  Handler::Lcd, env_data
           end
           handle Type::BUZZER_SOUND,  Handler::Buzzer, env_data
           handle Type::RFID_RESPONSE_JSON,  Handler::RemoteResponse, env_data
@@ -101,7 +101,6 @@ module Tamashii
         @client.close
       end
 
-
       def send_auth_request
         # TODO: other types of auth
         if @client.transmit(Packet.new(Type::AUTH_TOKEN, 0, [Type::CLIENT[:agent], @master.serial_number,Config.token].join(",")).dump)

data/lib/tamashii/agent/{connection → networking}/request_observer.rb

@@ -2,12 +2,12 @@ require 'tamashii/common'
 
 module Tamashii
   module Agent
-    class Connection
+    class Networking
       class RequestObserver
 
         include Common::Loggable
-        def initialize(connection, id, ev_type, ev_body, future)
-          @connection = connection
+        def initialize(networking, id, ev_type, ev_body, future)
+          @networking = networking
           @id = id
           @ev_type = ev_type
           @ev_body = ev_body
@@ -21,13 +21,13 @@ module Tamashii
             case res_ev_type
             when Type::RFID_RESPONSE_JSON
               logger.debug "Handled: #{res_ev_type}: #{res_ev_body}"
-              @connection.handle_card_result(JSON.parse(res_ev_body))
+              @networking.handle_card_result(JSON.parse(res_ev_body))
             else
               logger.warn "Unhandled packet result: #{res_ev_type}: #{res_ev_body}"
             end
           else
             logger.error "#{@id} Failed with #{reason}"
-            @connection.on_request_timeout(@ev_type, @ev_body)
+            @networking.on_request_timeout(@ev_type, @ev_body)
           end
         end
       end

data/lib/tamashii/agent/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Agent
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/tamashii-agent.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{The agent module for RubyConfTW checkin system.}
   spec.description   = %q{The agent module for RubyConfTW checkin system.}
-  spec.homepage      = "https://github.com/5xruby/tamashii-agent"
+  spec.homepage      = "https://github.com/tamashii-io/tamashii-agent"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -40,11 +40,12 @@ Gem::Specification.new do |spec|
 
 
   spec.add_runtime_dependency "tamashii-common", ">=0.1.6"
-  spec.add_runtime_dependency "tamashii-client"
+  spec.add_runtime_dependency "tamashii-client", ">=0.1.2"
   spec.add_runtime_dependency "websocket-driver"
   spec.add_runtime_dependency "nio4r"
   spec.add_runtime_dependency "pi_piper"
-  spec.add_runtime_dependency "tamashii-mfrc522"
+  spec.add_runtime_dependency "tamashii-mfrc522", ">=1.0.8"
+  spec.add_runtime_dependency "tamashii-nfc"
   spec.add_runtime_dependency "i2c"
   spec.add_runtime_dependency "aasm"
   spec.add_runtime_dependency "concurrent-ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-agent
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,14 +144,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +196,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tamashii-mfrc522
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+- !ruby/object:Gem::Dependency
+  name: tamashii-nfc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -272,23 +286,23 @@ files:
 - bin/setup
 - exe/tamashii-agent
 - lib/tamashii/agent.rb
-- lib/tamashii/agent/adapter/base.rb
-- lib/tamashii/agent/adapter/buzzer.rb
-- lib/tamashii/agent/adapter/card_reader.rb
-- lib/tamashii/agent/adapter/lcd.rb
 - lib/tamashii/agent/buzzer.rb
 - lib/tamashii/agent/card_reader.rb
 - lib/tamashii/agent/common.rb
 - lib/tamashii/agent/common/loggable.rb
 - lib/tamashii/agent/component.rb
 - lib/tamashii/agent/config.rb
-- lib/tamashii/agent/connection.rb
-- lib/tamashii/agent/connection/request_observer.rb
-- lib/tamashii/agent/device/fake_buzzer.rb
-- lib/tamashii/agent/device/fake_card_reader.rb
-- lib/tamashii/agent/device/fake_lcd.rb
-- lib/tamashii/agent/device/lcd.rb
-- lib/tamashii/agent/device/pi_buzzer.rb
+- lib/tamashii/agent/device/buzzer/base.rb
+- lib/tamashii/agent/device/buzzer/dummy.rb
+- lib/tamashii/agent/device/buzzer/gpio_buzzer.rb
+- lib/tamashii/agent/device/card_reader/base.rb
+- lib/tamashii/agent/device/card_reader/dummy.rb
+- lib/tamashii/agent/device/card_reader/mfrc522_spi.rb
+- lib/tamashii/agent/device/card_reader/pn532_uart.rb
+- lib/tamashii/agent/device/device_base.rb
+- lib/tamashii/agent/device/lcd/base.rb
+- lib/tamashii/agent/device/lcd/dummy.rb
+- lib/tamashii/agent/device/lcd/lcm1602_i2c.rb
 - lib/tamashii/agent/event.rb
 - lib/tamashii/agent/handler.rb
 - lib/tamashii/agent/handler/base.rb
@@ -298,9 +312,11 @@ files:
 - lib/tamashii/agent/handler/system.rb
 - lib/tamashii/agent/lcd.rb
 - lib/tamashii/agent/master.rb
+- lib/tamashii/agent/networking.rb
+- lib/tamashii/agent/networking/request_observer.rb
 - lib/tamashii/agent/version.rb
 - tamashii-agent.gemspec
-homepage: https://github.com/5xruby/tamashii-agent
+homepage: https://github.com/tamashii-io/tamashii-agent
 licenses: []
 metadata: {}
 post_install_message: 

data/lib/tamashii/agent/adapter/base.rb

@@ -1,28 +0,0 @@
-require 'tamashii/common'
-require 'tamashii/agent/config'
-
-module Tamashii
-  module Agent
-    module Adapter
-      class Base
-        class << self
-          def object(*args, &block)
-            current_class.new(*args, &block)
-          end
-
-          def current_class
-            Config.env == "test" ? fake_class : real_class 
-          end
-
-          def real_class
-            raise NotImplementedError
-          end
-
-          def fake_class
-            raise NotImplementedError
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tamashii/agent/adapter/buzzer.rb

@@ -1,21 +0,0 @@
-require 'tamashii/agent/adapter/base'
-require 'tamashii/agent/device/pi_buzzer'
-require 'tamashii/agent/device/fake_buzzer'
-
-module Tamashii
-  module Agent
-    module Adapter
-      class Buzzer < Base
-        class << self
-          def real_class
-            Device::PIBuzzer
-          end
-
-          def fake_class
-            Device::FakeBuzzer
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tamashii/agent/adapter/card_reader.rb

@@ -1,20 +0,0 @@
-require 'tamashii/agent/adapter/base'
-require 'tamashii/agent/device/fake_card_reader'
-
-module Tamashii
-  module Agent
-    module Adapter
-      class CardReader < Base
-        class << self
-          def real_class
-            MFRC522
-          end
-
-          def fake_class
-            Device::FakeCardReader
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tamashii/agent/adapter/lcd.rb

@@ -1,22 +0,0 @@
-require 'tamashii/agent/adapter/base'
-require 'tamashii/agent/device/lcd'
-require 'tamashii/agent/device/fake_lcd'
-
-module Tamashii
-  module Agent
-    module Adapter
-      # :nodoc:
-      class LCD < Base
-        class << self
-          def real_class
-            Device::LCD
-          end
-
-          def fake_class
-            Device::FakeLCD
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tamashii/agent/device/fake_buzzer.rb

@@ -1,30 +0,0 @@
-require 'tamashii/agent/common'
-module Tamashii
-  module Agent
-    module Device
-      class FakeBuzzer
-        include Common::Loggable
-
-        def initialize
-          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 stop
-          logger.debug "Stopped"
-        end
-      end
-    end
-  end
-end

data/lib/tamashii/agent/device/fake_card_reader.rb

@@ -1,40 +0,0 @@
-require 'tamashii/agent/common'
-module Tamashii
-  module Agent
-    module Device
-      class FakeCardReader
-        include Common::Loggable
-
-        def initialize(*args)
-          logger.debug "Initialized"
-          @last_time = Time.now
-        end
-
-        def picc_request(*args)
-          if Time.now - @last_time > 2
-            @last_time = Time.now
-            if rand > 0.5
-              logger.debug "Fake Card Generated"
-              return true
-            else
-              return false
-            end
-          else
-            return false
-          end
-        end
-
-        def picc_select(*args)
-          [Array.new(4){ rand(256)}, "sak"]
-        end
-
-        def picc_halt(*args)
-        end
-
-        def shutdown(*args)
-        end
-      end
-    end
-  end
-end
-