uuidtools 0.1.4 → 1.0.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+== UUIDTools 1.0.0
+ * slight improvements to the random number generator
+ * fixed issue with failing to obtain mac address in certain environments
 == UUIDTools 0.1.4
  * improved speed when generating timestamp-based uuids
  * fixed bug with rapid generation of timestamp uuids leading to dupicates
@@ -12,4 +15,4 @@
 == UUIDTools 0.1.1
  * changed helper methods to be protected like they should have been
 == UUIDTools 0.1.0
- * parsing and generation of UUIDs implemented
+ * parsing and generation of UUIDs implemented

data/lib/uuidtools.rb

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-UUID_TOOLS_VERSION = "0.1.4"
+UUID_TOOLS_VERSION = "1.0.0"
 
 $:.unshift(File.dirname(__FILE__))
 
@@ -474,23 +474,29 @@ class UUID
         end
       else
         begin
-          ifconfig_output = `ifconfig`
-          mac_addresses = ifconfig_output.scan(
-            Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
-          if mac_addresses.size == 0
-            ifconfig_output = `ifconfig | grep HWaddr | cut -c39-`
-            mac_addresses = ifconfig_output.scan(
-              Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
-          end
-          if mac_addresses.size == 0
-            ifconfig_output = `/sbin/ifconfig`
+          mac_addresses = []
+          if File.exists?('/sbin/ifconfig')
+            ifconfig_output =
+              `/sbin/ifconfig 2>&1`
             mac_addresses = ifconfig_output.scan(
               Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
-          end
-          if mac_addresses.size == 0
-            ifconfig_output = `/sbin/ifconfig | grep HWaddr | cut -c39-`
+            if mac_addresses.size == 0
+              ifconfig_output =
+                `/sbin/ifconfig | grep HWaddr | cut -c39- 2>&1`
+              mac_addresses = ifconfig_output.scan(
+                Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+            end
+          else
+            ifconfig_output =
+              `ifconfig 2>&1`
             mac_addresses = ifconfig_output.scan(
-              Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+              Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+            if mac_addresses.size == 0
+              ifconfig_output =
+                `ifconfig | grep HWaddr | cut -c39- 2>&1`
+              mac_addresses = ifconfig_output.scan(
+                Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+            end
           end
           if mac_addresses.size > 0
             @@mac_address = mac_addresses.first.first
@@ -519,6 +525,7 @@ class UUID
       hash.update(rand.to_s)
       hash.update(hash.object_id.to_s)
       hash.update(self.methods.inspect)
+      hash.update($:.to_s)
       begin
         random_device = nil
         if File.exists? "/dev/urandom"

data/rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'uuidtools'
-PKG_VERSION   = '0.1.4'
+PKG_VERSION   = '1.0.0'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
@@ -35,7 +35,8 @@ Rake::TestTask.new("test_all") { |t|
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "UUID Tools -- universally unique id generation tools"
-  rdoc.options << '--line-numbers --inline-source --accessor cattr_accessor=object'
+  rdoc.options << '--line-numbers' << '--inline-source' <<
+    '--accessor' << 'cattr_accessor=object'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: uuidtools
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2005-11-11 00:00:00 -05:00
+  version: 1.0.0
+date: 2006-02-13 00:00:00 -05:00
 summary: Generation of UUIDs.
 require_paths: 
   - lib