mogilefs-client 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6485f77cf3355bd73565e09aa5955e461c7ee184
-  data.tar.gz: f3c904eb2e2801526629b3684aa7bf869736f97c
+  metadata.gz: d02264aa8b34f8fab16add61f2e81ee0643127cf
+  data.tar.gz: 5b333aa4abe0f863d819a9a480fa11180b902f1b
 SHA512:
-  metadata.gz: 630a6d7503310c7950bf343b79c7fa0709ce31ffe452390fb1d97940a09f8a019c77aa73085186043e3d140213a23b24d8b1547b928a2a8e07ce8a91960471c1
-  data.tar.gz: 81d66c0d390b66ad170a120bf84c0f6603971296fa8da6d708c0f6c93390271850aceb64cd726338d80770b098916e32fba5168c7fac168ed1f56a9678204555
+  metadata.gz: c6d650e02544bf8b432c80d50c21b13fbdca9169cd69b5513b534e66b7dc279f25a81a7b8823233e7e2b844d4624dd7d8c06ed38f74212d79a386884b8621f30
+  data.tar.gz: bd840975cb4154cc4aa6a0370765a7ff48dbf5374daa8aef079a48a2de9b27c4c3a96a543c9c52c6a2de95324fe8271b3a98818d41cc9d55edf8dc03890c0b09

data/.gitattributes

