uuidtools 2.1.3 → 2.1.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+== UUIDTools 2.1.4
+ * various OS-specific improvements to obtaining MAC address
+== UUIDTools 2.1.3
+ * changes to build system
+== UUIDTools 2.1.2
+ * fixed issue with frozen objects
+ * fixed issue with running specs in Ruby 1.9.2
 == UUIDTools 2.1.1
  * fixed issue with Ruby 1.9 compatibility
 == UUIDTools 2.1.0

data/Rakefile

@@ -24,7 +24,7 @@ PKG_FILES = FileList[
     "lib/**/*", "spec/**/*", "vendor/**/*",
     "tasks/**/*", "website/**/*",
     "[A-Z]*", "Rakefile"
-].exclude(/database\.yml/).exclude(/[_\.]git$/)
+].exclude(/database\.yml/).exclude(/[_\.]git$/).exclude(/Gemfile/).exclude(/Gemfile\.lock/)
 
 task :default => "spec"
 

data/lib/uuidtools.rb

@@ -426,19 +426,21 @@ module UUIDTools
     ##
     # Returns the hex digest of the UUID object.
     def hexdigest
-      self.frozen? ? generate_hexdigest : (@hexdigest ||= generate_hexdigest)
+      (self.frozen? ?
+        generate_hexdigest : (@hexdigest ||= generate_hexdigest)
+      ).dup
     end
 
     ##
     # Returns the raw bytes that represent this UUID.
     def raw
-      self.frozen? ? generate_raw : (@raw ||= generate_raw)
+      (self.frozen? ? generate_raw : (@raw ||= generate_raw)).dup
     end
 
     ##
     # Returns a string representation for this UUID.
     def to_s
-      self.frozen? ? generate_s : (@string ||= generate_s)
+      (self.frozen? ? generate_s : (@string ||= generate_s)).dup
     end
     alias_method :to_str, :to_s
 
@@ -520,116 +522,114 @@ module UUIDTools
       return self == other
     end
 
+    #
+    # Determine what OS we're running on.  Helps decide how to find the MAC
+    #
+    def self.os_class
+      require 'rbconfig'
+      os_platform = RbConfig::CONFIG['target_os']
+      os_class = nil
+      if (os_platform =~ /win/i && !(os_platform =~ /darwin/i)) ||
+          os_platform =~ /w32/i
+        os_class = :windows
+      elsif os_platform =~ /solaris/i
+        os_class = :solaris
+      elsif os_platform =~ /netbsd/i
+        os_class = :netbsd
+      elsif os_platform =~ /openbsd/i
+        os_class = :openbsd
+      end
+    end
+
+    # making these class variables helps with testing
+    @ifconfig_command = "ifconfig"
+    @ifconfig_path_default = "/sbin/ifconfig"
+    @ip_command = "ip"
+    @ip_path_default = "/sbin/ip"
+
+    class << self
+      attr_accessor :ifconfig_command, :ifconfig_path_default
+      attr_accessor :ip_command, :ip_path_default
+    end
+
+    #
+    # Find the path of the ifconfig(8) command if it is present
+    # 
+    def self.ifconfig_path
+      path = `which #{UUID.ifconfig_command} 2>/dev/null`.strip
+      path = UUID.ifconfig_path_default if (path == "" && File.exist?(UUID.ifconfig_path_default))
+      return (path === "" ? nil : path)
+    end
+
+    #
+    # Find the path of the ip(8) command if it is present
+    #
+    def self.ip_path
+      path = `which #{UUID.ip_command} 2>/dev/null`.strip
+      path = UUID.ip_path_default if (path == "" && File.exist?(UUID.ip_path_default))
+      return (path === "" ? nil : path)
+    end
+
+    #
+    # Call the ifconfig or ip command that is found
+    #
+    def self.ifconfig(all=nil)
+      # find the path of the ifconfig command
+      ifconfig_path = UUID.ifconfig_path
+
+      # if it does not exist, try the ip command
+      if ifconfig_path == nil
+        ifconfig_path = UUID.ip_path
+        # all makes no sense when using ip(1)
+        all = nil
+      end
+
+      all_switch = all == nil ? "" : "-a"
+      return `#{ifconfig_path} #{all_switch}` if not ifconfig_path == nil
+    end
+
+    # Match and return the first Mac address found
+    def self.first_mac(instring)
+      mac_regexps = [
+        Regexp.new("address:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("addr:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("ether:? (#{(["[0-9a-fA-F]{1,2}"] * 6).join(":")})"),
+        Regexp.new("HWaddr:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("link/ether? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
+        Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join("-")})")
+      ]
+      parse_mac = lambda do |output|
+        (mac_regexps.map do |regexp|
+           result = output[regexp, 1]
+           result.downcase.gsub(/-/, ":") if result != nil
+        end).compact.first
+      end
+
+      mac = parse_mac.call(instring)
+      # expand octets that were compressed (solaris)
+      mac.split(':').map { |c| (c.length == 1 ? "0#{c}" : c)}.join(':')
+
+    end
+
     ##
     # Returns the MAC address of the current computer's network card.
     # Returns nil if a MAC address could not be found.
     def self.mac_address
       if !defined?(@@mac_address)
         require 'rbconfig'
-        os_platform = RbConfig::CONFIG['target_os']
-        os_class = nil
-        if (os_platform =~ /win/i && !(os_platform =~ /darwin/i)) ||
-            os_platform =~ /w32/i
-          os_class = :windows
-        elsif os_platform =~ /solaris/i
-          os_class = :solaris
-        elsif os_platform =~ /netbsd/i
-          os_class = :netbsd
-        elsif os_platform =~ /openbsd/i
-          os_class = :openbsd
-        end
-        mac_regexps = [
-          Regexp.new("address:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
-          Regexp.new("addr:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
-          Regexp.new("ether:? (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
-          Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"),
-          Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join("-")})")
-        ]
-        parse_mac = lambda do |output|
-          (mac_regexps.map do |regexp|
-            result = output[regexp, 1]
-            result.downcase.gsub(/-/, ":") if result != nil
-          end).compact.first
-        end
+        
+        os_class = UUID.os_class
+
         if os_class == :windows
-          script_in_path = true
-        else
-          script_in_path = Kernel.system("which ifconfig 2>&1 > /dev/null")
-        end
-        if os_class == :solaris
           begin
-            ifconfig_output =
-              (script_in_path ? `ifconfig -a` : `/sbin/ifconfig -a`)
-            ip_addresses = ifconfig_output.scan(
-              /inet\s?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/)
-            ip = ip_addresses.find {|addr| addr[0] != '127.0.0.1'}[0]
-            @@mac_address = `/usr/sbin/arp #{ip}`.split(' ')[3]
-          rescue Exception
-          end
-          if @@mac_address == "" || @@mac_address == nil
-            begin
-              ifconfig_output =
-                (script_in_path ?
-                  `ifconfig -a` : `/sbin/ifconfig -a`).split(' ')
-              index = ifconfig_output.index("inet") + 1
-              ip = ifconfig_output[index]
-              @@mac_address = `arp #{ip}`.split(' ')[3]
-            rescue Exception
-            end
-          end
-        elsif os_class == :windows
-          begin
-            @@mac_address = parse_mac.call(`ipconfig /all`)
-          rescue
-          end
-        else
-          begin
-            if os_class == :netbsd
-              @@mac_address = parse_mac.call(
-                script_in_path ? `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`
-              )
-            elsif os_class == :openbsd
-              @@mac_address = parse_mac.call(
-                script_in_path ? `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`
-              )
-            elsif File.exists?('/sbin/ifconfig')
-              @@mac_address = parse_mac.call(
-                script_in_path ? `ifconfig 2>&1` : `/sbin/ifconfig 2>&1`
-              )
-              if @@mac_address == nil
-                @@mac_address = parse_mac.call(
-                  script_in_path ?
-                    `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`
-                )
-              end
-              if @@mac_address == nil
-                @@mac_address = parse_mac.call(
-                  script_in_path ?
-                    `ifconfig | grep HWaddr | cut -c39- 2>&1` :
-                    `/sbin/ifconfig | grep HWaddr | cut -c39- 2>&1`
-                )
-              end
-            else
-              @@mac_address = parse_mac.call(
-                script_in_path ? `ifconfig 2>&1` : `/sbin/ifconfig 2>&1`
-              )
-              if @@mac_address == nil
-                @@mac_address = parse_mac.call(
-                  script_in_path ?
-                    `ifconfig -a 2>&1` : `/sbin/ifconfig -a 2>&1`
-                )
-              end
-              if @@mac_address == nil
-                @@mac_address = parse_mac.call(
-                  script_in_path ?
-                    `ifconfig | grep HWaddr | cut -c39- 2>&1` :
-                    `/sbin/ifconfig | grep HWaddr | cut -c39- 2>&1`
-                )
-              end
-            end
+            @@mac_address = UUID.first_mac `ipconfig /all`
           rescue
           end
+        else # linux, bsd, macos, solaris
+          @@mac_address = UUID.first_mac(UUID.ifconfig(:all))
         end
+
         if @@mac_address != nil
           if @@mac_address.respond_to?(:to_str)
             @@mac_address = @@mac_address.to_str

data/lib/uuidtools/version.rb

@@ -22,7 +22,7 @@ unless defined? UUIDTools::VERSION
     module VERSION #:nodoc:
       MAJOR = 2
       MINOR = 1
-      TINY  = 3
+      TINY  = 4
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/uuidtools/mac_address_spec.rb

@@ -1,15 +1,459 @@
 require File.expand_path("../../spec_helper.rb", __FILE__)
 
+def pending_if_root_required
+  if @mac_address == nil
+    output = `ifconfig -a 2>&1`
+    if output =~ /inet/ &&
+        output =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ &&
+        output =~ /Warning: cannot open/
+      pending("Cannot get MAC address without root?")
+    end
+  end
+end
+
+# ===========================================================================
+#
+# Samples of ifconfig -a output
+#
+# ===========================================================================
+
+#
+# solaris
+#
+solaris_sample = <<EOF
+lo0: flags=2001000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4,VIRTUAL> mtu 8232 index 1
+        inet 127.0.0.1 netmask ff000000 
+igb1: flags=1000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4> mtu 1500 index 2
+        inet 10.51.0.18 netmask ffffff00 broadcast 10.51.0.255
+        ether 0:21:28:fa:c6:65 
+igb2: flags=1000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4> mtu 1500 index 3
+        inet 10.99.0.12 netmask ffffff00 broadcast 10.99.0.255
+        ether 0:21:28:fa:c6:66
+EOF
+
+solaris_mac = "00:21:28:fa:c6:65"
+
+#
+# windows
+#
+windows_sample = <<EOF
+Windows IP Configuration
+
+        Host Name . . . . . . . . . . . . : OFFICE
+        Primary Dns Suffix  . . . . . . . : 
+        Node Type . . . . . . . . . . . . : Unknown
+        IP Routing Enabled. . . . . . . . : No
+        WINS Proxy Enabled. . . . . . . . : No
+
+Ethernet adapter Local Area Connection:
+
+        Connection-specific DNS Suffix  . : 
+        Description . . . . . . . . . . . : Realtek PCIe GBE Family Controller
+        Physical Address. . . . . . . . . : E0-CB-4E-5D-BC-E9
+        Dhcp Enabled. . . . . . . . . . . : No
+        IP Address. . . . . . . . . . . . : 192.168.1.10
+        Subnet Mask . . . . . . . . . . . : 255.255.255.0
+        Default Gateway . . . . . . . . . : 192.168.1.1
+        DNS Servers . . . . . . . . . . . : 192.168.1.1
+                                            4.2.2.1
+EOF
+
+windows_mac = "e0:cb:4e:5d:bc:e9"
+
+#
+# linux
+#
+linux_sample = <<EOF
+eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+        inet 10.16.187.71  netmask 255.255.252.0  broadcast 10.16.187.255
+        inet6 fe80::226:2dff:fef6:b94  prefixlen 64  scopeid 0x20<link>
+        ether 00:26:2d:f6:0b:94  txqueuelen 1000  (Ethernet)
+        RX packets 172074  bytes 82784684 (78.9 MiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 99075  bytes 23551085 (22.4 MiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+        device interrupt 20  memory 0xf2600000-f2620000  
+
+lo: flags=73<UP,LOOPBACK,RUNNING>  mtu 65536
+        inet 127.0.0.1  netmask 255.0.0.0
+        inet6 ::1  prefixlen 128  scopeid 0x10<host>
+        loop  txqueuelen 0  (Local Loopback)
+        RX packets 20  bytes 2148 (2.0 KiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 20  bytes 2148 (2.0 KiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+EOF
+
+linux_mac = "00:26:2d:f6:0b:94"
+
+#
+# alternate linux
+#
+linux_sample_2 = <<EOF
+eth0      Link encap:Ethernet  HWaddr 00:80:C8:F8:4A:51
+          inet addr:192.168.99.35  Bcast:192.168.99.255  Mask:255.255.255.0
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:190312 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:86955 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:100 
+          RX bytes:30701229 (29.2 Mb)  TX bytes:7878951 (7.5 Mb)
+          Interrupt:9 Base address:0x5000 
+
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:306 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:306 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:29504 (28.8 Kb)  TX bytes:29504 (28.8 Kb)
+EOF
+
+linux_mac_2 = "00:80:c8:f8:4a:51"
+
+linux_ip_sample = <<EOF
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN 
+    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+    inet 127.0.0.1/8 scope host lo
+    inet6 ::1/128 scope host 
+       valid_lft forever preferred_lft forever
+2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000
+    link/ether 00:26:2d:f6:0b:94 brd ff:ff:ff:ff:ff:ff
+    inet 10.16.187.125/22 brd 10.16.187.255 scope global eth0
+    inet6 fe80::226:2dff:fef6:b94/64 scope link 
+       valid_lft forever preferred_lft forever
+3: wlan0: <BROADCAST,MULTICAST> mtu 1500 qdisc mq state DOWN qlen 1000
+    link/ether 00:26:c6:c6:1a:b4 brd ff:ff:ff:ff:ff:ff
+4: virbr0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN 
+    link/ether 52:54:00:e3:cf:d3 brd ff:ff:ff:ff:ff:ff
+    inet 192.168.122.1/24 brd 192.168.122.255 scope global virbr0
+5: virbr0-nic: <BROADCAST,MULTICAST> mtu 1500 qdisc pfifo_fast master virbr0 state DOWN qlen 500
+    link/ether 52:54:00:e3:cf:d3 brd ff:ff:ff:ff:ff:ff
+EOF
+
+linux_ip_mac = "00:26:2d:f6:0b:94"
+
+#
+# freebsd
+#
+freebsd_sample = <<EOF
+igb0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+        options=401bb<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,JUMBO_MTU,VLAN_HWCSUM,TSO4,VLAN_HWTSO>
+        ether 00:25:90:2b:81:32
+        inet6 fe80::225:90ff:fe2b:8132%igb0 prefixlen 64 scopeid 0x1 
+        nd6 options=29<PERFORMNUD,IFDISABLED,AUTO_LINKLOCAL>
+        media: Ethernet autoselect (1000baseT <full-duplex>)
+        status: active
+igb1: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+        options=401bb<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,JUMBO_MTU,VLAN_HWCSUM,TSO4,VLAN_HWTSO>
+        ether 00:25:90:2b:81:32
+        inet6 fe80::225:90ff:fe2b:8133%igb1 prefixlen 64 scopeid 0x2 
+        nd6 options=29<PERFORMNUD,IFDISABLED,AUTO_LINKLOCAL>
+        media: Ethernet autoselect (1000baseT <full-duplex>)
+EOF
+
+freebsd_mac = "00:25:90:2b:81:32"
+
+#
+# openbsd
+#
+openbsd_sample = <<EOF
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 33200
+        priority: 0
+        groups: lo
+        inet 127.0.0.1 netmask 0xff000000
+        inet6 ::1 prefixlen 128
+        inet6 fe80::1%lo0 prefixlen 64 scopeid 0x5
+vr0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+        lladdr 00:0d:b9:28:ab:44
+        priority: 0
+        media: Ethernet autoselect (100baseTX full-duplex)
+        status: active
+        inet 192.168.7.2 netmask 0xffffff00 broadcast 192.168.7.255
+        inet6 fe80::20d:b9ff:fe28:ab44%vr0 prefixlen 64 scopeid 0x1
+EOF
+
+openbsd_mac = "00:0d:b9:28:ab:44"
+
+#
+# MacOS 10
+#
+macos_sample = <<EOF
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+	options=3<RXCSUM,TXCSUM>
+	inet6 fe80::1%lo0 prefixlen 64 scopeid 0x1 
+	inet 127.0.0.1 netmask 0xff000000 
+	inet6 ::1 prefixlen 128 
+gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280
+stf0: flags=0<> mtu 1280
+en0: flags=8963<UP,BROADCAST,SMART,RUNNING,PROMISC,SIMPLEX,MULTICAST> mtu 1500
+	options=27<RXCSUM,TXCSUM,VLAN_MTU,TSO4>
+	ether 58:b0:35:a4:cd:0c 
+	inet6 fe80::5ab0:35ff:fea4:cd0c%en0 prefixlen 64 scopeid 0x4 
+	inet 192.168.142.136 netmask 0xfffffff0 broadcast 192.168.142.143
+	media: autoselect (1000baseT <full-duplex,flow-control>)
+	status: active
+en1: flags=8823<UP,BROADCAST,SMART,SIMPLEX,MULTICAST> mtu 1500
+	ether d8:30:62:51:dd:3d 
+	media: autoselect (<unknown type>)
+	status: inactive
+p2p0: flags=8802<BROADCAST,SIMPLEX,MULTICAST> mtu 2304
+	ether 0a:30:62:51:dd:3d 
+	media: autoselect
+	status: inactive
+EOF
+
+macos_mac = "58:b0:35:a4:cd:0c"
+
+# Gather the samples and MAC addresses for simple access
+samples = { 
+  :macos => macos_sample,
+  :windows => windows_sample,
+  :solaris => solaris_sample,
+  :freebsd => freebsd_sample,
+  :openbsd => openbsd_sample,
+  :linux => linux_sample,
+  :linux2 => linux_sample_2,
+  :linuxip => linux_ip_sample
+}
+
+macs = {
+  :macos => macos_mac,
+  :windows => windows_mac,
+  :solaris => solaris_mac,
+  :freebsd => freebsd_mac,
+  :openbsd => openbsd_mac,
+  :linux => linux_mac,
+  :linux2 => linux_mac_2,
+  :linuxip => linux_ip_mac
+}
+
+# --------------------------------------------------------------------------
+#
+# TESTS
+#
+# --------------------------------------------------------------------------
+
 describe UUIDTools::UUID, "when obtaining a MAC address" do
   before do
     @mac_address = UUIDTools::UUID.mac_address
   end
 
   it "should obtain a MAC address" do
+    pending_if_root_required()
     @mac_address.should_not be_nil
   end
 
   it "should cache the MAC address" do
+    pending_if_root_required()
     @mac_address.object_id.should == UUIDTools::UUID.mac_address.object_id
   end
+
+end
+
+describe UUIDTools::UUID, "before obtaining a MAC address" do
+
+  before do
+    module UUIDTools
+      class UUID
+        remove_class_variable(:@@mac_address) if defined?(@@mac_address)
+      end
+    end
+  end
+
+  it "should parse windows MAC addresses" do
+    # mock ifconfig() to return the windows sample
+    UUIDTools::UUID.stub(:ifconfig).and_return(samples[:windows])
+    mac = UUIDTools::UUID.mac_address
+    mac.should be == macs[:windows]
+  end
+
+  it "should parse solaris MAC addresses" do
+    UUIDTools::UUID.stub(:ifconfig).and_return(samples[:solaris])
+    mac = UUIDTools::UUID.mac_address
+    mac.should be == macs[:solaris]
+  end
+
+  it "should parse freebsd MAC addresses" do
+    UUIDTools::UUID.stub(:ifconfig).and_return(samples[:freebsd])
+    mac = UUIDTools::UUID.mac_address
+    mac.should be == macs[:freebsd]
+  end
+
+  it "should parse openbsd MAC addresses" do
+    UUIDTools::UUID.stub(:ifconfig).and_return(samples[:openbsd])
+    mac = UUIDTools::UUID.mac_address
+    mac.should be == macs[:openbsd]
+  end
+
+  it "should parse linux MAC addresses with ifconfig" do
+    UUIDTools::UUID.stub(:ifconfig).and_return(samples[:linux])
+    mac = UUIDTools::UUID.mac_address
+    mac.should be == macs[:linux]
+  end
+
+  it "should parse a linux HWaddr address with ifconfig" do
+    UUIDTools::UUID.stub(:ifconfig).and_return(samples[:linux2])
+    mac = UUIDTools::UUID.mac_address
+    mac.should be == macs[:linux2]
+  end
+
+  it "should parse macos MAC addresses with ifconfig" do
+    UUIDTools::UUID.stub(:ifconfig).and_return(samples[:macos])
+    mac = UUIDTools::UUID.mac_address
+    mac.should be == macs[:macos]
+  end
+
+  it "should parse linux MAC addresses with ip" do
+    UUIDTools::UUID.stub(:ifconfig).and_return(samples[:linuxip])
+    mac = UUIDTools::UUID.mac_address
+    mac.should be == macs[:linuxip]
+  end
+
+  it "should identify the default os classes" do
+    module RbConfig
+      CONFIG['target_os'] = nil
+    end
+
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == nil
+
+    RbConfig::CONFIG['target_os'] = 'linux'
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == nil
+
+    RbConfig::CONFIG['target_os'] = 'darwin'
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == nil
+  end
+
+  it "should identify the solaris os classes" do
+    module RbConfig
+      CONFIG['target_os'] = "solaris"
+    end
+
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == :solaris
+  end
+
+  it "should identify the BSD os classes" do
+    module RbConfig
+      CONFIG['target_os'] = "netbsd"
+    end
+
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == :netbsd
+
+    RbConfig::CONFIG['target_os'] = "openbsd"
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == :openbsd
+
+  end
+
+  it "should identify the Windows os classes" do
+    module RbConfig
+      CONFIG['target_os'] = "win"
+    end
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == :windows
+
+    RbConfig::CONFIG['target_os'] = "w32"
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == :windows
+
+    RbConfig::CONFIG['target_os'] = "darwin"
+    os_class = UUIDTools::UUID.os_class
+    os_class.should be == nil
+
+  end
+
+  it "should find the ifconfig program" do
+    save_ifconfig_command = UUIDTools::UUID.ifconfig_command
+    save_ifconfig_path = UUIDTools::UUID.ifconfig_path_default
+
+    # this should always exist
+    UUIDTools::UUID.ifconfig_command="sh"
+    UUIDTools::UUID.ifconfig_path_default="notfound"
+    ifconfig_path = UUIDTools::UUID.ifconfig_path
+#    ifconfig_path.should be == "/usr/bin/sh"
+
+    # Test what happens if it does not
+    UUIDTools::UUID.ifconfig_command="nosuchthing"
+    UUIDTools::UUID.ifconfig_path_default="default"
+    
+    # ifconfig_path checks if the IFCONFIG_PATH command file exists
+    File.stub(:exist?).and_return(true)
+
+    ifconfig_path = UUIDTools::UUID.ifconfig_path
+#    ifconfig_path.should be == "default"
+
+    UUIDTools::UUID.ifconfig_command=save_ifconfig_command
+    UUIDTools::UUID.ifconfig_path_default=save_ifconfig_path
+
+  end
+
+  it "should find the ip program" do
+    save_ip_command = UUIDTools::UUID.ip_command
+    save_ip_path = UUIDTools::UUID.ip_path_default
+
+    # this should always exist
+    UUIDTools::UUID.ip_command="sh"
+    UUIDTools::UUID.ip_path_default="notfound"
+    ip_path = UUIDTools::UUID.ip_path
+#    ip_path.should be == "/usr/bin/sh"
+
+    # Test what happens if it does not
+    UUIDTools::UUID.ip_command="nosuchthing"
+    UUIDTools::UUID.ip_path_default="default"
+    
+    # ifconfig_path checks if the IP_PATH command file exists
+    File.stub(:exist?).and_return(true)
+
+    ifconfig_path = UUIDTools::UUID.ip_path
+#    ifconfig_path.should be == "default"
+
+    UUIDTools::UUID.ip_command=save_ip_command
+    UUIDTools::UUID.ip_path_default=save_ip_path
+  end
+
+  it "should return the output of the ifconfig program" do
+    pending "I'm not quite sure how to mock backticks"
+  end
+
+  it "should be able to parse windows ipconfig output" do
+    mac = UUIDTools::UUID.first_mac samples[:windows]
+    mac.should be == macs[:windows]
+  end
+
+  it "should be able to parse solaris ifconfig output" do
+    mac = UUIDTools::UUID.first_mac samples[:solaris]
+    mac.should be == macs[:solaris]
+  end
+
+  it "should be able to parse freebsd ifconfig output" do
+    mac = UUIDTools::UUID.first_mac samples[:freebsd]
+    mac.should be == macs[:freebsd]
+  end
+
+  it "should be able to parse openbsd ifconfig output" do
+    mac = UUIDTools::UUID.first_mac samples[:openbsd]
+    mac.should be == macs[:openbsd]
+  end
+
+  it "should be able to parse linux ifconfig output" do
+    mac = UUIDTools::UUID.first_mac samples[:linux]
+    mac.should be == macs[:linux]
+
+    mac2 = UUIDTools::UUID.first_mac samples[:linux2]
+    mac2.should be == macs[:linux2]
+  end
+
+  it "should be able to parse macos ifconfig output" do
+    mac = UUIDTools::UUID.first_mac samples[:macos]
+    mac.should be == macs[:macos]
+  end
+
+  it "should be able to parse ip addr output" do
+    mac = UUIDTools::UUID.first_mac samples[:linuxip]
+    mac.should be == macs[:linuxip]
+  end
 end

data/spec/uuidtools/uuid_creation_spec.rb

@@ -44,6 +44,13 @@ describe UUIDTools::UUID, "when generating" do
     (uuids.map {|x| x.to_s}).uniq.size.should == uuids.size
   end
 
+  it "should not have internal state used in string representations" do
+    uuid = UUIDTools::UUID.random_create
+    uuid_string = uuid.to_s.dup
+    uuid.to_s.gsub!("-", "/")
+    uuid.to_s.should == uuid_string
+  end
+
   it "should throw an exception if a segment has an invalid value" do
     (lambda do
       UUIDTools::UUID.new(-1, 0, 0, 0, 0, [0, 0, 0, 0, 0, 0])

metadata

@@ -1,75 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: uuidtools
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.1.4
   prerelease: 
-  version: 2.1.3
 platform: ruby
-authors: 
+authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.3
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id004
-description: |
-  A simple universally unique ID generation library.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+description: ! 'A simple universally unique ID generation library.
 
+'
 email: bob@sporkmonger.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/compat/securerandom.rb
-- lib/uuidtools/version.rb
 - lib/uuidtools.rb
+- lib/uuidtools/version.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/uuidtools/mac_address_spec.rb
@@ -85,38 +102,33 @@ files:
 - tasks/yard.rake
 - website/index.html
 - CHANGELOG
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
-- Rakefile
 - README.md
+- Rakefile
 homepage: http://uuidtools.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: UUID generator
 test_files: []
-

data/Gemfile

@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-group :development do
-  gem 'launchy', '>= 2.0.0'
-  gem 'yard', '>= 0.8.2'
-  gem 'redcarpet'
-  gem 'rubyforge'
-end
-
-group :test, :development do
-  gem 'rake', '>= 0.7.3'
-  gem 'rspec', '>= 2.9.0'
-end
-
-gemspec

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    uuidtools (2.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.2.8)
-    diff-lcs (1.1.3)
-    json_pure (1.7.3)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
-    rake (0.9.2.2)
-    redcarpet (2.1.1)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.0)
-    rspec-expectations (2.11.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    yard (0.8.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  launchy (>= 2.0.0)
-  rake (>= 0.7.3)
-  redcarpet
-  rspec (>= 2.9.0)
-  rubyforge
-  uuidtools!
-  yard