fusuma 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23ebe4c1c6c7e8d235d7396d19b5c578d64d2347
-  data.tar.gz: '08aea58d39bd8c9052151950ecd621a9422635ef'
+  metadata.gz: 006b0257ed698f1e84f48003c23dbe5090ff1a77
+  data.tar.gz: 8acb3579213176b578501b6c13be87ec2b2cef47
 SHA512:
-  metadata.gz: 40a518e04442513efb8d161b2ad79b72f471d52f53631d030ae70433f18351d76eb40c9097e0d46713508487532bfc80a32d3907db31f7bc4d918a19bf59a3f9
-  data.tar.gz: 3a79ce9faa1447b3c2b6528d194a167dc5150c4de9ea04b7d6e588428afc3485855e387386023ad5a7ef53808d917aca5f3873271b227145c3d4bd413454c00e
+  metadata.gz: cfcbbae537901fe01b32a655a236ba665317a0f6f56193d97a8b9834efab141a5405f0d0375a091b81a493d7438787080076896aa2f92c5993a3194c9a45177f
+  data.tar.gz: d4295e32fd124ff621d6cf180f0250fe0cedae70eb168f0e13da6117573d0270dec8ed3188b6907f93dd7df922e6c98cc37c4f70a00968529540c10623fea48a

data/README.md

@@ -126,7 +126,9 @@ If the swipe's interval is `0.5`, shorten swipe-interval by half to recognize a
 
 *   `-c`, `--config=path/to/file` : Use an alternative config file
 *   `-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
 *   `--version`                   : Show fusuma version
 
 ## Contributing

data/exe/fusuma

@@ -4,31 +4,37 @@ require 'optparse'
 require_relative '../lib/fusuma'
 
 option = {}
-OptionParser.new do |opt|
-  opt.on('-c',
-         '--config=path/to/file',
-         'Use an alternative config file') do |config_path|
-    option[:config_path] = config_path
-  end
-
-  opt.on('-d',
-         '--daemon',
-         'Daemonize process') do |daemon|
-    option[:daemon] = daemon
-  end
-
-  opt.on('-v',
-         '--verbose',
-         'Show details about the results of running fusuma') do |verbose|
-    option[:verbose] = verbose
-  end
-
-  opt.on('--version',
-         'Show fusuma version') do |version|
-    option[:version] = version
-  end
-
-  opt.parse!(ARGV)
+opt = OptionParser.new
+
+opt.on('-c', '--config=path/to/file',
+       'Use an alternative config file') do |v|
+  option[:config_path] = v
+end
+
+opt.on('-d', '--daemon',
+       'Daemonize process') do |v|
+  option[:daemon] = v
+end
+
+opt.on('-l', '--list-devices',
+       'List available devices') do |v|
+  option[:list] = v
+end
+
+opt.on('--device=event14',
+       'Open the given device only') do |v|
+  option[:device] = v
+end
+
+opt.on('-v', '--verbose',
+       'Show details about the results of running fusuma') do |v|
+  option[:verbose] = v
 end
 
+opt.on('--version', 'Show fusuma version') do |v|
+  option[:version] = v
+end
+
+opt.parse!(ARGV)
+
 Fusuma::Runner.run(option)

data/lib/fusuma.rb

@@ -31,27 +31,40 @@ module Fusuma
         Signal.trap('TERM') { puts exit } # Trap `Kill `
       end
 
+      def read_options(option)
+        print_version && exit(0) if option[:version]
+        print_device_list if option[:list]
+        reload_custom_config(option[:config_path])
+        debug_mode if option[:verbose]
+        Device.given_device = option[:device]
+        Process.daemon if option[:daemon]
+      end
+
       def print_version
-        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 '---------------------------------------------'
+        MultiLogger.info '---------------------------------------------'
+        MultiLogger.info "Fusuma: #{Fusuma::VERSION}"
+        MultiLogger.info "libinput: #{LibinputCommands.new.version}"
+        MultiLogger.info "OS: #{`uname -rsv`}".strip
+        MultiLogger.info "Distribution: #{`cat /etc/issue`}".strip
+        MultiLogger.info "Desktop session: #{`echo $DESKTOP_SESSION`}".strip
+        MultiLogger.info '---------------------------------------------'
       end
 
-      def reload_custom_config(config_path)
+      def print_device_list
+        puts Device.names
+        exit(0)
+      end
+
+      def reload_custom_config(config_path = nil)
+        return unless config_path
         MultiLogger.info "use custom path: #{config_path}"
         Config.instance.custom_path = config_path
         Config.reload
       end
 
-      def read_options(option)
-        print_version if option[:version] || option[:verbose]
-        reload_custom_config(option[:config_path]) if option[:config_path]
-        MultiLogger.instance.debug_mode = true if option[:verbose]
-        Process.daemon if option[:daemon]
+      def debug_mode
+        print_version
+        MultiLogger.instance.debug_mode = true
       end
     end
 

data/lib/fusuma/device.rb

@@ -5,7 +5,7 @@ module Fusuma
       attr_writer :names
 
       def names
-        return @names unless @names.nil?
+        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?
@@ -15,8 +15,23 @@ module Fusuma
         exit 1
       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")
+        exit 1
+      end
+
       private
 
+      def no_name?
+        @names.nil? || @names.empty?
+      end
+
       # @return [Array]
       def fetch_device_names
         [].tap do |devices|

data/lib/fusuma/version.rb

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

metadata

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