fusuma 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ee3a00540af361bdf6fc271b075bc2582f165c66
-  data.tar.gz: 12de700700324a2f55bc6554df3b3e1b6c0682a6
+SHA256:
+  metadata.gz: ac4c95b3576fd59ee15c871707789a3140516ba87e2356780d560953f0e36a70
+  data.tar.gz: 9342d8e745074e23e7972694ba506f5ca6b5e41e9a5a7a1ec78f8ce5be48abc3
 SHA512:
-  metadata.gz: 777ed1969b9f371111405aa4d23779ff43c241da41e883e045ae58b182fbd8cd1ec1bf63eac4e04cff6e7dd4002c33a46cef0d3e1b27108cda288a4f6958b4e3
-  data.tar.gz: f0a43e7ad1e65a5ae79f0d469ede2672700be54307b3ae7ff4e41872e0b31f810d95b9e3d6cb1a6c057ea33d5d32f13750cd34add572cd4eceecf81b73648d08
+  metadata.gz: 7c909bda16f03e93c558d885f612f17b9905fa7ce99f41318dfe75e0e9400ca2164dea526937b2d85876bb0a11e0f7bc2c1ba9066c0dfb02fe3d2a861f698cab
+  data.tar.gz: aea1580e411f3ed6b139de5277cbe9d1cb3c6234902ca4ab60a8e1986230a2698ce0efb0283e9c8a8715b88b8a3f4115d5caac4198bc83e893864bb658d86a81

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 Metrics/ModuleLength:
   Exclude:
     - "**/*_spec.rb"

data/.rubocop_todo.yml

@@ -0,0 +1,94 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-05-24 12:59:49 +0900 using RuboCop version 0.70.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/AlignHash:
+  Exclude:
+    - 'spec/lib/config_spec.rb'
+
+# Offense count: 20
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/fusuma.rb'
+    - 'lib/fusuma/command_executor.rb'
+    - 'lib/fusuma/config.rb'
+    - 'lib/fusuma/device.rb'
+    - 'lib/fusuma/event_stack.rb'
+    - 'lib/fusuma/gesture_event.rb'
+    - 'lib/fusuma/libinput_commands.rb'
+    - 'lib/fusuma/multi_logger.rb'
+    - 'lib/fusuma/pinch.rb'
+    - 'lib/fusuma/swipe.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
+  Exclude:
+    - 'lib/fusuma/device.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'lib/fusuma/command_executor.rb'
+
+# Offense count: 23
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fusuma/pinch.rb'
+    - 'lib/fusuma/swipe.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
+# Whitelist: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/fusuma.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnneededInterpolation:
+  Exclude:
+    - 'lib/fusuma/command_executor.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    - 'spec/lib/command_executor_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 87

data/.travis.yml

@@ -1,9 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
   - 2.3.1
   - 2.4
   - 2.5
-before_install: gem install bundler -v 1.13.2
+before_install:
+  - travis_retry gem update --system || travis_retry gem update --system 2.7.8
+  - travis_retry gem install bundler --no-document || travis_retry gem install bundler --no-document -v 1.17.3

data/README.md

@@ -94,12 +94,13 @@ swipe:
     down: 
       command: 'xdotool key super+s'
 pinch:
-  in:
-    command: 'xdotool key ctrl+plus'
-    threshold: 0.1
-  out:
-    command: 'xdotool key ctrl+minus'
-    threshold: 0.1
+  2:
+    in:
+      command: 'xdotool key ctrl+plus'
+      threshold: 0.1
+    out:
+      command: 'xdotool key ctrl+minus'
+      threshold: 0.1
 
 threshold:
   swipe: 1
