uuid 2.0.0 → 2.0.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+2.0.1 (Pending)
+* Fixed:    MAC address parses correctly when using colon as separator, not
+            when using hyphen (ruby-mingw32). If your MAC address is all zero
+            (check with UUID.new.inspect), remove the ruby-uuid file, and it
+            will reset to the actual MAC address. (Rasha)
+* Fixed:    UUID.new.inspect not showing full MAC address.
+
 2.0.0 (2008-08-28)
 * Changed:  API. UUID.generate still works as it always did, but the rest of
             the API is brand spanking new, so if you rely on anything besides

data/README.rdoc

@@ -80,24 +80,17 @@ Stable release are made through RubyForge, to upgrade simply:
 You can subscribe for notifications of new releases through the reliable-msg
 project page at http://rubyforge.org/projects/reliable-msg
 
-Source code and documentation hosted on Github:
-
-  http://github.com/assaf/uuid
+Source code and documentation hosted on Github: http://github.com/assaf/uuid
 
 To get UUID from source:
 
   git clone git://github.com/assaf/uuid.git
 
 
-== Change Log
-
-:include: CHANGELOG
-
-
 == License
 
-This package is licensed under the MIT license and/or the {Creative
-Commons Attribution-ShareAlike}[http://creativecommons.org/licenses/by-sa/2.5/legalcode].
+This package is licensed under the MIT license and/or the Creative
+Commons Attribution-ShareAlike.
 
 :include: MIT-LICENSE
 

data/lib/uuid.rb

@@ -60,7 +60,7 @@ require 'macaddr'
 
 class UUID
 
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   ##
   # Clock multiplier. Converts Time (resolution: seconds) to UUID clock
@@ -160,7 +160,8 @@ class UUID
     if File.exist?(self.class.state_file) then
       next_sequence
     else
-      @mac = Mac.addr.gsub(':', '').hex & 0x7FFFFFFFFFFF
+      @mac = Mac.addr.gsub(/:|-/, '').hex & 0x7FFFFFFFFFFF
+      fail "Cannot determine MAC address from any available interface, tried with #{Mac.addr}" if @mac == 0
       @sequence = rand 0x10000
 
       open_lock 'w' do |io|
@@ -240,7 +241,7 @@ class UUID
   end
 
   def inspect
-    mac = ("%08x" % @mac).scan(/[0-9a-f]{2}/).join(':')
+    mac = ("%012x" % @mac).scan(/[0-9a-f]{2}/).join(':')
     "MAC: #{mac}  Sequence: #{@sequence}"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: uuid
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Assaf Arkin