rufus-cloche 0.1.15 → 0.1.16

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-cloche CHANGELOG.txt
 
 
+== rufus-cloche - 0.1.16    released 2010/03/14
+
+- :nolock option for JRuby 1.4.0 on Ubuntu
+
+
 == rufus-cloche - 0.1.15    released 2010/02/14
 
 - windows : mswin|mingw

data/Rakefile

@@ -41,6 +41,7 @@ Strives to be process-safe and thread-safe.
   #gem.add_dependency 'yajl-ruby'
   #gem.add_dependency 'json'
   gem.add_dependency 'rufus-json', '>= 0.2.0'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'jeweler'
 

data/lib/rufus/cloche.rb

@@ -43,18 +43,30 @@ module Rufus
   #
   class Cloche
 
-    VERSION = '0.1.15'
+    VERSION = '0.1.16'
 
-    WIN = RUBY_PLATFORM.match(/mswin|mingw/) != nil
+    WIN = (RUBY_PLATFORM.match(/mswin|mingw/) != nil)
 
     attr_reader :dir
 
-    # Currently, the only known option is :dir
+    # Creates a new 'cloche'.
+    #
+    # There are 2 options :
+    #
+    # * :dir : to specify the directory into which the cloche data is store
+    # * :nolock : when set to true, no flock is used
+    #
+    # On the Windows platform, :nolock is set to true automatically.
+    #
+    # With JRuby 1.4.0, :nolock=true seems necessary on Ubuntu. While
+    # flock seems to work on MacOSX Snow Leopard.
     #
     def initialize (opts={})
 
       @dir = File.expand_path(opts[:dir] || 'cloche')
       @mutex = Mutex.new
+
+      @nolock = WIN || opts[:nolock]
     end
 
     # Puts a document (Hash) under the cloche.
@@ -271,12 +283,12 @@ module Rufus
 
           return false if file.nil?
 
-          file.flock(File::LOCK_EX) unless WIN
+          file.flock(File::LOCK_EX) unless @nolock
           block.call(file)
 
         ensure
           begin
-            file.flock(File::LOCK_UN) unless WIN
+            file.flock(File::LOCK_UN) unless @nolock
           rescue Exception => e
             #p [ :lock, @fpath, e ]
             #e.backtrace.each { |l| puts l }

data/rufus-cloche.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-cloche}
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-02-13}
+  s.date = %q{2010-03-14}
   s.description = %q{
 A very stupid JSON hash store.
 
@@ -42,7 +42,7 @@ Strives to be process-safe and thread-safe.
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rufus}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{a very stupid JSON hash store}
   s.test_files = [
     "test/test.rb"
@@ -54,15 +54,18 @@ Strives to be process-safe and thread-safe.
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rufus-json>, [">= 0.2.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rufus-json>, [">= 0.2.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<rufus-json>, [">= 0.2.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

data/test/test.rb

@@ -28,7 +28,8 @@ class ClocheTest < Test::Unit::TestCase
 
     FileUtils.rm_rf(@c_dir) rescue nil
 
-    @c = Rufus::Cloche.new(:dir => @c_dir)
+    @c = Rufus::Cloche.new(
+      :dir => @c_dir, :nolock => (RUBY_PLATFORM.match('java') != nil))
   end
   #def teardown
   #end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-cloche
 version: !ruby/object:Gem::Version 
-  version: 0.1.15
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,39 +14,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +09:00
+date: 2010-03-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rufus-json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
         version: 0.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: "\n\
   A very stupid JSON hash store.\n\n\
   It's built on top of yajl-ruby and File.lock. Defaults to 'json' (or 'json_pure') if yajl-ruby is not present (it's probably just a \"gem install yajl-ruby\" away.\n\n\
@@ -82,18 +107,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: a very stupid JSON hash store