fusuma 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a510876d65266f27fc0ec9b809912b28cb9528fa
-  data.tar.gz: 36e206f619ae2689ed336f403c16c3afb32b9f82
+  metadata.gz: 5cffada31c25586ccf5d1c54eb347ac2b3cd93c2
+  data.tar.gz: 7644035ee0feabcb090ed5399620860a7cec1e20
 SHA512:
-  metadata.gz: ca75e1cf8a7f0921018fd353b5db9a88c4544d6f5fb7d33372c3f6776a0fbdc45c2365087c7b0f1342dd3f20d88386ba53943a1630cc0436a3947fa1c172a083
-  data.tar.gz: 1ddf273b0a1850ef257dd02826c8d62f765d19adf232c26fcf85452c8d61bb52f11a60ed45bd1168b5a0d45db4ccabdfd72ff03ca2e9924da4536462db9246f3
+  metadata.gz: 8aa3a21616162678ee8397deb0cd3168a4f6cf4ff132123330e4f5c9511cdc504457d76b7de919c698b86f8f0d5dca4438ebd6f25198f330e9f04ff166c56dfd
+  data.tar.gz: 390ef29b0020a6f1f76f1eba9ccf9b2345430b4ade22d2734affb5cad443910465a8ead153edcf60244b9efe732728102691956d4f7b79203a89f71f6246a181

data/README.md

@@ -32,7 +32,6 @@ Install Fusuma:
 
 ## Customize
 
-
 You can customize the settings for gestues to put and edit `~/.config/fusuma/config.yml`.
 
 ### Sample (default keymap for Elementary OS)
@@ -64,6 +63,10 @@ pinch:
      shortcut: 'ctrl+minus'
 ```
 
+## Options
+
+*   `-v` : Enable debug mode.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/iberianpig/fusuma. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/exe/fusuma

@@ -2,4 +2,5 @@
 
 require_relative '../lib/fusuma'
 
-Fusuma.run
+options = ARGV.getopts('v')
+Fusuma::Runner.run(v: options['v'])

data/lib/fusuma.rb

@@ -1,23 +1,31 @@
 require_relative 'fusuma/version'
 require_relative 'fusuma/action_stack'
 require_relative 'fusuma/gesture_action'
+require_relative 'fusuma/multi_logger'
 require 'logger'
 require 'open3'
 require 'yaml'
+require 'optparse'
+
+# for debug
+# require 'pry-byebug'
 
 # this is top level module
 module Fusuma
-  class << self
-    def run
-      read_libinput
+  # main class
+  class Runner
+    def self.run(args = {})
+      debug = args.fetch(:v, false)
+      MultiLogger.instance.debug_mode = true if debug
+      instance = new
+      MultiLogger.debug('Enable debug lines')
+      instance.read_libinput
     end
 
-    private
-
     def read_libinput
       Open3.popen3(libinput_command) do |_i, o, _e, _w|
         o.each do |line|
-          gesture_action = GestureAction.initialize_by_libinput(line, device_name)
+          gesture_action = GestureAction.initialize_by(line, device_name)
           next if gesture_action.nil?
           @action_stack ||= ActionStack.new
           @action_stack.push gesture_action
@@ -27,15 +35,20 @@ module Fusuma
       end
     end
 
+    private
+
     def libinput_command
       @libinput_command ||= "stdbuf -oL -- libinput-debug-events --device \
     /dev/input/#{device_name}"
+      MultiLogger.debug(libinput_command: @libinput_command)
+      @libinput_command
     end
 
     def device_name
       return @device_name unless @device_name.nil?
       Open3.popen3('libinput-list-devices') do |_i, o, _e, _w|
         o.each do |line|
+          MultiLogger.debug(line)
           extracted_input_device_from(line)
           next unless touch_is_available?(line)
           return @device_name

data/lib/fusuma/action_stack.rb

@@ -8,10 +8,12 @@ module Fusuma
     # return { finger:, direction:, action: } or nil
     def gesture_info
       return unless enough_actions?
+      MultiLogger.debug(enough_actions?: enough_actions?)
       direction = detect_direction
       finger    = detect_finger
       action    = detect_action
       clear
+      MultiLogger.debug(finger: finger, direction: direction, action: action)
       GestureInfo.new(finger, direction, action)
     end
 

data/lib/fusuma/gesture_action.rb

@@ -13,13 +13,13 @@ module Fusuma
                 :move_x, :move_y, :pinch
 
     class << self
-      def initialize_by_libinput(line, device_name)
+      def initialize_by(line, device_name)
         return unless line.to_s =~ /^#{device_name}/
         return if line.to_s =~ /_BEGIN/
         return unless line.to_s =~ /GESTURE_SWIPE|GESTURE_PINCH/
         time, action, finger, directions = gesture_action_arguments(line)
-        logger.debug(line)
-        logger.debug(directions)
+        MultiLogger.debug(time: time, action: action,
+                          finger: finger, directions: directions)
         GestureAction.new(time, action, finger, directions)
       end
 
@@ -27,7 +27,8 @@ module Fusuma
 
       def gesture_action_arguments(libinput_line)
         action, time, finger_directions = parse_libinput(libinput_line)
-        finger, move_x, move_y, pinch = parse_finger_directions(finger_directions)
+        finger, move_x, move_y, pinch =
+          parse_finger_directions(finger_directions)
         directions = { move: { x: move_x, y: move_y }, pinch: pinch }
         [time, action, finger, directions]
       end
@@ -43,14 +44,6 @@ module Fusuma
           finger_directions_line.tr('/', ' ').split
         [finger_num, move_x, move_y, pinch]
       end
-
-      def logger
-        @logger ||= begin
-                      log = Logger.new(STDOUT)
-                      log.level = Logger::WARN
-                      log
-                    end
-      end
     end
   end
 end

data/lib/fusuma/multi_logger.rb

@@ -0,0 +1,58 @@
+# module as namespace
+module Fusuma
+  require 'logger'
+  require 'singleton'
+  # logger separate between stdout and strerr
+  class MultiLogger < Logger
+    include Singleton
+    def initialize
+      super(STDOUT)
+      @err_logger = Logger.new(STDERR)
+      @debug_mode = false
+    end
+    attr_reader :err_logger
+    attr_accessor :debug_mode
+
+    def info(msg)
+      return unless debug_mode?
+      super(msg)
+    end
+
+    def debug(msg)
+      return unless debug_mode?
+      super(msg)
+    end
+
+    def warn(msg)
+      return unless debug_mode?
+      err_logger.warn(msg)
+    end
+
+    def error(msg)
+      return unless debug_mode?
+      err_logger.error(msg)
+    end
+
+    def debug_mode?
+      debug_mode
+    end
+
+    class << self
+      def info(msg)
+        instance.info(msg)
+      end
+
+      def debug(msg)
+        instance.debug(msg)
+      end
+
+      def warn(msg)
+        instance.warn(msg)
+      end
+
+      def error(msg)
+        instance.error(msg)
+      end
+    end
+  end
+end

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = "0.1.4"
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ files:
 - lib/fusuma/action_stack.rb
 - lib/fusuma/config.yml
 - lib/fusuma/gesture_action.rb
+- lib/fusuma/multi_logger.rb
 - lib/fusuma/version.rb
 homepage: https://github.com/iberianpig/fusuma
 licenses: