fusuma 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc1ccc23a12924fc5af5527efd39b3561cad0023
-  data.tar.gz: 69321805a249c2a3a6fcc6209eccf439d0d1039e
+  metadata.gz: ab7c21fda1d6f09e06a8ccc3f18e0fe1d8d34aeb
+  data.tar.gz: 44a05a105bc8bf49e48a11b253642b834793d685
 SHA512:
-  metadata.gz: 99f14ae299cd0f106df6b5504d7787101f8ac7e399c671726baaf8e750189882d4f99294c965a67ff460d7ed177ee4cfea6b86f69638fe2076f72f9f3f9ee4ed
-  data.tar.gz: 6d0c33ad2b6e63a838b0985f8f3fbd46926c248c1456ec2bd8de9b9de7ea34f86517f83be262afe484f3661ab6f7d9ade81757f14bd61aa79f9d137931b9f842
+  metadata.gz: f4eb4842122e42c0c48ed9db1fac93d8df1dfe12f6eb625a20214d86fe53eda05c4eeddf985995b26009d21ab2543a7f249367542908a619e9ed4677a735ece6
+  data.tar.gz: cb740e6023def63f2f8b8a1500f9149848e52ad8d048522be601771364b98a5aa69d9a2a3586ad2d857e428e5e388dee01d52dbac57cf71e668c56202e166e36

data/README.md

@@ -80,7 +80,8 @@ if the swipe's threshold change to `0.5`, shorten swipe-length by half
 
 ## Options
 
-*   `-v` : Enable debug mode.
+*   `-v`, `--verbose`             : Shows details about the results of running fusuma
+*   `-c`, `--config=path/to/file` : Use an alternative config file
 
 ## Contributing
 

data/exe/fusuma

@@ -7,9 +7,14 @@ option = {}
 OptionParser.new do |opt|
   opt.on('-v',
          '--verbose',
-         'shows details about the results of running fusuma') do |v|
+         'Shows details about the results of running fusuma') do |v|
     option[:verbose] = v
   end
+  opt.on('-c',
+         '--config=path/to/file',
+         'Use an alternative config file') do |v|
+    option[:config] = v
+  end
   opt.parse!(ARGV)
 end
 

data/lib/fusuma.rb

@@ -22,7 +22,12 @@ module Fusuma
       end
 
       def read_options(option)
-        debug = option.fetch(:verbose, false)
+        config_path = option.fetch(:config, nil)
+        if config_path
+          Config.instance.custom_path = config_path
+          Config.reload
+        end
+        debug = option.fetch(:verbose, nil)
         MultiLogger.instance.debug_mode = true if debug
       end
     end

data/lib/fusuma/config.rb

@@ -19,10 +19,13 @@ module Fusuma
       end
     end
 
+    attr_reader :keymap
+    attr_accessor :custom_path
+
     def initialize
+      @custom_path = nil
       reload
     end
-    attr_accessor :keymap
 
     def reload
       @cache  = nil
@@ -56,9 +59,25 @@ module Fusuma
 
     def file_path
       filename = 'fusuma/config.yml'
-      original_path = File.expand_path "~/.config/#{filename}"
-      default_path  = File.expand_path "../../#{filename}", __FILE__
-      File.exist?(original_path) ? original_path : default_path
+      if custom_path && File.exist?(expand_custom_path)
+        expand_custom_path
+      elsif File.exist?(expand_config_path(filename))
+        expand_config_path(filename)
+      else
+        expand_default_path(filename)
+      end
+    end
+
+    def expand_custom_path
+      File.expand_path(custom_path)
+    end
+
+    def expand_config_path(filename)
+      File.expand_path "~/.config/#{filename}"
+    end
+
+    def expand_default_path(filename)
+      File.expand_path "../../#{filename}", __FILE__
     end
 
     def action_index(gesture_info)

data/lib/fusuma/multi_logger.rb

@@ -5,13 +5,15 @@ module Fusuma
   # logger separate between stdout and strerr
   class MultiLogger < Logger
     include Singleton
+
+    attr_reader :err_logger
+    attr_accessor :debug_mode
+
     def initialize
       super(STDOUT)
       @err_logger = Logger.new(STDERR)
       @debug_mode = false
     end
-    attr_reader :err_logger
-    attr_accessor :debug_mode
 
     def info(msg)
       return unless debug_mode?

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler