global_hotkeys_manager 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61ace4dfdc9e4d6d1615d00b87c1ba16f2b8236
-  data.tar.gz: b2c8c1d16ecf29bc46c3151fe59ad5aff0cf1cf2
+  metadata.gz: adb28c6fbd1b19e075f73cbb840ed3ca04b8469b
+  data.tar.gz: 56bb046810c3638252f1df6befd963a997017801
 SHA512:
-  metadata.gz: 26af94ac42f815043d6aeb86d8d6c19a23d6058f2df02a5bf4fb03bd6ca22d38e4abe4525a68f501bb3098d864b9b3cee18d09cc773570b660569d91d6ea3717
-  data.tar.gz: ba167724570649b1025269aae5768f6d3dc3e75c2a533e096819a0895954fdd834a76a80efd28b8d85c991ba4429a772a2351e287dd00f3731d113ab57115cc9
+  metadata.gz: 21522c515cc792a33dd03b7f05ea6b813e73d681c21ab50c7efbfe7cfa46571b4daaabf4c0f04b730d844a439b39b0978662cdbb693511879e1a6452cc1f7a0e
+  data.tar.gz: 05dd0cff2152ec4fb9ab075b0ea69134d7dc23d968a1ec5c654fc853514ccede70ad830322c54487981921e88c3baf64d4fe772eed0850b7bb077e1eff48ac3b

data/exe/global_hotkeys_manager

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
+# to allow running the development checkout:
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+
 require 'global_hotkeys_manager'
-require 'global_hotkeys_manager/web_app'
 
 unless ['xbindkeys', 'xwininfo', 'xdotool'].all?{|app| system "which #{app} > /dev/null"}
   puts "The following tools are required to be installed for this app to work:
@@ -35,12 +37,18 @@ def stop
 end
 
 def start
-  exit 0 if running?
-  Process.daemon unless (debug_mode = ARGV[0] == 'debug')
+  debug_mode = ARGV[0] == 'debug'
+  if running?
+    puts "The daemon is currently running, please stop it first" if debug_mode
+    exit 0
+  end
+  Process.daemon unless debug_mode
+  GlobalHotkeysManager::SETTINGS[:debug] = true if debug_mode
   File.write PID_FILE, Process.pid
   at_exit{ File.delete PID_FILE }
   GlobalHotkeysManager.ensure_running
-  GlobalHotkeysManager::WebApp.run! environment: (debug_mode ? 'development' : 'production')
+  require 'global_hotkeys_manager/web_app'
+  GlobalHotkeysManager::WebApp.run!
 end
 
 case ARGV[0]

data/lib/global_hotkeys_manager.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require_relative 'global_hotkeys_manager/version'
 
 module GlobalHotkeysManager
+  SETTINGS = {}
   CONFIG_DIR = File.expand_path '~/.config/global-hotkeys-manager'
   XBINDKEYSRC = "#{CONFIG_DIR}/xbindkeysrc"
   HOTKEYS_JSON = "#{CONFIG_DIR}/hotkeys.json"
@@ -12,6 +13,7 @@ module GlobalHotkeysManager
   URL_BASE = "http://#{HOST}:#{PORT}"
 
   FileUtils.mkdir_p CONFIG_DIR
+  File.write XBINDKEYSRC, '' unless File.exist? XBINDKEYSRC # so that xbindkeys -k does not fail
 
   def self.pid
     return unless pid = `pgrep -o -f xbindkeys.*hotkeys`.split("\n").find{|p| system "kill -0 #{p}"}
@@ -109,7 +111,7 @@ module GlobalHotkeysManager
   end
 
   def self.ask_for_key
-    `xbindkeys -k`.split("\n").last
+    `xbindkeys -f #{XBINDKEYSRC} -k`.split("\n").last
   end
 end
 

data/lib/global_hotkeys_manager/version.rb

@@ -1,3 +1,3 @@
 module GlobalHotkeysManager
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/global_hotkeys_manager/web_app.rb

@@ -5,18 +5,19 @@ require_relative '../global_hotkeys_manager'
 
 module GlobalHotkeysManager
   class WebApp < Sinatra::Base
-    configure :development do
-      begin
-        require 'sinatra/reloader'
-        register Sinatra::Reloader
-      rescue Exception => e
-        puts 'For auto-reload to work sinatra-contrib gem must be installed'
-      end
-    end
-
     configure do
+      set :environment, :production
       set :port, GlobalHotkeysManager::PORT
       set :bind, GlobalHotkeysManager::HOST
+      if GlobalHotkeysManager::SETTINGS[:debug]
+        set :environment, :development
+        begin
+          require 'sinatra/reloader'
+          register Sinatra::Reloader
+        rescue Exception => e
+          puts 'For auto-reload to work sinatra-contrib gem must be installed'
+        end
+      end
     end
 
     get '/' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_hotkeys_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rodrigo Rosenfeld Rosas