scrolls 0.3.9 → 0.9.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 764cf377dd151093b60740032200866af5dfe033
-  data.tar.gz: ad73c8e48a7baa90366ca0e1a05eea887f719fb3
+  metadata.gz: b78c2d850fe048ad6f192be59e56b6d04daee1c5
+  data.tar.gz: 49934f36ea64c5fe6a8a1b44ecb5689ea4574a75
 SHA512:
-  metadata.gz: 43df84fb536e8f94aa15e99471def2587ad5a8abe73ba018392d4aa9deacfff21eb1d2fbc11458670f43d459fe7a3cedeb190436bd5d93a997f7f2374fd35383
-  data.tar.gz: d565408e3abf2d46ce1f0561e9dbee59003f5041bbec07a0bdae3cd099295ec9cbf77c3bd8f2df97b1b15b797c1c7d452c1099df2d59ae53b444cb49e5c32424
+  metadata.gz: 9d05994bb1dfdd62a76ad372a56ac83270fe8853e19f5f402d86031e90b22eec8ff09f26d3208efe91e392a6b2d6391a56c8236eb3b6d29390183cbd8abf58ef
+  data.tar.gz: c45dca818ec283f03f238de1201d5ea70198375b55a458e5a1441f2f8fa069f85198894cd11827496541084cd403ae356b6b9ce40376a499876f72be44f183fc

data/lib/scrolls.rb

@@ -1,6 +1,5 @@
 require "thread"
-require "scrolls/atomic"
-require "scrolls/log"
+require "scrolls/logger"
 require "scrolls/version"
 
 module Scrolls
@@ -8,33 +7,10 @@ module Scrolls
 
   # Public: Initialize a Scrolls logger
   #
-  # Convienence method to prepare for future releases. Currently mimics
-  # behavior found in other methods. This prepares the developer for a future
-  # backward incompatible change, see:
-  # https://github.com/asenchi/scrolls/pull/54
-  #
   # options - A hash of key/values for configuring Scrolls
   #
-  def init(options)
-    stream     = options.fetch(:stream, STDOUT)
-    facility   = options.fetch(:facility, Syslog::LOG_USER)
-    time_unit  = options.fetch(:time_unit, "seconds")
-    timestamp  = options.fetch(:timestamp, false)
-    exceptions = options.fetch(:exceptions, "multi")
-    global_ctx = options.fetch(:global_context, {})
-
-    Log.stream    = stream
-    Log.facility  = facility if facility
-    Log.time_unit = time_unit unless time_unit == "seconds"
-    Log.add_timestamp = timestamp unless timestamp == false
-
-    if exceptions == "single"
-      Log.single_line_exceptions = true
-    end
-
-    unless global_ctx == {}
-      Log.global_context = global_ctx
-    end
+  def init(options={})
+    @log = Log.new(options)
   end
 
   # Public: Set a context in a block for logs
@@ -45,37 +21,13 @@ module Scrolls
   # Examples:
   #
   def context(data, &blk)
-    Log.with_context(data, &blk)
-  end
-
-  # Deprecated: Get or set a global context that prefixs all logs
-  #
-  # data - A hash of key/values to prepend to each log
-  #
-  # This method will be deprecated two releases after 0.3.8.
-  # See https://github.com/asenchi/scrolls/releases/tag/v0.3.8
-  # for more details.
-  #
-  def global_context(data=nil)
-    $stderr.puts "global_context() will be deprecated after v0.3.8, please see https://github.com/asenchi/scrolls for more information."
-    if data
-      Log.global_context = data
-    else
-      Log.global_context
-    end
+    @log.with_context(data, &blk)
   end
 
-  # Deprecated: Get or set a global context that prefixs all logs
-  #
-  # data - A hash of key/values to prepend to each log
-  #
-  # This method will be deprecated two releases after 0.3.8.
-  # See https://github.com/asenchi/scrolls/releases/tag/v0.3.8
-  # for more details.
+  # Public: Get the global context that prefixs all logs
   #
-  def add_global_context(data)
-    $stderr.puts "add_global_context will be deprecated after v0.3.8, please see https://github.com/asenchi/scrolls for more information."
-    Log.add_global_context(data)
+  def global_context
+    @log.global_context
   end
 
   # Public: Log data and/or wrap a block with start/finish
@@ -96,7 +48,7 @@ module Scrolls
   #   => nil
   #
   def log(data, &blk)
