uuidtools 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+== UUIDTools 1.0.2
+ * improved code for obtaining a MAC address for Solaris and OpenBSD
+ * added hash and eql? methods
 == UUIDTools 1.0.1
  * improved code for obtaining a MAC address for Solaris and NetBSD
  * MAC addresses can now be set manually

data/lib/uuidtools.rb

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-UUID_TOOLS_VERSION = "1.0.1"
+UUID_TOOLS_VERSION = "1.0.2"
 
 $:.unshift(File.dirname(__FILE__))
 
@@ -233,7 +233,13 @@ class UUID
       # Convert to 100 nanosecond blocks
       gmt_timestamp_100_nanoseconds = (gmt_timestamp.tv_sec * 10000000) +
         (gmt_timestamp.tv_usec * 10) + 0x01B21DD213814000
-      nodes = self.get_mac_address.split(":").collect do |octet|
+      mac_address = self.get_mac_address
+      if mac_address == nil || mac_address == ""
+        raise StandardError,
+          "MAC address could not be autodetected.  " +
+          "Set the MAC address manually."
+      end
+      nodes = mac_address.split(":").collect do |octet|
         octet.to_i(16)
       end
       node_id = 0
@@ -429,6 +435,16 @@ class UUID
   def to_uri
     return "urn:uuid:#{self.to_s}"
   end
+
+  # Returns an integer hash value.
+  def hash
+    return self.to_i
+  end
+
+  # Returns true if this UUID is exactly equal to the other UUID.
+  def eql?(other)
+    return (self <=> other) == 0
+  end
   
   def self.create_from_hash(hash_class, namespace, name) #:nodoc:
     if hash_class == Digest::MD5
@@ -455,7 +471,7 @@ class UUID
 
   # Returns the MAC address of the current computer's network card.
   # Returns nil if a MAC address could not be found.
-  def self.get_mac_address #:nodoc:
+  def self.mac_address #:nodoc:
     if @@mac_address.nil?
       if RUBY_PLATFORM =~ /solaris/
         begin
@@ -466,6 +482,15 @@ class UUID
         	@@mac_address = `/usr/sbin/arp #{ip}`.split(' ')[3]
         rescue Exception
         end
+        if @@mac_address == "" || @@mac_address == nil
+          begin
+  	        ifconfig_output = `ifconfig -a`.split(' ')
+            index = ifconfig_output.index("inet") + 1
+            ip = ifconfig_output[index]
+            @@mac_address = `arp #{ip}`.split(' ')[3]
+          rescue Exception
+          end
+        end
       elsif RUBY_PLATFORM =~ /win/ && !(RUBY_PLATFORM =~ /darwin/)
         begin
           ifconfig_output = `ipconfig /all`
@@ -483,6 +508,10 @@ class UUID
             ifconfig_output = `/sbin/ifconfig -a 2>&1`
             mac_addresses = ifconfig_output.scan(
               Regexp.new("address\: (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+          elsif RUBY_PLATFORM =~ /openbsd/
+            ifconfig_output = `/sbin/ifconfig -a 2>&1`
+            mac_addresses = ifconfig_output.scan(
+              Regexp.new("addr (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
           elsif File.exists?('/sbin/ifconfig')
             ifconfig_output = `/sbin/ifconfig 2>&1`
             mac_addresses = ifconfig_output.scan(
@@ -534,7 +563,7 @@ class UUID
     return @@mac_address
   end
   class <<self
-    alias_method :mac_address, :get_mac_address
+    alias_method :get_mac_address, :mac_address
   end
   
   # Allows users to set the MAC address manually in cases where the MAC

data/rakefile

@@ -7,13 +7,14 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'uuidtools'
-PKG_VERSION   = '1.0.1'
+PKG_VERSION   = '1.0.2'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
 
-RUBY_FORGE_PROJECT = "uuidtools"
-RUBY_FORGE_USER    = "vacindak"
+RUBY_FORGE_PROJECT = PKG_NAME
+RUBY_FORGE_USER    = "sporkmonger"
+RUBY_FORGE_PATH    = "/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}"
 
 PKG_FILES = FileList[
     "lib/**/*", "test/**/*", "examples/**/*", "doc/**/*", "[A-Z]*", "rakefile"
@@ -142,12 +143,40 @@ task :benchmark do
 end
 
 
-# Publishing ------------------------------------------------------
+namespace :publish do
+  desc "Publish the API documentation"
+  task :api => [ "rdoc" ] do 
+    Rake::SshDirPublisher.new(
+      "#{RUBY_FORGE_USER}@rubyforge.org",
+      "#{RUBY_FORGE_PATH}/",
+      "doc"
+    ).upload
+  end
+
+  desc "Runs all of the publishing tasks"
+  task :all => ["publish:api"] do
+  end
+end
+
+task :lines do
+  lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
+
+  for file_name in FileList["lib/**/*.rb"]
+    f = File.open(file_name)
+
+    while line = f.gets
+      lines += 1
+      next if line =~ /^\s*$/
+      next if line =~ /^\s*#/
+      codelines += 1
+    end
+    puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
+    
+    total_lines     += lines
+    total_codelines += codelines
+    
+    lines, codelines = 0, 0
+  end
 
-desc "Publish the API documentation"
-task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new(
-    "vacindak@sporkmonger.com",
-    "public_html/projects/uuidtools/api",
-    "doc").upload
-end
+  puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: uuidtools
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2007-04-28 00:00:00 -04:00
+  version: 1.0.2
+date: 2007-11-07 00:00:00 -05:00
 summary: Generation of UUIDs.
 require_paths: 
 - lib