fusuma 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac0fbe0303830adea0e5cd8c832ecf0cdeb2a940
-  data.tar.gz: 93e0a151d905833b5794e21fd5a29c6ffae354c2
+  metadata.gz: e5e7633611c459a64db5cba4070e79049a6cf054
+  data.tar.gz: f5c6cdfaf53b3ccd80940dcbfef20111e7511c18
 SHA512:
-  metadata.gz: e1e335a827ba3dbfaaff2eb01d534f036547da876d919638e2f610eb84e2b409fa59c31f8a37a0801506ee05b5c61e47c6f5581d399b2da8cf3df257ec699ff3
-  data.tar.gz: 410c8ce3fc7f2575f9f3f6042a8d54d3189f93136de037e12ca1607af943dad5a7272600ff6982f8d4d305d097f125899a8d9bebd96403ee051d141feae55c33
+  metadata.gz: 207655e6474d8abcea5c75d8e2a7993d4410af1620c15bdfc90530930adafe04134f96cce9870603e3c798535addae9d7c8b132b0748a50aaf0509c9788b8997
+  data.tar.gz: 691af29a6416febc5fca48835f5ea2606c306eb1f6f50ac5188d7abd9a9669805c9ee2de12f30ab437a582dbb9bce6461442a7b1a393b5000fe6d041b818028c

data/exe/fusuma

@@ -7,8 +7,8 @@ option = {}
 OptionParser.new do |opt|
   opt.on('-c',
          '--config=path/to/file',
-         'Use an alternative config file') do |config|
-    option[:config] = config
+         'Use an alternative config file') do |config_path|
+    option[:config_path] = config_path
   end
 
   opt.on('-d',
@@ -24,12 +24,8 @@ OptionParser.new do |opt|
   end
 
   opt.on('--version',
-         'Show fusuma version') do |_version|
-    puts "Fusuma: #{Fusuma::VERSION}"
-    puts "OS: #{`uname -rsv`}"
-    puts "Distribution: #{`cat /etc/issue`}"
-    puts "Desktop session: #{`echo $DESKTOP_SESSION`}"
-    exit 0
+         'Show fusuma version') do |version|
+    option[:version] = version
   end
 
   opt.parse!(ARGV)

data/lib/fusuma.rb

@@ -17,23 +17,39 @@ module Fusuma
   class Runner
     class << self
       def run(option = {})
-        Signal.trap('INT') { exit } # Trap ^C
-        Signal.trap('TERM') { exit } # Trap `Kill `
-
+        set_trap
         read_options(option)
         instance = new
         instance.read_libinput
       end
 
+      private
+
+      def set_trap
+        Signal.trap('INT') { puts exit } # Trap ^C
+        Signal.trap('TERM') { puts exit } # Trap `Kill `
+      end
+
+      def print_version
+        puts "---------------------------------------------"
+        puts "Fusuma: #{Fusuma::VERSION}"
+        puts "OS: #{`uname -rsv`}"
+        puts "Distribution: #{`cat /etc/issue`}"
+        puts "Desktop session: #{`echo $DESKTOP_SESSION`}"
+        puts "---------------------------------------------"
+      end
+
+      def reload_custom_config(config_path)
+        MultiLogger.info "use custom path: #{config_path}"
+        Config.instance.custom_path = config_path
+        Config.reload
+      end
+
       def read_options(option)
-        option.fetch(:version, nil)
-        config_path = option.fetch(:config, nil)
-        if config_path
-          Config.instance.custom_path = config_path
-          Config.reload
-        end
-        MultiLogger.instance.debug_mode = true if option.fetch(:verbose, nil)
-        Process.daemon if option.fetch(:daemon, nil)
+        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]
       end
     end
 

data/lib/fusuma/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - iberianpig