uuid 2.3.3 → 2.3.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+2.3.4 (2011-09-01)
+
+Fixed State file mode isn't respected with standard umask (Brandon Turner).
+
 2.3.3 (2011-08-01)
 
 Check if ruby-uuid is writable: it might have been claimed by another user on

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

@@ -259,6 +259,9 @@ class UUID
       fail "Cannot determine MAC address from any available interface, tried with #{mac_address}" if @mac == 0
       @sequence = rand 0x10000
 
+      # Ensure the mode is respected, even with a restrictive umask
+      File.open(state_file, 'w') { |f| f.chmod(self.class.mode) } if state_file && !File.exists?(state_file)
+
       if state_file
         open_lock 'wb' do |io|
           write_state io

data/test/test-uuid.rb

@@ -17,6 +17,19 @@ class TestUUID < Test::Unit::TestCase
     File.exist?(path)
   end
 
+  def test_state_file_creation_mode
+    UUID.class_eval{ @state_file = nil; @mode = nil }
+    UUID.state_file 0666
+    path = UUID.state_file
+    File.delete path if File.exist?(path)
+
+    old_umask = File.umask(0022)
+    UUID.new.generate
+    File.umask(old_umask)
+
+    assert_equal '0666', sprintf('%04o', File.stat(path).mode & 0777)
+  end
+
   def test_state_file_specify
     path = File.join("path", "to", "ruby-uuid")
     UUID.state_file = path

data/uuid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'uuid'
-  s.version = '2.3.3'
+  s.version = '2.3.4'
   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.3
+  version: 2.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-01 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: macaddr
-  requirement: &2152873140 !ruby/object:Gem::Requirement
+  requirement: &2156334240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,7 +22,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152873140
+  version_requirements: *2156334240
 description: ! 'UUID generator for producing universally unique identifiers based
   on RFC 4122
 
@@ -46,7 +45,6 @@ files:
 - Rakefile
 - CHANGELOG
 - uuid.gemspec
-has_rdoc: true
 homepage: http://github.com/assaf/uuid
 licenses: []
 post_install_message: 
@@ -64,15 +62,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2227115529809974426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2227115529809974426
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: UUID generator