fusuma 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e7633611c459a64db5cba4070e79049a6cf054
-  data.tar.gz: f5c6cdfaf53b3ccd80940dcbfef20111e7511c18
+  metadata.gz: 23ebe4c1c6c7e8d235d7396d19b5c578d64d2347
+  data.tar.gz: '08aea58d39bd8c9052151950ecd621a9422635ef'
 SHA512:
-  metadata.gz: 207655e6474d8abcea5c75d8e2a7993d4410af1620c15bdfc90530930adafe04134f96cce9870603e3c798535addae9d7c8b132b0748a50aaf0509c9788b8997
-  data.tar.gz: 691af29a6416febc5fca48835f5ea2606c306eb1f6f50ac5188d7abd9a9669805c9ee2de12f30ab437a582dbb9bce6461442a7b1a393b5000fe6d041b818028c
+  metadata.gz: 40a518e04442513efb8d161b2ad79b72f471d52f53631d030ae70433f18351d76eb40c9097e0d46713508487532bfc80a32d3907db31f7bc4d918a19bf59a3f9
+  data.tar.gz: 3a79ce9faa1447b3c2b6528d194a167dc5150c4de9ea04b7d6e588428afc3485855e387386023ad5a7ef53808d917aca5f3873271b227145c3d4bd413454c00e

data/.rubocop.yml

@@ -5,3 +5,7 @@ Metrics/ModuleLength:
 Metrics/BlockLength:
   Exclude:
     - "**/*_spec.rb"
+
+Metrics/LineLength:
+  Exclude:
+    - "fusuma.gemspec"

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "fusuma"
+require 'bundler/setup'
+require 'fusuma'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
-require "pry-byebug"
+require 'pry'
+require 'pry-byebug'
 Pry.start

data/fusuma.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fusuma/version'
@@ -22,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'reek'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/fusuma.rb

@@ -7,6 +7,7 @@ require_relative 'fusuma/pinch.rb'
 require_relative 'fusuma/multi_logger'
 require_relative 'fusuma/config.rb'
 require_relative 'fusuma/device.rb'
+require_relative 'fusuma/libinput_commands.rb'
 require 'logger'
 require 'open3'
 require 'yaml'
@@ -20,7 +21,7 @@ module Fusuma
         set_trap
         read_options(option)
         instance = new
-        instance.read_libinput
+        instance.run
       end
 
       private
@@ -31,12 +32,13 @@ module Fusuma
       end
 
       def print_version
-        puts "---------------------------------------------"
+        puts '---------------------------------------------'
         puts "Fusuma: #{Fusuma::VERSION}"
+        puts "libinput: #{LibinputCommands.new.version}"
         puts "OS: #{`uname -rsv`}"
         puts "Distribution: #{`cat /etc/issue`}"
         puts "Desktop session: #{`echo $DESKTOP_SESSION`}"
-        puts "---------------------------------------------"
+        puts '---------------------------------------------'
       end
 
       def reload_custom_config(config_path)
@@ -53,31 +55,15 @@ module Fusuma
       end
     end
 
-    def read_libinput
-      Open3.popen3(libinput_command) do |_i, o, _e, _w|
-        o.each do |line|
-          gesture_action = GestureAction.initialize_by(line, Device.names)
-          next if gesture_action.nil?
-          @action_stack ||= ActionStack.new
-          @action_stack << gesture_action
-          event_trigger = @action_stack.generate_event_trigger
-          event_trigger.send_command unless event_trigger.nil?
-        end
+    def run
+      LibinputCommands.new.debug_events do |line|
+        gesture_action = GestureAction.initialize_by(line, Device.names)
+        next if gesture_action.nil?
+        @action_stack ||= ActionStack.new
+        @action_stack << gesture_action
+        event_trigger = @action_stack.generate_event_trigger
+        event_trigger.send_command unless event_trigger.nil?
       end
     end
