torid 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75b5b4431a8b596afe4c63016bde43c434de5e22
-  data.tar.gz: 3b90048fa36d6c4b3ae54e993c42c2055acbd794
+  metadata.gz: 5ba896500ff2a3f4d59b713763c65b9176f1253d
+  data.tar.gz: 21e3039eb342abd526bc5d1918bc50a60e645ece
 SHA512:
-  metadata.gz: 2815d42c3959644c9ba09ff9017f647d55efd30ee708fab08e3467c02967336b91ce432c2c225aa355a24a632a384eb20c9d34196db80c4183cf75706f569dbb
-  data.tar.gz: 9963cbd09d89b0d8b7feb0c59ca7addef19cbaa0ff78146a1b86b86c357bb8d09fa930996399e5497f83c907eb827ad2c7f1ea81b254271ddc0cccbb8fb3b782
+  metadata.gz: 144ce568600e2fc4b87b4a934be242fff48d2f03af12d6a0a83a7c10bbc684d18e6454774297791e07df102b7d896a13efe7cbf4f9117af446eaed3514a61369
+  data.tar.gz: 66ca30ee9f65023be20c776bdcf4a8ff6a2cd6b2bc4a9b4bdc4a7a3755fb06b2185bcda9d1b82528ddaff83fd51d46f09337f8d1eec9a5f81fc79458d5c8d12a

data/HISTORY.md

@@ -1,4 +1,8 @@
 # Torid Changelog
+## Version 1.2.4 - 2015-02-18
+
+* Fix a failing test case on jruby. Only affected running tests.
+
 ## Version 1.2.3 - 2014-09-13
 
 * Use `captures` instead of named captures.

data/Rakefile

@@ -12,6 +12,7 @@ This.ruby_gemspec do |spec|
   spec.add_development_dependency( 'rake'     , '~> 10.1')
   spec.add_development_dependency( 'minitest' , '~> 5.0' )
   spec.add_development_dependency( 'rdoc'     , '~> 4.0' )
+  spec.add_development_dependency( 'simplecov', '~> 0.9' )
 end
 
 load 'tasks/default.rake'

data/lib/torid.rb

@@ -2,7 +2,7 @@
 # that sort lexically in time order.
 module Torid
   # Public: The Version of the Torid library as a String
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 
   # Public: return the next Torid::UUID from the default Generator
   #

data/lib/torid/clock.rb

@@ -15,6 +15,10 @@ module Torid
 
     # Internal: Return the current microsecond UNIX timstamp
     #
+    # Since this value is outside of any mutex, it is not valid to comopare it
+    # against any value from 'tick'. This is a utility method for use soley
+    # inside of the Clock instance.
+    #
     # Example:
     #
     #   Clock.stamp => 1404774462369341
@@ -25,6 +29,8 @@ module Torid
       (now.to_f * 1_000_000).floor
     end
 
+    attr_reader :prev_stamp
+
     # Internal: Create a new Clock
     #
     # prev_stamp - An initial value for the previous timestamp (default:

data/tasks/default.rake

@@ -10,21 +10,12 @@ namespace :develop do
 
   # Install all the development and runtime dependencies of this gem using the
   # gemspec.
-  task :default do
+  task :default => 'Gemfile' do
     require 'rubygems/dependency_installer'
     installer = ::Gem::DependencyInstaller.new
-
-    This.set_coverage_gem
-
-    puts "Installing gem depedencies needed for development"
-    This.platform_gemspec.dependencies.each do |dep|
-      if dep.matching_specs.empty? then
-        puts "Installing : #{dep}"
-        installer.install dep
-      else
-        puts "Skipping   : #{dep} -> already installed #{dep.matching_specs.first.full_name}"
-      end
-    end
+    puts "Installing bundler..."
+    installer.install 'bundler'
+    sh 'bundle install'
     puts "\n\nNow run 'rake test'"
   end
 
@@ -37,14 +28,6 @@ namespace :develop do
       f.puts 'gemspec'
     end
   end
-
-  desc "Create a bundler Gemfile"
-  task :using_bundler => 'Gemfile' do
-    puts "Now you can 'bundle'"
-  end
-
-  # Gemfiles are build artifacts
-  CLOBBER << FileList['Gemfile*']
 end
 desc "Boostrap development"
 task :develop => "develop:default"
@@ -90,31 +73,16 @@ end
 # Coverage - optional code coverage, rcov for 1.8 and simplecov for 1.9, so
 #            for the moment only rcov is listed.
 #------------------------------------------------------------------------------
-if RUBY_VERSION < "1.9.0"
-  begin
-   require 'rcov/rcovtask'
-   Rcov::RcovTask.new( 'coverage' ) do |t|
-     t.libs      << 'spec'
-     t.pattern   = 'spec/**/*_spec.rb'
-     t.verbose   = true
-     t.rcov_opts << "-x ^/"           # remove all the global files
-     t.rcov_opts << "--sort coverage" # so we see the worst files at the top
-   end
-  rescue LoadError
-   This.task_warning( 'rcov' )
-  end
-else
-  begin
-    require 'simplecov'
-    desc 'Run tests with code coverage'
-    task :coverage do
-      ENV['COVERAGE'] = 'true'
-      Rake::Task[:test].execute
-    end
-    CLOBBER << FileList["coverage"]
-  rescue LoadError
-    This.task_warning( 'simplecov' )
+begin
+  require 'simplecov'
+  desc 'Run tests with code coverage'
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task[:test].execute
   end
+  CLOBBER << 'coverage' if File.directory?( 'coverage' )
+rescue LoadError
+  This.task_warning( 'simplecov' )
 end
 
 #------------------------------------------------------------------------------
@@ -179,9 +147,10 @@ namespace :fixme do
   end
 
   def outdated_fixme_files
-    local_fixme_files.reject do |local|
+    local_fixme_files.select do |local|
       upstream     = fixme_project_path( local )
-      Digest::SHA256.file( local ) == Digest::SHA256.file( upstream )
+      upstream.exist? &&
+        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
     end
   end
 
@@ -231,9 +200,6 @@ task :gemspec do
   end
 end
 
-# the gemspec is also a dev artifact and should not be kept around.
-CLOBBER << This.gemspec_file.to_s
-
 # .rbc files from ruby 2.0
 CLOBBER << FileList["**/*.rbc"]
 

data/tasks/this.rb

@@ -13,7 +13,7 @@ class ThisProject
   attr_accessor :email
 
   # The homepage of this project
-  attr_accessor :homepage 
+  attr_accessor :homepage
 
   # The regex of files to exclude from the manifest
   attr_accessor :exclude_from_manifest
@@ -123,7 +123,7 @@ class ThisProject
 
   # Internal: Returns the gemspace associated with the current ruby platform
   def platform_gemspec
-    gemspecs[platform]
+    gemspecs.fetch(platform) { This.ruby_gemspec }
   end
 
   def core_gemspec
@@ -145,6 +145,8 @@ class ThisProject
       spec.extra_rdoc_files += spec.files.grep(/(txt|rdoc|md)$/)
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
+
+      spec.required_ruby_version = '>= 1.9.3'
     end
   end
 
@@ -171,20 +173,6 @@ class ThisProject
     return spec
   end
 
-  # Internal: Set the recovery gem development dependency
-  #
-  # These are dynamically set since they cannot be hard coded as there is 
-  # no way to ship them correctly in the gemspec
-  #
-  # Returns nothing.
-  def set_coverage_gem
-    if RUBY_VERSION < "1.9.0"
-      platform_gemspec.add_development_dependency( 'rcov', '~> 1.0.0' )
-    else
-      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.9' )
-    end
-  end
-
   # Internal: Return the platform of ThisProject at the current moment in time.
   def platform
     (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
@@ -194,8 +182,8 @@ class ThisProject
   def description_section
     section_of( 'README.md', 'DESCRIPTION')
   end
- 
- # Internal: Return the summary text from the README 
+
+  # Internal: Return the summary text from the README
   def summary
     description_section.first
   end

data/test/test_clock.rb

@@ -4,9 +4,10 @@ require 'torid/clock'
 module Torid
   class ClockTest < ::Minitest::Test
     def test_tick_is_after_stamp
-      stamp = Clock.stamp
-      tick  = Clock.tick
-      assert( tick > stamp )
+      clock = Clock.new
+      stamp = clock.prev_stamp
+      tick  = clock.tick
+      assert( tick > stamp, "tick #{tick} is not > than stamp of #{stamp}")
     end
 
     def test_tick_follows_clock_not_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torid
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fnv
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: 'Temporally Ordered IDs. Generate universally unique identifiers (UUID)
   that sort lexically in time order. Torid exists to solve the problem of generating
   UUIDs that when ordered lexically, they are also ordered temporally. I needed a
@@ -119,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -127,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Temporally Ordered IDs. Generate universally unique identifiers (UUID) that