wwtd 0.1.3 → 0.1.4

data/lib/wwtd.rb

@@ -24,9 +24,23 @@ module WWTD
 
       # Execute tests
       matrix = matrix(config)
+      results = run_full_matrix(matrix, options)
+
+      # Summary
+      if matrix.size > 1
+        puts "\nResults:"
+        puts results.map(&:last)
+      end
+
+      results.all?(&:first) ? 0 : 1
+    end
+
+    private
+
+    def run_full_matrix(matrix, options)
       results = nil
       with_clean_dot_bundle do
-        Tempfile.open "wwtd" do |lock|
+        Dir.mktmpdir do |lock| # does not return values in ruby 1.8
           results = Parallel.map(matrix.each_with_index, :in_processes => options[:parallel].to_i) do |config, i|
             ENV["TEST_ENV_NUMBER"] = (i == 0 ? "" : (i + 1).to_s) if options[:parallel]
 
@@ -41,18 +55,9 @@ module WWTD
           end
         end
       end
-
-      # Summary
-      if matrix.size > 1
-        puts "\nResults:"
-        puts results.map(&:last)
-      end
-
-      results.all?(&:first) ? 0 : 1
+      results
     end
 
-    private
-
     def with_clean_dot_bundle
       had_old = File.exist?(".bundle")
       Dir.mktmpdir do |dir|
@@ -136,10 +141,10 @@ module WWTD
         rvm = "rvm #{config["rvm"]} do " if config["rvm"]
 
         if wants_bundle
-          flock(lock) do
-            default_bundler_args = "--deployment" if File.exist?("#{gemfile || DEFAULT_GEMFILE}.lock")
+          flock("#{lock}/#{config["rvm"] || "rvm"}") do
+            default_bundler_args = "--deployment --path #{Dir.pwd}/vendor/bundle" if committed?("#{gemfile || DEFAULT_GEMFILE}.lock")
             bundle_command = "#{rvm}bundle install #{config["bundler_args"] || default_bundler_args}"
-            return false unless sh "#{bundle_command.strip} --quiet --path #{Dir.pwd}/vendor/bundle"
+            return false unless sh "#{bundle_command.strip} --quiet"
           end
         end
 
@@ -151,8 +156,13 @@ module WWTD
       end
     end
 
+    def committed?(file)
+      @committed_files ||= (File.exist?(".git") && `git ls-files`.split("\n")) || []
+      @committed_files.include?(file)
+    end
+
     def flock(file)
-      File.open(file.path) do |f|
+      File.open(file, "w") do |f|
         begin
           f.flock(File::LOCK_EX)
           yield

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wwtd
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -36,7 +36,7 @@ cert_chain:
   ycwMXfl0
   -----END CERTIFICATE-----
 
-date: 2013-09-01 00:00:00 Z
+date: 2013-09-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: parallel