volay 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 688ccbdc75ceb9062fb138563fa72504509a2afaffbc2b1aae9e8f9f24a3dd32
-  data.tar.gz: 2e2c26689b143f3011d04a3d522eb9bbae829254d36618b5e853b9ecc8d64006
+  metadata.gz: 3e383f672606a89520f19cc97e3704539037a44b65cd8f97b4e965ba8b3bd2a0
+  data.tar.gz: b0cfb666b0b3cdce544bb105fb58986311c72660a377df8fab2863e67e535e6b
 SHA512:
-  metadata.gz: a13b3fb7690cf4bf04bbc210deaf6317d18fbb13743877dc330b345a084aeaae1242865bf72e2cbfe8319525fbbba09eeae4be0d66e1c05609f4f270a4a81dd7
-  data.tar.gz: 6cd5dcc83ccd294308644e5b45c9871a02447ec28c13fa14bc60c2fe44403996a58490128155ef4b523fb58998f89e117f87c7874b1bc3b98a71245f05164e7f
+  metadata.gz: f157a6475a185d45d55b0348c8b96c0164eeab49d23f0bc8bb793e109548e729f36f95f72fdde2a8762fc2984f34e4a9c14b8a2668e7fe3718cced3623e3524b
+  data.tar.gz: 59a3bec0c005d48f56e51eb8591e34718334a1f33fbefa62653d412a735e37a2afa1161fb5038b5ba871f8155412e8c4547d5d834e219d9c41128040af64090b

data/Rakefile

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'

data/bin/volay

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require File.expand_path('../../lib/volay', __FILE__)
+require File.expand_path('../lib/volay', __dir__)
 
 # Module volay
 module Volay
@@ -26,7 +26,7 @@ module Volay
     end
 
     def app
-      Volay::App.new(File.expand_path('../../glade/volay.glade', __FILE__))
+      Volay::App.new(File.expand_path('../glade/volay.glade', __dir__))
       Gtk.main
     end
   end

data/glade/volay.glade

@@ -13,6 +13,14 @@
   <object class="GtkMenu" id="popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="no_show_all">True</property>
+    <child>
+      <object class="GtkMenuItem" id="popup_menu_cards">
+        <property name="can_focus">False</property>
+        <property name="label">Cards</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
     <child>
       <object class="GtkImageMenuItem" id="popup_menu_quit">
         <property name="label">gtk-quit</property>

data/lib/volay.rb

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

data/lib/volay/app.rb

@@ -55,9 +55,13 @@ module Volay
       # Override Icon path to prevent
       # Gtk-CRITICAL **:gtk_icon_source_set_filename:
       ui = File.read(path)
-      ui.gsub!(%r{/glade/icons},
-               File.expand_path('../../glade/icons',
-                                File.dirname(__FILE__)))
+      ui.gsub!(
+        %r{/glade/icons},
+        File.expand_path(
+          '../glade/icons',
+          File.dirname(__dir__)
+        )
+      )
       add_from_string(ui)
     end
   end

data/lib/volay/config.rb

@@ -60,6 +60,7 @@ module Volay
     #
     def self.mixer
       raise MixerNotFound unless which('pacmd')
+
       @mixer ||= Volay::Mixer::Pulse.new
     end
 

data/lib/volay/mixer/pulse.rb

@@ -77,17 +77,6 @@ module Volay
         refresh
       end
 
-      private
-
-      ##
-      # Get volume percent
-      #
-      # @return Integer
-      #
-      def volume_percent(value)
-        value * 100 / MAX_VALUE
-      end
-
       ##
       # Refresh cards data
       #
@@ -110,6 +99,17 @@ module Volay
         set_long_names
       end
 
+      private
+
+      ##
+      # Get volume percent
+      #
+      # @return Integer
+      #
+      def volume_percent(value)
+        value * 100 / MAX_VALUE
+      end
+
       ##
       # Set cards data such as default sink
       # volume and if card is muted
@@ -119,6 +119,7 @@ module Volay
       def set_data(args)
         @cards.each do |id, card|
           next if args[1].nil? || !args[1].include?(card['name'])
+
           case args[0]
           when 'set-default-sink'
             @default_sink_id = id

data/lib/volay/utils.rb

@@ -29,6 +29,7 @@ module Volay
 
     def status_icon
       return 'volume-muted' if @app.mixer.muted?
+
       if (66..100).cover?(@app.mixer.percent)
         'volume-high'
       elsif (33..65).cover?(@app.mixer.percent)

data/lib/volay/version.rb

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

data/lib/volay/volay.rb

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

data/lib/volay/widget/events.rb

@@ -16,6 +16,7 @@ module Volay
 
         methods.each do |name|
           next unless name =~ /^on_/
+
           @app.signals_list[name.to_s] = method(name)
         end
 

data/lib/volay/widget/system_tray.rb

@@ -6,36 +6,15 @@ module Volay
   module Widget
     # Events class
     class SystemTray < Events
-      LEFT_CLICK = 1
-      RIGHT_CLICK = 3
-      M_KEYCODE = 47
+      KEYCODE_MOUSE_CLICK_LEFT = 1
+      KEYCODE_MOUSE_CLICK_RIGHT = 3
+      KEYCODE_M = 47
 
       ##
       # When popup window menu is draw
       #
       def init
-        return unless @app&.mixer&.cards
-
-        cards_menu = Gtk::MenuItem.new(label: 'Cards')
-        menu = Gtk::Menu.new
-        last_item = nil
-        @app.mixer.cards.each do |id, card|
-          radio_menu_item = Gtk::RadioMenuItem.new(nil, card['long_name'])
-          radio_menu_item.join_group(last_item) if last_item
-          radio_menu_item.name = "card_menu_#{id}"
-          radio_menu_item.active = @app.mixer.default_sink_id == id
-          last_item = radio_menu_item
-          menu.append(radio_menu_item)
-
-          radio_menu_item.signal_connect('activate') do |widget|
-            next unless widget.active?
-            @app.mixer.change_card(id)
-            @app.utils.update_status_icon
-          end
-        end
-
-        cards_menu.submenu = menu
-        @app.get_object('popup_menu').prepend(cards_menu)
+        refresh_cards_menu
       end
 
       ##
@@ -46,7 +25,8 @@ module Volay
       #
       def on_status_icon_button_press_event(_widget, event)
         return unless event.is_a?(Gdk::EventButton) &&
-                      event.button == LEFT_CLICK
+                      event.button == KEYCODE_MOUSE_CLICK_LEFT
+
         return on_system_tray_window_focus_out_event if
           @app.get_object('system_tray_window').visible?
 
@@ -68,7 +48,8 @@ module Volay
       #
       def on_system_tray_window_key_release_event(_widget, event)
         return unless event.is_a?(Gdk::EventKey) &&
-                      event.hardware_keycode == M_KEYCODE
+                      event.hardware_keycode == KEYCODE_M
+
         @app.mixer.toggle
         @app.utils.update_status_icon
       end
@@ -92,6 +73,18 @@ module Volay
         Gtk.main_quit
       end
 
+      ##
+      # When system tray window is showed
+      #
+      def on_system_tray_window_show
+        @app.mixer.refresh
+        refresh_cards_menu
+
+        @app.get_object('volume_adjustement')
+            .value = @app.mixer.percent
+        @app.utils.update_status_icon
+      end
+
       ##
       # Retrieve the good position to be above
       # the status icon
@@ -129,6 +122,40 @@ module Volay
 
         [posx, posy]
       end
+
+      private
+
+      ##
+      # Refresh card menu items
+      #
+      def refresh_cards_menu
+        @app.get_object('popup_menu_cards').visible = false
+
+        return unless @app&.mixer&.cards
+        return if @app.mixer.cards.keys.count <= 1
+
+        menu = Gtk::Menu.new
+        last_item = nil
+        @app.mixer.cards.each do |id, card|
+          radio_menu_item = Gtk::RadioMenuItem.new(nil, card['long_name'])
+          radio_menu_item.join_group(last_item) if last_item
+          radio_menu_item.name = "card_menu_#{id}"
+          radio_menu_item.visible = true
+          radio_menu_item.active = @app.mixer.default_sink_id == id
+          last_item = radio_menu_item
+          menu.append(radio_menu_item)
+
+          radio_menu_item.signal_connect('activate') do |widget|
+            next unless widget.active?
+
+            @app.mixer.change_card(id)
+            @app.utils.update_status_icon
+          end
+        end
+
+        @app.get_object('popup_menu_cards').visible = true
+        @app.get_object('popup_menu_cards').submenu = menu
+      end
     end
   end
 end

data/lib/volay/widget/volume_control.rb

@@ -6,15 +6,6 @@ module Volay
   module Widget
     # Events class
     class VolumeControl < Events
