thread_order 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a2dabe6630ddb96b43c686369e6a50f85a1d55c
-  data.tar.gz: aa1928df61b660fec67fbd4d33eb3f8214c8aefb
+  metadata.gz: b2d68b153c8a232b3fdcb3efc2ec6799abf9e11a
+  data.tar.gz: 5f340011a9259a523b6fa3dca0494ad8f17887aa
 SHA512:
-  metadata.gz: b33ae8eafd3294c2f030f91e29268818eb5f1ec22f34a8e564b3731075033ba7c53dc6df07861932343e68858d3abf0d0e45a74bfdd2665e0cd6b9ebbdccbc81
-  data.tar.gz: a83df4acfce7b1d39bff123261b7ab12e0e8dc4cc35af6f973de76469873656f508360242427ea9c9f216b3d16fd4ae6056298e60d82709efc09c35bbf688c49
+  metadata.gz: 6247a9d7f485371a1725e7098a2dde38b4376a822ecfcb6ea7a69c36d8a1abc7d60bded9f12c3c5297bd635c05e4c87c271bc73054f19724068e2f2a62ed979c
+  data.tar.gz: 988632f09cc15d15fa705e87a561d86b26c8f5f079df692c8d288865cd578674f1db67371e8363e08e66adc59ce778b6bdc3a91ea9e74a9cc7de2f126c828591

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
 Gemfile.lock
+tmp/

data/.travis.yml

@@ -1,8 +1,20 @@
 language: ruby
-script: bundle exec rspec
+script: spec/run
 rvm:
+  - 1.8.7
+  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.2
-  - 2.2.0
+  - 2.1
+  - 2.2
   - ruby-head
+  - ree
+  - jruby-18mode
+  - jruby
+  - jruby-head
+  - rbx
+matrix:
+  include:
+    - rvm: jruby
+      env: JRUBY_OPTS='--2.0'
+  fast_finish: true

data/Readme.md

