clock_window 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eeb75045c84292f96dc765b06173d5c43afe5e0
-  data.tar.gz: 908fd15c3d7c4beba0dfb4bf497e19147aa99612
+  metadata.gz: 5012765917a148b032d0ba2d0500799e4f755f3c
+  data.tar.gz: 4753ccc37be96da66166b90a683c2c08c3cad383
 SHA512:
-  metadata.gz: 7bd7995f99f8d5aee5d81b5fb58fa8f1b0e129c53d1d4840a3f6638a3d13fbb777884765d45c55a1eef106c8bcff0001928dc28d30df258b7f94ef4f5e119fca
-  data.tar.gz: fbcdecdde1147191822d8c0d6ee9c40bd46e12c7cea0e03a70cf3707d66bc8e2eeae3f32626afee406739867b3c497a86690827f024c83a2ee720623f413e172
+  metadata.gz: d4794cfd6ebec829de70e8ef42a6c6901ffd3b2cbdcdbbc7669a22374fc075bcda2eb36e7e3d1dafb470ff117319e0487bdd650b3b432655e6a47015aed440ed
+  data.tar.gz: 615416ae0e711751cefed115c9848e090a919c8f3f40ea39c0896fa29973a6d4a95eabd1709a1d68b9ae2f1b7428683383a2948e2a93f9e8566acd8d439a4fcf

data/.travis.yml

@@ -2,4 +2,5 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.1
-before_install: gem install bundler -v 1.12.1
+before_install: gem install bundler -v 1.12.3
+script: XWINDOWS=FALSE bundle exec rake test

