redis_test 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86491435908a76458ad312207fe78ddb7be54155
-  data.tar.gz: 412265e1b235aa4f06645adc31bb53905061f214
+  metadata.gz: 0437358bc1bf7eafb05bbf3a1d7c5bb17213097d
+  data.tar.gz: 48fe391b4f3900726f8aa9bc45c14c9258182cb6
 SHA512:
-  metadata.gz: 962abdca861751e329a63dcd40f2c235c319f50f581f51b3ebcae15d15977edb35ab06e473a13f90856919990422f43b64a01454e08170edcbff4bd8eab06bfe
-  data.tar.gz: dc783babf4af0a3a15b18f794a899fdd391b369b1c0ef9fd06e6de5538d349bc913e8bd834e952e84afb10516aeb95edc3e8130521faf63cfb9d16012f6feb7a
+  metadata.gz: 4ce99e7759b8b3bb6dddea8ab8f9bcfaa5c4b5582cf2b08c56f288bb255322a978ac6e7b5fabcc05ac70cb3704f36ebff12eb301acc3c50bd6f9496f7d8fb3b1
+  data.tar.gz: fbece8f6a0531369273d3c540d81079ea92929ba23f2ce03a8796ae4baf889579f14d1147017c9ca6b58fa52f1b15d44cb10c56c9f107e651e270f1ea34c9d92

data/lib/redis_test.rb

@@ -1,4 +1,6 @@
-require "redis_test/version"
+# frozen_string_literal: true
+
+require 'redis_test/version'
 require 'socket'
 
 module RedisTest
@@ -32,12 +34,10 @@ module RedisTest
     end
 
     def loglevel
-      @loglevel || "debug"
+      @loglevel || 'debug'
     end
 
-    def loglevel=(level)
-      @loglevel = level
-    end
+    attr_writer :loglevel
 
     def start(log_to_stdout: false)
       FileUtils.mkdir_p cache_path
@@ -45,30 +45,27 @@ module RedisTest
       FileUtils.mkdir_p logs_path
 
       redis_options = {
-        "pidfile"       => pidfile,
-        "port"          => port,
-        "timeout"       => 300,
-        "dbfilename"    => db_filename,
-        "dir"           => cache_path,
-        "loglevel"      => loglevel,
-        "databases"     => 16
+        'pidfile' => pidfile,
+        'port' => port,
+        'timeout' => 300,
+        'dbfilename' => db_filename,
+        'dir' => cache_path,
+        'loglevel' => loglevel,
+        'databases' => 16
       }
 
-      unless log_to_stdout
-        redis_options.merge!(
-          "logfile"       => logfile,
-        )
-      end
+      redis_options['logfile'] = logfile unless log_to_stdout
 
       redis_options_str = redis_options.map { |k, v| "#{k} #{v}" }.join('\n')
 
       fork do
-        system "echo '#{redis_options_str}' | redis-server -"
+        echo_command = mac? ? 'echo' : 'echo -e'
+        system "#{echo_command} '#{redis_options_str}' | redis-server -"
       end
 
       wait_time_remaining = 5
       begin
-        self.socket = TCPSocket.open("localhost", port)
+        self.socket = TCPSocket.open('localhost', port)
         clear
         @started = true
       rescue Exception => e
@@ -89,8 +86,12 @@ module RedisTest
       if File.file?(pidfile) && File.readable?(pidfile)
         pid = File.read(pidfile).to_i
         if pid > 0
-          Process.kill("QUIT", pid)
-          until (Process.getpgid(pid) rescue nil).nil? do
+          Process.kill('SIGTERM', pid)
+          until (begin
+                   Process.getpgid(pid)
+                 rescue StandardError
+                   nil
+                 end).nil?
             sleep 0.01
           end
         end
@@ -134,18 +135,23 @@ module RedisTest
     end
 
     def clear
-      socket.puts("flushall")
+      socket.puts('flushall')
       socket.gets # wait for redis server to reply with "OK"
     end
 
     def find_available_port
-      server = TCPServer.new("127.0.0.1", 0)
+      server = TCPServer.new('127.0.0.1', 0)
       server.addr[1]
     ensure
-      server.close if server
+      server&.close
     end
 
     private
+
     attr_accessor :socket
+
+    def mac?
+      `uname`.downcase.include?('darwin')
+    end
   end
 end

data/lib/redis_test/version.rb

@@ -1,3 +1,3 @@
 module RedisTest
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/redis_test.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_test
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Phuong Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.3
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: A helper to launch redis server during test