-    Log.log(data, &blk)
+    @log.log(data, &blk)
   end
 
   # Public: Log an exception
@@ -115,7 +67,7 @@ module Scrolls
   #   ...
   #
   def log_exception(data, e)
-    Log.log_exception(data, e)
+    @log.log_exception(data, e)
   end
 
   # Public: Setup a logging facility (default: Syslog::LOG_USER)
@@ -127,7 +79,7 @@ module Scrolls
   #   Scrolls.facility = Syslog::LOG_LOCAL7
   #
   def facility=(f)
-    Log.facility=(f)
+    @log.facility=(f)
   end
 
   # Public: Return the Syslog facility
@@ -138,7 +90,7 @@ module Scrolls
   #   => 8
   #
   def facility
-    Log.facility
+    @log.facility
   end
 
   # Public: Setup a new output (default: STDOUT)
@@ -154,7 +106,7 @@ module Scrolls
   #   Scrolls.stream = StringIO.new
   #
   def stream=(out)
-    Log.stream=(out)
+    @log.stream=(out)
   end
 
   # Public: Return the stream
@@ -165,7 +117,7 @@ module Scrolls
   #   => #<IO:<STDOUT>>
   #
   def stream
-    Log.stream
+    @log.stream
   end
 
   # Public: Set the time unit we use for 'elapsed' (default: "seconds")
@@ -177,7 +129,7 @@ module Scrolls
   #   Scrolls.time_unit = "milliseconds"
   #
   def time_unit=(unit)
-    Log.time_unit=(unit)
+    @log.time_unit = unit
   end
 
   # Public: Return the time unit currently configured
@@ -188,7 +140,7 @@ module Scrolls
   #   => "seconds"
   #
   def time_unit
-    Log.time_unit
+    @log.time_unit
   end
 
   # Public: Set whether to include a timestamp (now=<ISO8601>) field in the log
@@ -199,7 +151,7 @@ module Scrolls
   #   Scrolls.add_timestamp = true
   #
   def add_timestamp=(boolean)
-    Log.add_timestamp = boolean
+    @log.timestamp = boolean
   end
 
   # Public: Return whether the timestamp field will be included in the log
@@ -211,7 +163,7 @@ module Scrolls
   #   => true
   #
   def add_timestamp
-    Log.add_timestamp
+    @log.timestamp
   end
 
   # Public: Set whether exceptions should generate a single log
@@ -222,7 +174,7 @@ module Scrolls
   #   Scrolls.single_line_exceptions = true
   #
   def single_line_exceptions=(boolean)
-    Log.single_line_exceptions = boolean
+    @log.exceptions = boolean
   end
 
   # Public: Return whether exceptions generate a single log message.
@@ -233,7 +185,7 @@ module Scrolls
   #   => true
   #
   def single_line_exceptions?
-    Log.single_line_exceptions
+    @log.single_line_exceptions?
   end
 
   # Public: Convience method for Logger replacement
@@ -249,7 +201,7 @@ module Scrolls
   #
   def debug(data, &blk)
     data = data.merge(:level => "debug") if data.is_a?(Hash)
-    Log.log(data, &blk)
+    @log.log(data, &blk)
   end
 
   # Public: Convience method for Logger replacement
@@ -267,7 +219,7 @@ module Scrolls
   #
   def error(data, &blk)
     data = data.merge(:level => "warning") if data.is_a?(Hash)
-    Log.log(data, &blk)
+    @log.log(data, &blk)
   end
 
   # Public: Convience method for Logger replacement
@@ -285,7 +237,7 @@ module Scrolls
   #
   def fatal(data, &blk)
     data = data.merge(:level => "error") if data.is_a?(Hash)
-    Log.log(data, &blk)
+    @log.log(data, &blk)
   end
 
   # Public: Convience method for Logger replacement
@@ -303,7 +255,7 @@ module Scrolls
   #
   def info(data, &blk)
     data = data.merge(:level => "info") if data.is_a?(Hash)
-    Log.log(data, &blk)
+    @log.log(data, &blk)
   end
 
   # Public: Convience method for Logger replacement
@@ -321,7 +273,7 @@ module Scrolls
   #
   def warn(data, &blk)
     data = data.merge(:level => "notice") if data.is_a?(Hash)
-    Log.log(data, &blk)
+    @log.log(data, &blk)
   end
 
   # Public: Convience method for Logger replacement
@@ -339,7 +291,13 @@ module Scrolls
   #
   def unknown(data, &blk)
     data = data.merge(:level => "alert") if data.is_a?(Hash)
