spec_tiller 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9860619a722afce5c9d9fd35042c134bad7e4a3
-  data.tar.gz: 7409ba1e7a22b25c7f1b51b6122cf7349412b998
+  metadata.gz: 13beb7e2c37b837223f232fc52c9e566dfe33801
+  data.tar.gz: f19fd50a68c23b32c436993f24b130e5ae8b7123
 SHA512:
-  metadata.gz: 22d2ed32885a2e3a48c160e8a4fbecc7d2ede996a9ba51d946d57f5422e91e7328e94bf2e8ae0883927b5179730e79f6952e435f40eb587c2bb541a9c6825df8
-  data.tar.gz: 7a36f2b751515ce1734e6ede356758e983cfd94e98278d6d0eaecd66c694499fb0ad7393687537880ab8c73d1d66151c6278352f4d4663fda895000c0da54912
+  metadata.gz: c2f349be26ef856b2f6b2739acec9ae4dd90defbdad2721fc18ac8a21904a9b66161e654464e6a4a799bc5b6e2ef97ffafa57e9424c9805640f5a0541c8c71a3
+  data.tar.gz: e02dead8672b5bcdb107e1c61061d9619d70f1afa52c64dd9feee6cd86e74771cfc482c38b7cebc76d5daf9aa3350d19f900362a802f07e7a891a12392c3d471

data/lib/spec_tiller/build_matrix_parser.rb

@@ -17,8 +17,8 @@ module BuildMatrixParser
     content_env_matrix = []
 
     env_matrix.each do |var_hash|
