fest 1.3.12 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911be5f2274e3d6480715de33a5a22ae7579f420
-  data.tar.gz: 4ccef82bd14c9b03efd7883e5d7812489102c0d8
+  metadata.gz: 971b8a6270186dc0400dd8c2831878d736b6a698
+  data.tar.gz: 5000bd30c31c717c364ec41e100bcccae9a3c98e
 SHA512:
-  metadata.gz: fff84a8efefeca08043a8ce7b7cde76b9c13f5a92478f14932b6be7067acf49c8a2d03eb354432d43beceafb19cbee9c8f00cf32d425f77c87204dc9beb78719
-  data.tar.gz: b3dfff72cac33060164af1092b47149b443d04540cf9134058f5e2ed2177cef6ac578f5141ce216a926d73a500359161580333fc274fe959fd403b289288376d
+  metadata.gz: 66cc10e14ab3435990869502e7ad6cce79be50163bac163c05708c7739aa9fef1fe1b6fc8f1f99592e6f169ea46b7c26614388bebd5c3017a21ba9dd55e14c11
+  data.tar.gz: 8f8233848deaa304ce77f950e276a0449ea421802cfb0849c5e6f75b5cd968b12f80520cb9334595096ef047d9902fde79197cf88c00b617b317a5ec59d5f7db

data/README.md

