fancybox2 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f1b63c49186562a7754d3a1674d201202f8cfa2fa83b009d148b8036514a41
-  data.tar.gz: d91b6945428ab9b366ecd29dcf4f56eced667f129592cf48b39888bd114b360f
+  metadata.gz: 7d6fec49dcd588ebb60bc82f555240121134b3fcfc40747b63513795f50adf96
+  data.tar.gz: 5d683438d83ad32f12db66ab811da55864e3c0f801f6fb0eb7620d5bb35432a8
 SHA512:
-  metadata.gz: 6f03ac7a8f28b7dc5ce77ce4e77e71f623a94a5ccfa30bb472d4408e8c0cb5d07334166864474c514f4f72f74f9010b8aa7a1b0f785a87e93845af986f6113d5
-  data.tar.gz: e5df22e0bc8a716cc16cbfe0d0c696560ead8923b9bb9b41b431284e11574fe389ce9980e54943cc8dc314266c9761c010a626945206f7c5368214a88241a0e0
+  metadata.gz: 22dcbb5bc7e731cc338ade1afe6023b706230526abeafef56655fe863f0e3314a622c8bab91eb3a2b788219026acb8151651be6deed4f4a616dfde5780338def
+  data.tar.gz: 49e4e79a91a552d4cb130c7c8cce4e037d6cf7c3314d38abaffc75167d3c1fac83fb0384ae850860df11c87de46e5caf278a0442df1e9f2e939b4cbfc1e71f19

data/lib/fancybox2/logger/mqtt_log_device.rb

@@ -13,10 +13,13 @@ module Fancybox2
         unless @client.respond_to?(:publish)
           raise ArgumentError, "provided client does not respond to 'publish'"
         end
+        unless @client.respond_to?(:connected?)
+          raise ArgumentError, "provided client does not respond to 'connected?'"
+        end
       end
 
       def write(message)
-        if @client.connected?
+        if @client && @client.connected?
           @client.publish @topic, message
         end
       end

data/lib/fancybox2/migrations/base.rb

@@ -0,0 +1,24 @@
+module Fancybox2
+  module Migrations
+    class Base
+
+      class << self
+        def self.descendants
+          ObjectSpace.each_object(Class).select { |klass| klass < self }
+        end
+      end
+
+      attr_reader :name, :version
+
+      def initialize(name)
+        @name = name
+
+        @version = Runner.extract_and_validate_version_from name
+      end
+
+      def call(up_or_down = :up)
+        send up_or_down
+      end
+    end
+  end
+end

data/lib/fancybox2/migrations/exceptions.rb

@@ -0,0 +1,13 @@
+module Fancybox2
+  module Migrations
+    module Exceptions
+
+      class FileNameError < StandardError
+        def initialize(message = nil)
+          message = message || 'One of the provided migrations file has an invalid name'
+          super(message)
+        end
+      end
+    end
+  end
+end

data/lib/fancybox2/migrations/runner.rb

@@ -0,0 +1,78 @@
+module Fancybox2
+  module Migrations
+    class Runner
+      include Exceptions
+
+      VERSION_REGEXP = /^(\d+)/.freeze
+
+      class << self
+
+        def extract_and_validate_version_from(migration_name)
+          version = migration_name.to_s.scan(VERSION_REGEXP).flatten.first
+          unless version
+            raise ArgumentError, 'migration name must start with an integer number e.g: 02_do_something.rb'
+          end
+
+          version.to_i
+        end
+      end
+
+      attr_reader :files_path, :current_version, :migrations
+
+      def initialize(files_path)
+        @files_path = files_path
+
+        load_migrations
+      end
+
+      # @param from a valid migration name or version
+      # @param to a valid migration name or version
+      def run(from: nil, to: nil)
+        # Extract and validate versions
+        from = self.class.extract_and_validate_version_from from
+        to = self.class.extract_and_validate_version_from to
+        # Select migrations to run
+        to_run, direction = migrations_to_run from, to
+        to_run.each do |migration|
+          migration.send direction
+        end
+      end
+
+      def load_migrations
+        # Load files from files_path and create classes
+        @migrations = Dir[File.join(File.expand_path(files_path), '**', '*.rb')].map do |file_path|
+          migration_name = File.basename(file_path)
+          klass = Class.new(Base)
+          klass.class_eval(File.read(file_path), file_path)
+          klass.freeze
+          klass.new migration_name
+        end.sort_by { |migration| migration.version }
+      end
+
+      # Select migrations to run depending given a starting and an ending one
+      def migrations_to_run(from, to)
+        selected = []
+        direction = from <= to ? :up : :down
+        @migrations.each do |m|
+          break if (from == to)
+          # Break if we already arrived to "from" migration
+          break if (from > to) && (m.version > from)
+          # Break if we already arrived to "to" migration
+          break if (from < to) && (m.version > to)
+          # Skip until we arrive to "to" migration
+          next if (from > to) && (m.version < to)
+          # Skip until we arrive to "from" migration
+          next if (from < to) && (m.version < from)
+
+          if m.version <= from
+            selected.prepend m
+          else
+            selected.append m
+          end
+        end
+
+        [selected, direction]
+      end
+    end
+  end
+end

data/lib/fancybox2/module/base.rb

@@ -30,6 +30,7 @@ module Fancybox2
         @logger = options.fetch :logger, create_default_logger
         @status = :stopped
         @alive_task = nil
+        @configs = {}
       end
 
       def alive_message_data(&block)
@@ -86,20 +87,12 @@ module Fancybox2
           @on_configs = block
           return
         end