@@ -0,0 +1,4 @@
+*.gemspec diff=ruby
+*.rb diff=ruby
+Rakefile diff=ruby
+bin/* diff=ruby

data/.olddoc.yml

@@ -5,3 +5,5 @@ rdoc_url: http://bogomips.org/mogilefs-client
 changelog_start: v1.2.1
 private_email: e@80x24.org
 public_email: mogilefs-client-public@bogomips.org
+nntp_url: nntp://news.public-inbox.org/inbox.comp.file-systems.mogilefs.ruby
+ml_url: http://bogomips.org/mogilefs-client-public/

data/GIT-VERSION-GEN

@@ -2,7 +2,7 @@
 CONSTANT = "MogileFS::VERSION"
 RVF = "lib/mogilefs/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v3.9.0"
+DEF_VER = "v3.10.0"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/README

@@ -14,7 +14,7 @@ list-cc :: mailto:mogile@googlegroups.com
 list-archive :: http://bogomips.org/mogilefs-client-public
 email :: mailto:e@80x24.org
 repo :: git://bogomips.org/mogilefs-client.git
-cgit :: http://bogomips.org/mogilefs-client.git
+	http://bogomips.org/mogilefs-client.git
 gitweb :: http://repo.or.cz/w/ruby-mogilefs-client.git
 download :: http://bogomips.org/mogilefs-client/files/
 

data/lib/mogilefs.rb

@@ -5,6 +5,7 @@
 # Client usage information is available in MogileFS::MogileFS.
 module MogileFS
 
+  # :stopdoc:
   if defined?(Process::CLOCK_MONOTONIC)
     def self.now
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -14,6 +15,7 @@ def self.now
       Time.now.to_f
     end
   end
+  # :startdoc:
 
   # Standard error class for most MogileFS-specific errors
   Error = Class.new(StandardError)

data/lib/mogilefs/admin.rb

@@ -69,8 +69,7 @@ def get_devices(devid = nil)
     rv = clean('devices', 'dev', rv, true, to_i, want)
 
     rv.each do |row|
-      u = row["utilization"] and
-        row["utilization"] = nil == u ? nil : u.to_f
+      u = row["utilization"] and row["utilization"] = u.to_f
 
       case row["observed_state"]
       when ""
@@ -83,6 +82,8 @@ def get_devices(devid = nil)
         row["reject_bad_md5"] = true
       when "0"
         row["reject_bad_md5"] = false
+      when ""
+        row["reject_bad_md5"] = nil
       end
     end
   end

data/lib/mogilefs/backend.rb

@@ -79,6 +79,7 @@ def initialize(args)
 
     @mutex = Mutex.new
     @timeout = args[:timeout] || 3
+    @connect_timeout = args[:connect_timeout] || @timeout
     @socket = nil
     @lasterr = nil
     @lasterrstr = nil
@@ -242,7 +243,7 @@ def do_request(cmd, args, idempotent = false)
       begin
         io = dispatch_unlocked(request)
         line = io.timed_gets(@timeout)
-        break if /\r?\n\z/ =~ line
+        break if /\n\z/ =~ line
 
         line and raise MogileFS::InvalidResponseError,
                        "Invalid response from server: #{line.inspect}"
@@ -313,7 +314,7 @@ def clear_cache(types = %w(all))
     types.each { |type| opts[type] = 1 }
 
     sockets = @hosts.map do |host|
-      MogileFS::Socket.start(*(host.split(/:/))) rescue nil
+      MogileFS::Socket.start(*(host.split(':'.freeze))) rescue nil
     end
     sockets.compact!
 
@@ -346,8 +347,8 @@ def socket
       next if dead = @dead[host] and dead[0] > (MogileFS.now - @fail_timeout)
 
       begin
-        addr, port = host.split(/:/)
-        @socket = MogileFS::Socket.tcp(addr, port, @timeout)
+        addr, port = host.split(':'.freeze)
+        @socket = MogileFS::Socket.tcp(addr, port, @connect_timeout)
         @active_host = host
       rescue SystemCallError, MogileFS::Timeout => err
         @dead[host] = [ MogileFS.now, err ]
@@ -365,8 +366,8 @@ def socket
   # Turns a url params string into a Hash.
   def url_decode(str) # :nodoc:
     rv = {}
-    str.split(/&/).each do |pair|
-      k, v = pair.split(/=/, 2).map! { |x| url_unescape(x) }
+    str.split('&'.freeze).each do |pair|
+      k, v = pair.split('='.freeze, 2).map! { |x| url_unescape(x) }
       rv[k.freeze] = v
     end
     rv
@@ -382,13 +383,15 @@ def url_decode(str) # :nodoc:
   def url_encode(params) # :nodoc:
     params.map do |k,v|
       "#{url_escape k.to_s}=#{url_escape v.to_s}"
-    end.join("&")
+    end.join('&'.freeze)
   end
 
   # Escapes naughty URL characters.
   if ''.respond_to?(:ord) # Ruby 1.9
     def url_escape(str) # :nodoc:
-      str.gsub(/([^\w\,\-.\/\\\: ])/) { "%%%02x" % $1.ord }.tr(' ', '+')
+      str = str.gsub(/([^\w\,\-.\/\\\: ])/) { "%%%02x".freeze % $1.ord }
+      str.tr!(' '.freeze, '+'.freeze)
+      str
     end
   else # Ruby 1.8
     def url_escape(str) # :nodoc:
@@ -398,6 +401,8 @@ def url_escape(str) # :nodoc:
 
   # Unescapes naughty URL characters.
   def url_unescape(str) # :nodoc:
-    str.tr('+', ' ').gsub(/%([a-f0-9][a-f0-9])/i) { [$1.to_i(16)].pack 'C' }
+    str = str.tr('+'.freeze, ' '.freeze)
+    str.gsub!(/%([a-f0-9][a-f0-9])/i) { [$1.to_i(16)].pack('C'.freeze) }
+    str
   end
 end

data/lib/mogilefs/bigfile.rb

@@ -26,6 +26,7 @@ def bigfile_write(key, wr_io, opts = { :verify => false })
     # we only decode raw zlib deflated streams that mogtool (unfortunately)
     # generates.  tarballs and gzip(1) are up to to the application to decrypt.
     if info[:compressed] || opts[:verify]
+      require 'mogilefs/bigfile/filter'
       wr_io = MogileFS::Bigfile::Filter.new(wr_io, info, opts)
     end
 
@@ -85,7 +86,6 @@ def bigfile_parse_info(info) # :nodoc:
     rv
   end
 end
-require "mogilefs/bigfile/filter"
 
 __END__
 # Copied from mogtool:

data/lib/mogilefs/bigfile/filter.rb

@@ -33,7 +33,7 @@ def flush
   end
 
   def write(buf)
-    if nil == @zi
+    unless @zi
       if @info[:compressed] &&
          INFLATABLE_TYPES.include?(@info[:type]) &&
          buf.bytesize >= 2 &&
@@ -51,7 +51,7 @@ def write(buf)
     if @zi
       buf = @zi.inflate(buf)
     else
-      @md5 << buf
+      @md5.update(buf) if @md5
     end
     @io.write(buf)
   end

data/lib/mogilefs/chunker.rb

@@ -1,6 +1,5 @@
 # -*- encoding: binary -*-
 class MogileFS::Chunker
-  CRLF = "\r\n"
   attr_reader :io
 
   def initialize(io, md5, expect_md5)
@@ -14,7 +13,7 @@ def write(buf)
     @io.write("#{rv.to_s(16)}\r\n")
     @io.write(buf)
     @md5.update(buf) if @md5
-    @io.write(CRLF)
+    @io.write("\r\n".freeze)
     rv
   end
 
@@ -30,7 +29,7 @@ def flush
       end
       @io.write("0\r\nContent-MD5: #{content_md5}\r\n\r\n")
     else
-      @io.write("0\r\n\r\n")
+      @io.write("0\r\n\r\n".freeze)
     end
   end
 end

data/lib/mogilefs/client.rb

@@ -27,6 +27,7 @@ def initialize(args)
     @readonly = args[:readonly] ? true : false
     @timeout = args[:timeout]
     @fail_timeout = args[:fail_timeout]
+    @connect_timeout = args[:connect_timeout]
 
     reload
   end
@@ -37,7 +38,8 @@ def initialize(args)
   def reload
     @backend = MogileFS::Backend.new(:hosts => @hosts,
                                      :timeout => @timeout,
-                                     :fail_timeout => @fail_timeout)
+                                     :fail_timeout => @fail_timeout,
+                                     :connect_timeout => @connect_timeout)
   end
 
   ##

data/lib/mogilefs/mogilefs.rb

@@ -64,6 +64,10 @@ class MogileFS::MogileFS < MogileFS::Client
   #   Timeout for tracker backend responses.
   #   Defaults to 3 seconds.
   #
+  # [:connect_timeout => Integer]
+  #
+  #   Timeout for connecting to a tracker
+  #   Defaults to 3 seconds
   def initialize(args = {})
     @domain = args[:domain]
 
@@ -503,7 +507,7 @@ def file_info(key, args = nil)
   def file_info_cleanup(rv) # :nodoc:
     %w(fid length devcount).each { |f| rv[f] = rv[f].to_i }
     devids = rv["devids"] and
-      rv["devids"] = devids.split(/,/).map! { |x| x.to_i }
+      rv["devids"] = devids.split(','.freeze).map! { |x| x.to_i }
     rv
   end
 
@@ -540,7 +544,7 @@ def file_debug(args)
             nexttry|fromdevid|failcount|flags|devid|type)\z/x
         rv[k] = v.to_i
       when /devids\z/
-        rv[k] = v.split(/,/).map! { |x| x.to_i }
+        rv[k] = v.split(','.freeze).map! { |x| x.to_i }
       end
     end
   end

data/lib/mogilefs/new_file/stream.rb

@@ -42,7 +42,7 @@ def initialize(dests, opts)
 
   def write(buf)
     buf = String buf
-    return 0 if 0 == buf.size
+    return 0 if buf.empty?
     rv = @writer.write(buf)
     @bytes_uploaded += rv
     rv

data/lib/mogilefs/socket/pure_ruby.rb

@@ -5,13 +5,21 @@
 class MogileFS::Socket < Socket
   include MogileFS::SocketCommon
 
-  def self.start(host, port)
-    sock = new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-    begin
-      sock.connect_nonblock(sockaddr_in(port, host))
-    rescue Errno::EINPROGRESS
+  if RUBY_VERSION.to_f >= 2.3
+    def self.start(host, port)
+      sock = new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+      sock.connect_nonblock(sockaddr_in(port, host), :exception => false)
+      sock.post_init(host, port)
+    end
+  else
+    def self.start(host, port)
+      sock = new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+      begin
+        sock.connect_nonblock(sockaddr_in(port, host))
+      rescue Errno::EINPROGRESS
+      end
+      sock.post_init(host, port)
     end
-    sock.post_init(host, port)
   end
 
   def self.tcp(host, port, timeout = 5)
@@ -23,50 +31,83 @@ def self.tcp(host, port, timeout = 5)
     sock
   end
 
-  def wait_writable(timeout)
+  def wait_writable(timeout = nil)
     IO.select(nil, [ self ], nil, timeout)
   end unless self.instance_methods.include?(:wait_writable) # Ruby <2.0.0
 
-  def timed_read(len, dst = "", timeout = 5)
-    begin
-      wait_readable(timeout) or unreadable_socket!(timeout)
-      return read_nonblock(len, dst)
-    rescue Errno::EAGAIN
-    rescue EOFError
-      return
-    end while true
-  end
-
   def timed_peek(len, dst, timeout = 5)
     begin
-      wait_readable(timeout) or unreadable_socket!(timeout)
       rc = recv_nonblock(len, Socket::MSG_PEEK)
       return rc.empty? ? nil : dst.replace(rc)
     rescue Errno::EAGAIN
+      wait(timeout) or unreadable_socket!(timeout)
     rescue EOFError
       dst.replace("")
       return
     end while true
+  rescue EOFError
+    nil
   end
 
-  def timed_write(buf, timeout = 5)
-    written = 0
-    expect = buf.bytesize
-    begin
-      rc = write_nonblock(buf)
-      return expect if rc == buf.bytesize
-      written += rc
+  # write_nonblock and read_nonblock support `exception: false`
+  if RUBY_VERSION.to_f >= 2.1
+    def timed_read(len, dst = "", timeout = 5)
+      case rc = read_nonblock(len, dst, :exception => false)
+      when String
+        return rc
+      when :wait_readable
+        wait(timeout) or unreadable_socket!(timeout)
+      when nil
+        return
+      end while true
+    rescue EOFError
+      nil
+    end
+
+    def timed_write(buf, timeout = 5)
+      written = 0
+      expect = buf.bytesize
+      case rc = write_nonblock(buf, :exception => false)
+      when Integer
+        return expect if rc == buf.bytesize
+        written += rc
+        buf = buf.byteslice(rc, buf.bytesize) # Ruby 1.9.3+
+      when :wait_writable
+        wait_writable(timeout) or request_truncated!(written, expect, timeout)
+      end while true
+    end
+  else # Ruby 1.8.7 - 2.0.0
+    def timed_read(len, dst = "", timeout = 5)
+      begin
+        return read_nonblock(len, dst)
+      rescue Errno::EAGAIN
+        wait(timeout) or unreadable_socket!(timeout)
+      rescue EOFError
+        return
+      end while true
+    rescue EOFError
+      nil
+    end
 
-      if buf.respond_to?(:byteslice)
-        buf = buf.byteslice(rc, buf.bytesize)
-      else
-        if buf.respond_to?(:encoding) && buf.encoding != Encoding::BINARY
-          buf = buf.dup.force_encoding(Encoding::BINARY)
+    def timed_write(buf, timeout = 5)
+      written = 0
+      expect = buf.bytesize
+      begin
+        rc = write_nonblock(buf)
+        return expect if rc == buf.bytesize
+        written += rc
+
+        if buf.respond_to?(:byteslice) # Ruby 1.9.3+
+          buf = buf.byteslice(rc, buf.bytesize)
+        else
+          if buf.respond_to?(:encoding) && buf.encoding != Encoding::BINARY
+            buf = buf.dup.force_encoding(Encoding::BINARY)
+          end
+          buf = buf.slice(rc, buf.bytesize)
         end
-        buf = buf.slice(rc, buf.bytesize)
-      end
-    rescue Errno::EAGAIN
-      wait_writable(timeout) or request_truncated!(written, expect, timeout)
-    end while true
+      rescue Errno::EAGAIN
+        wait_writable(timeout) or request_truncated!(written, expect, timeout)
+      end while true
+    end
   end
 end

data/pkg.mk

@@ -86,7 +86,7 @@ fix-perms:
 gem: $(pkggem)
 
 install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
+	gem install --local $(CURDIR)/$<
 
 $(pkggem): manifest fix-perms
 	gem build $(rfpackage).gemspec

data/test/fresh.rb

@@ -82,7 +82,7 @@ def add_host_device_domain
     # MogileFS::Server 2.60+ shows reject_bad_md5 monitor status
     dev = @admin.get_devices[0]
     if dev.include?("reject_bad_md5")
-      assert [true, false].include?(dev["reject_bad_md5"])
+      assert [true, false, nil].include?(dev["reject_bad_md5"]), dev.inspect
     end
 
     out = err = nil

data/test/test_backend.rb

@@ -25,12 +25,14 @@ def test_initialize
 
     assert_equal ['localhost:1'], @backend.hosts
     assert_equal 3, @backend.timeout
+    assert_equal 3, @backend.instance_variable_get(:@connect_timeout)
     assert_equal nil, @backend.lasterr
     assert_equal nil, @backend.lasterrstr
     assert_equal({}, @backend.dead)
 
     @backend = MogileFS::Backend.new :hosts => ['localhost:6001'], :timeout => 1
     assert_equal 1, @backend.timeout
+    assert_equal 1, @backend.instance_variable_get(:@connect_timeout)
   end
 
   def test_do_request
@@ -223,5 +225,18 @@ def test_fail_timeout
     c = MogileFS::MogileFS.new(o)
     assert_equal 0.666, c.backend.instance_variable_get(:@fail_timeout)
   end
-end
 
+  def test_connect_timeout
+    o = {
+      :domain => "none",
+      :hosts => %w(0:666 0:6 0:66),
+      :connect_timeout => 1
+    }
+    c = MogileFS::MogileFS.new(o)
+    assert_equal 1, c.backend.instance_variable_get(:@connect_timeout)
+    o[:timeout] = 5
+    c = MogileFS::MogileFS.new(o)
+    assert_equal 1, c.backend.instance_variable_get(:@connect_timeout)
+    assert_equal 5, c.backend.instance_variable_get(:@timeout)
+  end
+end

data/test/test_fresh.rb

@@ -88,7 +88,7 @@ def test_new_file_info_checksum
     end
     test_new_file_info(:md5)
   ensure
-    @admin.delete_class @domain, "check"
+    @admin.delete_class(@domain, "check") if @domain
   end
 
   def test_create_open_close_opts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mogilefs-client
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - mogilefs-client hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: olddoc
@@ -36,6 +36,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".gitattributes"
 - ".gitignore"
 - ".manifest"
 - ".olddoc.yml"
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: client - MogileFS client library for Ruby