@@ -9,7 +9,7 @@ Ruby wrapper use [Festival](https://wiki.archlinux.org/index.php/Festival_%28%D0
 
 ## Requirements
 
-- *nix* or OS X ...
+- *nix* or OS X (pgrep tools) ...
 - [Festival](https://wiki.archlinux.org/index.php/Festival_%28%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%29) and necessary languages ...
 - [Pulseaudio](https://wiki.archlinux.org/index.php/PulseAudio_%28%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%29)
 

data/changelog.org

@@ -1,3 +1,7 @@
+** 1.4.12 (Сб 03 окт 2015 13:08:17)
+- manage volumes on inputs ... down ... up ...
+- merge for default params with params ...
+- add conditions ... flash and skype ...
 ** 1.3.12 (Пт 02 окт 2015 09:37:39)
 - fix conditions ... delete xbacklight from dependence ...
 ** 1.3.11 (Чт 01 окт 2015 18:40:50)

data/config/conditions.yml

@@ -2,7 +2,21 @@
 light:
   - "brightness = `cat /sys/class/backlight/intel_backlight/brightness`.to_i"
   - "exit if @backlight == 'nil' && brightness == 0"
+flash:
+  - "displays = `xvinfo`.scan(/screen\\s#(\\d+)/i).flatten"
+  - "displays.each do |display|"
+  - "  display = display.eql?('0') ? '' : '.' + display"
+  - "  active = `DISPLAY=:0#{display} xprop -root '_NET_ACTIVE_WINDOW'`.scan(/\\w+/).last"
+  - "  unless `xprop -id '#{active}' | grep '_NET_WM_STATE_FULLSCREEN'`.empty?"
+  - "    title = `xprop -id '#{active}' | grep 'WM_CLASS(STRING)'`"
+  - "    ['unknown', 'plugin-containe', 'exe'].each do |name|"
+  - "      exit if title.scan(name).last == name"
+  - "    end"
+  - "  end"
+  - "end"
+skype:
+  - "exit unless `pactl list sink-inputs | grep 'phone'`.empty?"
 players:
   - "%w(xbmc kodi vlc).each do |player|"
-  - "exit if `ps -el | grep '#{player}' | wc -l`.to_i > 0"
+  - "  exit if `pgrep -lfc '#{player}'`.to_i > 0"
   - "end"

data/config/custom.yml

@@ -1,7 +1,7 @@
 ---
 path:
   '/tmp'
-current_volume:
+common_volume:
   - "`amixer | grep -o '[0-9]*' | sed '5 ! d' `.to_i"
 index:
   - "index = `ls -r #{@path} | grep -o '[0-9]*' | sed '1 ! d'`.to_i"

data/config/default.yml

@@ -1,7 +1,7 @@
 ---
 path:
   '/tmp'
-current_volume:
+common_volume:
   - "`amixer | grep -o '[0-9]*' | sed '5 ! d' `.to_i"
 index:
   - "index = `ls -r #{@path} | grep -o '[0-9]*' | sed '1 ! d'`.to_i"

data/fest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'fest'
-  gem.version = '1.3.12'
+  gem.version = '1.4.12'
   gem.authors = 'Alexsey Ermolaev'
   gem.email = 'afay.zangetsu@gmail.com'
   gem.homepage = 'https://github.com/AfsmNGhr/fest'

data/lib/fest.rb

@@ -14,14 +14,13 @@ class Fest
     unless string.nil? || string.empty?
       check_conditions
       make_wav(string)
-      expect_if_paplay_now
       play_wav
+      delete_wav
     end
   end
 
   def initialize(params = {})
-    params =
-      YAML.load_file("#{GEM_ROOT}/config/default.yml") if params == {}
+    params = YAML.load_file("#{GEM_ROOT}/config/default.yml").merge(params)
     params.each do |key, value|
       instance_variable_set(
         "@#{key}",
@@ -45,20 +44,20 @@ class Fest
 
   def expect_if_paplay_now
     loop do
-      break if `ps -el | grep paplay | wc -l`.to_i == 0
+      break if `pgrep -lfc 'paplay'`.to_i == 0
       sleep 1
     end
   end
 
   def play_wav
-    check_optimal_volume
+    expect_if_paplay_now
+    current_volumes_on_inputs
+    volumes_for_inputs
     optimize_volume
-    sink_inputs
-    change_volume(@current_volume, @volume, @step)
+    change_volumes(@current_volumes, @volumes, @step)
     system("paplay #{@path}/say_#{@index}.wav \
       --volume='#{@optimize_volume * 655}' > /dev/null 2>&1")
-    change_volume(@volume, @current_volume, @step)
-    delete_wav
+    change_volumes(@volumes, @current_volumes, @step)
   end
 
   def delete_wav

data/lib/fest/volume.rb

@@ -1,33 +1,40 @@
 # coding: utf-8
-#
 module Volume
-  def check_optimal_volume
-    @volume = @current_volume - @current_volume / 10 * @step
+  def current_volumes_on_inputs
+    info = `pactl list sink-inputs`
+    inputs = info.scan(/\A#|№(\d+)/).flatten
+    volumes = info.scan(/\W+:\s\w+\W+\w+:\s\d+\s\/\s+(\d+)%/).flatten
+    @current_volumes = inputs.zip(volumes.map(&:to_i)).to_h
+  end
+
+  def volumes_for_inputs
+    @volumes = {}
+    @current_volumes.each do |input, volume|
+      @volumes.merge!({ input => (volume - volume / 10 * @step) })
+    end
+    @volumes
   end
 
   def optimize_volume
     @optimize_volume = (
-    if @current_volume > @max_volume
+    if @common_volume > @max_volume
       @max_volume
-    elsif @current_volume < @min_volume
+    elsif @common_volume < @min_volume
       @min_volume
     else
-      @current_volume
+      @common_volume
     end
     )
   end
 
-  def sink_inputs
-    @inputs = `pactl list sink-inputs | grep '№' | grep -o '[0-9]*'`.split("\n")
-  end
-
-  def change_volume(volume, break_volume, step)
-    change = volume > break_volume ? 'down' : 'up'
-    @inputs.each do |input|
+  def change_volumes(volumes, break_volumes, step)
+    volumes.each do |input, volume|
+      change = volume > break_volumes[input] ? 'down' : 'up'
       loop do
         system("pactl set-sink-input-volume #{input} '#{volume * 655}'")
         change == 'up' ? volume += step : volume -= step
-        break if change == 'up' ? volume > break_volume : volume < break_volume
+        break if change == 'up' ? volume > break_volumes[input] :
+                   volume < break_volumes[input]
       end
     end
   end

data/spec/volume_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Fest do
       @fest = Fest.new
       params = YAML.load_file("#{GEM_ROOT}/config/default.yml")
       @step = params['step']
-      @current_volume = eval(params['current_volume'].join('; '))
+      @common_volume = eval(params['common_volume'].join('; '))
       @max_volume = params['max_volume']
       @min_volume = params['min_volume']
     end
@@ -16,56 +16,65 @@ RSpec.describe Fest do
       expect(@fest.class.included_modules.include?(Volume)).to be_truthy
     end
 
-    it 'current volume eq volume?' do
+    it 'common volume eq volume?' do
       vol = `amixer | grep -o '[0-9]*' | sed "5 ! d"`.to_i
-      expect(@current_volume).to eq(vol)
+      expect(@common_volume).to eq(vol)
     end
 
-    it '#inputs' do
-      inputs =
-        `pactl list sink-inputs | grep '№' | grep -o '[0-9]*'`.split("\n")
-      expect(@fest.sink_inputs).to match_array(inputs)
+    it '#current_volumes_on_inputs' do
+      info = `pactl list sink-inputs`
+      inputs = info.scan(/\A#|№(\d+)/).flatten
+      volumes = info.scan(/\W+:\s\w+\W+\w+:\s\d+\s\/\s+(\d+)%/).flatten
+      current_volumes = inputs.zip(volumes.map(&:to_i)).to_h
+      expect(@fest.current_volumes_on_inputs).to eq(current_volumes)
     end
 
-    it '#check_optimal_volume' do
-      vol = @current_volume - @current_volume / 10 * @step
-      expect(@fest.check_optimal_volume).to eq(vol)
+    it '#volumes_for_inputs' do
+      current_volumes = @fest.current_volumes_on_inputs
+      volumes = {}
+      current_volumes.each do |input, volume|
+        volumes.merge!({ input => (volume - volume / 10 * @step) })
+      end
+      expect(@fest.volumes_for_inputs).to eq(volumes)
     end
 
     it '#optimize_volume' do
-      if @current_volume > @max_volume
-        expect(@fest.optimize_volume).to be < @current_volume
-      elsif @current_volume < @min_volume
-        expect(@fest.optimize_volume).to be > @current_volume
+      if @common_volume > @max_volume
+        expect(@fest.optimize_volume).to be < @common_volume
+      elsif @common_volume < @min_volume
+        expect(@fest.optimize_volume).to be > @common_volume
       else
-        expect(@fest.optimize_volume).to eq(@current_volume)
+        expect(@fest.optimize_volume).to eq(@common_volume)
       end
     end
 
-    it '#change_volume down' do
-      @fest.sink_inputs
-      @fest.change_volume(
-        @current_volume,
-        @fest.check_optimal_volume,
-        @step
-      )
+    it '#change_volumes down' do
+      @fest.change_volumes(
+        @fest.current_volumes_on_inputs, @fest.volumes_for_inputs, @step)
+
+      info = `pactl list sink-inputs`
+      inputs = info.scan(/\A#|№(\d+)/).flatten
+      volumes = info.scan(/\W+:\s\w+\W+\w+:\s\d+\s\/\s+(\d+)%/).flatten
+      current_volumes = inputs.zip(volumes.map(&:to_i)).to_h
 
-      current_volume = `amixer | grep -o '[0-9]*' | sed "5 ! d"`.to_i
-      vol = current_volume - current_volume / 10 * @step
-      expect(@fest.check_optimal_volume).to eq(vol)
+      @fest.volumes_for_inputs.each do |input, volume|
+        expect(volume).to eq(current_volumes[input])
+      end
     end
 
-    it '#change_volume up' do
-      @fest.sink_inputs
-      @fest.change_volume(
-        @fest.check_optimal_volume,
-        @current_volume,
-        @step
-      )
+    it '#change_volumes up' do
+      @fest.current_volumes_on_inputs
+      @fest.change_volumes(
+        @fest.volumes_for_inputs, @fest.current_volumes_on_inputs, @step)
 
-      current_volume = `amixer | grep -o '[0-9]*' | sed "5 ! d"`.to_i
-      vol = `amixer | grep -o '[0-9]*' | sed "5 ! d"`.to_i
-      expect(current_volume).to eq(vol)
+      info = `pactl list sink-inputs`
+      inputs = info.scan(/\A#|№(\d+)/).flatten
+      volumes = info.scan(/\W+:\s\w+\W+\w+:\s\d+\s\/\s+(\d+)%/).flatten
+      current_volumes = inputs.zip(volumes.map(&:to_i)).to_h
+
+      @fest.current_volumes_on_inputs.each do |input, volume|
+        expect(volume).to eq(current_volumes[input])
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fest
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.4.12
 platform: ruby
 authors:
 - Alexsey Ermolaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake