net-ntp 2.1.1 → 2.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8bbc7ec55a142eb7a087a849c5ad9c0c918f864c
+  data.tar.gz: 42cbee4bfc9aa3e62d4306982d29f782639d53f1
+SHA512:
+  metadata.gz: a6c4fda6c182d1dfa46a26b95a61cb5a68aab34ae634ed1fe2bb1e5ec56e5afe05f37827e07c56076f6cfd7ef4c7e340e231c522964347b5ae9dbf9651c7bdb9
+  data.tar.gz: 1afe43476aae8eb8336ef31c55a9b4ae0f4c91a06cd1f2098c63d0f98936a27597284f2740a9cc77322438d7442bca25cb7c6174371565f2536455371a8c6e52

data/lib/net/ntp/ntp.rb

@@ -67,8 +67,7 @@ module Net #:nodoc:
       sock = UDPSocket.new
       sock.connect(host, port)
 
-      client_time_send      = Time.new.to_i
-      client_localtime      = client_time_send
+      client_localtime      = Time.now.to_f
       client_adj_localtime  = client_localtime + NTP_ADJ
       client_frac_localtime = frac2bin(client_adj_localtime)
 
@@ -77,12 +76,16 @@ module Net #:nodoc:
       sock.print ntp_msg
       sock.flush
 
-      data = nil
-      Timeout::timeout(timeout) do |t|
-        data = sock.recvfrom(960)[0]
+      read, write, error = IO.select [sock], nil, nil, timeout
+      if read[0]
+        client_time_receive = Time.now.to_f
+        data, _ = sock.recvfrom(960)
+        Response.new(data, client_time_receive)
+      else
+        # For backwards compatibility we throw a Timeout error, even
+        # though the timeout is being controlled by select()
+        raise Timeout::Error
       end
-
-      Response.new(data)
     end
 
     def self.frac2bin(frac) #:nodoc:
@@ -98,14 +101,17 @@ module Net #:nodoc:
     private_class_method :frac2bin
 
     class Response
-      def initialize(raw_data)
+
+      attr_reader :client_time_receive
+      
+      def initialize(raw_data, client_time_receive)
         @raw_data             = raw_data
-        @client_time_receive  = Time.new.to_i
+        @client_time_receive  = client_time_receive
         @packet_data_by_field = nil
       end
 
       def leap_indicator
-        @leap_indicator ||= (packet_data_by_field[:byte1][0] & 0xC0) >> 6
+        @leap_indicator ||= (packet_data_by_field[:byte1].bytes.first & 0xC0) >> 6
       end
 
       def leap_indicator_text
@@ -113,11 +119,11 @@ module Net #:nodoc:
       end
 
       def version_number
-        @version_number ||= (packet_data_by_field[:byte1][0] & 0x38) >> 3
+        @version_number ||= (packet_data_by_field[:byte1].bytes.first & 0x38) >> 3
       end
 
       def mode
-        @mode ||= (packet_data_by_field[:byte1][0] & 0x07)
+        @mode ||= (packet_data_by_field[:byte1].bytes.first & 0x07)
       end
 
       def mode_text
@@ -176,12 +182,16 @@ module Net #:nodoc:
         @time ||= Time.at(receive_timestamp)
       end
 
+      # As described in http://tools.ietf.org/html/rfc958
+      def offset
+        @offset ||= (receive_timestamp - originate_timestamp + transmit_timestamp - client_time_receive) / 2.0
+      end
 
     protected
 
       def packet_data_by_field #:nodoc:
         if !@packet_data_by_field
-          @packetdata = @raw_data.unpack("a C3   n B16 n B16 H8   N B32 N B32   N B32 N B32");
+          @packetdata = @raw_data.unpack("a C3   n B16 n B16 H8   N B32 N B32   N B32 N B32")
           @packet_data_by_field = {}
           NTP_FIELDS.each do |field|
             @packet_data_by_field[field] = @packetdata.shift
@@ -203,7 +213,7 @@ module Net #:nodoc:
 
       def unpack_ip(stratum, tmp_ip) #:nodoc:
         if stratum < 2
-          [tmp_ip].pack("H8").unpack("A4")[0]
+          [tmp_ip].pack("H8").unpack("A4").bytes.first
         else
           ipbytes = [tmp_ip].pack("H8").unpack("C4")
           sprintf("%d.%d.%d.%d", ipbytes[0], ipbytes[1], ipbytes[2], ipbytes[3])

data/lib/net/ntp/version.rb

@@ -1,5 +1,5 @@
 module Net
   module NTP
-    VERSION = '2.1.1'
+    VERSION = '2.1.2'
   end
 end

metadata

@@ -1,74 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: net-ntp
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 1
-  version: 2.1.1
+version: !ruby/object:Gem::Version
+  version: 2.1.2
 platform: ruby
-authors: 
+authors:
 - Jerome Waibel
 - Nathan Sutton
 - Brandon Arbini
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-23 00:00:00 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies: []
-
-description: This project was a rubyfied version of perl's Net::NTP module, (C) 2004 by James G. Willmore. It provides a method to query an NTP server as specified in RFC1305 and RFC2030. Updated and re-released in 2010 by Zencoder.
-email: 
+description: This project was a rubyfied version of perl's Net::NTP module, (C) 2004
+  by James G. Willmore. It provides a method to query an NTP server as specified in
+  RFC1305 and RFC2030. Updated and re-released in 2010 by Zencoder.
+email:
 - nate@zencoder.com
 - brandon@zencoder.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/net/ntp/ntp.rb
-- lib/net/ntp/version.rb
-- lib/net/ntp.rb
+files:
 - LICENSE
 - README.markdown
 - Rakefile
+- lib/net/ntp.rb
+- lib/net/ntp/ntp.rb
+- lib/net/ntp/version.rb
 homepage: http://github.com/zencoder/net-ntp
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: NTP client for ruby.
 test_files: []
-