volay 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e383f672606a89520f19cc97e3704539037a44b65cd8f97b4e965ba8b3bd2a0
-  data.tar.gz: b0cfb666b0b3cdce544bb105fb58986311c72660a377df8fab2863e67e535e6b
+  metadata.gz: 66f48ec0ea900b7f7287f2eab6485e04bdbc06a0cc9e6a703cd49ee6a51a97ea
+  data.tar.gz: 32e5d402b328ccd0d504d11835c2e12951935c70127afe776ed8769e88ecccd1
 SHA512:
-  metadata.gz: f157a6475a185d45d55b0348c8b96c0164eeab49d23f0bc8bb793e109548e729f36f95f72fdde2a8762fc2984f34e4a9c14b8a2668e7fe3718cced3623e3524b
-  data.tar.gz: 59a3bec0c005d48f56e51eb8591e34718334a1f33fbefa62653d412a735e37a2afa1161fb5038b5ba871f8155412e8c4547d5d834e219d9c41128040af64090b
+  metadata.gz: a994cfad34bf6bb04ce516e571bf5e9e39a4522f96c0cf0d56bc1852b5a76aed77d3a2a3d060c2fa2eac6d051ba4d51d4e79e09c43762417440bab10b2695aaa
+  data.tar.gz: 923fd7c1765926770711e6f4a859467f50f0794d99b15c2db939e21f33d20abb77908a03edaa9b8e3c529256062546d267fffd3e7cc3b8a831d64edf1f0740c0

data/.rubocop.yml

@@ -7,6 +7,8 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
+Metrics/LineLength:
+  Max: 120
 Metrics/MethodLength:
   Enabled: false
 Metrics/PerceivedComplexity:
@@ -22,6 +24,3 @@ Style/FrozenStringLiteralComment:
   Exclude:
     - lib/volay/cli.rb
     - lib/volay/version.rb
-
-Performance/RegexpMatch:
-  Enabled: false

data/lib/volay.rb

@@ -5,9 +5,8 @@ require 'logger'
 require 'mixlib/cli'
 require 'mixlib/shellout'
 
-unless $LOAD_PATH.include?(File.expand_path('', __dir__))
-  $LOAD_PATH.unshift(File.expand_path('', __dir__))
-end
+$LOAD_PATH.unshift(File.expand_path('', __dir__)) unless
+  $LOAD_PATH.include?(File.expand_path('', __dir__))
 
 require 'volay/version'
 require 'volay/config'

data/lib/volay/mixer/pulse.rb

@@ -34,6 +34,8 @@ module Volay
       end
 
       def toggle
+        return if current_sink.nil?
+
         value = if current_sink['muted'] == 'yes'
                   'no'
                 else
@@ -45,10 +47,10 @@ module Volay
 
       def current
         {
-          value: current_sink['volume'],
+          value: current_sink.nil? ? 0 : current_sink['volume'],
           max_value: MAX_VALUE,
-          percent: volume_percent(current_sink['volume']),
-          muted: current_sink['muted'] == 'yes'
+          percent: current_sink.nil? ? 0 : volume_percent(current_sink['volume']),
+          muted: current_sink.nil? ? true : current_sink['muted'] == 'yes'
         }
       end
 
@@ -81,7 +83,10 @@ module Volay
       # Refresh cards data
       #
       def refresh
-        dump = command('dump').lines
+        cmd = command('dump')
+        return unless cmd
+
+        dump = cmd.lines
         dump.each do |line|
           args = line.split
 
@@ -173,6 +178,8 @@ module Volay
       # @param [Integer] volume Volume to set up, must be a percentage
       #
       def set_volume(volume)
+        return if current_sink.nil?
+
         volume = [[0, (volume * MAX_VALUE / 100)].max, MAX_VALUE].min
         @cards[@default_sink_id]['volume'] = volume
         sink = @cards[@default_sink_id]['sink']
@@ -189,6 +196,9 @@ module Volay
         result = Mixlib::ShellOut.new(command)
         Volay::Config.logger.debug(command)
         result.run_command
+
+        return unless result.exitstatus.zero?
+
         Volay::Config.logger.error(result.stderr) unless result.stderr.empty?
         Volay::Config.logger.debug(result.stdout) unless result.stdout.empty?
         result.stdout

data/lib/volay/version.rb

@@ -1,4 +1,4 @@
 # Volay module
 module Volay
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/lib/volay/volay.rb

@@ -3,9 +3,8 @@
 require 'gtk3'
 require 'mixlib-cli'
 
-unless $LOAD_PATH.include?(File.expand_path('', __dir__))
-  $LOAD_PATH.unshift(File.expand_path('', __dir__))
-end
+$LOAD_PATH.unshift(File.expand_path('', __dir__)) unless
+  $LOAD_PATH.include?(File.expand_path('', __dir__))
 
 require 'volay/version'
 require 'volay/app'

data/spec/volay/config_spec.rb

@@ -58,9 +58,22 @@ describe 'Volay::Config' do
     end
 
     it 'should return a mixer' do
+      run_command = double(
+        exitstatus: double(
+          zero?: true
+        )
+      )
+      shellout = double
+
       Volay::Config.logger.level = :info
-      allow_any_instance_of(Mixlib::ShellOut).to receive(:new).twice
-      allow_any_instance_of(Mixlib::ShellOut).to receive(:run_command)
+      allow_any_instance_of(Mixlib::ShellOut).to receive(:new)
+        .with('pacmd dump')
+        .and_return(shellout)
+
+      allow(shellout).to receive(:run_command)
+        .with("pacmd list-cards | grep -e device.string -e 'name:' -e 'card_name'")
+        .and_return(run_command)
+
       app_mixer('pacmd')
       expect(Volay::Config.mixer).to be_a(Volay::Mixer::Pulse)
     end

data/spec/volay/mixer/pulse_spec.rb

@@ -11,12 +11,17 @@ describe 'Volay::Mixer::Pulse' do
 
   def stub_shellout(cmd, stdout = '', stderr = '')
     shellout = double(
-      run_command: nil,
       error!: nil,
       stdout: stdout,
-      stderr: stderr
+      stderr: stderr,
+      exitstatus: double(
+        zero?: true
+      )
     )
 
+    allow(shellout).to receive(:run_command)
+      .once
+
     expect(Mixlib::ShellOut).to receive(:new)
       .with("pacmd #{cmd}")
       .and_return(shellout)

data/volay.gemspec

@@ -21,11 +21,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'mixlib-cli', '~>1.7'
   s.add_dependency 'mixlib-shellout', '~>2.3'
 
-  s.add_development_dependency 'fakefs', '~>0.13'
+  s.add_development_dependency 'fakefs', '~>0.20'
   s.add_development_dependency 'rack', '~>2.0'
   s.add_development_dependency 'rack-test', '~>0.8'
-  s.add_development_dependency 'rake', '~>12.0'
-  s.add_development_dependency 'rspec', '~>3.7'
-  s.add_development_dependency 'rubocop', '~>0.52'
-  s.add_development_dependency 'simplecov', '~>0.15'
+  s.add_development_dependency 'rake', '~>12.3'
+  s.add_development_dependency 'rspec', '~>3.8'
+  s.add_development_dependency 'rubocop', '~>0.69'
+  s.add_development_dependency 'rubocop-performance', '~>1.3'
+  s.add_development_dependency 'simplecov', '~>0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volay
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -114,56 +114,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.69'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.69'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 description: Really simple volume system tray written in ruby.
 email: pierre.rambaud86@gmail.com
 executables:
@@ -229,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: The Volume system tray