learn-test 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abd382c4de1233fe1c72ba3933f59ddc361a07a6
-  data.tar.gz: d90c0b51e75a8ed6c84ee36c4588834712d2d191
+  metadata.gz: 4d8e6eb7a48f5fe1b9c4506cd41db28f23ca8a09
+  data.tar.gz: 8b43a51699975858494ef64ef0a282e4422ccb31
 SHA512:
-  metadata.gz: c825c369af9290b56616a58d327ad8876ad6357d60bcb2986a0120d69957c257acabb7d2202ef3db2c55975f10f0694891ec5a8b07e4881cdfafeff6367815e1
-  data.tar.gz: d58792529831e1361c4307be560bd9c31cb6048cc33447c5ca5c7bf90c04590eed5d0fafcf3d8b36afed3d45f03cd44df53ede12ed04945a81ee512d801de01d
+  metadata.gz: 180f0bf382c18299922e7797e6b63c27d0a919619ad8da028ae481dc2bec04aeb9cea14677fd85b22eb2d9fdab42da225fd5b9821c7b816d587a4423c1b1d610
+  data.tar.gz: f5874d0523b0a31bfdf2326ed5972e4d675b6e833bbef53213f5d523225e59b825edc135214c65caaf45d6a69dde8e478988c66cd56f27d4ef30a3694ae59841

data/lib/learn_test/dependencies/ant.rb

@@ -2,15 +2,23 @@ module LearnTest
   module Dependencies
     class Ant < LearnTest::Dependency
       def missing?
-        `which ant`.empty?
+        if win?
+          `where ant`.empty?
+        else
+          `which ant`.empty?
+        end
       end
 
       def install
-        puts('Checking for homebrew...'.green)
-        die('You must have Homebrew installed') unless brew_installed?
-        puts('Updating brew...'.green)
-        print_installing('ant')
-        run_install('brew install ant')
+        if win? || !mac?
+          die('Please install Ant.')
+        else
+          puts('Checking for homebrew...'.green)
+          die('You must have Homebrew installed') unless brew_installed?
+          puts('Updating brew...'.green)
+          print_installing('ant')
+          run_install('brew install ant')
+        end
       end
 
       private

data/lib/learn_test/dependencies/java.rb

@@ -2,7 +2,11 @@ module LearnTest
   module Dependencies
     class Java < LearnTest::Dependency
       def missing?
-        `which java`.empty?
+        if win?
+          `where java`.empty?
+        else
+          `which java`.empty?
+        end
       end
 
       def install

data/lib/learn_test/dependency.rb

@@ -24,6 +24,10 @@ module LearnTest
       !!RUBY_PLATFORM.match(/darwin/)
     end
 
+    def win?
+      !!RUBY_PLATFORM.match(/mswin|mingw|cygwin/)
+    end
+
     def print_installing(name)
       puts "Installing missing dependency #{name}...".green
     end

data/lib/learn_test/runner.rb

@@ -1,7 +1,7 @@
 module LearnTest
   class Runner
     attr_reader :repo, :options
-    SERVICE_URL = 'http://ironbroker07.fe.flatironschool.com'
+    SERVICE_URL = 'http://ironbroker-v2.flatironschool.com'
 
     def initialize(repo, options = {})
       @repo = repo
@@ -41,8 +41,8 @@ module LearnTest
 
     def strategies
       [
-        LearnTest::Strategies::Rspec,
         LearnTest::Strategies::Jasmine,
+        LearnTest::Strategies::Rspec,
         LearnTest::Strategies::Karma,
         LearnTest::Strategies::Protractor,
         LearnTest::Strategies::JavaJunit,

data/lib/learn_test/strategies/java_junit.rb

@@ -18,6 +18,7 @@ module LearnTest
       end
 
       def run
+        clean_old_results
         run_ant
         make_json
       end
@@ -46,8 +47,16 @@ module LearnTest
 
       private
 
+      def clean_old_results
+        if Dir.entries(lab_dir).any? { |f| f == 'junit' }
+          system("rm -rf #{lab_dir}/junit")
+        end
+      end
+
       def run_ant
-        system('ant test -buildfile javacs*/build.xml')
+        javacs_dir = Dir.entries('.').detect { |f| !!f.match(/javacs/) }
+
+        system("ant clean -buildfile #{javacs_dir}/build.xml && ant build -buildfile #{javacs_dir}/build.xml && ant test -buildfile #{javacs_dir}/build.xml")
       end
 
       def test_path
@@ -55,28 +64,36 @@ module LearnTest
       end
 
       def lab_dir
-        @lab_dir ||= Dir.entries('.').detect {|f| f.match(/^javacs\-lab\d+$/)}
+        @lab_dir ||= Dir.entries('.').detect { |f| f.match(/^javacs\-lab\d+$/) }
       end
 
       def make_json
-        test_xml_files.each do |f|
-          parsed = JSON.parse(Crack::XML.parse(File.read(f)).to_json)['testsuite']
-          next if !parsed
-
-          parsed['testcase'].each do |test_case|
-            results[:build][:test_suite][0][:formatted_output] << test_case
+        if File.exists?(test_path)
+          test_xml_files.each do |f|
+            parsed = JSON.parse(Crack::XML.parse(File.read(f)).to_json)['testsuite']
+            next if !parsed
+
+            if parsed['testcase']
+              parsed['testcase'].each do |test_case|
+                results[:build][:test_suite][0][:formatted_output] << test_case
+              end
+            end
+
+            test_count    = parsed['tests'].to_i
+            skipped_count = parsed['skipped'].to_i
+            error_count   = parsed['errors'].to_i
+            failure_count = parsed['failures'].to_i
+            duration      = parsed['time'].to_f
+
+            results[:examples] += test_count
+            results[:passing_count] += (test_count - skipped_count - error_count - failure_count)
+            results[:failure_count] += (error_count + failure_count)
+            results[:build][:test_suite][0][:duration] = duration
           end
-
-          test_count    = parsed['tests'].to_i
-          skipped_count = parsed['skipped'].to_i
-          error_count   = parsed['errors'].to_i
-          failure_count = parsed['failures'].to_i
-          duration      = parsed['time'].to_f
-
-          results[:examples] += test_count
-          results[:passing_count] += (test_count - skipped_count - error_count - failure_count)
-          results[:failure_count] += (error_count + failure_count)
-          results[:build][:test_suite][0][:duration] = duration
+        else
+          results[:examples]      = 1
+          results[:failure_count] = 1
+          results[:passing_count] = 0
         end
 
         if runner.keep_results?

data/lib/learn_test/strategies/mocha.rb

@@ -29,8 +29,7 @@ module LearnTest
       end
 
       def run
-        run_install('npm install')
-        run_install('npm install mocha-multi')
+        install_mocha_multi
         run_mocha
       end
 
@@ -65,6 +64,12 @@ module LearnTest
       def run_mocha
         system("multi='json=.results.json spec=-' node_modules/mocha/bin/mocha test -R mocha-multi")
       end
+
+      def install_mocha_multi
+        if !File.exists?('node_modules/mocha-multi')
+          run_install('npm install mocha-multi')
+        end
+      end
     end
   end
 end

data/lib/learn_test/version.rb

@@ -1,3 +1,3 @@
 module LearnTest
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Flatiron School