Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into organize

  • Loading branch information...
commit 6103d94b3a900500b57ac929445d7b59454ddf6a 2 parents 9dceb75 + 4a49d02
Micah Frost authored
12 .travis.yml
View
@@ -0,0 +1,12 @@
+language: ruby
+
+before_install:
+ - rm Gemfile.loc*
+ - sudo apt-get install wamerican-small
+
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+
+
2  lib/integrity/builders/threaded_builder.rb
View
@@ -86,10 +86,10 @@ def size=(other)
# Default pool size is 2 threads.
def initialize(size, logger)
+ @logger = logger
@jobs = Queue.new
@njobs = Incrementor.new
@workers = Array.new(size) { spawn }
- @logger = logger
end
# Adds a job to the queue, the job can be any number of objects
2  lib/integrity/checkout.rb
View
@@ -67,7 +67,7 @@ def head
end
def run_in_dir(command)
- in_dir { |r| r.run(command) }
+ in_dir { |r| r.run("INTEGRITY_BRANCH=\"#{@repo.branch}\" " + command) }
end
def run_in_dir!(command)
Please sign in to comment.
Something went wrong with that request. Please try again.