openstudio_measure_tester 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114965f771ab5429ff6e0a47f9469143723f957a
-  data.tar.gz: 6880af89a1126f2474f503722ce73746074bf04d
+  metadata.gz: 873523e54e5442f1468b7398b0dff3e773fbe280
+  data.tar.gz: 04e7b34c93d47e3af0554718bfaf52a8b97e4bb4
 SHA512:
-  metadata.gz: 65c48c6e8ebe186696f5a2322dde5899e84bacfadd95510b75cf03e8982bee6137f9ea4d2e36fabb7b103e9211cedb8d228c70ffe6a7f17cc16fadd850299fa2
-  data.tar.gz: aeb836feeafb27e169a38e1569b0f2fe606ba8df68d8133dd2c29627df23b5084d70f8245af706c09aba56621342b30fcb1192477bf2fe37887cc9e162090688
+  metadata.gz: 34d5ee8f5ee06c1c06cca5768e280cc0bead1fae7e3bbb85410e7c5d5256bc3bf1dd681a8cae61ee1ea7b1d258d37652fbe28113b5557967d5db136b958cdf0a
+  data.tar.gz: b11fef30aed043abec4a4ea1931620ad8249df59e490870e17f8c13df7bbd5910203f7197b969ac51fcca48ded5dfd3e7263d860757c6c76749f1e7f2b08a870

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.1.7
+
+* Support running measure tester in the directory of the measure.rb with OpenStudio CLI (e.g. `openstudio measure -r .`)
+
 # Version 0.1.6
 
 * Do not require git to run

data/lib/openstudio_measure_tester.rb

@@ -76,6 +76,6 @@ class Minitest::Test
     after = ObjectSpace.count_objects
     delta = {}
     before.each { |k, v| delta[k] = v - after[k] if after.key? k }
-    puts "GC Delta: #{delta}"
+    # puts "GC Delta: #{delta}"
   end
 end

data/lib/openstudio_measure_tester/rubocop_result.rb

@@ -65,7 +65,7 @@ module OpenStudioMeasureTester
     end
 
     def parse_results
-      Dir["#{@path_to_results}/rubocop-results.xml"].each do |file|
+      Dir[File.join(@path_to_results,'rubocop-results.xml')].each do |file|
         puts "Parsing Rubocop report #{file}"
 
         measure_names = []
@@ -76,13 +76,22 @@ module OpenStudioMeasureTester
         puts "Finished reading #{file}"
 
         # Go through the XML and find all the measure names first
-        doc.elements.each('file') do |rc_file|
+        doc.elements.each('//checkstyle/file') do |rc_file|
           @total_files += 1
           measure_name = rc_file.attributes['name']
           if measure_name
-            parts = measure_name.split('/')
-            if parts.last == 'measure.rb'
-              measure_names << parts[-2]
+            # If the user runs the tests from within the directory (where the measure.rb) file exists, then the
+            # measure name is not included in the XML. Therefore, the measure_name will need to be abstracted by
+            # the name of the directory relative to where the test_results are.
+            if measure_name.include? File::SEPARATOR
+              parts = measure_name.split(File::SEPARATOR)
+              if parts.last == 'measure.rb'
+                measure_names << parts[-2]
+              end
+            elsif measure_name == 'measure.rb'
+              # the measure name must be extracted from the directory
+              parts = file.split(File::SEPARATOR)
+              measure_names << parts[-4]
             end
           end
         end
@@ -99,12 +108,21 @@ module OpenStudioMeasureTester
           mhash['files'] = []
 
           cn = ''
-          doc.elements.each('file') do |rc_file|
-            next unless rc_file.attributes['name'].include? measure_name
+          doc.elements.each('//checkstyle/file') do |rc_file|
+            # Allow processing when the file is just the measure.rb
+            if rc_file.attributes['name'] != 'measure.rb'
+              if !rc_file.attributes['name'].include? measure_name
+                next
+              end
+            end
 
             # Save off the file information
             fhash = {}
-            fhash['file_name'] = rc_file.attributes['name'].split('/')[-1]
+            if rc_file.attributes['name'].include? File::SEPARATOR
+              fhash['file_name'] = rc_file.attributes['name'].split(File::SEPARATOR)[-1]
+            else
+              fhash['file_name'] = rc_file.attributes['name']
+            end
             fhash['violations'] = []
 
             # get the class name out of the measure file! wow, okay... sure why not.

data/lib/openstudio_measure_tester/version.rb

@@ -27,5 +27,5 @@
 ########################################################################################################################
 
 module OpenStudioMeasureTester
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

data/openstudio_measure_tester.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   if /^2\.2/.match(RUBY_VERSION)
     spec.add_dependency 'rubocop', '0.54.0'
   elsif /^2\.0/.match(RUBY_VERSION)
-    spec.add_dependency 'nokogiri', '1.6.8' 
     spec.add_dependency 'rainbow', '2.2.2' 
     spec.add_dependency 'rubocop', '0.50.0'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio_measure_tester
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Nicholas Long
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler