volay 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c3642161520ea465b1c2593a913593fd00ce9037
-  data.tar.gz: 02c6cb3128ff4ac554dd9123d52fc5ee9a1e75e5
+SHA256:
+  metadata.gz: '0786e6be35e259e88f2c72bbd57b2b1014ec2e8e0928000c9162a2ca172cb1c0'
+  data.tar.gz: a4131cbfad89dfc19a8614c9c5a94313bd544a4c06bbdd89e443b0cd99935317
 SHA512:
-  metadata.gz: 03a28e5a4a6b8404ba849b0303f1ca5825e5baae672d6f7295f93b80c8e4e97faad8dd83b9ece29350768e8d0e9b75cb98c7b791fbecb138c6aeb756dd71630c
-  data.tar.gz: 26a6ba15b4a327bf539c27c53ae5f7d256583645f7fba8935d37afa808a79801818945805baea2be1ebc782685e29e84b26d4eeb24f98e59d8d2c27a414dae55
+  metadata.gz: 5e5220cba4ce083166566bcddaf825ddc77e12e78774b2fafc30f9bd6b93aa6778c9accaf18f032122dee0d36976c5a867d82e1ec8107b68530aafaf67da8272
+  data.tar.gz: e6c2f0e812fac1c0589ccc53b83229647e7edf36fa1dd0872a055f7a1dcd43cc41af6bad8f9b883b842eaffb6d5e313ba010ed3bcdeb83d0814a18dbf82e10ba

data/.rubocop.yml

@@ -8,3 +8,13 @@ Metrics/MethodLength:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*.rb
+
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - lib/volay/cli.rb

data/Gemfile

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,12 +1,12 @@
-#Volay, the Volume System Tray
+# Volay, the Volume System Tray
 
 [![Build Status](https://travis-ci.org/PierreRambaud/volay.svg)](https://travis-ci.org/PierreRambaud/volay)
 
-##Requirements
+## Requirements
 
  * Ruby 2.0 or newer
 
-##Installation
+## Installation
 
 From Rubygems:
 

data/Rakefile

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 GEMSPEC = Gem::Specification.load('gemirro.gemspec')
 
@@ -6,4 +8,4 @@ Dir['./task/*.rake'].each do |task|
   import(task)
 end
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]

data/bin/volay

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require File.expand_path('../../lib/volay', __FILE__)
 
 # Module volay
@@ -10,7 +12,7 @@ module Volay
       cli.parse_options
       Volay::Config.set(:log_level, cli.config[:log_level])
       Volay::Config.init_config
-      if [:up, :down, :mute].any? { |k| cli.config.key?(k) }
+      if %i[up down mute].any? { |k| cli.config.key?(k) }
         sound(cli.config)
       else
         app

data/lib/volay.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gtk3'
 require 'logger'
 require 'mixlib/cli'

data/lib/volay/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
   # App class

data/lib/volay/cli.rb

@@ -19,7 +19,7 @@ module Volay
            short: '-l LEVEL',
            long: '--log_level LEVEL',
            description: 'Set the log level (debug, info, warn, error, fatal)',
-           in: %w(debug info warn error fatal),
+           in: %I[debug info warn error fatal],
            default: :info,
            proc: proc { |l| l.to_sym })
 

data/lib/volay/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
   # Config class

data/lib/volay/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay Module
 module Volay
   # Mixer not found

data/lib/volay/mixer/alsa.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
   # Mixer module
@@ -32,7 +34,7 @@ module Volay
         { value: current_value,
           max_value: max_value,
           percent: current_percent,
-          muted: current_state == 'on' ? false : true }
+          muted: current_state != 'on' }
       end
 
       private

data/lib/volay/mixer/default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
   # Mixer module

data/lib/volay/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
   # Utils class
@@ -26,18 +28,14 @@ module Volay
     end
 
     def status_icon
-      unless @app.mixer.muted?
-        case @app.mixer.percent
-        when 66..100
-          icon = 'volume-high'
-        when 33..65
-          icon = 'volume-medium'
-        when 0..32
-          icon = 'volume-low'
-        end
+      return 'volume-muted' if @app.mixer.muted?
+      if (66..100).cover?(@app.mixer.percent)
+        'volume-high'
+      elsif (33..65).cover?(@app.mixer.percent)
+        'volume-medium'
+      else
+        'volume-low'
       end
-
-      icon.nil? ? 'volume-muted' : icon
     end
   end
 end

data/lib/volay/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'
 end

data/lib/volay/volay.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gtk3'
 require 'mixlib-cli'
 

data/lib/volay/widget/events.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
   # Widgets components
@@ -13,7 +15,7 @@ module Volay
         @app = app
 
         methods.each do |name|
-          next unless name =~ /^on_/
+          next unless name.match?(/^on_/)
           @app.signals_list[name.to_s] = method(name)
         end
       end

data/lib/volay/widget/system_tray.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
   # Widgets components
@@ -85,18 +87,16 @@ module Volay
             posx = rectangle.x + rectangle.width
             posy = rectangle.y
           end
+        elsif rectangle.y + rectangle.height + window_height <=
+              monitor.y + monitor.height
+          posy = rectangle.y + rectangle.height
         else
-          total = rectangle.y + rectangle.height + window_height
-          if total <= monitor.y + monitor.height
-            posy = rectangle.y + rectangle.height
-          else
-            posy = rectangle.y - window_height
-            posx = if rectangle.x + window_width <= monitor.x + monitor.width
-                     rectangle.x
-                   else
-                     monitor.x + monitor.width - window_width
-                   end
-          end
+          posy = rectangle.y - window_height
+          posx = if rectangle.x + window_width <= monitor.x + monitor.width
+                   rectangle.x
+                 else
+                   monitor.x + monitor.width - window_width
+                 end
         end
 
         [posx, posy]

data/lib/volay/widget/volume_control.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Volay module
 module Volay
   # Widgets components

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH << File.expand_path('../lib', __FILE__)
 
 require 'simplecov'

data/spec/volay/app_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fakefs/spec_helpers'
 require 'gtk3'
@@ -14,9 +16,6 @@ describe 'Volay::App' do
   include FakeFS::SpecHelpers
 
   context '#events' do
-    def app_events
-    end
-
     it 'should return alsa' do
       allow_any_instance_of(Volay::App).to receive(:initialize_mixer)
       allow_any_instance_of(Volay::App).to receive(:initialize_ui)
@@ -35,18 +34,18 @@ describe 'Volay::App' do
       allow_any_instance_of(Volay::App).to receive(:initialize_mixer)
       allow_any_instance_of(Volay::App).to receive(:initialize_events)
 
-      xml = <<-EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
-<interface>
-  <requires lib="gtk+" version="3.2"/>
-  <object class="GtkIconFactory" id="icon_factory">
-    <sources>
-  <source stock-id="volume-muted" filename="/glade/icons/volume-muted.png"/>
-    </sources>
-  </object>
-</interface>
-EOF
+      xml = <<-XML
+  <?xml version="1.0" encoding="UTF-8"?>
+  <!-- Generated with glade 3.18.3 -->
+  <interface>
+    <requires lib="gtk+" version="3.2"/>
+    <object class="GtkIconFactory" id="icon_factory">
+      <sources>
+    <source stock-id="volume-muted" filename="/glade/icons/volume-muted.png"/>
+      </sources>
+    </object>
+  </interface>
+XML
 
       File.write('something', xml)
       app = Volay::App.new('something')

data/spec/volay/config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'logger'
 require 'volay/config'

data/spec/volay/mixer/alsa_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'mixlib/shellout'
 require 'volay/mixer/default'
@@ -38,15 +40,15 @@ describe 'Volay::Mixer::Alsa' do
   end
 
   it 'should raise error when calling current' do
-    stdout = <<-EOF
-Simple mixer control 'Master',0
+    stdout = <<-OUTPUT
+  Simple mixer control 'Master',0
   Capabilities: pvolume pswitch pswitch-joined
   Playback channels: Front Left - Front Right
   Limits: Playback 0 - 65536
   Mono:
   Front Left: Playback 13108 [20%] [off]
   Front Right: Playback 13108 [20%] [off]
-EOF
+OUTPUT
     stub_shellout('get Master', stdout)
     expect(mixer.current).to eq(value: 13_107,
                                 max_value: 65_536,

data/spec/volay/mixer/default_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'volay/mixer/default'
 

data/spec/volay/utils_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'volay/utils'
 

data/spec/volay/widget/volume_control_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'volay/widget/volume_control'
 
@@ -18,7 +20,7 @@ describe 'Volay::Widget::VolumeControl' do
     volume = double
     allow(volume).to receive(:value=).and_return(20)
     allow(app).to receive(:get_object).once.with('volume_adjustement')
-      .and_return(volume)
+                                      .and_return(volume)
     allow(app).to receive(:utils).once.and_return(utils)
     allow(utils).to receive(:update_status_icon).once.and_return(true)
     allow(app.mixer).to receive(:percent).and_return(20)

data/task/manifest.rake

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 desc 'Generates the MANIFEST file'
 task :manifest do
   files  = `git ls-files`.split("\n").sort

data/task/rubocop.rake

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'rubocop/rake_task'
 
 desc 'Run RuboCop'

data/task/spec.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/core/rake_task'
 
 desc 'Run Rspec tests'

data/volay.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../lib/volay/version', __FILE__)
 
 Gem::Specification.new do |s|
@@ -12,17 +14,18 @@ Gem::Specification.new do |s|
   s.executables = ['volay']
   s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
 
-  s.required_ruby_version = '>= 2.0'
+  s.required_ruby_version = '> 2.3'
 
-  s.add_dependency 'mixlib-cli', '=1.5.0'
-  s.add_dependency 'mixlib-shellout', '~>2.2'
-  s.add_dependency 'gtk3', '~>3.0'
+  s.add_dependency 'glib2', '~>3.2'
+  s.add_dependency 'gtk3', '~>3.2'
+  s.add_dependency 'mixlib-cli', '~>1.7'
+  s.add_dependency 'mixlib-shellout', '~>2.3'
 
-  s.add_development_dependency 'fakefs', '~>0.6'
-  s.add_development_dependency 'rake', '~>10.5'
-  s.add_development_dependency 'rack', '~>1.6'
-  s.add_development_dependency 'rack-test', '~>0.6'
-  s.add_development_dependency 'rspec', '~>3.4'
-  s.add_development_dependency 'simplecov', '~>0.11'
-  s.add_development_dependency 'rubocop', '~>0.35'
+  s.add_development_dependency 'fakefs', '~>0.13'
+  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'
 end

metadata

@@ -1,155 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: volay
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mixlib-cli
+  name: glib2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: gtk3
+  name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+        version: '2.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.52'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 description: Really simple volume system tray written in ruby.
 email: pierre.rambaud86@gmail.com
 executables:
@@ -205,9 +219,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -215,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: The Volume system tray