-    Log.log(data, &blk)
+    @log.log(data, &blk)
+  end
+
+  # Internal: The Logger initialized by #init
+  #
+  def internal
+    @log
   end
 
 end

data/lib/scrolls/iolog.rb

@@ -1,7 +1,9 @@
 module Scrolls
   class IOLog
     def initialize(stream)
-      stream.sync = true
+      if stream.respond_to?(:sync)
+        stream.sync = true
+      end
       @stream = stream
     end
 

data/lib/scrolls/logger.rb

@@ -0,0 +1,297 @@
+require "scrolls/parser"
+require "scrolls/iolog"
+require "scrolls/syslog"
+
+module Scrolls
+  class TimeUnitError < RuntimeError; end
+
+  class GlobalContext
+    attr_reader :context
+    def initialize(context)
+      @context = context || {}
+    end
+
+    def to_h
+      @context
+    end
+  end
+
+  class Log
+    LOG_FACILITY = ENV['LOG_FACILITY'] || Syslog::LOG_USER
+    LOG_FACILITY_MAP = {
+      "auth"     => Syslog::LOG_AUTH,
+      "authpriv" => Syslog::LOG_AUTHPRIV,
+      "cron"     => Syslog::LOG_CRON,
+      "daemon"   => Syslog::LOG_DAEMON,
+      "ftp"      => Syslog::LOG_FTP,
+      "kern"     => Syslog::LOG_KERN,
+      "mail"     => Syslog::LOG_MAIL,
+      "news"     => Syslog::LOG_NEWS,
+      "syslog"   => Syslog::LOG_SYSLOG,
+      "user"     => Syslog::LOG_USER,
+      "uucp"     => Syslog::LOG_UUCP,
+      "local0"   => Syslog::LOG_LOCAL0,
+      "local1"   => Syslog::LOG_LOCAL1,
+      "local2"   => Syslog::LOG_LOCAL2,
+      "local3"   => Syslog::LOG_LOCAL3,
+      "local4"   => Syslog::LOG_LOCAL4,
+      "local5"   => Syslog::LOG_LOCAL5,
+      "local6"   => Syslog::LOG_LOCAL6,
+      "local7"   => Syslog::LOG_LOCAL7,
+    }
+
+    LOG_LEVEL = (ENV['LOG_LEVEL'] || 6).to_i
+    LOG_LEVEL_MAP = {
+      "emergency" => 0,
+      "alert"     => 1,
+      "critical"  => 2,
+      "error"     => 3,
+      "warning"   => 4,
+      "notice"    => 5,
+      "info"      => 6,
+      "debug"     => 7
+    }
+
+    attr_reader :logger
+    attr_accessor :exceptions, :timestamp
+
+    def initialize(options={})
+      @stream     = options.fetch(:stream, sync_stream)
+      @facility   = options.fetch(:facility, LOG_FACILITY)
+      @time_unit  = options.fetch(:time_unit, "seconds")
+      @timestamp  = options.fetch(:timestamp, false)
+      @exceptions = options.fetch(:exceptions, "single")
+      @global_ctx = options.fetch(:global_context, {})
+
+      setup!
+    end
+
+    def context
+      Thread.current[:scrolls_context] ||= {}
+    end
+
+    def context=(h)
+      Thread.current[:scrolls_context] = h
+    end
+
+    def stream
+      @stream
+    end
+
+    def stream=(stream)
+      # Return early to avoid setup
+      return if stream == @stream
+      
+      @stream = stream
+      setup_stream
+    end
+
+    def facility
+      @facility ||= LOG_FACILITY
+    end
+
+    def facility=(f)
+      if f
+        @facility = LOG_FACILITY_MAP[f]
+        # Assume we are using syslog and set it up again
+        @logger = Scrolls::SyslogLogger.new(progname, facility)
+      end
+    end
+
+    def time_unit
+      @time_unit
+    end
+
+    def time_unit=(u)
+      @time_unit = u
+      translate_time_unit
+    end
+
+    def global_context
+      @global_context.to_h
+    end
+
+    def log(data, &blk)
+      # If we get a string lets bring it into our structure.
+      if data.kind_of? String
+        rawhash = { "log_message" => data }
+      else
+        rawhash = data
+      end
+
+      if gc = @global_context.to_h
+        ctx = gc.merge(context)
+        logdata = ctx.merge(rawhash)
+      end
+
+      # By merging the logdata into the timestamp, rather than vice-versa, we
+      # ensure that the timestamp comes first in the Hash, and is placed first
+      # on the output, which helps with readability.
+      logdata = { :now => Time.now.utc }.merge(logdata) if prepend_timestamp?
+
+      unless blk
+        write(logdata)
+      else
+        start = Time.now
+        res = nil
+        log(logdata.merge(:at => "start"))
+        begin
+          res = yield
+        rescue StandardError => e
+          log(logdata.merge(
+            :at           => "exception",
+            :reraise      => true,
+            :class        => e.class,
+            :message      => e.message,
+            :exception_id => e.object_id.abs,
+            :elapsed      => calculate_time(start, Time.now)
+          ))
+          raise e
+        end
+        log(logdata.merge(:at => "finish", :elapsed => calculate_time(start, Time.now)))
+        res
+      end
+    end
+
+    def log_exception(data, e)
+      unless @defined
+        @stream = STDERR
+        setup_stream
+      end
+
+      # If we get a string lets bring it into our structure.
+      if data.kind_of? String
+        rawhash = { "log_message" => data }
+      else
+        rawhash = data
+      end
+
+      if gc = @global_context.to_h
+        logdata = gc.merge(rawhash)
+      end
+
+      excepdata = {
+        :at           => "exception",
+        :class        => e.class,
+        :message      => e.message,
+        :exception_id => e.object_id.abs
+      }
+
+      if e.backtrace
+        if single_line_exceptions?
+          lines = e.backtrace.map { |line| line.gsub(/[`'"]/, "") }
+
+          if lines.length > 0
+            excepdata[:site] = lines.join('\n')
+            log(logdata.merge(excepdata))
+          end
+        else
+          log(logdata.merge(excepdata))
+
+          e.backtrace.each do |line|
+            log(logdata.merge(excepdata).merge(
+              :at           => "exception",
+              :class        => e.class,
+              :exception_id => e.object_id.abs,
+              :site         => line.gsub(/[`'"]/, "")
+            ))
+          end
+        end
+      end
+    end
+
+    def with_context(prefix)
+      return unless block_given?
+      old = context
+      self.context = old.merge(prefix)
+      res = yield if block_given?
+    ensure
+      self.context = old
+      res
+    end
+
+    private
+
+    def setup!
+      build_global_context
+      prepend_timestamp?
+      setup_stream
+      single_line_exceptions?
+      translate_time_unit
+    end
+
+    def build_global_context
+      # Builds up an immutable object for our global_context
+      # This is not backwards compatiable and was introduced after 0.3.7.
+      # Removes ability to add to global context once we initialize our
+      # logging object. This also deprecates #add_global_context.
+      @global_context = GlobalContext.new(@global_ctx)
+      @global_context.freeze
+    end
+
+    def prepend_timestamp?
+      @timestamp
+    end
+
+    def setup_stream
+      unless @stream == STDOUT
+        @defined = true
+      end
+
+      if @stream == "syslog"
+        @logger = Scrolls::SyslogLogger.new(progname, facility)
+      else
+        @logger = sync_stream(@stream)
+      end
+    end
+
+    def single_line_exceptions?
+      return false if @exceptions == "multi"
+      true
+    end
+
+    def translate_time_unit
+      unless %w{s ms seconds milliseconds}.include? @time_unit
+        raise TimeUnitError, "Specify the following: s, ms, seconds, milliseconds"
+      end
+
+      case @time_unit
+      when %w{s seconds}
+        @t = 1.0
+      when %w{ms milliseconds}
+        @t = 1000.0
+      else
+        @t = 1.0
+      end
+    end
+    
+    def sync_stream(out = STDOUT)
+      IOLog.new(out)
+    end
+
+    def progname
+      File.basename($0)
+    end
+
+    def calculate_time(start, finish)
+      translate_time_unit unless @t
+      ((finish - start).to_f * @t)
+    end
+
+    def log_level_ok?(level)
+      if level
+        LOG_LEVEL_MAP[level.to_s] <= LOG_LEVEL
+      else
+        true
+      end
+    end
+
+    def write(data)
+      if log_level_ok?(data[:level])
+        msg = Scrolls::Parser.unparse(data)
+        logger.log(msg)
+      end
+    end
+
+  end
+end

data/lib/scrolls/version.rb

@@ -1,3 +1,3 @@
 module Scrolls
-  VERSION = "0.3.9"
+  VERSION = "0.9.0.pre"
 end

data/test/test_parser.rb

@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require File.expand_path("../test_helper", __FILE__)
 
 class TestScrollsParser < Test::Unit::TestCase
   include Scrolls::Parser

data/test/test_scrolls.rb

@@ -1,44 +1,38 @@
-require_relative "test_helper"
+require File.expand_path("../test_helper", __FILE__)
 
 class TestScrolls < Test::Unit::TestCase
   def setup
     @out = StringIO.new
-    Scrolls.init(:stream => @out)
+    Scrolls.init(
+      :stream => @out
+    )
   end
 
   def teardown
-    Scrolls.global_context({})
-    # Reset our syslog context
-    Scrolls.facility = Scrolls::LOG_FACILITY
-    Scrolls.add_timestamp = false
   end
 
-  def test_construct
+  def test_default_construct
+    Scrolls.init
     assert_equal Scrolls::IOLog, Scrolls.stream.class
   end
 
   def test_default_global_context
+    Scrolls.init(:stream => @out)
     assert_equal Hash.new, Scrolls.global_context
   end
 
   def test_setting_global_context
-    Scrolls.global_context(:g => "g")
-    Scrolls.log(:d => "d")
-    global = @out.string.gsub("\n", 'XX')
-    assert_match /g=g.*d=d/, global
-  end
-  
-  def test_adding_to_global_context
-    Scrolls.global_context(:g => "g")
-    Scrolls.add_global_context(:h => "h")
+    Scrolls.init(
+      :stream => @out,
+      :global_context => {:g => "g"},
+    )
     Scrolls.log(:d => "d")
-    global = @out.string.gsub("\n", 'XX')
-    assert_match /g=g.*h=h.*d=d/, global
+    assert_equal "g=g d=d\n", @out.string
   end
 
   def test_default_context
-    Scrolls.log(:data => "d")
-    assert_equal Hash.new, Scrolls::Log.context
+    Scrolls.log(:d => "d")
+    assert_equal Hash.new, Scrolls.internal.context
   end
 
   def test_setting_context
@@ -48,15 +42,19 @@ class TestScrolls < Test::Unit::TestCase
   end
 
   def test_all_the_contexts
-    Scrolls.global_context(:g => "g")
+    Scrolls.init(
+      :stream => @out,
+      :global_context => {:g => "g"},
+    )
     Scrolls.log(:o => "o") do
       Scrolls.context(:c => "c") do
         Scrolls.log(:ic => "i")
       end
       Scrolls.log(:i => "i")
     end
-    global = @out.string.gsub("\n", 'XX')
-    assert_match /g=g.*at=start.*i=i/, global
+    @out.truncate(37)
+    output = "g=g o=o at=start\ng=g c=c ic=i\ng=g i=i"
+    assert_equal output, @out.string
   end
 
   def test_deeply_nested_context
@@ -89,7 +87,7 @@ class TestScrolls < Test::Unit::TestCase
         raise "Error from inside of context"
       end
       fail "Exception did not escape context block"
-    rescue => e
+    rescue
       Scrolls.log(:o => 'o')
       assert_equal "o=o\n", @out.string
     end
@@ -107,6 +105,7 @@ class TestScrolls < Test::Unit::TestCase
   def test_setting_incorrect_time_unit
     assert_raise Scrolls::TimeUnitError do
       Scrolls.time_unit = "years"
+      Scrolls.log(:tu => "yrs")
     end
   end
 
@@ -128,25 +127,25 @@ class TestScrolls < Test::Unit::TestCase
       Scrolls.log_exception({:test => "exception"}, e)
     end
 
-    oneline_backtrace = @out.string.gsub("\n", 'XX')
-
-    assert_match /test=exception at=exception.*test_log_exception.*XX/,
-      oneline_backtrace
+    oneline_bt = @out.string.gsub("\n", 'XX')
+    assert_match(/test=exception at=exception.*test_log_exception.*XX/, oneline_bt)
   end
 
-  def test_single_line_exceptions
-    Scrolls.single_line_exceptions = true
+  def test_multi_line_exceptions
+    Scrolls.single_line_exceptions = "multi"
     begin
       raise Exception
     rescue Exception => e
       Scrolls.log_exception({:o => "o"}, e)
     end
-    assert_equal 1, @out.string.scan(/.*site=.*/).size
+
+    oneline_bt = @out.string.gsub("\n", 'XX')
+    assert_match(/o=o at=exception.*test_multi_line_exceptions.*XX/, oneline_bt)
   end
 
   def test_syslog_integration
     Scrolls.stream = 'syslog'
-    assert_equal Scrolls::SyslogLogger, Scrolls.stream.class
+    assert_equal Scrolls::SyslogLogger, Scrolls.internal.logger.class
   end
 
   def test_syslog_facility
@@ -162,13 +161,7 @@ class TestScrolls < Test::Unit::TestCase
   def test_setting_syslog_facility_after_instantiation
     Scrolls.stream = 'syslog'
     Scrolls.facility = 'local7'
-    assert_match /facility=184/, Scrolls.stream.inspect
-  end
-
-  def test_logging_message_with_syslog
-    Scrolls.stream = 'syslog'
-    Scrolls.facility = 'local7'
-    Scrolls.log "scrolls test"
+    assert_match(/facility=184/, Scrolls.internal.logger.inspect)
   end
 
   def test_add_timestamp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrolls
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.9.0.pre
 platform: ruby
 authors:
 - Curt Micol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies: []
 description: Logging, easier, more consistent.
 email:
@@ -25,15 +25,14 @@ files:
 - docs/global-context.md
 - docs/syslog.md
 - lib/scrolls.rb
-- lib/scrolls/atomic.rb
 - lib/scrolls/iolog.rb
 - lib/scrolls/log.rb
+- lib/scrolls/logger.rb
 - lib/scrolls/parser.rb
 - lib/scrolls/syslog.rb
 - lib/scrolls/utils.rb
 - lib/scrolls/version.rb
 - scrolls.gemspec
-- test/test_atomic.rb
 - test/test_helper.rb
 - test/test_parser.rb
 - test/test_scrolls.rb
@@ -52,9 +51,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11
@@ -62,7 +61,6 @@ signing_key:
 specification_version: 4
 summary: When do we log? All the time.
 test_files:
-- test/test_atomic.rb
 - test/test_helper.rb
 - test/test_parser.rb
 - test/test_scrolls.rb

data/lib/scrolls/atomic.rb

@@ -1,59 +0,0 @@
-require 'thread'
-
-module Scrolls
-  # The result of issues with an update I made to Scrolls. After talking with
-  # Fabio Kung about a fix I started work on an atomic object, but he added some
-  # fixes to #context without it and then used Headius' atomic gem.
-  #
-  # The code below is the start and cleanup of my atomic object. It's slim on
-  # details and eventually cleaned up around inspiration from Headius' code.
-  #
-  # LICENSE: Apache 2.0
-  #
-  # See Headius' atomic gem here:
-  # https://github.com/headius/ruby-atomic
-  class AtomicObject
-    def initialize(o)
-      @mtx = Mutex.new
-      @o = o
-    end
-
-    def get
-      @mtx.synchronize { @o }
-    end
-
-    def set(n)
-      @mtx.synchronize { @o = n }
-    end
-
-    def verify_set(o, n)
-      return false unless @mtx.try_lock
-      begin
-        return false unless @o.equal? o
-        @o = n
-      ensure
-        @mtx.unlock
-      end
-    end
-  end
-
-  class Atomic < AtomicObject
-    def initialize(v=nil)
-      super(v)
-    end
-
-    def value
-      self.get
-    end
-
-    def value=(v)
-      self.set(v)
-      v
-    end
-
-    def update
-      true until self.verify_set(o = self.get, n = yield(o))
-      n
-    end
-  end
-end

data/test/test_atomic.rb

@@ -1,33 +0,0 @@
-require_relative "test_helper"
-
-class TestAtomic < Test::Unit::TestCase
-  def test_construct
-    atomic = Scrolls::Atomic.new
-    assert_equal nil, atomic.value
-    
-    atomic = Scrolls::Atomic.new(0)
-    assert_equal 0, atomic.value
-  end
-  
-  def test_value
-    atomic = Scrolls::Atomic.new(0)
-    atomic.value = 1
-    
-    assert_equal 1, atomic.value
-  end
-  
-  def test_update
-    atomic = Scrolls::Atomic.new(1000)
-    res = atomic.update {|v| v + 1}
-    
-    assert_equal 1001, atomic.value
-    assert_equal 1001, res
-  end
-
-  def test_update_retries
-    tries = 0
-    atomic = Scrolls::Atomic.new(1000)
-    atomic.update{|v| tries += 1 ; atomic.value = 1001 ; v + 1}
-    assert_equal 2, tries
-  end
-end