-
-    private
-
-    def libinput_command
-      return @libinput_command if @libinput_command
-      prefix = 'stdbuf -oL --'
-      command = 'libinput-debug-events'
-      device_option = if Device.names.size == 1
-                        "--device /dev/input/#{Device.names.first}"
-                      end
-      @libinput_command = [prefix, command, device_option].join(' ')
-      MultiLogger.debug(libinput_command: @libinput_command)
-      @libinput_command
-    end
   end
 end

data/lib/fusuma/device.rb

@@ -17,21 +17,18 @@ module Fusuma
 
       private
 
+      # @return [Array]
       def fetch_device_names
-        current_device = nil
-        list_devices_logs.map do |line|
-          current_device = extracted_input_device_from(line) || current_device
-          next unless natural_scroll_is_available?(line)
-          current_device
+        [].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
+          end
         end.compact
       end
 
-      def list_devices_logs
-        Open3.popen3('libinput-list-devices') do |_i, o, _e, _w|
-          return o.to_a
-        end
-      end
-
       def extracted_input_device_from(line)
         return unless line =~ /^Kernel: /
         line.match(/event[0-9]+/).to_s

data/lib/fusuma/libinput_commands.rb

@@ -0,0 +1,95 @@
+module Fusuma
+  # libinput commands wrapper
+  class LibinputCommands
+    def initialize(*options)
+      @options = options
+    end
+
+    # `libinput-list-devices` and `libinput-debug-events` are deprecated,
+    # use `libinput list-devices` and `libinput debug-events` from 1.8.
+    NEW_CLI_OPTION_VERSION = 1.8
+
+    # @return [Boolean]
+    def new_cli_option_available?
+      Gem::Version.new(version) >= Gem::Version.new(NEW_CLI_OPTION_VERSION)
+    end
+
+    # @return [String]
+    def version
+      # versiom_command prints "1.6.3\n"
+      @version ||= `#{version_command}`.strip
+    end
+
+    # @yield [line] gives a line in libinput list-devices output to the block
+    def list_devices
+      cmd = list_devices_command
+      MultiLogger.debug(debug_events: cmd)
+      Open3.popen3(cmd) do |_i, o, _e, _w|
+        o.each { |line| yield(line) }
+      end
+    end
+
+    # @yield [line] gives a line in libinput debug-events output to the block
+    def debug_events
+      prefix = 'stdbuf -oL --'
+      options = [*@options, device_option]
+      cmd = "#{prefix} #{debug_events_command} #{options.join(' ')}".strip
+      MultiLogger.debug(debug_events: cmd)
+      Open3.popen3(cmd) do |_i, o, _e, _w|
+        o.each { |line| yield(line) }
+      end
+    end
+
+    # @return [String] command
+    # @raise [SystemExit]
+    def version_command
+      if which('libinput')
+        'libinput --version'
+      elsif which('libinput-list-devices')
+        'libinput-list-devices --version'
+      else
+        MultiLogger.error 'install libinput-tools'
+        exit 1
+      end
+    end
+
+    def list_devices_command
+      if new_cli_option_available?
+        'libinput list-devices'
+      else
+        'libinput-list-devices'
+      end
+    end
+
+    def debug_events_command
+      if new_cli_option_available?
+        'libinput debug-events'
+      else
+        'libinput-debug-events'
+      end
+    end
+
+    private
+
+    def device_option
+      "--device /dev/input/#{Device.names.first}" if Device.names.size == 1
+    end
+
+    # which in ruby: Checking if program exists in $PATH from ruby
+    # (https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby)
+    # Cross-platform way of finding an executable in the $PATH.
+    #
+    #   which('ruby') #=> /usr/bin/ruby
+    # @return [String, nil]
+    def which(command)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{command}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,49 +25,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: reek
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -127,7 +127,6 @@ files:
 - Gemfile
 - ISSUE_TEMPLATE.md
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
@@ -141,6 +140,7 @@ files:
 - lib/fusuma/device.rb
 - lib/fusuma/event_trigger.rb
 - lib/fusuma/gesture_action.rb
+- lib/fusuma/libinput_commands.rb
 - lib/fusuma/multi_logger.rb
 - lib/fusuma/pinch.rb
 - lib/fusuma/swipe.rb

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 iberianpig
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.