mesa_test 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e39eda31af33458a33b066006203290ebe1c7b51daf79b8347bda4da7a28b5c9
-  data.tar.gz: 2a5d0c0ccb199c0be121b0614e5ea28252d5802affa1d26def601433df125fd9
+SHA1:
+  metadata.gz: 26ef4bd6ae1c1477a4854e2538e82739cc014f8f
+  data.tar.gz: 3c6f8083a3b8f398581d84dbd90e655b7d106a2b
 SHA512:
-  metadata.gz: 140d12aeeb0211108a56c52f537811ac46cba6c3792599ab76a33a536d575951b1d4d1b2b86d9ae37eb2055dc2eae3123ece53b4bd176f76f8176fa661a32b60
-  data.tar.gz: bd83ecabec1798df5e2142d8e5381f8d0fc559671e9b84913362e66b70b2b81b82ce6a97f27ca5371444aa0643fa96d67ac8ac7262dc40dd0fda1236986a8d24
+  metadata.gz: 4c3d20717f37ff348806b287c97e450e102e8bbd21bdebdeffbe54c265091d578c0d3dee5aa7761aa8ce6912b61ad18e7bda8ddfd88f956540b9ebde36104183
+  data.tar.gz: 8b096bd903232e3ebd9b9eb9db216bac67540368417307eac3596e991da07a67768e0cc83d36804e8c62167d2b6677698e95295a79caf26794a03c49c398aee3

data/bin/mesa_test

@@ -59,11 +59,15 @@ class MesaTest < Thor
                   type: :string, default: 'all', aliases: '-m'                  
   option :log, type: :boolean, default: true, desc: 'Save yml file of test ' \
                'results in test case directory.'
+  option :auto_diff, desc: 'Automatically determine if diffs should be run '\
+                     'from svn log entry. Overrides --diff or --no-diff.',
+                     type: :boolean, default: false
   def test_one(mesa_dir, test_case_name)
     s = create_and_check_submitter(force: options[:force]) if options[:submit]
     m = create_and_check_mesa(mesa_dir: mesa_dir, diff: options[:diff],
                               mod: options[:module].downcase.to_sym,
-                              use_svn: options[:svn], using_sdk: using_sdk?(s))
+                              use_svn: options[:svn], using_sdk: using_sdk?(s),
+                              auto_diff: options[:auto_diff])
     t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
                                    mod: options[:module].downcase.to_sym)
 
@@ -113,11 +117,16 @@ class MesaTest < Thor
                   type: :string, default: 'all', aliases: '-m'                  
   option :log, type: :boolean, default: true, desc: 'Save yml file of test ' \
                'results in test case directory.'
+  option :auto_diff, desc: 'Automatically determine if diffs should be run '\
+                     'from svn log entry. Overrides --diff or --no-diff.',
+                     type: :boolean, default: false
   def test_revision(mesa_dir)
     s = create_and_check_submitter(force: options[:force]) if options[:submit]
     m = create_and_check_mesa(mesa_dir: mesa_dir, diff: options[:diff],
                               mod: options[:module].downcase.to_sym,
-                              use_svn: options[:svn], using_sdk: using_sdk?(s))
+                              use_svn: options[:svn],
+                              using_sdk: using_sdk?(s),
+                              auto_diff: options[:auto_diff])
 
     # run all tests
     m.each_test_run_and_diff(log_results: options[:log],
@@ -274,8 +283,11 @@ class MesaTest < Thor
                    'submission of complete results.', default: false
   option :log, type: :boolean, default: true, desc: 'Save yml file of test ' \
                'results in test case directory.'
+  option :auto_diff, desc: 'Automatically determine if diffs should be run '\
+                     'from svn log entry. Overrides --diff or --no-diff.',
+                     type: :boolean, default: false
   def install_and_test_revision(version, mesa_dir)
-    s = nil  # to make sure using_sdk? below will work properly
+    s = nil # to make sure using_sdk? below will work properly
     s = create_and_check_submitter(force: options[:force]) if options[:submit]
     mesa_version, diff = filter_version_and_diff(version, s)
     if mesa_version.nil?
@@ -292,7 +304,8 @@ class MesaTest < Thor
       shell.say "\nFailed in compiling MESA r-#{m.version_number}.", :red
     else
       check_mesa(m)
-      update_mesa(mesa: m, diff: diff, mod: options[:module].downcase.to_sym)
+      update_mesa(mesa: m, diff: diff, mod: options[:module].downcase.to_sym,
+                  auto_diff: options[:auto_diff])
 
       # run all tests. Don't be fooled, whether or not a diff happens is set
       # by the diff attribute of the mesa object, set above.
@@ -335,10 +348,10 @@ class MesaTest < Thor
   end
 
   def create_and_check_mesa(mesa_dir:, use_svn: true, diff: true, mod: :all,
-                            using_sdk: true)
+                            using_sdk: true, auto_diff: false)
     m = Mesa.new(mesa_dir: mesa_dir, use_svn: use_svn, using_sdk: using_sdk)
     check_mesa(m)
-    update_mesa(mesa: m, diff: diff, mod: mod)
+    update_mesa(mesa: m, diff: diff, mod: mod, auto_diff: true)
     m
   end
 
@@ -349,10 +362,12 @@ class MesaTest < Thor
     end
   end
 
-  def update_mesa(mesa:, diff: true, mod: :all)
+  def update_mesa(mesa:, diff: true, mod: :all, auto_diff: false)
     mesa.load_test_source_data(mod: mod)
-    # choose whether to update checksums
-    mesa.update_checksums = !diff
+    # choose whether to update checksums.
+    mesa.update_checksums = !diff unless diff.nil?
+    # automatically figure out diff situation. Overrides choice from diff!
+    mesa.determine_diff if auto_diff
   end
 
   def create_and_check_test_case(mesa:, test_case_name:, mod: :all)

data/lib/mesa_test.rb

@@ -553,6 +553,31 @@ class Mesa
     @use_svn
   end
 
+  def determine_diff
+    # automatically determine if update_checksums should be true (don't do
+    # diffs or true (DO do diffs). Only works if svn data has ALREADY been
+    # loaded
+
+    # don't do anything to @update_checksums if we haven't loaded svn data
+    return unless @svn_log
+
+    # by default, DON'T do diffs
+    @update_checksums = true
+
+    # list of phrases, which, if present in the log entry, will trigger diffs
+    [
+      /updated? checksums?/i,
+      /checksums? updated?/i,
+      /ready for diffs?/i,
+    ].each { |trigger| @update_checksums = false if trigger =~ @svn_log }
+    if @update_checksums
+      shell.say "\nFrom svn log, didn't decide to tak diffs."
+    else
+      shell.say "From svn log, automatically decided to take diffs." 
+    end
+    shell.say "log entry: #{@svn_log}"
+  end
+
   def version_number
     version = @svn_version || 0
     # fall back to MESA_DIR/data's version number svn didn't work

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Command line tool for running and reporting the MESA test suites.