bunch 1.0.0pre2 → 1.0.0pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d5aba69bf87251e2474a2b0851ef99d5d85b7ef
-  data.tar.gz: c4583b708490467740c0846b67e7413a6af5b5a9
+  metadata.gz: a37d91d1930ff1ac34b123a971d142fa3d55bb52
+  data.tar.gz: 58e981014d925670a9cfba1bea8e724166e8cb2b
 SHA512:
-  metadata.gz: 3f1aa8c5167f12b45e444c0568b615a6e287809496054a0bc21f48c22ba243c17b5289292fe40ad2bb4e49478ae615a4199040a4dc97d0d965bb777f513ee144
-  data.tar.gz: f806f3cb5188661a16d3f889fab249e74a8cd0bfb2711a1e886bc41dec87b367daa0f54a3143d4d3624b2defba2daf77754c1ebaaef3a52ee439d373d72ff13a
+  metadata.gz: e54d84f5412f4487384e0bfa433df0b60320b64b499812db97fdd56936d15013ad30d6ba775b5f970735a36f1941420befc2baf196eae0c986ce283e86ef4e93
+  data.tar.gz: 848abb8159a204f5b3467a2c64069d18d2fbf7427e413ce45e4ac4a6966e284c66e6e5718f210a933949b449ff9f7759299c332d40ab3f5d641bf01119e7072e

data/lib/bunch/file_cache.rb

@@ -2,6 +2,7 @@
 
 require "digest/md5"
 require "fileutils"
+require "thread"
 require "yaml"
 
 module Bunch
@@ -15,18 +16,22 @@ module Bunch
     def initialize(processor_class, input_dir, *args)
       @processor_class, @args = processor_class, args
       @cache_name = "#{processor_class}-#{input_dir}"
+      @mutex = Mutex.new
     end
 
     def new(tree)
-      cache     = load_cache
-      partition = Partition.new(tree, cache)
+      result = nil
+      @mutex.synchronize do
+        cache     = load_cache
+        partition = Partition.new(tree, cache)
 
-      partition.process!
+        partition.process!
 
-      processor = @processor_class.new(partition.pending, *@args)
-      result    = TreeMerge.new(partition.cached, processor.result).result
+        processor = @processor_class.new(partition.pending, *@args)
+        result    = TreeMerge.new(partition.cached, processor.result).result
 
-      save_cache tree, result
+        save_cache tree, result
+      end
       Result.new(result)
     end
 

data/lib/bunch/simple_cache.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require "thread"
+
 module Bunch
   def self.SimpleCache(*args)
     SimpleCache.new(*args)
@@ -12,15 +14,20 @@ module Bunch
       @processor_class, @args = processor_class, args
       @cache = nil
       @hache = nil
+      @mutex = Mutex.new
     end
 
     def new(tree)
-      check_cache!(tree)
-      @cache ||= begin
-        processor = @processor_class.new(tree, *@args)
-        processor.result
+      result = nil
+      @mutex.synchronize do
+        check_cache!(tree)
+        @cache ||= begin
+          processor = @processor_class.new(tree, *@args)
+          processor.result
+        end
+        result = @cache.dup
       end
-      Result.new(@cache.dup)
+      Result.new(result)
     end
 
     private

data/lib/bunch/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Bunch
-  VERSION = "1.0.0pre2"
+  VERSION = "1.0.0pre3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunch
 version: !ruby/object:Gem::Version
-  version: 1.0.0pre2
+  version: 1.0.0pre3
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types