data/README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/danielpclark/clock_window.svg?branch=master)](https://travis-ci.org/danielpclark/clock_window)
 [![Code Triagers Badge](http://www.codetriage.com/danielpclark/clock_window/badges/users.svg)](http://www.codetriage.com/danielpclark/clock_window)
 
 # Clock Window

data/lib/clock_window/filters.rb

@@ -0,0 +1,48 @@
+module ClockWindow
+  class Filters
+    def initialize(**kwargs)
+      @title_range = kwargs.fetch(:title_range)     { 0..60 }
+      @lazy_matchers = kwargs.fetch(:lazy_matchers) { true  }
+      @no_notify = kwargs.fetch(:no_notify)         { false }
+
+      # These are destructive matchers.  String will conform to match data.
+      @matches = Array(kwargs.fetch(:matches)           { [] }) # [/(thing)/, /(in)/] # parenthesis takes priority
+      @substitutions = Array(kwargs.fetch(:substitutions) { [] }) # [[//,'']]
+    end
+
+    def call(source)
+      apply_filters(source)
+    end
+
+    private
+    def apply_filters(target)
+      target = matchers(target)
+      @substitutions.each do |a,b|
+        target = target.gsub(a,b)
+      end
+      target = no_notify(target)
+      target[@title_range]
+    end
+
+    def matchers(target)
+      @matches.each do |fltr|
+        if @lazy_matchers
+          tmp = target.match( Regexp.new(fltr) )
+          tmp = tmp[1] || tmp[0] if tmp.is_a? MatchData
+          target = tmp || target 
+        else
+          target = target[Regexp.new(fltr)].to_s
+        end
+      end
+      target
+    end
+
+    def no_notify(target)
+      # Remove Twitter notifications (must be last)
+      # Other sites may follow same notification pattern
+      target = target.gsub(Regexp.new(/\A ?\(\d+\) ?/), '') if @no_notify
+      target
+    end
+  end
+
+end

data/lib/clock_window/oscommand.rb

@@ -0,0 +1,61 @@
+module ClockWindow
+  class OScommand
+    using Refinements::AddIf
+    # As this will get more sophisticated this class is the Back End
+    def initialize(**kwargs)
+      @filter_opts = kwargs.fetch(:filter_opts) { {} }
+
+      # Detect operating system
+      @os = RbConfig::CONFIG['host_os']
+    end
+
+    # output will be a two parameter array
+    # the first will be an OS specific executable string
+    # the second will be formatting the return value from the executables output
+    def active_window
+      # Choose script to execute and format output to just window name
+      case @os
+      when /linux/i
+        # Linux command to execute
+        exe = "xprop -id $(xprop -root 32x '\t$0' _NET_ACTIVE_WINDOW | cut -f 2) _NET_WM_NAME"
+
+        # Filters for resulting string
+        format = Filters.new(
+          matches: [ Regexp.new(/.*\"(.*)\"\n\z/) ].
+            add_if(@filter_opts.has_key? :matches){@filter_opts.delete(:matches)},
+          **@filter_opts
+        )
+        [exe, format]
+      when /darwin/i
+        exe = <<-SCRIPT
+          osascript -e '
+            global frontApp, frontAppName, windowTitle
+
+            set windowTitle to ""
+            tell application "System Events"
+              set frontApp to first application process whose frontmost is true
+              set frontAppName to name of frontApp
+              tell process frontAppName
+                  tell (1st window whose value of attribute "AXMain" is true)
+                      set windowTitle to value of attribute "AXTitle"
+                  end tell
+              end tell
+            end tell
+
+            return windowTitle & " - " & frontAppName
+          '
+        SCRIPT
+
+        format = Filters.new(
+          matches: [ Regexp.new(/(.*)\n/) ].
+            add_if(@filter_opts.has_key? :matches){@filter_opts.delete(:matches)},
+          **@filter_opts
+        )
+        [exe, format]
+      else
+        raise "Not implemented for #{@os}"
+      end
+    end
+  end
+  private_constant :OScommand
+end

data/lib/clock_window/refinements.rb

@@ -0,0 +1,12 @@
+module ClockWindow
+  module Refinements
+    module AddIf
+      refine Array do
+        def add_if(expr)
+          self.insert(-1, *Array(yield)) if expr
+          self
+        end
+      end
+    end
+  end
+end

data/lib/clock_window/version.rb

@@ -1,3 +1,3 @@
 module ClockWindow
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/clock_window.rb

@@ -1,10 +1,13 @@
 require "clock_window/version"
+require "clock_window/refinements"
+require "clock_window/filters"
+require "clock_window/oscommand"
 
 module ClockWindow
   class ClockIt
     # As this will get more sophisticated this class is the UI
-    def initialize
-      @os_cmd = OScommand.new
+    def initialize(**kwargs)
+      @os_cmd = OScommand.new(**kwargs)
     end
 
     def active_window
@@ -12,54 +15,4 @@ module ClockWindow
       format.call(`#{exe}`)
     end
   end
-
-  class OScommand
-    # As this will get more sophisticated this class is the Back End
-    def initialize
-      # Detect operating system
-      @os = RbConfig::CONFIG['host_os']
-      @window_title_length = 0..60
-    end
-
-    # output will be a two parameter array
-    # the first will be an OS specific executable string
-    # the second will be formatting the return value from the executables output
-    def active_window
-      # Choose script to execute and format output to just window name
-      case @os
-      when /linux/i
-        exe = "xprop -id $(xprop -root 32x '\t$0' _NET_ACTIVE_WINDOW | cut -f 2) _NET_WM_NAME"
-        format = ->str{ str.match(/.*\"(.*)\"\n\z/)[1][@window_title_length] }
-        [exe, format]
-      when /darwin/i
-        exe = <<-SCRIPT
-          osascript -e '
-            global frontApp, frontAppName, windowTitle
-
-            set windowTitle to ""
-            tell application "System Events"
-              set frontApp to first application process whose frontmost is true
-              set frontAppName to name of frontApp
-              tell process frontAppName
-                  tell (1st window whose value of attribute "AXMain" is true)
-                      set windowTitle to value of attribute "AXTitle"
-                  end tell
-              end tell
-            end tell
-
-            return {frontAppName, windowTitle}
-          '
-        SCRIPT
-
-        format = ->str {
-          app, window = str.split(',')
-          "#{window.strip} - #{app.strip}"[@window_title_length]
-        }
-        [exe, format]
-      else
-        raise "Not implemented for #{@os}"
-      end
-    end
-  end
-  private_constant :OScommand
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clock_window
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -85,6 +85,9 @@ files:
 - clock_window.gemspec
 - exe/clock_window
 - lib/clock_window.rb
+- lib/clock_window/filters.rb
+- lib/clock_window/oscommand.rb
+- lib/clock_window/refinements.rb
 - lib/clock_window/version.rb
 homepage: https://github.com/danielpclark/clock_window
 licenses: