fest 1.4.12 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971b8a6270186dc0400dd8c2831878d736b6a698
-  data.tar.gz: 5000bd30c31c717c364ec41e100bcccae9a3c98e
+  metadata.gz: 53f68ffbc15a4a6966f6fcb94ce7574d62ca544d
+  data.tar.gz: e84ae4593be638f11355e4176e92940f6a2baeb9
 SHA512:
-  metadata.gz: 66cc10e14ab3435990869502e7ad6cce79be50163bac163c05708c7739aa9fef1fe1b6fc8f1f99592e6f169ea46b7c26614388bebd5c3017a21ba9dd55e14c11
-  data.tar.gz: 8f8233848deaa304ce77f950e276a0449ea421802cfb0849c5e6f75b5cd968b12f80520cb9334595096ef047d9902fde79197cf88c00b617b317a5ec59d5f7db
+  metadata.gz: b60e425906795bf19eaaafb1247731d783b3f638d13f0a8cdd9d6d696aafd953786068d36ba7a54e91531036e7e14367342291c8c4a290b90e4307d68a53112e
+  data.tar.gz: 0ef24eb74d9d1e5576c35ced977b9862572e4cb3f11128c0841c6019a76d45bc06165a8196449733b100f4bffb86520dc8f05dcbdf6dcb63a8502488809b0df3

data/README.md

@@ -30,8 +30,7 @@ $ gem install fest
 require 'fest'
 
 @fest = Fest.new
-@fest.say("Пример")
-# => Say "Пример"
+@fest.say("Пример") # => Say "Пример"
 
 @fest = Fest.new(YAML.load_file('../config/custom.yml'))
 @fest.say("This is an example")
@@ -39,21 +38,23 @@ require 'fest'
 
 # All options
 # params || default value
-params['path'] || "/tmp"
+params['path'] || '/tmp'
+params['flat_volumes'] || 'no' # need pulseaudio flat-volumes = no
 params['min_volume'] || 20
 params['max_volume'] || 60
 params['step'] || 4
 params['backlight'] || nil # disable check backlight
-params['language'] || "voice_msu_ru_nsh_clunits"
+params['language'] || 'voice_msu_ru_nsh_clunits'
+params['conditions'] || {} # eval config/conditions.yml
 
 ## Сustomization
 
 @fest.initialize(params = {})
-# check @current_volume
+# check @common_volume
 # @path, @index, @min_volume, @max_volume ...
 
 @fest.check_conditions
-# eval config/conditions.yml
+# eval config/conditions.yml if default conditions
 
 @fest.make_wav(text)
 
@@ -61,11 +62,7 @@ params['language'] || "voice_msu_ru_nsh_clunits"
 # wait if paplay active ...
 
 @fest.play_wav
-# @fest.check_optimal_volume (optimize min_volume and max_volume)
-# @fest.turn_down_volume (with @step)
-# @volume = @current_volume - @current_volume / 10 * @step
 # play wav ... with @optimize_volume
-# @fest.return_current_volume (with @step)
 # delete_wav
 ```
 
@@ -78,3 +75,11 @@ params['language'] || "voice_msu_ru_nsh_clunits"
 vlc.run --play-and-exit $*
 amixer set Master 30% > /dev/null 2>&1
 ```
+
+or
+
+```.js
+; pulseaudio config
+
+flat-volumes = no ; yes
+```

data/changelog.org

@@ -1,3 +1,7 @@
+** 1.4.14 (Ср 14 окт 2015 13:34:03)
+- fix optimize volume with flat_volumes ...
+** 1.4.13 (Ср 14 окт 2015 11:59:29)
+- add flat_volumes ... and play with it ...
 ** 1.4.12 (Сб 03 окт 2015 13:08:17)
 - manage volumes on inputs ... down ... up ...
 - merge for default params with params ...

data/config/custom.yml

@@ -1,6 +1,8 @@
 ---
 path:
   '/tmp'
+flat_volumes:
+  'yes'
 common_volume:
   - "`amixer | grep -o '[0-9]*' | sed '5 ! d' `.to_i"
 index:

data/config/default.yml

@@ -1,6 +1,8 @@
 ---
 path:
   '/tmp'
+flat_volumes:
+  'no'
 common_volume:
   - "`amixer | grep -o '[0-9]*' | sed '5 ! d' `.to_i"
 index:

data/fest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'fest'
-  gem.version = '1.4.12'
+  gem.version = '1.4.14'
   gem.authors = 'Alexsey Ermolaev'
   gem.email = 'afay.zangetsu@gmail.com'
   gem.homepage = 'https://github.com/AfsmNGhr/fest'
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
 
   gem.extra_rdoc_files = ['License.org', 'README.md']
-  gem.requirements = ['*nix* or OS X', 'Pulseaudio sound server',
-                      'Festival snpeech engine', 'xbacklight']
+  gem.requirements = ['*nix* or OS X (pgrep tools)',
+                      'Pulseaudio sound server',
+                      'Festival speech engine']
 end

data/lib/fest/volume.rb

@@ -16,15 +16,24 @@ module Volume
   end
 
   def optimize_volume
-    @optimize_volume = (
-    if @common_volume > @max_volume
-      @max_volume
-    elsif @common_volume < @min_volume
-      @min_volume
+    case @flat_volumes
+    when 'yes'
+      if @common_volume > @max_volume
+        @max_volume
+      elsif @common_volume < @min_volume
+        @min_volume
+      else
+        @common_volume
+      end
     else
-      @common_volume
+      if @common_volume > @max_volume
+        @max_volume
+      elsif @common_volume < @min_volume
+        @min_volume
+      else
+        100
+      end
     end
-    )
   end
 
   def change_volumes(volumes, break_volumes, step)

data/lib/fest.rb

@@ -53,10 +53,9 @@ class Fest
     expect_if_paplay_now
     current_volumes_on_inputs
     volumes_for_inputs
-    optimize_volume
     change_volumes(@current_volumes, @volumes, @step)
     system("paplay #{@path}/say_#{@index}.wav \
-      --volume='#{@optimize_volume * 655}' > /dev/null 2>&1")
+      --volume='#{optimize_volume * 655}' > /dev/null 2>&1")
     change_volumes(@volumes, @current_volumes, @step)
   end
 

data/spec/fest_spec.rb

@@ -56,6 +56,8 @@ RSpec.describe Fest do
       @fest.make_wav('Вы числ+яю энт ро+п+ии ю вселенной')
       @fest.play_wav
       expect($?.success?).to be_truthy
+      @fest.delete_wav
+      expect($?.success?).to be_truthy
     end
   end
 end

data/spec/volume_spec.rb

@@ -3,13 +3,16 @@ require 'spec_helper'
 
 RSpec.describe Fest do
   describe '::Volume' do
-    before(:each) do
+    before(:all) do
       @fest = Fest.new
       params = YAML.load_file("#{GEM_ROOT}/config/default.yml")
+      @flat_volumes = params['flat_volumes']
       @step = params['step']
       @common_volume = eval(params['common_volume'].join('; '))
       @max_volume = params['max_volume']
       @min_volume = params['min_volume']
+      @current_volumes = @fest.current_volumes_on_inputs
+      @volumes = @fest.volumes_for_inputs
     end
 
     it '.include? Volume' do
@@ -39,40 +42,48 @@ RSpec.describe Fest do
     end
 
     it '#optimize_volume' do
-      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
+      case @flat_volumes
+      when 'yes'
+        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(@common_volume)
+        end
       else
-        expect(@fest.optimize_volume).to eq(@common_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(100)
+        end
       end
     end
 
     it '#change_volumes down' do
-      @fest.change_volumes(
-        @fest.current_volumes_on_inputs, @fest.volumes_for_inputs, @step)
+      @fest.change_volumes(@current_volumes, @volumes, @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
 
-      @fest.volumes_for_inputs.each do |input, volume|
+      @volumes.each do |input, volume|
         expect(volume).to eq(current_volumes[input])
       end
     end
 
     it '#change_volumes up' do
-      @fest.current_volumes_on_inputs
-      @fest.change_volumes(
-        @fest.volumes_for_inputs, @fest.current_volumes_on_inputs, @step)
+      @fest.change_volumes(@volumes, @current_volumes, @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
 
-      @fest.current_volumes_on_inputs.each do |input, volume|
+      @current_volumes.each do |input, volume|
         expect(volume).to eq(current_volumes[input])
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fest
 version: !ruby/object:Gem::Version
-  version: 1.4.12
+  version: 1.4.14
 platform: ruby
 authors:
 - Alexsey Ermolaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,10 +85,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- "*nix* or OS X"
+- "*nix* or OS X (pgrep tools)"
 - Pulseaudio sound server
-- Festival snpeech engine
-- xbacklight
+- Festival speech engine
 rubyforge_project: 
 rubygems_version: 2.5.0
 signing_key: