fusuma 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 006b0257ed698f1e84f48003c23dbe5090ff1a77
-  data.tar.gz: 8acb3579213176b578501b6c13be87ec2b2cef47
+  metadata.gz: facd335cd7fea4ee4d9c3c9a3a4e59e8d255ed77
+  data.tar.gz: d306dfeb6133a60222ecfb5de3538afb44f13943
 SHA512:
-  metadata.gz: cfcbbae537901fe01b32a655a236ba665317a0f6f56193d97a8b9834efab141a5405f0d0375a091b81a493d7438787080076896aa2f92c5993a3194c9a45177f
-  data.tar.gz: d4295e32fd124ff621d6cf180f0250fe0cedae70eb168f0e13da6117573d0270dec8ed3188b6907f93dd7df922e6c98cc37c4f70a00968529540c10623fea48a
+  metadata.gz: 697898bff6f3b10e9a0eb4d0d7827e938fc4e013c6095e3004b153588746de1cb9be46d05979e428460835ee7fdc7ae038f8e57b8a9d5cca4e72e52d7ce73cfc
+  data.tar.gz: b9bf9fd97efc18bdaebc1fdbfe3a1f5406fcf42b54bc5e20e1680a6a81f6d4c02f85e920c84b95740ef75335c21658e1c9ffdad76311650a05b622b052e6b9cc

data/README.md

@@ -128,7 +128,7 @@ If the swipe's interval is `0.5`, shorten swipe-interval by half to recognize a
 *   `-d`, `--daemon`              : Daemonize process
 *   `-l`, `--list-devices`        : List available devices
 *   `-v`, `--verbose`             : Show details about the results of running fusuma
-*   `--device=event14`            : Open the given device only
+*   `--device="Device name"`      : Open the given device only
 *   `--version`                   : Show fusuma version
 
 ## Contributing

data/exe/fusuma

@@ -21,7 +21,7 @@ opt.on('-l', '--list-devices',
   option[:list] = v
 end
 
-opt.on('--device=event14',
+opt.on('--device="Device name"',
        'Open the given device only') do |v|
   option[:device] = v
 end

data/lib/fusuma.rb

@@ -70,7 +70,7 @@ module Fusuma
 
     def run
       LibinputCommands.new.debug_events do |line|
-        gesture_action = GestureAction.initialize_by(line, Device.names)
+        gesture_action = GestureAction.initialize_by(line, Device.ids)
         next if gesture_action.nil?
         @action_stack ||= ActionStack.new
         @action_stack << gesture_action

data/lib/fusuma/device.rb

@@ -1,58 +1,118 @@
 module Fusuma
   # detect input device
   class Device
+    attr_accessor :id
+    attr_accessor :name
+    attr_accessor :available
+
+    def initialize(id: nil, name: nil, available: nil)
+      @id = id
+      @name = name
+      @available = available
+    end
+
     class << self
-      attr_writer :names
+      # @return [Array]
+      def ids
+        available.map(&:id)
+      end
 
+      # @return [Array]
       def names
-        return @names unless no_name?
-        device_names = fetch_device_names
-        MultiLogger.debug(device_names: device_names)
-        raise 'Touchpad is not found' if device_names.empty?
-        @names = device_names
+        available.map(&:name)
+      end
+
+      # @raise [SystemExit]
+      # @return [Array]
+      def available
+        @available ||= fetch_available.tap do |d|
+          MultiLogger.debug(available_devices: d)
+          raise 'Touchpad is not found' if d.empty?
+        end
       rescue RuntimeError => ex
         MultiLogger.error(ex.message)
         exit 1
       end
 
+      def reset
+        @available = nil
+      end
+
       # @params [String]
       def given_device=(name)
         return if name.nil?
-        if names.include? name
-          self.names = [name]
-          return
-        end
-        MultiLogger.error("Device #{name} is not found")
+        @available = available.select { |d| d.name == name }
+        return unless names.empty?
+        MultiLogger.error("Device #{name} is not found.\n
+           Check available device with: $ fusuma --list-devices\n")
         exit 1
       end
 
       private
 
-      def no_name?
-        @names.nil? || @names.empty?
+      # @return [Array]
+      def fetch_available
+        line_parser = LineParser.new
+        LibinputCommands.new.list_devices do |line|
+          line_parser.push(line)
+        end
+        line_parser.generate_devices
       end
 
-      # @return [Array]
-      def fetch_device_names
-        [].tap do |devices|
-          current_device = nil
-          LibinputCommands.new.list_devices do |line|
-            current_device = extracted_input_device_from(line) || current_device
-            next unless natural_scroll_is_available?(line)
-            devices << current_device
+      # parse line and generate devices
+      class LineParser
+        attr_reader :lines
+
+        def initialize
+          @lines = []
+        end
+
+        # @param line [String]
+        def push(line)
+          lines.push(line)
+        end
+
+        def generate_devices
+          device = nil
+          lines.each_with_object([]) do |line, devices|
+            device ||= Device.new
+            device = parse(device: device, line: line)
+            if device.available
+              devices << device
+              device = nil
+            end
           end
-        end.compact
-      end
+        end
 
-      def extracted_input_device_from(line)
-        return unless line =~ /^Kernel: /
-        line.match(/event[0-9]+/).to_s
-      end
+        # @return [Device]
+        def parse(device:, line:)
+          if (id = id_from(line))
+            device.id = id
+          elsif (name = name_from(line))
+            device.name = name
+          elsif (available = natural_scroll_is_available?(line))
+            device.available = available
+          end
+          device
+        end
+
+        def id_from(line)
+          line.match('^Kernel:[[:space:]]*') do |m|
+            m.post_match.match(/event[0-9]+/).to_s
+          end
+        end
 
-      def natural_scroll_is_available?(line)
-        return false unless line =~ /^Nat.scrolling: /
-        return false if line =~ %r{n/a}
-        true
+        def name_from(line)
+          line.match('^Device:[[:space:]]*') do |m|
+            m.post_match.strip
+          end
+        end
+
+        def natural_scroll_is_available?(line)
+          return false unless line =~ /^Nat.scrolling: /
+          return false if line =~ %r{n/a}
+          true
+        end
       end
     end
   end

data/lib/fusuma/libinput_commands.rb

@@ -70,9 +70,11 @@ module Fusuma
     end
 
     private
-
+    # use device option only if libinput detect only 1 device
+    # @return [String]
     def device_option
-      "--device /dev/input/#{Device.names.first}" if Device.names.size == 1
+      return unless Device.available.size == 1
+      "--device /dev/input/#{Device.available.first.id}"
     end
 
     # which in ruby: Checking if program exists in $PATH from ruby

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-23 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler