fest 1.2.10 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d50c7542a471b18e485824b82e1b2bb9167a731
-  data.tar.gz: dba013463a29ac9cc600d8a5409cbb31ae9b2a41
+  metadata.gz: 162120a716861b8e7afe36ae975895af52eee799
+  data.tar.gz: ce28d4db581b858d5165640155388073edcbaa82
 SHA512:
-  metadata.gz: a5b23bba2ab84449c1d0f39fc860e42ebdc6cd44d07b6e970ee404e953a012e803af17448e4325b3e1ac8def3ab080b57aa816d61a2b3602e038f4ad2f3b7fb4
-  data.tar.gz: f986e9e00655b709cf5cb7fba4c82599be713bfba578c80ed4729f54a4bdc8dc86c2d2532c43d7e0dc3a8230f5a0938799b123e88f3446927c7025b3b98b37e3
+  metadata.gz: 34fed53a50413d0484681508ba00d25f8c1c00283f21fbeb2abff3c06a062c35585971647bb6efc0b181b751309d0c0b99d650809a9550c8e36cbbc9a0b36b2c
+  data.tar.gz: aab8528a178264dff0bb486670e8bc208ce90ac9e201d23cd149d6fdcfa758232e4e74bf06a93c8b5eaaf9347ae7fea786cb933a5e0e067f3f292d84307faad0

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format progress
+--backtrace

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
+cache:
+  - bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.3
-  - 2.1.4
+  - 2.1.0
+  - 2.2.0
   - ruby-head
 before_install:
   - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc'

data/README.md

@@ -34,42 +34,27 @@ require 'fest'
 @fest.say("Пример")
 # => Say "Пример"
 
-# Expanded option
-@fest.params = {:language => "cmu_us_slt_arctic_hts"}
+@fest = Fest.new({'language' => "cmu_us_slt_arctic_hts"})
 @fest.say("This is an example")
 # => Say "This is an example"
 
 # All options
 # params || default value
-params[:path] || "/tmp"
-params[:min_volume] || 20
-params[:max_volume] || 60
-params[:step] || 4
-params[:backlight] || nil # disable check backlight
-params[:language] || "voice_msu_ru_nsh_clunits"
-
-# Declension
-text = @fest.pluraform(2, %w(Сообщение Сообщения Сообщений))
-puts text
-# => "Сообщения"
-```
+params['path'] || "/tmp"
+params['min_volume'] || 20
+params['max_volume'] || 60
+params['step'] || 4
+params['backlight'] || nil # disable check backlight
+params['language'] || "voice_msu_ru_nsh_clunits"
 
 ## Сustomization
 
-```.ruby
-@fest.init(params)
+@fest.initialize(params = {})
 # check @current_volume
 # @path, @index, @min_volume, @max_volume ...
 
 @fest.check_conditions
-# @fest.check_say_wav
-# check_light и check_home_theater
-
-@fest.check_light # (with xbacklight)
-# exit if backlight equal 0
-
-@fest.check_home_theater
-# exit if run (vlc, kodi(xbmc))
+# eval config/conditions.yml
 
 @fest.make_wav(text)
 

data/Rakefile

@@ -10,5 +10,11 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+RSpec::Core::RakeTask.new(:spec) do |task|
+   file_list = FileList['spec/**/*_spec.rb']
+   file_list -= ['spec/fest_spec.rb',
+                 'spec/volume_spec.rb']
+   task.pattern = file_list
+end
+
+task default: :spec

data/changelog.org

@@ -1,3 +1,9 @@
+** 1.3.10 (2015-28-09 Пн)
+- initialize with params for yml file
+- check conditions @params['conditions'] or conditions.yml
+- delete module conditions
+- delete pluraform ...
+- delete accessor params ...
 ** 1.2.10 (2015-03-11 Ср)
 - say without params
 - attr_accessor params

data/config/conditions.yml

@@ -0,0 +1,7 @@
+---
+light:
+  - "exit if @backlight.nil? && `xbacklight`.to_i == 0"
+players:
+  - "['xbmc', 'kodi', 'vlc'].each do |player|"
+  - "exit if `ps -el | grep '#{player}' | wc -l`.to_i > 0"
+  - "end"

data/config/default.yml

@@ -0,0 +1,20 @@
+---
+path:
+  '/tmp'
+current_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"
+  - "index > 0 ? index += 1 : index = 1"
+min_volume:
+  20
+max_volume:
+  60
+step:
+  4
+language:
+  'voice_msu_ru_nsh_clunits'
+backlight:
+  nil
+conditions:
+  {}

data/fest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'fest'
-  gem.version = '1.2.10'
+  gem.version = '1.3.10'
   gem.authors = 'Alexsey Ermolaev'
   gem.email = 'afay.zangetsu@gmail.com'
   gem.homepage = 'https://github.com/AfsmNGhr/fest'
@@ -8,11 +8,11 @@ Gem::Specification.new do |gem|
   gem.summary = 'Ruby wrapper for festival speech engine'
   gem.license = 'MIT'
 
-  gem.add_development_dependency 'rake', '~> 0'
-  gem.add_development_dependency 'rspec', '3.2.0'
+  gem.add_development_dependency 'rake', '~> 10.4'
+  gem.add_development_dependency 'rspec', '~> 3.3'
 
   gem.files = `git ls-files`.split("\n")
-  gem.require_paths = ['lib']
+  gem.require_paths = ['lib', 'config']
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
 
   gem.extra_rdoc_files = ['License.org', 'README.md']

data/lib/fest/volume.rb

@@ -17,28 +17,17 @@ module Volume
     )
   end
 
-  def inputs
-    @inputs = `pactl list sink-inputs | grep № | grep -o '[0-9]*'`.split("\n")
+  def sink_inputs
+    @inputs = `pactl list sink-inputs | grep '№' | grep -o '[0-9]*'`.split("\n")
   end
 
-  def turn_down_volume
+  def change_volume(volume, break_volume, step)
+    change = volume > break_volume ? 'down' : 'up'
     @inputs.each do |input|
-      volume = @current_volume
       loop do
         system("pactl set-sink-input-volume #{input} '#{volume * 655}'")
-        volume -= @step
-        break if volume < @volume
-      end
-    end
-  end
-
-  def return_current_volume
-    @inputs.each do |input|
-      volume = @volume
-      loop do
-        system("pactl set-sink-input-volume #{input} '#{volume * 655}'")
-        volume += @step
-        break if volume > @current_volume
+        change == 'up' ? volume += step : volume -= step
+        break if change == 'up' ? volume > break_volume : volume < break_volume
       end
     end
   end

data/lib/fest.rb

@@ -2,33 +2,38 @@
 # Ruby wrapper for Festival speech engine
 # author Alexsey Ermolaev afay.zangetsu@gmail.com
 
-require_relative './fest/params'
+require 'bundler'
+GEM_ROOT = Bundler.rubygems.find_name('fest').first.full_gem_path
 require_relative './fest/volume'
-require_relative './fest/conditions'
-#
+require 'yaml'
+
 class Fest
-  include Params
   include Volume
-  include Conditions
-  attr_accessor :params
 
   def say(string)
-    init
     check_conditions
     make_wav(string)
     expect_if_paplay_now
     play_wav
   end
 
-  def init
-    @params ||= {}
-    current_volume
-    min_volume
-    max_volume
-    language
-    index
-    path
-    step
+  def initialize(params = {})
+    params =
+      YAML.load_file("#{GEM_ROOT}/config/default.yml") if params == {}
+    params.each do |key, value|
+      instance_variable_set(
+        "@#{key}",
+        value.is_a?(Array) ? eval(value.join('; ')) : value
+      )
+    end
+  end
+
+  def check_conditions
+    @conditions =
+      YAML.load_file("#{GEM_ROOT}/config/conditions.yml") if @conditions == {}
+    @conditions.values.each do |value|
+      eval(value.join('; '))
+    end
   end
 
   def make_wav(string)
@@ -46,26 +51,17 @@ class Fest
   def play_wav
     check_optimal_volume
     optimize_volume
-    inputs
-    turn_down_volume
+    sink_inputs
+    change_volume(@current_volume, @volume, @step)
     system("paplay #{@path}/say_#{@index}.wav \
       --volume='#{@optimize_volume * 655}' > /dev/null 2>&1")
-    return_current_volume
-    system("rm -f #{@path}/say_#{@index}.wav")
+    change_volume(@volume, @current_volume, @step)
+    delete_wav
   end
 
