fidget 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce823012d9505a1ffb01dc781c1481df5e507532
-  data.tar.gz: d328d92527cbeba4a359a0a270c8cb9d0de36c09
+  metadata.gz: 053aecb8ac134a93352ee94ad74e2b5d53391157
+  data.tar.gz: a03308997ca134b329f148f477865d630b336efb
 SHA512:
-  metadata.gz: 63bad66d8091d5a84099ae4b64e8d8bc230da6f4ca852bc7b7f6bca9d7184cc1fdadf9216404e1d22cc7fb31c59f58bb6e99ee64c5605ef72bb89779fffe0621
-  data.tar.gz: 941ff8d08cffa1cc6792f0a74b4808c5ea969271213936369e486c74f5cb1d3f30bc6534f76ebffabe0b0314801434775742f5928dd427711f0b1c7a8c75c7f5
+  metadata.gz: e891bb9f07dab6e7c6406cb1693cc59c84cf3ad3fce0f02741010af879d88e63cb9c982190ac418e53afa5fc63e981de9ed59d5d33ee97ed999ec053aaf76349
+  data.tar.gz: 75076bdb11679fe0e55c2df30e62a03ef218d64e841923e2569113e5b7c7c795728f86eee6bdb96e6661f24eff86ea61674226a7aac82779a007ee8bb0af6d1d

data/README.md

@@ -20,6 +20,7 @@ Additional OS X options:
 Additional Windows options:
 
   * `away` enables a low-power, but not sleeping, mode on Windows.
+  * `simulate` will simulate a user keyboard action every few seconds.
 
 Additional Linux options:
 

data/lib/fidget/platform/linux.rb

@@ -1,4 +1,6 @@
 class Fidget::Platform
+  require "dbus"
+
   def self.current_process(options)
     options = munge(options)
     suspend(options)
@@ -35,7 +37,7 @@ class Fidget::Platform
     end
     options
   end
-  #private_class_method :munge
+  private_class_method :munge
 
   def self.root_win
     ids = `xwininfo -root`.each_line.collect do |line|
@@ -45,12 +47,25 @@ class Fidget::Platform
     raise "Parsing xwininfo failed" unless ids.size == 1
     ids.first
   end
-  #private_class_method :root_win
+  private_class_method :root_win
 
   def self.suspend(options)
     if options.include? :display
+      # I'm sure that if we tried, we could find yet another way to do this
       system("xdg-screensaver suspend #{root_win}")
+      system('xset s off')
+      system('xset s noblank')
       system('xset -dpms')
+
+      # xdg-screensaver doesn't actually seem to work, but making DBus calls ourself does.
+      # This is possibly because the inhibit expires when the dbus-session command terminates
+      # I don't know if this will work in other distros though. Yay for consistency. *\o/*
+      begin
+        dbus_screensaver.Inhibit(root_win, 'Administratively disabled')
+      rescue => e
+        STDERR.puts 'Fidget: DBus action failed.'
+        STDERR.puts e.backtrace.join "\n"
+      end
     end
 
     if options.include? :blanking
@@ -63,7 +78,11 @@ class Fidget::Platform
   def self.resume(options)
     if options.include? :display
       system("xdg-screensaver resume #{root_win}")
-      system('xset dpms')
+      system('xset +dpms')
+      system('xset s on')
+
+      # if we have a cookie, we can trust that DBus works
+      dbus_screensaver.Uninhibit(@@cookie) if @@cookie
     end
 
     if options.include? :blanking
@@ -72,4 +91,13 @@ class Fidget::Platform
   end
   private_class_method :resume
 
+  def self.dbus_screensaver
+    session = DBus.session_bus
+    service = session['org.freedesktop.ScreenSaver']
+    object  = service['/ScreenSaver']
+    object.introspect
+    object['org.freedesktop.ScreenSaver']
+  end
+  private_class_method :dbus_screensaver
+
 end

data/lib/fidget/platform/windows.rb

@@ -40,7 +40,7 @@ class Fidget::Platform
     options.flatten!
     options.compact!
     options = [:display, :sleep] if options.empty?
-    options = [:display, :sleep, :away] if options == [:all]
+    options = [:display, :sleep, :simulate, :away] if options == [:all]
 
     terms = {
       :display => ES_DISPLAY_REQUIRED,
@@ -57,7 +57,7 @@ class Fidget::Platform
     state = Win32API.new('kernel32','SetThreadExecutionState','L')
     state.call(ES_CONTINUOUS|mode)
 
-    if options.include? :display
+    if options.include? :simulate
       @@kb_poker = Thread.new do
         kb = Win32API.new('user32.dll', 'keybd_event', 'nnnn', 'v')
         loop do

data/lib/fidget/version.rb

@@ -1,3 +1,3 @@
 class Fidget
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidget
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ben Ford
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-01-08 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-dbus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
     Fidget was inspired by the OS X commandline `caffeinate` tool, which in turn
     was inspired by the Caffeine menubar tool. However, this tool is cross platform