@@ -137,6 +138,11 @@ swipe:
 +      command: 'xdotool key alt+Right'
 ```
 
+### About xdotool
+
+* xdotool manual (https://github.com/jordansissel/xdotool/blob/master/xdotool.pod)
+* Available keys' hint (https://github.com/jordansissel/xdotool/issues/212#issuecomment-406156157)
+
 ## Options
 
 *   `-c`, `--config=path/to/file` : Use an alternative config file
@@ -146,10 +152,11 @@ swipe:
 *   `--device="Device name"`      : Open the given device only
 *   `--version`                   : Show fusuma version
 
-## Autostart(gnome-session-properties)
-1. Check where you installed fusuma
+## Autostart (gnome-session-properties)
+1. Check the path where you installed fusuma with `$ which fusuma`
 2. Open `$ gnome-session-properties`
-3. Add Fusuma and input location where you checked above's path
+3. Add Fusuma and enter the location where the above path was checked in the command input field
+4. Add the `-d` option at the end of the command input field
 
 ## Support
 

data/fusuma.gemspec

@@ -20,9 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry-byebug', '~> 3.4'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'reek'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/fusuma.rb

@@ -74,7 +74,7 @@ module Fusuma
 
     def run
       LibinputCommands.new.debug_events do |line|
-        gesture_event = GestureEvent.initialize_by(line, Device.ids)
+        gesture_event = GestureEvent.initialize_by(line.to_s, Device.ids)
         next unless gesture_event
         @event_stack << gesture_event
         @event_stack.generate_command_executor.tap { |c| c.execute if c }

data/lib/fusuma/command_executor.rb

@@ -9,7 +9,11 @@ module Fusuma
     attr_reader :finger, :direction, :event_type
 
     def execute
-      `#{command_or_shortcut}`
+      pid = fork {
+        Process.daemon(true)
+        exec("#{command_or_shortcut}")
+      }
+      Process.detach(pid)
       MultiLogger.info("Execute: #{command_or_shortcut}")
     end
 

data/lib/fusuma/device.rb

@@ -11,6 +11,20 @@ module Fusuma
       @available = available
     end
 
+    # @param [Hash]
+    def assign_attributes(attributes)
+      attributes.each do |k, v|
+        case k
+        when :id
+          self.id = v
+        when :name
+          self.name = v
+        when :available
+          self.available = v
+        end
+      end
+    end
+
     class << self
       # @return [Array]
       def ids
@@ -38,7 +52,7 @@ module Fusuma
         @available = nil
       end
 
-      # @params [String]
+      # @param [String]
       def given_device=(name)
         return if name.nil?
         @available = available.select { |d| d.name == name }
@@ -72,11 +86,12 @@ module Fusuma
           lines.push(line)
         end
 
+        # @return [Array]
         def generate_devices
           device = nil
           lines.each_with_object([]) do |line, devices|
             device ||= Device.new
-            device = parse(device: device, line: line)
+            device.assign_attributes extract_attribute(line: line)
             if device.available
               devices << device
               device = nil
@@ -84,16 +99,18 @@ module Fusuma
           end
         end
 
-        # @return [Device]
-        def parse(device:, line:)
+        # @param  [String]
+        # @return [Hash]
+        def extract_attribute(line:)
           if (id = id_from(line))
-            device.id = id
+            { id: id }
           elsif (name = name_from(line))
-            device.name = name
-          elsif (available = natural_scroll_is_available?(line))
-            device.available = available
+            { name: name }
+          elsif (available = available?(line))
+            { available: available }
+          else
+            {}
           end
-          device
         end
 
         def id_from(line)
@@ -108,7 +125,8 @@ module Fusuma
           end
         end
 
-        def natural_scroll_is_available?(line)
+        def available?(line)
+          # NOTE: natural scroll is available?
           return false unless line =~ /^Nat.scrolling: /
           return false if line =~ %r{n/a}
           true

data/lib/fusuma/gesture_event.rb

@@ -15,14 +15,14 @@ module Fusuma
     class << self
       def initialize_by(line, device_names)
         return if device_names.none? do |device_name|
-          line.to_s =~ /^\s?#{device_name}/
+          line =~ /^\s?#{device_name}/
         end
-        return if line.to_s =~ /_BEGIN/
-        return unless line.to_s =~ /GESTURE_SWIPE|GESTURE_PINCH/
+        return if line =~ /_BEGIN/
+        return unless line =~ /GESTURE_SWIPE|GESTURE_PINCH/
         time, event, finger, directions = gesture_event_arguments(line)
         MultiLogger.debug(time: time, event: event,
                           finger: finger, directions: directions)
-        GestureEvent.new(time, event, finger, directions)
+        new(time, event, finger, directions)
       end
 
       private
@@ -41,7 +41,7 @@ module Fusuma
       end
 
       def parse_finger_directions(line)
-        return [] if line.nil?
+        return [] unless line
         move_x, move_y, _, _, _, zoom = line.tr('/|(|)', ' ').split
         [move_x, move_y, zoom]
       end

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.10.2'.freeze
+  VERSION = '0.11.0'.freeze
 end

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -42,16 +28,16 @@ dependencies:
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +111,7 @@ files:
 - ".reek.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -166,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput dirver on X11, Linux