-      next if var_hash.empty? || var_hash["TEST_SUITE"].empty?
-      line = var_hash.map { |key, value| %Q(#{key}="#{value}") }.join(' ')
+      next if nil_or_empty?(var_hash)
+      line = var_hash.map { |key, value| %(#{key}="#{value}") }.join(' ')
 
       content_env_matrix << line
     end
@@ -27,4 +27,8 @@ module BuildMatrixParser
   end
   module_function :format_matrix
 
-end
+  def self.nil_or_empty?(var_hash)
+    return true if var_hash.empty? || var_hash['TEST_SUITE'].nil?
+    var_hash['TEST_SUITE'].empty?
+  end
+end

data/lib/spec_tiller/sync_spec_file_list.rb

@@ -4,13 +4,15 @@ module SyncSpecFiles
   include BuildMatrixParser
 
   def rewrite_travis_content(content, current_file_list, &block)
+    num_buckets = content['num_builds']
+
     ignore_specs = get_ignored_specs(content)
     current_file_list = current_file_list.reject { |file_path| ignore_specs.include?(file_path) }
     env_matrix = BuildMatrixParser.parse_env_matrix(content)
     original = extract_spec_files(env_matrix)
     after_removed = delete_removed_files(original, current_file_list)
-    after_added = add_new_files(original, after_removed, current_file_list)
-
+    after_added = add_new_files(original, after_removed, current_file_list, num_buckets)
+    
     env_matrix.each do |var_hash|
       if var_hash.has_key?('TEST_SUITE')
         test_bucket = after_added.shift
@@ -70,9 +72,12 @@ module SyncSpecFiles
       end
     end
 
-    def self.add_new_files(original, buckets, current_file_list)
+    def self.add_new_files(original, buckets, current_file_list, num_buckets)
       buckets_clone = buckets.map(&:dup)
-      num_buckets = buckets.length
+      test_suite_worker_count = buckets_clone.length
+
+      # This check is to determine if the stated bucket count is > available workers
+      num_buckets = test_suite_worker_count < num_buckets ? test_suite_worker_count : num_buckets
 
       added_files(original, current_file_list).each do |spec_file|
         bucket_index = rand(num_buckets)
@@ -99,4 +104,4 @@ module SyncSpecFiles
 
       "  Removed: #{removed}\n  Added:   #{added}\n\n"
     end
-end
+end

data/lib/spec_tiller/version.rb

@@ -1,3 +1,3 @@
 module SpecTiller
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/sync_spec_file_list_spec.rb

@@ -14,34 +14,71 @@ describe 'SyncSpecFiles' do
     end
     let(:travis_yaml) { YAML::load(File.open('spec/documents/.travis.yml')) }
 
-    before(:each) do
-      SyncSpecFiles.rewrite_travis_content(travis_yaml, current_file_list)
-    end
-
-    it 'adds new files to random line' do
-      expect(travis_yaml['env']['matrix'].join(' ')).to include('spec/test/new1.rb','spec/test2/new2.rb','spec/test/new3.rb')
-    end
+    describe 'Static Yaml' do
+      before(:each) do
+        SyncSpecFiles.rewrite_travis_content(travis_yaml, current_file_list)
+      end
 
-    it 'removes unused specs' do
-      travis_yaml['env']['matrix'].each do |bucket|
-        expect(bucket).not_to include('spec/features/three_vars.rb')
+      it 'adds new files to random line' do
+        expect(travis_yaml['env']['matrix'].join(' ')).to include('spec/test/new1.rb','spec/test2/new2.rb','spec/test/new3.rb')
       end
 
-    end
+      it 'removes unused specs' do
+        travis_yaml['env']['matrix'].each do |bucket|
+          expect(bucket).not_to include('spec/features/three_vars.rb')
+        end
 
-    it 'removes lines without a TEST_SUITE' do
-      travis_yaml['env']['matrix'].each do |bucket|
-        expect(bucket).to include('TEST_SUITE="')
       end
-    end
 
-    it 'does not include ignored specs' do
-      travis_yaml['env']['matrix'].each do |bucket|
-        expect(bucket).not_to include('spec/features/ignore_me.rb')
+      it 'removes lines without a TEST_SUITE' do
+        travis_yaml['env']['matrix'].each do |bucket|
+          expect(bucket).to include('TEST_SUITE="')
+        end
       end
 
+      it 'does not include ignored specs' do
+        travis_yaml['env']['matrix'].each do |bucket|
+          expect(bucket).not_to include('spec/features/ignore_me.rb')
+        end
+      end
     end
 
+    describe 'Modified Yaml' do
+      describe 'Respects num_builds in syncing files' do
+        it 'when num_builds: 1, adds files to only the first two lines of the matrix' do
+          travis_yaml['num_builds'] = 1
+          SyncSpecFiles.rewrite_travis_content(travis_yaml, current_file_list) do |yaml|
+            matrix =  yaml['env']['matrix']
+            first_bucket = matrix.first
+            rest_buckets = matrix[1..-1].join(' ')
+
+            expect(first_bucket).to include('spec/test/new1.rb','spec/test2/new2.rb','spec/test/new3.rb')
+            expect(rest_buckets).not_to include('spec/test/new1.rb','spec/test2/new2.rb','spec/test/new3.rb')
+          end
+        end
+
+        it 'when num_builds: 2, adds files to only the first 2 lines of the matrix' do
+          travis_yaml['num_builds'] = 2
+          SyncSpecFiles.rewrite_travis_content(travis_yaml, current_file_list) do |yaml|
+          matrix = yaml['env']['matrix']
+          first_two_buckets = matrix[0..1].join(' ')
+          rest_buckets = matrix[2..-1].join(' ')
+
+          expect(first_two_buckets).to include('spec/test/new1.rb','spec/test2/new2.rb','spec/test/new3.rb')
+          expect(rest_buckets).not_to include('spec/test/new1.rb','spec/test2/new2.rb','spec/test/new3.rb')
+          end
+        end
+
+        it 'when num_builds > current bucket count it uses current bucket count' do
+          travis_yaml['num_builds'] = 100
+          SyncSpecFiles.rewrite_travis_content(travis_yaml, current_file_list) do |yaml|
+            matrix = yaml['env']['matrix']
+            buckets = matrix.join(' ')
+            expect(buckets).to include('spec/test/new1.rb','spec/test2/new2.rb','spec/test/new3.rb')
+          end
+        end
+      end
+    end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spec_tiller
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Matt Schmaus
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler