alsa_aconnect 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 275d59e874cb491657df6c74926c4ebc806b21d3d8ae827a48cea410e6cd2c3f
-  data.tar.gz: cb9cb058ce0e86e6359eb6c4b8f9411ff8c904ee68ace706fd523538bf6bfb37
+  metadata.gz: 15f9788a8fe37cd553690282394fdac0bd2bf30de7dccffd6b83540013ba55f4
+  data.tar.gz: 01d4786195dccd53b11184be34d34eae6da37a2d0bab6e79ec0fc2125926d7b6
 SHA512:
-  metadata.gz: 81e6394325a1d7ac7867942b0f03a118cb987e4d7c1a836ad74cebdf4363305f1ab5acc1af46a4fad259c030e9f20bc9be33c22c978c4001ff18e8e0624f808e
-  data.tar.gz: c629519f0baba38ba006b571474b98d624208b9e37d760d39bd7b6fd835107a7b69ea7c64b3395c5780bce2b4b5bf26f364bfe0fdd581848f82bd11a10a05999
+  metadata.gz: 9ceb96edc8acb00da4bc75e8ce8c972cdd5486b39d6587b1513da9abc57edc3abd9625e25fa6d8297d63952053a61e68632b22cb412ae77c5ac992dcd6a5173e
+  data.tar.gz: 6309907438e7bdc992be734b2ef81c60ca2e510a2721bef9b0b14f796f6d58c5e0c035fa6b335a5a77b9f3974141de669d4f3f70c131ec02c92e15ae2d14d27d

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## 0.1.2 (2020-05-16)
+* simplify command run
+
 ## 0.1.1 (2020-05-16)
 * fix #connect and #disconnect
 

data/README.md

@@ -24,16 +24,21 @@ Or install it yourself as:
 require 'alsa/aconnect'
 
 def print_client(client)
-  puts "#{client.id} => #{client.name} [type=#{client.type},card=#{client.card},pid=#{client.pid}]"
+  tags = {
+    type: client.type,
+    card: client.card,
+    pid: client.pid
+  }.compact.map { |k, v| "#{k}=#{v}" }.join(',')
+  lines = ["#{client.id} => #{client.name} [#{tags}]"]
   client.ports.each do |port|
     if port.connected_to_type
       connected = "connected to #{port.connected_to_type} #{port.connected_to_client_id}:#{port.connected_to_port_id}"
     else
       connected = 'not connected'
     end
-    puts "  #{port.id} => #{port.name} (#{connected})"
+    lines.push "  #{port.id} => #{port.name} (#{connected})"
   end
-  puts ''
+  puts(*lines, '')
 end
 
 input_clients = ALSA::Aconnect.input_clients

data/lib/alsa/aconnect.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'alsa/command'
 require 'alsa/aconnect/version'
 require 'alsa/aconnect/error'
 require 'alsa/aconnect/cmd'

data/lib/alsa/aconnect/cmd.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'open3'
+
 module ALSA
   module Aconnect
     class Cmd
@@ -15,10 +17,12 @@ module ALSA
       end
 
       def run
-        status, out, err = Command.run(@exec, *@arguments)
-        raise Error.new(status.exitstatus, err.join("\n")) if status != 0 || !err.empty?
+        cmd = [@exec, *@arguments].compact.join(' ')
+        out, err, status = Open3.capture3(cmd)
+        code = status.exitstatus
+        raise Error.new code, err.join("\n") unless code.zero?
 
-        out.join("\n")
+        out
       end
     end
   end

data/lib/alsa/aconnect/version.rb

@@ -2,6 +2,6 @@
 
 module ALSA
   module Aconnect
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alsa_aconnect
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Denis Talakevich
@@ -37,7 +37,6 @@ files:
 - lib/alsa/aconnect/parser.rb
 - lib/alsa/aconnect/port.rb
 - lib/alsa/aconnect/version.rb
-- lib/alsa/command.rb
 - lib/alsa_aconnect.rb
 - man.txt
 homepage: https://github.com/senid231/alsa_aconnect

data/lib/alsa/command.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-require 'open3'
-
-module ALSA
-  # Util class for shell commands execution
-  class Command
-    def self.run(command, *arguments, **options)
-      new(command, arguments, options).run
-    end
-
-    attr_reader :command, :arguments, :env, :out, :err
-
-    def initialize(command, arguments, env: {}, out: nil, err: nil)
-      @command = command
-      @arguments = arguments
-      @env = env
-      @out = out
-      @err = err
-      @out_buff = []
-      @err_buff = []
-    end
-
-    def run
-      env_line = env.map { |k, v| "#{k}=#{v}" }.join(' ')
-      command_line = ([env_line, command] + arguments).reject(&:empty?).join(' ')
-
-      code = raw_execute(command_line)
-      [code, @out_buff, @err_buff]
-    end
-
-    private
-
-    def raw_execute(command_line)
-      Open3.popen3(command_line) do |_stdin, stdout, stderr, wait_thread|
-        Thread.new do
-          begin
-            until (raw_line = stdout.gets).nil?
-              @out_buff.push(raw_line)
-              out&.call(raw_line)
-            end
-          rescue IOError => _e
-            # command process was closed and it's ok
-          end
-        end
-        Thread.new do
-          begin
-            until (raw_line = stderr.gets).nil?
-              @err_buff.push(raw_line)
-              err&.call(raw_line)
-            end
-          rescue IOError => _e
-            # command process was closed and it's ok
-          end
-        end
-        wait_thread.value
-      end
-    end
-  end
-end