@@ -1,2 +1,11 @@
+[![Build Status](https://travis-ci.org/JoshCheek/thread_order.svg)](https://travis-ci.org/JoshCheek/thread_order)
+
 ThreadOrder
 ===========
+
+A tool for testing threaded code.
+Its purpose is to enable reasoning about thread order.
+
+* Tested on 1.8.7 - 2.2, JRuby, Rbx
+* It has no external dependencies
+* It does not depend on the stdlib.

data/lib/thread_order.rb

@@ -1,3 +1,5 @@
+require 'thread_order/mutex'
+
 class ThreadOrder
   def initialize
     @bodies  = {}

data/lib/thread_order/mutex.rb

@@ -0,0 +1,60 @@
+# On > 1.9, this is in core.
+# On 1.8.7, it's in the stdlib.
+# We don't want to load the stdlib, b/c this is a test tool, and can affect the test environment,
+# causing tests to pass where they should fail.
+#
+# So we're transcribing it here, from.
+# It is based on this implementation: https://github.com/ruby/ruby/blob/v1_8_7_374/lib/thread.rb#L56
+# If it's not already defined. Some methods we don't need are deleted.
+# Anything I don't understand is left in.
+class ThreadOrder
+  Mutex = if defined? ::Mutex
+    ::Mutex
+  else
+    Class.new do
+      def initialize
+        @waiting = []
+        @locked = false;
+        @waiting.taint		# enable tainted comunication
+        self.taint
+      end
+
+      def lock
+        while (Thread.critical = true; @locked)
+          @waiting.push Thread.current
+          Thread.stop
+        end
+        @locked = true
+        Thread.critical = false
+        self
+      end
+
+      def unlock
+        return unless @locked
+        Thread.critical = true
+        @locked = false
+        begin
+          t = @waiting.shift
+          t.wakeup if t
+        rescue ThreadError
+          retry
+        end
+        Thread.critical = false
+        begin
+          t.run if t
+        rescue ThreadError
+        end
+        self
+      end
+
+      def synchronize
+        lock
+        begin
+          yield
+        ensure
+          unlock
+        end
+      end
+    end
+  end
+end

data/lib/thread_order/version.rb

@@ -0,0 +1,3 @@
+class ThreadOrder
+  VERSION = '1.0.0'
+end

data/spec/run

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# do this stuff in a tmp dir
+cd "$(dirname "$0")/.."
+project_root=`pwd`
+mkdir -p tmp
+cd tmp
+
+# this is basically a shitty version of `gem unpack`
+get_gem() {
+  name="$1"
+  url="$2"
+
+  if test -d "$name"
+  then
+    echo "Skipping download of $name"
+    return
+  else
+    echo "Downloading $name"
+  fi
+
+  mkdir "$name" &&
+  cd "$name" &&
+  curl -L "$url" > "$name".gem &&
+  tar -xf "$name".gem &&
+  gunzip data.tar.gz &&
+  tar -xf data.tar &&
+  cd ..
+}
+
+# download dependencies
+get_gem "rspec"              "https://rubygems.org/downloads/rspec-3.2.0.gem" &&
+get_gem "rspec-core"         "https://rubygems.org/downloads/rspec-core-3.2.1.gem" &&
+get_gem "rspec-support"      "https://rubygems.org/downloads/rspec-support-3.2.2.gem" &&
+get_gem "rspec-expectations" "https://rubygems.org/downloads/rspec-expectations-3.2.0.gem" &&
+get_gem "rspec-mocks"        "https://rubygems.org/downloads/rspec-mocks-3.2.1.gem" &&
+get_gem "diff-lcs"           "https://rubygems.org/downloads/diff-lcs-1.2.5.gem"
+
+
+# run specs
+cd $project_root
+
+export PATH="$project_root/tmp/rspec-core/exe:$PATH"
+
+opts=""
+opts=" -I $project_root/tmp/diff-lcs/lib $opts"
+opts=" -I $project_root/tmp/rspec/lib $opts"
+opts=" -I $project_root/tmp/rspec-core/lib $opts"
+opts=" -I $project_root/tmp/rspec-expectations/lib $opts"
+opts=" -I $project_root/tmp/rspec-mocks/lib $opts"
+opts=" -I $project_root/tmp/rspec-support/lib $opts"
+
+if `ruby -e "exit RUBY_VERSION != '1.8.7'"`
+then
+  opts="--disable-gems $opts"
+fi
+
+ruby $opts -S rspec

data/spec/thread_order_spec.rb

@@ -102,12 +102,16 @@ RSpec.describe ThreadOrder do
     expect(thread_names).to eq [:a, nil]
   end
 
-  xit 'is implemented without depending on the stdlib' do
+  it 'is implemented without depending on the stdlib' do
     loaded_filenames = $LOADED_FEATURES.map { |filepath| File.basename filepath }
-    pending 'fucking fails :('
-    expect(loaded_filenames).to_not include 'monitor.rb'
-    expect(loaded_filenames).to_not include 'thread.rb'
-    expect(loaded_filenames).to_not include 'thread.bundle'
+    begin
+      expect(loaded_filenames).to_not include 'monitor.rb'
+      expect(loaded_filenames).to_not include 'thread.rb'
+      expect(loaded_filenames).to_not include 'thread.bundle'
+    rescue RSpec::Expectations::ExpectationNotMetError
+      pending if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' # somehow this still gets loaded in some JRubies
+      raise
+    end
   end
 
   describe 'incorrect interface usage' do

data/thread_order.gemspec

@@ -1,9 +1,11 @@
+require_relative 'lib/thread_order/version'
+
 Gem::Specification.new do |s|
   s.name        = 'thread_order'
-  s.version     = '0.1.0'
+  s.version     = ThreadOrder::VERSION
   s.licenses    = ['MIT']
-  s.summary     = "Test helper for ordering threaded code (does not depend on stdlib)"
-  s.description = "Test helper for ordering threaded code (does not depend on stdlib)."
+  s.summary     = "Test helper for ordering threaded code"
+  s.description = "Test helper for ordering threaded code (does not depend on gems or stdlib, tested on 1.8.7 - 2.2)."
   s.authors     = ["Josh Cheek"]
   s.email       = 'josh.cheek@gmail.com'
   s.files       = `git ls-files`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thread_order
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,7 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Test helper for ordering threaded code (does not depend on stdlib).
+description: Test helper for ordering threaded code (does not depend on gems or stdlib,
+  tested on 1.8.7 - 2.2).
 email: josh.cheek@gmail.com
 executables: []
 extensions: []
@@ -36,6 +37,9 @@ files:
 - License.txt
 - Readme.md
 - lib/thread_order.rb
+- lib/thread_order/mutex.rb
+- lib/thread_order/version.rb
+- spec/run
 - spec/thread_order_spec.rb
 - thread_order.gemspec
 homepage: https://github.com/JoshCheek/thread_order
@@ -58,10 +62,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Test helper for ordering threaded code (does not depend on stdlib)
+summary: Test helper for ordering threaded code
 test_files:
+- spec/run
 - spec/thread_order_spec.rb
 has_rdoc: