fusuma 1.10.2 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dddc8b3508264aaa617b19ed621ed6ee97c5f0d8435cb988a29a9789f9fe2a22
-  data.tar.gz: 8c99bd1dbddf7640d9422ed505ac090361b97b87fc0ea77584ddc6fb8f6416db
+  metadata.gz: bd9b74b06494e85c0caf6250e0dfeed80c37187098982b4f32c2dd8e727732fb
+  data.tar.gz: eb8c3d19693570b77b26519d7296856480342eec3eba0205ed970e01a4b46a16
 SHA512:
-  metadata.gz: 107aa86cb7e326e17e7cb5c183e3fcb49a6352fd1f9b6a04211d2820bd6e738b9abb00f2ecddeef31903f2bb77ad15b7dcc742ca835df9eb9f67e970b166e843
-  data.tar.gz: 294b6a9c9fd0770bf470c38af08f5c48fd7fc14d38f3acd0f802ac3f51e21d200de6d02be1f197edea65c0e5d13ee95f4e43a85c8cea0a0a80372154eda3ea15
+  metadata.gz: abe0b55ab9f332d3f67c423b0890135973d57a4cf8b7d6fafc7b01b44874c2489b6752fcb7a66d0b0a625c612879e35ce7d11b6a3b5ce485711b84e8f45e5279
+  data.tar.gz: 323c35769c6f9827f8a94532a4dd10a25facf6bc6858d85b2b6540a6d78064e9003d4ccb83f4914f214aa6523cea8878b5f63abbe113211b1b0900ce0e203521

data/.rubocop.yml

@@ -27,6 +27,10 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: true
 
+# For compatible ruby 2.3
+Style/RedundantBegin:
+  Enabled: false
+
 Lint/RaiseException:
    Enabled: true
 Lint/StructNewOverride:

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [v1.11.0](https://github.com/iberianpig/fusuma/tree/v1.11.0) (2020-07-25)
+
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.10.2...v1.11.0)
+
+**Implemented enhancements:**
+
+- Feature/yaml check [\#193](https://github.com/iberianpig/fusuma/pull/193) ([iberianpig](https://github.com/iberianpig))
+
+## [v1.10.2](https://github.com/iberianpig/fusuma/tree/v1.10.2) (2020-07-23)
+
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.10.1...v1.10.2)
+
+**Closed issues:**
+
+- Gestures from libinput are not recognised [\#192](https://github.com/iberianpig/fusuma/issues/192)
+- Vertical 4 finger swipe and rotation not recognised [\#189](https://github.com/iberianpig/fusuma/issues/189)
+- Pinch in gesture not recognized in Popos 20.04 \(Ubuntu 20.04\) [\#184](https://github.com/iberianpig/fusuma/issues/184)
+- Fusuma crashes while switching between workspaces on KDE Plasma [\#181](https://github.com/iberianpig/fusuma/issues/181)
+- Window Prev/Next moves desktop environment when no active window [\#178](https://github.com/iberianpig/fusuma/issues/178)
+- Add ydotool to docs. [\#177](https://github.com/iberianpig/fusuma/issues/177)
+- Can't use alternative .config.yml [\#176](https://github.com/iberianpig/fusuma/issues/176)
+- Fusuma stops working sometimes [\#175](https://github.com/iberianpig/fusuma/issues/175)
+- Pinch \(2, in\) does not work. [\#174](https://github.com/iberianpig/fusuma/issues/174)
+
+**Merged pull requests:**
+
+- 177. Add ydootool to docs. [\#179](https://github.com/iberianpig/fusuma/pull/179) ([mattdemarillac](https://github.com/mattdemarillac))
+
+## [v1.10.1](https://github.com/iberianpig/fusuma/tree/v1.10.1) (2020-05-15)
+
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.10.0...v1.10.1)
+
+**Closed issues:**
+
+- Some gestures are not always recognized [\#172](https://github.com/iberianpig/fusuma/issues/172)
+- Unable to reprogram Pinch  [\#171](https://github.com/iberianpig/fusuma/issues/171)
+
 ## [v1.10.0](https://github.com/iberianpig/fusuma/tree/v1.10.0) (2020-05-04)
 
 [Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.9.0...v1.10.0)

data/lib/fusuma.rb

@@ -48,8 +48,6 @@ module Fusuma
       end
 
       def load_custom_config(config_path = nil)
-        return unless config_path
-
         Config.custom_path = config_path
       end
     end

data/lib/fusuma/config.rb

@@ -2,6 +2,7 @@
 
 require_relative './multi_logger.rb'
 require_relative './config/index.rb'
+require_relative './config/yaml_duplication_checker.rb'
 require 'singleton'
 require 'yaml'
 
@@ -9,6 +10,9 @@ require 'yaml'
 module Fusuma
   # read keymap from yaml file
   class Config
+    class NotFoundError < StandardError; end
+    class InvalidFileError < StandardError; end
+
     include Singleton
 
     class << self
@@ -28,7 +32,6 @@ module Fusuma
       @custom_path = nil
       @cache = nil
       @keymap = nil
-      reload
     end
 
     def custom_path=(new_path)
@@ -37,12 +40,33 @@ module Fusuma
     end
 
     def reload
-      @cache  = nil
-      @keymap = YAML.load_file(file_path).deep_symbolize_keys
-      MultiLogger.info "reload config : #{file_path}"
+      @cache = nil
+      path = find_filepath
+      MultiLogger.info "reload config: #{path}"
+      @keymap = validate(path)
       self
     end
 
+    # @return [Hash]
+    # @raise [InvalidError]
+    def validate(path)
+      duplicates = []
+      YAMLDuplicationChecker.check(File.read(path), path) do |ignored, duplicate|
+        MultiLogger.error "#{path}: #{ignored.value} is duplicated"
+        duplicates << duplicate.value
+      end
+      raise InvalidFileError, "Detect duplicate keys #{duplicates}" unless duplicates.empty?
+
+      yaml = YAML.load_file(path)
+
+      raise InvalidFileError, 'Invaid YAML file' unless yaml.is_a? Hash
+
+      yaml.deep_symbolize_keys
+    rescue StandardError => e
+      MultiLogger.error e.message
+      raise InvalidFileError, e.message
+    end
+
     # @param index [Index]
     def search(index)
       cache(index.cache_key) do
@@ -64,13 +88,16 @@ module Fusuma
 
     private
 
-    def file_path
+    def find_filepath
       filename = 'fusuma/config.yml'
-      if custom_path && File.exist?(expand_custom_path)
-        expand_custom_path
+      if custom_path
+        return expand_custom_path if File.exist?(expand_custom_path)
+
+        raise NotFoundError, "#{expand_custom_path} is NOT FOUND"
       elsif File.exist?(expand_config_path(filename))
         expand_config_path(filename)
       else
+        MultiLogger.warn "config file: #{expand_config_path(filename)} is NOT FOUND"
         expand_default_path(filename)
       end
     end

data/lib/fusuma/config/yaml_duplication_checker.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Fusuma
+  class Config
+    # ref: https://github.com/rubocop-hq/rubocop/blob/97e4ffc8a71e9e5239a927c6a534dfc1e0da917f/lib/rubocop/yaml_duplication_checker.rb
+    # Find duplicated keys from YAML.
+    module YAMLDuplicationChecker
+      def self.check(yaml_string, filename, &on_duplicated)
+        # Ruby 2.6+
+        tree = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
+                 # Specify filename to display helpful message when it raises
+                 # an error.
+                 YAML.parse(yaml_string, filename: filename)
+               else
+                 YAML.parse(yaml_string, filename)
+               end
+        return unless tree
+
+        traverse(tree, &on_duplicated)
+      end
+
+      def self.traverse(tree, &on_duplicated)
+        case tree
+        when Psych::Nodes::Mapping
+          tree.children.each_slice(2).with_object([]) do |(key, value), keys|
+            exist = keys.find { |key2| key2.value == key.value }
+            on_duplicated.call(exist, key) if exist
+            keys << key
+            traverse(value, &on_duplicated)
+          end
+        else
+          children = tree.children
+          return unless children
+
+          children.each { |c| traverse(c, &on_duplicated) }
+        end
+      end
+
+      private_class_method :traverse
+    end
+  end
+end

data/lib/fusuma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = '1.10.2'
+  VERSION = '1.11.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,6 +200,7 @@ files:
 - lib/fusuma/config.rb
 - lib/fusuma/config.yml
 - lib/fusuma/config/index.rb
+- lib/fusuma/config/yaml_duplication_checker.rb
 - lib/fusuma/device.rb
 - lib/fusuma/environment.rb
 - lib/fusuma/libinput_command.rb
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput dirver on X11, Linux