-      ##
-      # When system tray window is showed
-      #
-      def on_system_tray_window_show
-        @app.get_object('volume_adjustement')
-            .value = @app.mixer.percent
-        @app.utils.update_status_icon
-      end
-
       ##
       # When slider have its adjustement value changed
       #

data/spec/spec_helper.rb

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

data/spec/volay/app_spec.rb

@@ -16,15 +16,26 @@ describe 'Volay::App' do
   include FakeFS::SpecHelpers
 
   context '#events' do
+    let(:popup_menu_cards) do
+      pmc = double
+      allow(pmc).to receive(:visible=).and_return(true)
+
+      pmc
+    end
+
     it 'should initiliaze events' do
       allow_any_instance_of(Volay::App).to receive(:initialize_mixer)
       allow_any_instance_of(Volay::App).to receive(:initialize_ui)
       allow_any_instance_of(Volay::Utils).to receive(:update_status_icon)
       allow_any_instance_of(Volay::App).to receive(:connect_signals)
         .and_yield('on_status_icon_button_press_event')
+      allow_any_instance_of(Volay::App).to receive(:get_object)
+        .with('popup_menu_cards')
+        .and_return(popup_menu_cards)
 
       File.write('something', '')
       app = Volay::App.new('something')
+
       expect(app.signals_list).to be_a(Hash)
     end
   end
@@ -45,7 +56,7 @@ describe 'Volay::App' do
       </sources>
     </object>
   </interface>
-XML
+      XML
 
       File.write('something', xml)
       app = Volay::App.new('something')

data/spec/volay/mixer/pulse_spec.rb

@@ -26,13 +26,13 @@ describe 'Volay::Mixer::Pulse' do
     stub_shellout(
       'dump',
       File.read(
-        File.expand_path('../stubs/pulse_dump.stub', __FILE__)
+        File.expand_path('stubs/pulse_dump.stub', __dir__)
       )
     )
     stub_shellout(
       "list-cards | grep -e device.string -e 'name:' -e 'card_name'",
       File.read(
-        File.expand_path('../stubs/pulse_list-cards.stub', __FILE__)
+        File.expand_path('stubs/pulse_list-cards.stub', __dir__)
       )
     )
   end

data/spec/volay/widget/volume_control_spec.rb

@@ -12,18 +12,34 @@ describe 'Volay::Widget::VolumeControl' do
   end
 
   let(:vc) do
+    allow(Thread).to receive(:new).and_yield
     Volay::Widget::VolumeControl.new(app)
   end
 
   it 'on volume scale' do
     utils = double
     volume = double
-    allow(volume).to receive(:value=).and_return(20)
-    allow(app).to receive(:get_object).once.with('volume_adjustement')
-                                      .and_return(volume)
+
+    allow(volume).to receive(:value).once.and_return(20)
+    allow(utils).to receive(:update_status_icon).once.and_return(true)
+
     allow(app).to receive(:utils).once.and_return(utils)
+    allow(app.mixer).to receive(:value=).with(20).once
+
+    vc.on_volume_adjustement_value_changed(volume)
+  end
+
+  it 'no volume mute' do
+    utils = double
+    volume = double
+
+    allow(volume).to receive(:active?).once.and_return(true)
     allow(utils).to receive(:update_status_icon).once.and_return(true)
-    allow(app.mixer).to receive(:percent).and_return(20)
-    expect(vc.on_system_tray_window_show).to be_truthy
+
+    allow(app).to receive(:utils).once.and_return(utils)
+    allow(app.mixer).to receive(:muted?).once.and_return(true)
+    allow(app.mixer).to receive(:toggle).once
+
+    vc.on_toggle_mute_toggled(volume)
   end
 end

data/task/manifest.rake

@@ -3,7 +3,7 @@
 desc 'Generates the MANIFEST file'
 task :manifest do
   files  = `git ls-files`.split("\n").sort
-  handle = File.open(File.expand_path('../../MANIFEST', __FILE__), 'w')
+  handle = File.open(File.expand_path('../MANIFEST', __dir__), 'w')
 
   handle.write(files.join("\n"))
   handle.close

data/volay.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('../lib/volay/version', __FILE__)
+require File.expand_path('lib/volay/version', __dir__)
 
 Gem::Specification.new do |s|
   s.name = 'volay'
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/PierreRambaud/volay'
   s.description = 'Really simple volume system tray written in ruby.'
   s.executables = ['volay']
-  s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
+  s.files = File.read(File.expand_path('MANIFEST', __dir__)).split("\n")
 
   s.required_ruby_version = '> 2.3'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volay
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: The Volume system tray