uuid 2.3.1 → 2.3.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+2.3.2 (2011-04-11)
+* Allow usage on environments that don't have MAC address accessible (mikezter)
+* Fix for JRuby expand_path interpretation on windows (pinnymz)
+
 2.3.1 (2010-05-07)
 * Fix: Open state file in binary mode (http://github.com/assaf/uuid/issues#issue/8)
 

data/lib/uuid.rb

@@ -11,6 +11,7 @@ require 'thread'
 require 'tmpdir'
 require 'socket'
 require 'macaddr'
+require 'digest/sha1'
 
 
 ##
@@ -169,7 +170,7 @@ class UUID
     if File.writable?(state_dir) then
       @state_file = File.join(state_dir, 'ruby-uuid')
     else
-      @state_file = File.expand_path(File.join('~', '.ruby-uuid'))
+      @state_file = File.expand_path('.ruby-uuid', '~')
     end
 
     @state_file
@@ -194,6 +195,55 @@ class UUID
       uuid =~ /\A(urn:uuid:)?[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}\z/i
   end
 
+  ##
+  # Generate a pseudo MAC address because we have no pure-ruby way
+  # to know  the MAC  address of the  NIC this system  uses.  Note
+  # that cheating  with pseudo arresses here  is completely legal:
+  # see Section 4.5 of RFC4122 for details.
+  #
+  # This implementation is shamelessly stolen from
+  #  https://github.com/spectra/ruby-uuid/blob/master/uuid.rb
+  # Thanks spectra.
+  #
+  def pseudo_mac_address
+    sha1 = ::Digest::SHA1.new
+    256.times do
+      r = [rand(0x100000000)].pack "N"
+      sha1.update r
+    end
+    str = sha1.digest
+    r = rand 14 # 20-6
+    node = str[r, 6] || str
+    if RUBY_VERSION >= "1.9.0"
+      nnode = node.bytes.to_a
+      nnode[0] |= 0x01
+      node = ''
+      nnode.each { |s| node << s.chr }
+    else
+      node[0] |= 0x01 # multicast bit
+    end
+    node.bytes.collect{|b|b.to_s(16)}.join.hex & 0x7FFFFFFFFFFF
+  end
+
+  ##
+  # Uses system calls to get a mac address
+  #
+  def iee_mac_address
+    begin
+      Mac.addr.gsub(/:|-/, '').hex & 0x7FFFFFFFFFFF
+    rescue
+      0 
+    end
+  end
+
+  ##
+  # return iee_mac_address if available, pseudo_mac_address otherwise
+  #
+  def mac_address
+    return iee_mac_address unless iee_mac_address == 0
+    return pseudo_mac_address
+  end
+
   ##
   # Create a new UUID generator.  You really only need to do this once.
   def initialize
@@ -205,8 +255,8 @@ class UUID
     if state_file && File.size?(state_file) then
       next_sequence
     else
-      @mac = Mac.addr.gsub(/:|-/, '').hex & 0x7FFFFFFFFFFF
-      fail "Cannot determine MAC address from any available interface, tried with #{Mac.addr}" if @mac == 0
+      @mac = mac_address
+      fail "Cannot determine MAC address from any available interface, tried with #{mac_address}" if @mac == 0
       @sequence = rand 0x10000
 
       if state_file
@@ -358,9 +408,9 @@ protected
     def listen(address)
       sock = bind(address)
       while client = sock.accept
-        Thread.start(client) do |client|
-          while client.read 1
-            client.write @generator.generate
+        Thread.start(client) do |socket|
+          while socket.read 1
+            socket.write @generator.generate
           end
         end
       end

data/test/test-uuid.rb

@@ -4,7 +4,9 @@
 # License:: MIT and/or Creative Commons Attribution-ShareAlike
 
 require 'test/unit'
+require 'rubygems'
 require 'uuid'
+require 'mocha'
 
 class TestUUID < Test::Unit::TestCase
 
@@ -31,8 +33,7 @@ class TestUUID < Test::Unit::TestCase
     assert !UUID.state_file
   end
 
-  def test_instance_generate
-    uuid = UUID.new
+  def validate_uuid_generator(uuid)
     assert_match(/\A[\da-f]{32}\z/i, uuid.generate(:compact))
 
     assert_match(/\A[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}\z/i,
@@ -44,8 +45,13 @@ class TestUUID < Test::Unit::TestCase
     e = assert_raise ArgumentError do
       uuid.generate :unknown
     end
-
     assert_equal 'invalid UUID format :unknown', e.message
+
+  end
+
+  def test_instance_generate
+    uuid = UUID.new
+    validate_uuid_generator(uuid)
   end
 
   def test_class_generate
@@ -108,5 +114,15 @@ class TestUUID < Test::Unit::TestCase
     assert_equal foo.sequence + 1, bar.sequence
   end
 
+  def test_pseudo_random_mac_address
+    uuid_gen = UUID.new
+    Mac.stubs(:addr).returns "00:00:00:00:00:00"
+    assert uuid_gen.iee_mac_address == 0
+    [:compact, :default, :urn].each do |format|
+      assert UUID.validate(uuid_gen.generate(format)), format.to_s
+    end
+    validate_uuid_generator(uuid_gen)
+  end
+
 end
 

data/uuid.gemspec

@@ -1,23 +1,22 @@
-spec = Gem::Specification.new do |spec|
-  spec.name = 'uuid'
-  spec.version = '2.3.1'
-  spec.summary = "UUID generator"
-  spec.description = <<-EOF
+Gem::Specification.new do |s|
+  s.name = 'uuid'
+  s.version = '2.3.2'
+  s.summary = "UUID generator"
+  s.description = <<-EOF
 UUID generator for producing universally unique identifiers based on RFC 4122
 (http://www.ietf.org/rfc/rfc4122.txt).
 EOF
 
-  spec.authors << 'Assaf Arkin' << 'Eric Hodel'
-  spec.email = 'assaf@labnotes.org'
-  spec.homepage = 'http://github.com/assaf/uuid'
+  s.authors << 'Assaf Arkin' << 'Eric Hodel'
+  s.email = 'assaf@labnotes.org'
+  s.homepage = 'http://github.com/assaf/uuid'
 
-  spec.files = Dir['{bin,test,lib,docs}/**/*'] + ['README.rdoc', 'MIT-LICENSE', 'Rakefile', 'CHANGELOG', 'uuid.gemspec']
-  spec.executables = "uuid"
+  s.files = Dir['{bin,test,lib,docs}/**/*'] + ['README.rdoc', 'MIT-LICENSE', 'Rakefile', 'CHANGELOG', 'uuid.gemspec']
+  s.executables = "uuid"
   
-  spec.has_rdoc = true
-  spec.rdoc_options << '--main' << 'README.rdoc' << '--title' <<  'UUID generator' << '--line-numbers'
+  s.rdoc_options << '--main' << 'README.rdoc' << '--title' <<  'UUID generator' << '--line-numbers'
                        '--webcvs' << 'http://github.com/assaf/uuid'
-  spec.extra_rdoc_files = ['README.rdoc', 'MIT-LICENSE']
+  s.extra_rdoc_files = ['README.rdoc', 'MIT-LICENSE']
 
-  spec.add_dependency 'macaddr', ['~>1.0']
+  s.add_dependency 'macaddr', ['~>1.0']
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: uuid
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 3
-  - 1
-  version: 2.3.1
+  prerelease: 
+  version: 2.3.2
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -15,21 +11,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -07:00
-default_executable: 
+date: 2011-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: macaddr
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 description: |
   UUID generator for producing universally unique identifiers based on RFC 4122
@@ -52,7 +45,6 @@ files:
 - Rakefile
 - CHANGELOG
 - uuid.gemspec
-has_rdoc: true
 homepage: http://github.com/assaf/uuid
 licenses: []
 
@@ -66,25 +58,24 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: UUID generator
 test_files: []
 
+has_rdoc: