uuid 2.3.6 → 2.3.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+2.3.7 (2013-02-18)
+
+Use Dir.tmpdir instead of hardcoded /var/tmp path (Justin Langhorst).
+
+
 2.3.6 (2012-11-18)
 
 Manually setting the state_file path sets mode too (Tom Lea).

data/README.rdoc

@@ -62,7 +62,7 @@ first used by the application, to prevent multiple processes from
 generating the same set of identifiers, and deal with changes to the
 system clock.
 
-The UUID state file is created in <tt>/var/tmp/ruby-uuid</tt> or the Windows
+The UUID state file is created in <tt>#Dir.tmpdir/ruby-uuid</tt> or the Windows
 common application data directory using mode 0644.  If that directory is not
 writable, the file is created as <tt>.ruby-uuid</tt> in the home directory.
 If you need to create the file with a different mode, use UUID#state_file
@@ -76,6 +76,14 @@ Engine) you can simple turn it off:
 
 State files are not portable across machines.
 
+If you do not use the state file, UUID generation will attempt to use your
+server's MAC address using the macaddr gem, which runs system commands to
+identify the MAC address and then cache it.  Since this can take a few seconds
+on some operating systems, when using UUID.state_file = false, you should add
+the following line after disabling the state file:
+
+  UUID.generator.next_sequence
+
 Note: when using a forking server (Unicorn, Resque, Pipemaster, etc) you don't
 want your forked processes using the same sequence number.  Make sure to
 increment the sequence number each time a worker forks.

data/bin/uuid

@@ -1,55 +1,16 @@
 #!/usr/bin/env ruby
-require "uuid"
-require "optparse"
+#
+# This file was generated by Bundler.
+#
+# The application 'uuid' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-address = nil 
-count = 1
-format = :default
-server = false
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-opts = OptionParser.new("", 24, '  ') do |opts|
-  opts.banner = "Usage: #{File.basename($0)} [options]"
+require 'rubygems'
+require 'bundler/setup'
 
-  opts.separator "\nOptions:"
-  opts.on("-s", "--socket {HOST:PORT|PATH}",
-          "communicate on HOST:PORT or PATH (default: #{UUID::SOCKET_NAME})") do |value|
-    address = value
-  end
-
-  opts.on("-S", "--server", "run as a server") do |value|
-    server = value ? true : false
-  end
-
-  opts.on("-F", "--format {FORMAT}", "UUID format (client only)") do |value|
-    format = value.to_sym
-  end
-
-  opts.on("-C", "--count {COUNT}", "returns give number of UUIDs") do |value|
-    count = value.to_i
-  end
-
-  opts.on("-h", "--help", "Show this message") do
-    puts opts.to_s.gsub(/^.*DEPRECATED.*$/s, '')
-    exit
-  end
-
-  opts.on("-v", "--version", "Show version") do
-    puts "UUID v#{UUID::VERSION}"
-    exit
-  end
-
-  opts.parse! ARGV
-end
-
-
-if server
-  $stdout << "Starting UUID server on #{address}\n"
-  UUID::Server.new.listen(address || UUID::SOCKET_NAME)
-else
-  UUID.server = address if address
-  $stdout << UUID.generate(format)
-  (count - 1).times do
-    $stdout.putc "\n"
-    $stdout << UUID.generate(format)
-  end
-end
+load Gem.bin_path('uuid', 'uuid')

data/lib/uuid.rb

@@ -13,6 +13,7 @@ require 'tmpdir'
 require 'socket'
 require 'macaddr'
 require 'digest/sha1'
+require 'tmpdir'
 
 
 ##
@@ -146,7 +147,7 @@ class UUID
   end
 
   ##
-  # Creates an empty state file in /var/tmp/ruby-uuid or the windows common
+  # Creates an empty state file in #Dir.tmpdir/ruby-uuid or the windows common
   # application data directory using mode 0644.  Call with a different mode
   # before creating a UUID generator if you want to open access beyond your
   # user by default.
@@ -169,7 +170,7 @@ class UUID
 
       state_dir = File.join(path.strip)
     rescue LoadError
-      state_dir = File.join('', 'var', 'tmp')
+      state_dir = Dir.tmpdir
     end
 
     @state_file = File.join(state_dir, 'ruby-uuid')

data/test/test-uuid.rb

@@ -39,7 +39,7 @@ class TestUUID < Test::Unit::TestCase
 
   def test_mode_is_set_on_state_file_specify
     UUID.class_eval{ @state_file = nil; @mode = nil }
-    path = File.join("/tmp", "ruby-uuid-test")
+    path = File.join(Dir.tmpdir, "ruby-uuid-test")
     File.delete path if File.exist?(path)
 
     UUID.state_file = path

data/uuid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'uuid'
-  s.version = '2.3.6'
+  s.version = '2.3.7'
   s.summary = "UUID generator"
   s.description = <<-EOF
 UUID generator for producing universally unique identifiers based on RFC 4122

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uuid
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: macaddr
@@ -71,18 +71,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3353469269955199070
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3353469269955199070
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23