-  def pluralform(number, array)
-    n = number % 100
-    m = n % 10
-
-    if n > 10 && n < 20
-      array[2]
-    elsif m > 1 && m < 5
-      array[1]
-    elsif m == 1
-      array[0]
-    else
-      array[2]
+  def delete_wav
+    if File.exist?("#{@path}/say_#{@index}.wav")
+      File.delete("#{@path}/say_#{@index}.wav")
     end
   end
 end

data/spec/fest_spec.rb

@@ -0,0 +1,61 @@
+# coding: utf-8
+require 'spec_helper'
+
+RSpec.describe Fest do
+  before(:each) do
+    @fest = Fest.new
+    params = YAML.load_file("#{GEM_ROOT}/config/default.yml")
+    @index = params['index']
+    @path = params['path']
+  end
+
+  context '#say' do
+    it 'check successfull say' do
+      @fest.say('Начинаю тъэ+с т+ирова ние')
+      expect($?.success?).to be_truthy
+    end
+  end
+
+  context '#make_wav' do
+    it 'successfull make wav?' do
+      @fest.make_wav('Пример')
+      expect($?.success?).to be_truthy
+    end
+
+    it 'pid not eq latest' do
+      pid = $?.pid
+      @fest.make_wav('Пример')
+      expect(pid).not_to eq($?.pid)
+    end
+
+    it 'index change after make wav' do
+      i = `ls -r #{@path} | grep -o '[0-9]*' | sed "1 ! d"`.to_i
+      @fest.make_wav('Пример')
+      expect(@index).not_to eq(i)
+    end
+  end
+
+  context '#delete_wav' do
+    it 'with successfull?' do
+      @fest.make_wav('Пример')
+      @fest.delete_wav
+      expect($?.success?).to be_truthy
+    end
+
+    it 'index change' do
+      i = `ls -r #{@path} | grep -o '[0-9]*' | sed "1 ! d"`.to_i
+      @fest.make_wav('Пример')
+      @fest.delete_wav
+      x = `ls -r #{@path} | grep -o '[0-9]*' | sed "1 ! d"`.to_i
+      expect(i).to eq(x)
+    end
+  end
+
+  context 'for pause' do
+    it '#play_wav' do
+      @fest.make_wav('Вы числ+яю энт ро+п+ии ю вселенной')
+      @fest.play_wav
+      expect($?.success?).to be_truthy
+    end
+  end
+end

data/spec/params/custom_spec.rb

@@ -0,0 +1,20 @@
+require_relative '../spec_helper'
+
+describe Fest do
+  describe '#initialize' do
+    params = YAML.load_file("#{GEM_ROOT}/config/default.yml")
+    let(:loader) { described_class.new(params) }
+
+    params.each do |key, value|
+      let(":#{key}") { value.is_a?(Array) ? eval(value.join('; ')) : value }
+
+      context "when initialized with a set of @#{key}" do
+        it "from params['#{key}']" do
+          @path = params['path'] if key == 'index'
+          expect(loader.instance_variable_get("@#{key}".to_sym)).
+            to eq(value.is_a?(Array) ? eval(value.join('; ')) : value)
+        end
+      end
+    end
+  end
+end

data/spec/params/default_spec.rb

@@ -0,0 +1,20 @@
+require_relative '../spec_helper'
+
+describe Fest do
+  describe '#initialize' do
+    params = YAML.load_file("#{GEM_ROOT}/config/default.yml")
+    let(:loader) { described_class.new }
+
+    params.each do |key, value|
+      let(":#{key}") { value.is_a?(Array) ? eval(value.join('; ')) : value }
+
+      context "when initialized with a set of @#{key}" do
+        it "from params['#{key}']" do
+          @path = params['path'] if key == 'index'
+          expect(loader.instance_variable_get("@#{key}".to_sym)).
+            to eq(value.is_a?(Array) ? eval(value.join('; ')) : value)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fest
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.3.10
 platform: ruby
 authors:
 - Alexsey Ermolaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.3'
 description: Ruby wrapper for festival scripts
 email: afay.zangetsu@gmail.com
 executables: []
@@ -47,19 +47,21 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - License.org
 - README.md
 - Rakefile
 - changelog.org
+- config/conditions.yml
+- config/default.yml
 - fest.gemspec
 - lib/fest.rb
-- lib/fest/conditions.rb
-- lib/fest/params.rb
 - lib/fest/volume.rb
-- spec/custom_params_spec.rb
-- spec/default_params_spec.rb
+- spec/fest_spec.rb
+- spec/params/custom_spec.rb
+- spec/params/default_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/AfsmNGhr/fest
 licenses:
@@ -69,6 +71,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- config
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -85,12 +88,12 @@ requirements:
 - Festival snpeech engine
 - xbacklight
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for festival speech engine
 test_files:
-- spec/custom_params_spec.rb
-- spec/default_params_spec.rb
+- spec/fest_spec.rb
+- spec/params/custom_spec.rb
+- spec/params/default_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/fest/conditions.rb

@@ -1,19 +0,0 @@
-# coding: utf-8
-#
-module Conditions
-  def check_conditions
-    check_light
-    check_home_theater
-  end
-
-  def check_light
-    exit if @params[:backlight].nil? && `xbacklight`.to_i == 0
-  end
-
-  def check_home_theater
-    xbmc = `ps -el | grep xbmc | wc -l`.to_i
-    vlc = `ps -el | grep vlc | wc -l`.to_i
-    kodi = `ps -el | grep kodi | wc -l`.to_i
-    exit if xbmc > 0 || vlc > 0 || kodi > 0
-  end
-end

data/lib/fest/params.rb

@@ -1,32 +0,0 @@
-# coding: utf-8
-#
-module Params
-  def path
-    @path = @params[:path] || '/tmp'
-  end
-
-  def current_volume
-    @current_volume = `amixer | grep -o '[0-9]*' | sed "5 ! d"`.to_i
-  end
-
-  def index
-    @index = `ls -r #{@path} | grep -o '[0-9]*' | sed "1 ! d"`.to_i
-    @index > 0 ? @index += 1 : @index = 1
-  end
-
-  def min_volume
-    @min_volume = @params[:min_volume] || 20
-  end
-
-  def max_volume
-    @max_volume = @params[:max_volume] || 60
-  end
-
-  def step
-    @step = @params[:step] || 4
-  end
-
-  def language
-    @language = @params[:language] || 'voice_msu_ru_nsh_clunits'
-  end
-end

data/spec/custom_params_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Fest do
-  before(:each) do
-    @fest = Fest.new
-    @fest.params = {:language => 'cmu_us_slt_arctic_hts',
-                    :min_volume => 30,
-                    :max_volume => 70,
-                    :step => 3,
-                    :path => '~/'}
-  end
-
-  it 'check custom params' do
-    params = {:language => 'cmu_us_slt_arctic_hts',
-              :min_volume => 30,
-              :max_volume => 70,
-              :step => 3,
-              :path => '~/'}
-    expect(@fest.params).to eq(params)
-  end
-
-  it 'check custom path in params' do
-    expect(@fest.path).to eq('~/')
-  end
-
-  it 'check custom min volume' do
-    expect(@fest.min_volume).to eq(30)
-  end
-
-  it 'check custom max volume' do
-    expect(@fest.max_volume).to eq(70)
-  end
-
-  it 'check custom step' do
-    expect(@fest.step).to eq(3)
-  end
-
-  it 'check custom language' do
-    expect(@fest.language).to eq('cmu_us_slt_arctic_hts')
-  end
-end

data/spec/default_params_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Fest do
-  before(:each) do
-    @fest = Fest.new
-    @fest.params = {}
-  end
-
-  it 'check default params' do
-    expect(@fest.params).to eq({})
-  end
-
-  it 'check default path' do
-    expect(@fest.path).to eq('/tmp')
-  end
-
-  it 'check current volume' do
-    vol = `amixer | grep -o '[0-9]*' | sed "5 ! d"`.to_i
-    expect(@fest.current_volume).to eq(vol)
-  end
-
-  it 'check index' do
-    i = `ls -r #{@path} | grep -o '[0-9]*' | sed "1 ! d"`.to_i
-    expect(@fest.index).not_to eq(i)
-  end
-
-  it 'check default min volume' do
-    expect(@fest.min_volume).to eq(20)
-  end
-
-  it 'check default max volume' do
-    expect(@fest.max_volume).to eq(60)
-  end
-
-  it 'check default step' do
-    expect(@fest.step).to eq(4)
-  end
-
-  it 'check default language' do
-    expect(@fest.language).to eq('voice_msu_ru_nsh_clunits')
-  end
-end