rmpd 1.1.12 → 1.1.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bb4988929e39ec902157e3f0cc7bbdd5f84620d7
+  data.tar.gz: df089ffe90ceb7121317eaa749466adba80628c6
+SHA512:
+  metadata.gz: 45b1d3ec4b78bcfc4499c54e33c3f6d827b7e6b2e87c1ef7bd1c36f4e45b2a6ce548b9ee6afd3c57ed79f41b69a95b7388b8f01f4772b3b6bfbc2a35ad392ee7
+  data.tar.gz: 9f246fef27256d620ab5e48142b8c835a41d55987e8bc5af6c1aa1095cf499a393a1f22dd04bca305a4f020f4ba080de727c6a05ff550668d8ef9a4c13053122

data/Jenkinsfile

@@ -0,0 +1,27 @@
+// -*- groovy -*-
+
+node {
+    workspace = pwd()
+
+    stage "Clone"
+    git branch: 'master', url: 'ssh://git@gitlab.xmtp.net:2222/mildred/rmpd.git', credentialsId: 'ssh-jenkins'
+
+    stage "Bundle"
+    sh '''#!/bin/bash -l
+bundle install'''
+
+    stage "Test"
+    sh '''#!/bin/bash -l
+bundle exec rake'''
+
+    stage "Build"
+    sh '''#!/bin/bash -l
+bundle exec gem build ./rmpd.gemspec'''
+
+    stage name: "Deploy", concurrency: 1
+    sh '''#!/bin/bash
+gem=$(ls rmpd*.gem | sort -n | tail -n 1)
+ver=$(echo $gem | sed -e 's/^rmpd-//' -e 's/\\.gem$//')
+bundle exec gem search --remote '^rmpd\\b' | grep -q $ver || bundle exec gem push $gem
+'''
+}

data/lib/rmpd/commands/admin.rb

@@ -10,7 +10,9 @@ module Rmpd
 
     def kill
       _kill
+      @socket_mu.lock
       @socket.close
+      @socket_mu.unlock
     end
 
     alias_method :disable_output, :disableoutput

data/lib/rmpd/connection.rb

@@ -16,14 +16,22 @@ module Rmpd
     def initialize(config_file=nil)
       @config = Rmpd::Config.new(config_file)
       @socket = nil
+      @socket_mu = Mutex.new
     end
 
     def close
+      @socket_mu.lock
       @socket.close
+      @socket_mu.unlock
     end
 
     def connect
-      return unless @socket.nil? || @socket.closed?
+      @socket_mu.lock
+      unless @socket.nil? || @socket.closed?
+        @socket_mu.unlock
+        return
+      end
+      @socket_mu.unlock
 
       if %r{^/} === @config.hostname
         connect_unix_socket
@@ -36,14 +44,20 @@ module Rmpd
     end
 
     def connect_unix_socket
-      @socket = UNIXSocket.new(@config.hostname)
-    rescue StandardError => error
-      @socket = nil
-      raise MpdConnRefusedError.new(error)
+      @socket_mu.lock
+      begin
+        @socket = UNIXSocket.new(@config.hostname)
+      rescue StandardError => error
+        @socket = nil
+        raise MpdConnRefusedError.new(error)
+      ensure
+        @socket_mu.unlock
+      end
     end
 
     def connect_inet_socket
       Socket::getaddrinfo(@config.hostname, @config.port, nil, SOCK_STREAM).each do |info|
+        @socket_mu.lock
         begin
           sockaddr = Socket.pack_sockaddr_in(info[1], info[3])
           @socket = Socket.new(info[4], info[5], 0)
@@ -53,6 +67,8 @@ module Rmpd
           raise MpdConnRefusedError.new(error)
         else
           break
+        ensure
+          @socket_mu.unlock
         end
       end
     end
@@ -60,8 +76,9 @@ module Rmpd
     def send_command(command, *args)
       tries = 0
 
+      connect
+      @socket_mu.lock
       begin
-        connect
         @socket.puts("#{command} #{quote(args).join(" ")}".strip)
       rescue Errno::EPIPE, EOFError
         @socket.close
@@ -70,16 +87,21 @@ module Rmpd
         else
           raise MpdError.new("Retry count exceeded")
         end
+      ensure
+        @socket_mu.unlock
       end
     end
 
     def read_response
       response = []
 
-      while (line = @socket.readline.force_encoding("UTF-8"))
-        response << line.strip
-        break if END_RE === line
+      @socket_mu.synchronize do
+        while (line = @socket.readline.force_encoding("UTF-8"))
+          response << line.strip
+          break if END_RE === line
+        end
       end
+
       response
     end
 

data/lib/rmpd/version.rb

@@ -1,3 +1,3 @@
 module Rmpd
-  VERSION = "1.1.12"
+  VERSION = "1.1.13"
 end

data/rmpd.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency("rspec", "~> 2.6.0")
-  s.add_development_dependency("debugger")
+  s.add_development_dependency("byebug")
   s.add_development_dependency("rake")
   s.add_development_dependency("pry")
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rmpd
 version: !ruby/object:Gem::Version
-  version: 1.1.12
-  prerelease: 
+  version: 1.1.13
 platform: ruby
 authors:
 - Eric Wollesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Music Player Daemon client in Ruby
@@ -82,10 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
 - Gemfile
+- Jenkinsfile
 - Rakefile
 - console.rb
 - lib/rmpd.rb
@@ -120,27 +112,25 @@ files:
 - spec/spec_rcov.opts
 homepage: http://github.com/ewollesen/rmpd
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Music Player Daemon client in Ruby
 test_files: []
-has_rdoc: