uuid 2.0.2 → 2.1.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+2.1.0 (2009-12-16)
+* Added uuid.validate -- easier to implement than explain why it's wrong.
+
 2.0.2 (2009-06-10)
 * Maintenance release. Added uuid.gemspec file in packaging, tested against
 Ruby 1.9.1.

data/Rakefile

@@ -1,15 +1,11 @@
-# Adapted from the rake Rakefile.
-
-require 'rubygems'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
 
 
-spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'uuid.gemspec'))
+spec = Gem::Specification.load(File.expand_path("uuid.gemspec", File.dirname(__FILE__)))
 
 desc "Default Task"
-task 'default' => ['test', 'rdoc']
+task :default => :test
 
 
 desc "If you're building from sources, run this task first to setup the necessary dependencies"
@@ -39,55 +35,26 @@ end
 
 # Create the documentation.
 Rake::RDocTask.new do |rdoc|
-  rdoc.main = 'README.rdoc'
-  rdoc.rdoc_files.include('README.rdoc', 'lib/**/*.rb')
-  rdoc.title = "UUID generator"
+  rdoc.rdoc_files.include "README.rdoc", "lib/**/*.rb"
+  rdoc.options = spec.rdoc_options
 end
 
 
-gem = Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-  pkg.need_zip = true
-end
-
-desc "Install the package locally"
-task 'install'=>['setup', 'package'] do |task|
-  rb_bin = File.expand_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
-  args = [rb_bin, '-S', 'gem', 'install', "pkg/#{spec.name}-#{spec.version}.gem"]
-  windows = Config::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
-  args.unshift('sudo') unless windows || ENV['GEM_HOME']
-  sh args.map{ |a| a.inspect }.join(' ')
-end
-
-desc "Uninstall previously installed packaged"
-task 'uninstall' do |task|
-  rb_bin = File.expand_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
-  args = [rb_bin, '-S', 'gem', 'install', spec.name, '-v', spec.version.to_s]
-  windows = Config::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
-  args.unshift('sudo') unless windows || ENV['GEM_HOME']
-  sh args.map{ |a| a.inspect }.join(' ')
-end
-
-
-task 'release'=>['setup', 'test', 'package'] do
-  
-  require 'rubyforge'
-  changes = File.read('CHANGELOG')[/\d+.\d+.\d+.*\n((:?^[^\n]+\n)*)/]
-  File.open '.changes', 'w' do |file|
-    file.write changes
-  end
 
-  puts "Uploading #{spec.name} #{spec.version}"
-  files = Dir['pkg/*.{gem,tgz,zip}']
-  rubyforge = RubyForge.new
-  rubyforge.configure
-  rubyforge.login    
-  rubyforge.userconfig.merge! 'release_changes'=>'.changes', 'preformatted'=>true
-  rubyforge.add_release spec.rubyforge_project.downcase, spec.name.downcase, spec.version.to_s, *files
-  rm_f '.changes'
-  puts "Release #{spec.version} uploaded"
+desc "Push new release to gemcutter and git tag"
+task :push do
+  sh "git push"
+  puts "Tagging version #{spec.version} .."
+  sh "git tag v#{spec.version}"
+  sh "git push --tag"
+  puts "Building and pushing gem .."
+  sh "gem build #{spec.name}.gemspec"
+  sh "gem push #{spec.name}-#{spec.version}.gem"
 end
 
-task 'clobber' do
-  rm_f '.changes'
+desc "Install #{spec.name} locally"
+task :install do
+  sh "gem build #{spec.name}.gemspec"
+  sudo = "sudo" unless File.writable?( Gem::ConfigMap[:bindir])
+  sh "#{sudo} gem install #{spec.name}-#{spec.version}.gem"
 end

data/lib/uuid.rb

@@ -59,7 +59,16 @@ require 'macaddr'
 
 class UUID
 
-  VERSION = '2.0.1'
+  # Version number.
+  module Version
+    version = Gem::Specification.load(File.expand_path("../uuid.gemspec", File.dirname(__FILE__))).version.to_s.split(".").map { |i| i.to_i }
+    MAJOR = version[0]
+    MINOR = version[1]
+    PATCH = version[2]
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
+  end
+
+  VERSION = Version::STRING
 
   ##
   # Clock multiplier. Converts Time (resolution: seconds) to UUID clock
@@ -149,6 +158,21 @@ class UUID
     @state_file
   end
 
+  ##
+  # Specify the path of the state file.
+  def self.state_file=(path)
+    @state_file = path
+  end
+
+  ##
+  # Returns true if +uuid+ is in compact, default or urn formats.  Does not
+  # validate the layout (RFC 4122 section 4) of the UUID.
+  def self.validate(uuid)
+    return true if uuid =~ /\A[\da-f]{32}\z/i
+    return true if
+      uuid =~ /\A(urn:uuid:)?[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}\z/i
+  end
+
   ##
   # Create a new UUID generator.  You really only need to do this once.
   def initialize
@@ -277,5 +301,5 @@ protected
 
     io.write [mac1, mac2, @sequence, @last_clock].pack(STATE_FILE_FORMAT)
   end
-  
+
 end

data/test/test-uuid.rb

@@ -14,7 +14,13 @@ class TestUUID < Test::Unit::TestCase
     UUID.new.generate
     File.exist?(path)
   end
-  
+
+  def test_state_file_specify
+    path = File.join("path", "to", "ruby-uuid")
+    UUID.state_file = path
+    assert_equal path, UUID.state_file
+  end
+
   def test_instance_generate
     uuid = UUID.new
     assert_match(/\A[\da-f]{32}\z/i, uuid.generate(:compact))
@@ -32,7 +38,7 @@ class TestUUID < Test::Unit::TestCase
     assert_equal 'invalid UUID format :unknown', e.message
   end
 
-  def test_class_generate    uuid = UUID.new
+  def test_class_generate
     assert_match(/\A[\da-f]{32}\z/i, UUID.generate(:compact))
 
     assert_match(/\A[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}\z/i,
@@ -47,6 +53,20 @@ class TestUUID < Test::Unit::TestCase
     assert_equal 'invalid UUID format :unknown', e.message
   end
 
+  def test_class_validate
+    assert !UUID.validate('')
+
+    assert  UUID.validate('01234567abcd8901efab234567890123'), 'compact'
+    assert  UUID.validate('01234567-abcd-8901-efab-234567890123'), 'default'
+    assert  UUID.validate('urn:uuid:01234567-abcd-8901-efab-234567890123'),
+            'urn'
+
+    assert  UUID.validate('01234567ABCD8901EFAB234567890123'), 'compact'
+    assert  UUID.validate('01234567-ABCD-8901-EFAB-234567890123'), 'default'
+    assert  UUID.validate('urn:uuid:01234567-ABCD-8901-EFAB-234567890123'),
+            'urn'
+  end
+
   def test_monotonic
     seen = {}
     uuid_gen = UUID.new
@@ -57,7 +77,7 @@ class TestUUID < Test::Unit::TestCase
       seen[uuid] = true
     end
   end
-  
+
   def test_same_mac
     class << foo = UUID.new
       attr_reader :mac
@@ -67,7 +87,7 @@ class TestUUID < Test::Unit::TestCase
     end
     assert_equal foo.mac, bar.mac
   end
-  
+
   def test_increasing_sequence
     class << foo = UUID.new
       attr_reader :sequence

data/uuid.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |spec|
   spec.name = 'uuid'
-  spec.version = '2.0.2'
+  spec.version = '2.1.0'
   spec.summary = "UUID generator"
   spec.description = <<-EOF
 UUID generator for producing universally unique identifiers based on RFC 4122
@@ -10,9 +10,8 @@ EOF
   spec.authors << 'Assaf Arkin' << 'Eric Hodel'
   spec.email = 'assaf@labnotes.org'
   spec.homepage = 'http://github.com/assaf/uuid'
-  spec.rubyforge_project = 'reliable-msg'
 
-  spec.files = Dir['{bin,test,lib,docs}/**/*', 'README.rdoc', 'MIT-LICENSE', 'Rakefile', 'CHANGELOG', 'uuid.gemspec']
+  spec.files = Dir['{bin,test,lib,docs}/**/*'] + ['README.rdoc', 'MIT-LICENSE', 'Rakefile', 'CHANGELOG', 'uuid.gemspec']
   spec.has_rdoc = true
   spec.rdoc_options << '--main' << 'README.rdoc' << '--title' <<  'UUID generator' << '--line-numbers'
                        '--webcvs' << 'http://github.com/assaf/uuid'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: uuid
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-10 00:00:00 -07:00
+date: 2009-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,8 +70,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: reliable-msg
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: UUID generator