tsafe 0.0.11 → 0.0.12

data/lib/tsafe_mrswlock_jruby.rb

@@ -6,17 +6,17 @@ class Tsafe::Mrswlock
   # Sets various variables.
   def initialize
     @lock = java.util.concurrent.locks.ReentrantReadWriteLock.new
-    
-    #This hash holds thread-IDs for threads that are reading.
+
+    # This hash holds thread-IDs for threads that are reading.
     @reading_threads = {}
   end
-  
+
   # Runs the given block through the read-synchronization.
   def rsync
     @lock.read_lock.lock
     tid = Thread.current.__id__
     @reading_threads[tid] = true
-    
+
     begin
       yield
     ensure
@@ -24,8 +24,8 @@ class Tsafe::Mrswlock
       @lock.read_lock.unlock
     end
   end
-  
-  #Runs the given block through the write-synchronization (locks both reading and writing).
+
+  # Runs the given block through the write-synchronization (locks both reading and writing).
   #===Examples
   #  lock.wsync do
   #    #do something within lock.
@@ -33,7 +33,7 @@ class Tsafe::Mrswlock
   def wsync
     tid = Thread.current.__id__
     raise ThreadError, "Deadlock: Writing is not allowed while reading." if @reading_threads.key?(tid)
-    
+
     begin
       @wlock_by = tid
       @lock.write_lock.lock
@@ -42,4 +42,4 @@ class Tsafe::Mrswlock
       @lock.write_lock.unlock
     end
   end
-end
+end

data/lib/tsafe_mrswlock_synmodule.rb

@@ -8,7 +8,7 @@
 module Tsafe::Mrswlock_synmodule
   def self.included(base)
     base.to_s.split("::").inject(Object, :const_get).class_eval do
-      #Yields the given block within the read-lock.
+      # Yields the given block within the read-lock.
       #===Examples
       # obj._tsafe_rsync do
       #   #do something within read-lock.
@@ -16,8 +16,8 @@ module Tsafe::Mrswlock_synmodule
       def _tsafe_rsync(&block)
         @tsafe_mrswlock.rsync(&block)
       end
-      
-      #Yields the given block within the write-lock (and read-lock).
+
+      # Yields the given block within the write-lock (and read-lock).
       #===Examples
       # obj._tsafe_wsync do
       #   #do something within write-lock.
@@ -25,39 +25,39 @@ module Tsafe::Mrswlock_synmodule
       def _tsafe_wsync(&block)
         @tsafe_mrswlock.rsync(&block)
       end
-      
-      #Rename initialize.
+
+      # Rename initialize.
       alias_method(:initialize_mrswlock, :initialize)
-      
-      #Make another initialize-method that spawns the lock and then calls the original initialize.
+
+      # Make another initialize-method that spawns the lock and then calls the original initialize.
       define_method(:initialize) do |*args, &block|
         @tsafe_mrswlock = Tsafe::Mrswlock.new
         return initialize_mrswlock(*args, &block)
       end
-      
-      #Makes reader methods go through reader-lock.
+
+      # Makes reader methods go through reader-lock.
       base.class_variable_get(:@@tsafe_mrswlock_r_methods).each do |mname|
         newmname = "tsafe_mrswlock_#{mname}".to_sym
         alias_method(newmname, mname)
-        
+
         define_method(mname) do |*args, &block|
           @tsafe_mrswlock.rsync do
-            return self.__send__(newmname, *args, &block)
+            return __send__(newmname, *args, &block)
           end
         end
       end
-      
-      #Makes writer methods go through writer-lock.
+
+      # Makes writer methods go through writer-lock.
       base.class_variable_get(:@@tsafe_mrswlock_w_methods).each do |mname|
         newmname = "tsafe_mrswlock_#{mname}".to_sym
         alias_method(newmname, mname)
-        
+
         define_method(mname) do |*args, &block|
           @tsafe_mrswlock.wsync do
-            return self.__send__(newmname, *args, &block)
+            return __send__(newmname, *args, &block)
           end
         end
       end
     end
   end
-end
+end

data/lib/tsafe_mutexed.rb

@@ -1,4 +1,4 @@
-#This module can be included on a class to make all method-calls synchronized (by using mutex). Examples with array and hash are below.
+# This module can be included on a class to make all method-calls synchronized (by using mutex). Examples with array and hash are below.
 #
 #===Examples
 #  class MySyncedClass < SomeOtherClassThatNeedsToBeSynchronized
@@ -7,23 +7,23 @@
 module Tsafe::Mutexed
   def self.included(base)
     base.to_s.split("::").inject(Object, :const_get).class_eval do
-      self.instance_methods.each do |method_name|
-        #These two methods create warnings under JRuby.
+      instance_methods.each do |method_name|
+        # These two methods create warnings under JRuby.
         if RUBY_ENGINE == "jruby"
-          next if method_name == :instance_exec or method_name == :instance_eval
+          next if method_name == :instance_exec || method_name == :instance_eval
         end
-        
+
         new_method_name = "_ts_#{method_name}"
         alias_method(new_method_name, method_name)
-        
+
         define_method method_name do |*args, &block|
-          #Need to use monitor, since the internal calls might have to run not-synchronized, and we have just overwritten the internal methods.
-          @_ts_mutex = Mutex.new if !@_ts_mutex
+          # Need to use monitor, since the internal calls might have to run not-synchronized, and we have just overwritten the internal methods.
+          @_ts_mutex = Mutex.new unless @_ts_mutex
           @_ts_mutex.synchronize do
-            return self._ts___send__(new_method_name, *args, &block)
+            return _ts___send__(new_method_name, *args, &block)
           end
         end
       end
     end
   end
-end
+end

data/lib/tsafe_proxy.rb

@@ -1,13 +1,13 @@
-#Instances of this class proxies calls to a given-object by using a mutex or monitor.
+# Instances of this class proxies calls to a given-object by using a mutex or monitor.
 #
 #==== Examples
 #  threadsafe_array = Tsafe::Proxy.new(:obj => [])
 #  threadsafe_array << 5
 #  ret = threadsafe_array[0]
-#  
+#
 #  threadsafe_array = Tsafe::Proxy.new(:obj => [], :monitor => true)
 class Tsafe::Proxy
-  #Spawns needed vars.
+  # Spawns needed vars.
   def initialize(args)
     if args[:monitor]
       @mutex = Monitor.new
@@ -16,14 +16,14 @@ class Tsafe::Proxy
     else
       @mutex = Mutex.new
     end
-    
+
     @obj = args[:obj]
   end
-  
-  #Proxies all calls to this object through the mutex.
+
+  # Proxies all calls to this object through the mutex.
   def method_missing(method_name, *args, &block)
     @mutex.synchronize do
       @obj.__send__(method_name, *args, &block)
     end
   end
-end
+end

data/shippable.yml

@@ -0,0 +1,11 @@
+language: ruby
+cache: bundler
+archive: true
+rvm:
+  - ruby-2.1.2
+  - ruby-1.9.3-head
+script:
+  - bundle exec rspec
+  - bundle exec rubocop
+notifications:
+  email: false

data/spec/mrswlock_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 
 require "timeout"
 
@@ -6,112 +6,112 @@ describe "Tsafe::Rwmutex" do
   it "should work with the modified hash" do
     Thread.abort_on_exception = true
     debug = false
-    
+
     print "Setting initial values.\n" if debug
     hash = Tsafe::MonHash.new
     0.upto(15) do |count|
-      realcount = 100000000 - count
+      realcount = 100_000_000 - count
       hash[realcount] = realcount
     end
-    
+
     called = false
     hash._tsafe_rsync do
       called = true
     end
-    
-    raise "Expected to be called." if !called
-    
+
+    raise "Expected to be called." unless called
+
     called = false
     hash._tsafe_wsync do
       called = true
     end
-    
-    raise "Expected to be called." if !called
-    
+
+    raise "Expected to be called." unless called
+
     ts = []
-    
+
     1.upto(10) do |tcount|
       print "Starting thread #{tcount}\n" if debug
       ts << Thread.new do
         1.upto(5000) do |count|
           hash[count] = count
-          
+
           hash[count]
           hash.key?(count)
-          
+
           hash.delete(count)
-          
+
           hash.each do |key, val|
-            #nothing...
+            # nothing...
           end
         end
       end
     end
-    
+
     ts.each do |t|
       print "Joining #{t.__id__}\n" if debug
       t.join
     end
   end
-  
+
   it "should work with manual lock creation" do
     debug = false
-    
+
     hash = {}
     0.upto(15) do |count|
-      realcount = 100000000 - count
+      realcount = 100_000_000 - count
       hash[realcount] = realcount
     end
-    
+
     rwm = Tsafe::Mrswlock.new
     ts = []
-    
+
     1.upto(10) do
       ts << Thread.new do
         1.upto(5000) do |count|
           rwm.wsync do
             hash[count] = count
           end
-          
+
           rwm.rsync do
             hash[count]
             hash.key?(count)
           end
-          
+
           rwm.wsync do
             hash.delete(count)
           end
-          
+
           rwm.rsync do
             hash.each do |key, val|
-              #nothing...
+              # nothing...
             end
           end
         end
       end
     end
-    
+
     ts.each do |t|
       print "Joining #{t.__id__}\n" if debug
       t.join
     end
   end
-  
+
   it "should be able to read while writing from same thread while other threads are stressing" do
     hash = Tsafe::MonHash.new
     0.upto(1500) do |count|
       hash[count] = count
     end
-    
+
     Timeout.timeout(14) do
       ts = []
       1.upto(20) do
         ts << Thread.new do
-          hash.keep_if do |key, val|
+          hash.keep_if do |key, _val|
             hash.each do |key2, val2|
-              #ignore.
+              # ignore.
             end
-            
+
             if key > 500
               true
             else
@@ -120,55 +120,51 @@ describe "Tsafe::Rwmutex" do
           end
         end
       end
-      
-      ts.each do |t|
-        t.join
-      end
+
+      ts.each(&:join)
     end
   end
-  
+
   it "should not be able to write while reading from same thread" do
     hash = Tsafe::MonHash.new
     0.upto(1000) do |count|
       hash[count] = count
     end
-    
+
     begin
-      hash.each do |key, val|
+      hash.each do |key, _val|
         hash.delete(key)
       end
-      
+
       raise "Expected ThreadError but didnt get raised."
-    rescue ThreadError
-      #ignore - supposed to happen.
+    rescue ThreadError # rubocop:disable Lint/HandleExceptions
+      # Ignore - supposed to happen.
     end
   end
-  
+
   it "should include thread-safe array" do
     arr = Tsafe::MonArray.new
     0.upto(1000) do |count|
       arr << count
     end
-    
+
     ts = []
     0.upto(20) do
       ts << Thread.new do
         arr.each do |i|
-          something = i + 100 / 5
+          i + 100 / 5
         end
-        
+
         0.upto(1000) do |count|
           arr << count + 1000
         end
-        
+
         arr.delete_if do |count|
           count > 1000
         end
       end
     end
-    
-    ts.each do |t|
-      t.join
-    end
+
+    ts.each(&:join)
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,11 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'tsafe'
+require "rspec"
+require "tsafe"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  
 end

data/spec/tsafe_spec.rb

@@ -1,58 +1,57 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 
 describe "Tsafe" do
   it "should be able to spawn threadsafe proxy-objects" do
-    arr = Tsafe::Proxy.new(:obj => {})
-    
+    arr = Tsafe::Proxy.new(obj: {})
+
     0.upto(5) do |i|
       arr[i] = i
     end
-    
+
     Thread.new do
       begin
-        arr.each do |key, val|
-          res = key + val
+        arr.each do
           sleep 0.1
         end
-      rescue Exception => e
-        print e.inspect
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        puts e.inspect
       end
     end
-    
+
     5.upto(10) do |i|
       arr[i] = i
       sleep 0.1
     end
   end
-  
+
   it "should be able to spawn special classes" do
-    #Create new synchronized hash.
+    # Create new synchronized hash.
     arr = Tsafe::MonHash.new
-    
-    #Make sure we get the right results.
+
+    # Make sure we get the right results.
     arr[1] = 2
-    
+
     res = arr[1]
-    raise "Expected 2 but got '#{res}'." if res != 2
-    
-    #Set some values to test with.
+    raise "Expected 2 but got '#{res}'." unless res == 2
+
+    # Set some values to test with.
     0.upto(5) do |i|
       arr[i] = i
     end
-    
-    #Try to call through each through a thread and then also try to set new values, which normally would crash the hash.
+
+    # Try to call through each through a thread and then also try to set new values, which normally would crash the hash.
     Thread.new do
       begin
         arr.each do |key, val|
           res = key + val
           sleep 0.1
         end
-      rescue Exception => e
-        print e.inspect
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        puts e.inspect
       end
     end
-    
-    #This should not crash it, since they should wait for each other.
+
+    # This should not crash it, since they should wait for each other.
     5.upto(10) do |i|
       arr[i] = i
       sleep 0.1