uuid 2.3.5 → 2.3.6

data/CHANGELOG

@@ -1,3 +1,16 @@
+2.3.6 (2012-11-18)
+
+Manually setting the state_file path sets mode too (Tom Lea).
+
+When manually setting the state file, set the mode too.  Failure to do so
+causes an implicit conversion of nil to integer on first usage.
+
+Also provided a mode method to set the mode explicitly.
+
+
+Reverted executable loss (Michael Witrant ).
+
+
 2.3.4 (2012-01-23)
 
 Source files are now UTF-8 (Vicente Reig)

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake/testtask'
-require 'rake/rdoctask'
+#require 'rake/rdoctask'
 
 
 spec = Gem::Specification.load(File.expand_path("uuid.gemspec", File.dirname(__FILE__)))
@@ -16,10 +16,10 @@ Rake::TestTask.new do |test|
 end
 
 # Create the documentation.
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_files.include "README.rdoc", "lib/**/*.rb"
-  rdoc.options = spec.rdoc_options
-end
+#Rake::RDocTask.new do |rdoc|
+#  rdoc.rdoc_files.include "README.rdoc", "lib/**/*.rb"
+#  rdoc.options = spec.rdoc_options
+#end
 
 
 

data/bin/uuid

@@ -1,16 +1,55 @@
 #!/usr/bin/env ruby
-#
-# 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.
-#
+require "uuid"
+require "optparse"
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+address = nil 
+count = 1
+format = :default
+server = false
 
-require 'rubygems'
-require 'bundler/setup'
+opts = OptionParser.new("", 24, '  ') do |opts|
+  opts.banner = "Usage: #{File.basename($0)} [options]"
 
-load Gem.bin_path('uuid', 'uuid')
+  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

data/lib/uuid.rb

@@ -114,6 +114,10 @@ class UUID
     @mode
   end
 
+  def self.mode=(mode)
+    @mode = mode
+  end
+
   ##
   # Generates a new UUID string using +format+.  See FORMATS for a list of
   # supported formats.
@@ -185,6 +189,7 @@ class UUID
   # hosts).
   def self.state_file=(path)
     @state_file = path
+    @mode ||= 0644
   end
 
   ##

data/test/test-uuid.rb

@@ -37,6 +37,21 @@ class TestUUID < Test::Unit::TestCase
     assert_equal path, UUID.state_file
   end
 
+  def test_mode_is_set_on_state_file_specify
+    UUID.class_eval{ @state_file = nil; @mode = nil }
+    path = File.join("/tmp", "ruby-uuid-test")
+    File.delete path if File.exist?(path)
+
+    UUID.state_file = path
+
+    old_umask = File.umask(0022)
+    UUID.new.generate
+    File.umask(old_umask)
+
+    UUID.class_eval{ @state_file = nil; @mode = nil }
+    assert_equal '0644', sprintf('%04o', File.stat(path).mode & 0777)
+  end
+
   def test_with_no_state_file
     UUID.state_file = false
     assert !UUID.state_file

data/uuid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'uuid'
-  s.version = '2.3.5'
+  s.version = '2.3.6'
   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.5
+  version: 2.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: macaddr
-  requirement: &70206291414820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,12 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206291414820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: ! 'UUID generator for producing universally unique identifiers based
   on RFC 4122
 
@@ -68,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4057213684264310664
+      hash: -3353469269955199070
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,10 +82,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4057213684264310664
+      hash: -3353469269955199070
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: UUID generator