-        @configs = begin
-                     # Try to parse
-                     JSON.parse packet.payload
-                   rescue JSON::ParserError
-                     logger.debug 'on_configs: failed parsing packet as JSON, retrying with YAML'
-                     begin
-                       # Try to parse YAML
-                       YAML.load packet.payload
-                     rescue StandardError
-                       logger.debug 'on_configs: failed parsing packet as YAML. Falling back to raw payload'
-                       # Fallback to original content
-                       packet.payload
-                     end
-                   end
+
+        cfg = packet.payload
+        if cfg && cfg.is_a?(Hash) && cfg['configs']
+          self.configs.merge! cfg['configs']
+        end
+
         @on_configs.call(packet) if @on_configs
       end
 
@@ -142,6 +135,8 @@ module Fancybox2
           return
         end
 
+        @status = :on_shutdown
+
         shutdown_ok = true
         logger.debug "Received 'shutdown' command"
         # Stop sending alive messages
@@ -162,17 +157,20 @@ module Fancybox2
         message_to :core, :shutdown, { status: shutdown_message }
         sleep 0.05 # Wait some time in order to be sure that the message has been published (message is not mandatory)
 
-        if mqtt_client && mqtt_client.connected?
-          # Gracefully disconnect from broker and exit
-          logger.debug 'Disconnecting from broker'
-          mqtt_client.disconnect
-        end
+        Thread.new do
+          if mqtt_client && mqtt_client.connected?
+            # Gracefully disconnect from broker and exit
+            logger.debug 'Disconnecting from broker, bye'
+            mqtt_client.disconnect
+            @mqtt_client = nil
+          end
 
-        if do_exit
-          # Exit from process
-          status_code = shutdown_ok ? 0 : 1
-          logger.debug "Exiting with status code #{status_code}"
-          exit status_code
+          if do_exit
+            # Exit from process
+            status_code = shutdown_ok ? 0 : 1
+            logger.debug "Exiting with status code #{status_code}"
+            exit status_code
+          end
         end
       end
 
@@ -188,8 +186,8 @@ module Fancybox2
         # Call user code
         @on_start.call(packet) if @on_start
 
-        configs = packet ? packet.payload : {}
-        interval = configs['aliveTimeout'] || 1000
+        cfg = packet ? packet.payload : {}
+        interval = cfg['aliveTimeout'] || 1000
         # Start code execution from scratch
         logger.debug "Received 'start'"
         @status = :running
@@ -358,12 +356,12 @@ module Fancybox2
 
       def create_default_logger
         stdout_logger = ::Logger.new STDOUT
-        broker_logger = ::Logger.new(Logger::MQTTLogDevice.new(topic_for(dest: :core, action: :logs),
-                                                               client: mqtt_client),
-                                     formatter: Logger::JSONFormatter.new)
-        logger = Logger::Multi.new stdout_logger, broker_logger,
-                                    level: @log_level,
-                                    progname: @log_progname
+        # broker_logger = ::Logger.new(Logger::MQTTLogDevice.new(topic_for(dest: :core, action: :logs),
+        #                                                        client: mqtt_client),
+        #                              formatter: Logger::JSONFormatter.new)
+        logger = Logger::Multi.new stdout_logger,# broker_logger,
+                                   level: @log_level,
+                                   progname: @log_progname
         logger
       end
 

data/lib/fancybox2/utils/os.rb

@@ -4,34 +4,34 @@ module Fancybox2
       extend self
 
       def identifier
-        return @indentifier if @indentifier
+        return @identifier if @identifier
 
         host_os = RbConfig::CONFIG['host_os']
-        case host_os
-        when /aix(.+)$/
-          'aix'
-        when /darwin(.+)$/
-          'darwin'
-        when /linux/
-          'linux'
-        when /freebsd(.+)$/
-          'freebsd'
-        when /openbsd(.+)$/
-          'openbsd'
-        when /netbsd(.*)$/
-          'netbsd'
-        when /dragonfly(.*)$/
-          'dragonflybsd'
-        when /solaris2/
-          'solaris2'
-        when /mswin|mingw32|windows/
-          # No Windows platform exists that was not based on the Windows_NT kernel,
-          # so 'windows' refers to all platforms built upon the Windows_NT kernel and
-          # have access to win32 or win64 subsystems.
-          'windows'
-        else
-          host_os
-        end
+        @identifier = case host_os
+                      when /aix(.+)$/
+                        'aix'
+                      when /darwin(.+)$/
+                        'darwin'
+                      when /linux/
+                        'linux'
+                      when /freebsd(.+)$/
+                        'freebsd'
+                      when /openbsd(.+)$/
+                        'openbsd'
+                      when /netbsd(.*)$/
+                        'netbsd'
+                      when /dragonfly(.*)$/
+                        'dragonflybsd'
+                      when /solaris2/
+                        'solaris2'
+                      when /mswin|mingw32|windows/
+                        # No Windows platform exists that was not based on the Windows_NT kernel,
+                        # so 'windows' refers to all platforms built upon the Windows_NT kernel and
+                        # have access to win32 or win64 subsystems.
+                        'windows'
+                      else
+                        host_os
+                      end
       end
     end
   end

data/lib/fancybox2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fancybox2
-  VERSION = '0.0.3'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fancybox2
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -66,6 +66,9 @@ files:
 - lib/fancybox2/logger/json_formatter.rb
 - lib/fancybox2/logger/mqtt_log_device.rb
 - lib/fancybox2/logger/multi.rb
+- lib/fancybox2/migrations/base.rb
+- lib/fancybox2/migrations/exceptions.rb
+- lib/fancybox2/migrations/runner.rb
 - lib/fancybox2/module/base.rb
 - lib/fancybox2/module/config.rb
 - lib/fancybox2/module/exceptions.rb