bcl 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651c1e172bb8131e1a172d00914045dba3274711
-  data.tar.gz: 0742ebe62c0d50f3578c0bcd518098924a782dfe
+  metadata.gz: c879a3a43c8b31973a5432fda978ef90aade0139
+  data.tar.gz: 2e7889e68d19f79576462a527e039a791dfa552a
 SHA512:
-  metadata.gz: 03060573da0b0e9b2da8b1123d65369ef5d1d1f50e84d95aa2d673f282cfc0631fc7fc805fb366030fdc144785fdf8d8d22b40f5609b534d69aa6e8ef30e7911
-  data.tar.gz: 6438d96b80af12eb64a9b480aa2f184682767be797e25b3d6a32f60ef6eaa38c248be398973f01b23146fa9fb568b923f7dc086fc13d61ea12d282077ad52c56
+  metadata.gz: 67f1c26d8815663a569edac566e0ffb939a0c683decdd279e8df597b3cf612e9a09e61c01c7efa6b70660ff84dcfc650f3eb451dd22bf3d5f274d141d89b1a76
+  data.tar.gz: 34903fceacea4d40817c4880e290820e158191db0d03e7b0811025abcd319c29f624e7ecd0a8e9b9840b16494a09438db10c1708d063200670660a14d5982047

data/lib/bcl/component.rb

@@ -60,10 +60,10 @@ module BCL
 
       @path = save_path
 
-      # todo: validate against master taxonomy
+      # TODO: validate against master taxonomy
     end
 
-    # TODO This isn't implemented at the moment
+    # TODO: This isn't implemented at the moment
     def open_component_xml(filename)
       read_component_xml(filename)
     end
@@ -219,7 +219,7 @@ module BCL
 
       at = newcomp.componentData.componentDataAttributes
       @attributes.each do |attrib|
-        if (attrib.value.to_s != '') and (attrib.name.to_s != '')
+        if (attrib.value.to_s != '') && (attrib.name.to_s != '')
           if attrib.units != ''
             at.addAttribute(tc(attrib.name), attrib.value, attrib.units)
           else
@@ -232,7 +232,7 @@ module BCL
       comp_tag = ''
       @tags.each do |tag|
         tg.addTag(tc(tag.descriptor))
-        if (tag.descriptor != 'energyplus') and (tag.descriptor != 'construction')
+        if (tag.descriptor != 'energyplus') && (tag.descriptor != 'construction')
           # create a map of component tags to directories
           comp_tag = tag.descriptor
           if comp_tag == 'interior wall'
@@ -284,7 +284,7 @@ module BCL
       # setup the xml file
       comp_xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
       comp_xml.component('xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                         'xsi:noNamespaceSchemaLocation' => "#{@schema_url}") {
+                         'xsi:noNamespaceSchemaLocation' => "#{@schema_url}") do
         comp_xml.name @name
         comp_xml.uid @uuid
         comp_xml.version_id @vuid
@@ -294,57 +294,57 @@ module BCL
 
         # comp_xml.fidelity_level @fidelity_level if @fidelity_level != ""
 
-        comp_xml.provenances {
+        comp_xml.provenances do
           @provenances.each do |prov|
-            comp_xml.provenance {
+            comp_xml.provenance do
               comp_xml.author prov.author
               comp_xml.datetime prov.datetime
               comp_xml.comment prov.comment
-            }
+            end
           end
-        }
+        end
 
-        comp_xml.tags {
+        comp_xml.tags do
           @tags.each do |tag|
             comp_xml.tag tag.descriptor
           end
-        }
+        end
 
-        comp_xml.attributes {
+        comp_xml.attributes do
           @attributes.each do |attrib|
-            if (attrib.value.to_s != '') and (attrib.name.to_s != '') then
-              comp_xml.attribute {
+            if (attrib.value.to_s != '') && (attrib.name.to_s != '')
+              comp_xml.attribute do
                 comp_xml.name attrib.name
                 comp_xml.value attrib.value
                 comp_xml.datatype attrib.datatype
                 comp_xml.units attrib.units if attrib.units != ''
-              }
+              end
             end
           end
-        }
+        end
 
-        comp_xml.source {
+        comp_xml.source do
           comp_xml.manufacturer @source_manufacturer if @source_manufacturer != ''
           comp_xml.model @source_model if @source_model != ''
           comp_xml.serial_no @source_serial_no if @source_serial_no != ''
           comp_xml.year @source_year if @source_year != ''
           comp_xml.url @source_url if @source_url != ''
-        }
+        end
 
         unless @files.nil?
-          comp_xml.files {
+          comp_xml.files do
             @files.each do |file|
-            comp_xml.file {
-            comp_xml.version {
-            comp_xml.software_program file.version_software_program
-            comp_xml.identifier file.version_id
-          }
-
-            comp_xml.filename file.filename
-            comp_xml.filetype file.filetype
-          }
+              comp_xml.file do
+                comp_xml.version do
+                  comp_xml.software_program file.version_software_program
+                  comp_xml.identifier file.version_id
+                end
+
+                comp_xml.filename file.filename
+                comp_xml.filetype file.filetype
+              end
+            end
           end
-          }
         end
 
         # check if we should write out costs, don't write if all values are 0 or nil
@@ -360,9 +360,9 @@ module BCL
         # end
 
         if write_costs
-          comp_xml.costs {
+          comp_xml.costs do
             @costs.each do |cost|
-              comp_xml.cost {
+              comp_xml.cost do
                 comp_xml.instance_name cost.cost_name
                 comp_xml.cost_type cost.cost_type
                 comp_xml.category cost.category
@@ -375,12 +375,12 @@ module BCL
                 comp_xml.source cost.source if cost.source != ''
                 comp_xml.reference_component_name cost.reference_component_name if cost.reference_component_name != ''
                 comp_xml.reference_component_id cost.reference_component_id if cost.reference_component_id != ''
-              }
+              end
             end
-          }
+          end
         end
 
-      }
+      end
 
       xmlfile.close
     end

data/lib/bcl/component_from_spreadsheet.rb

@@ -124,7 +124,7 @@ module BCL
               filetype = values.delete_at(0)
               filepath = values.delete_at(0)
               # not all components(rows) have all files; skip if filename "" or nil
-              next if filename == '' or filename.nil?
+              next if filename == '' || filename.nil?
               # skip the file if it doesn't exist at the specified location
               unless File.exist?(filepath)
                 puts "[ComponentFromSpreadsheet] ERROR #{filepath} -> File does not exist, will not be included in component xml"
@@ -159,9 +159,9 @@ module BCL
       num_rows = xlsx_data.size
       # puts "Number of Rows: #{xlsx_data.size}"
       num_rows = 2
-      while true
+      loop do
         test = xlsx_data[num_rows][0]
-        if test.nil? or test.empty?
+        if test.nil? || test.empty?
           # num_rows -= 1
           break
         end
@@ -177,7 +177,7 @@ module BCL
         value1 = xlsx_data[0][index]
         value2 = xlsx_data[1][index]
 
-        if not value1.nil? and not value1.empty?
+        if !value1.nil? && !value1.empty?
           unless header.nil?
             headers << header
           end
@@ -186,13 +186,13 @@ module BCL
           header.children = []
         end
 
-        if not value2.nil? and not value2.empty?
+        if !value2.nil? && !value2.empty?
           unless header.nil?
             header.children << value2
           end
         end
 
-        if (value1.nil? or value1.empty?) and (value2.nil? or value2.empty?)
+        if (value1.nil? || value1.empty?) && (value2.nil? || value2.empty?)
           break
         end
 
@@ -219,7 +219,7 @@ module BCL
 
         # get uid, if empty set it
         component.uid = xlsx_data[i][1]
-        if component.uid.nil? or component.uid.empty?
+        if component.uid.nil? || component.uid.empty?
           component.uid = UUID.new.generate
           puts "#{component.name} uid missing; creating new one"
           xlsx_worksheet.add_cell(i, 1, component.uid)

data/lib/bcl/component_methods.rb

@@ -58,7 +58,7 @@ module BCL
         username = @config[:server][:user][:username]
         password = @config[:server][:user][:password]
         @group_id = group_id || @config[:server][:user][:group]
-        puts "logging in using credentials in .bcl/config.yml: Connecting to #{url} on port #{port} as #{username}"
+        puts "logging in using credentials in .bcl/config.yml: Connecting to #{url} on port #{port} as #{username} with group #{@group_id}"
       else
         @group_id = group_id
         puts "logging in using credentials in function arguments: Connecting to #{url} on port #{port} as #{username} with group #{@group_id}"
@@ -74,7 +74,7 @@ module BCL
         @http.use_ssl = true
       end
 
-      data = %Q({"username":"#{username}","password":"#{password}"})
+      data = %({"username":"#{username}","password":"#{password}"})
       # data = {"username" => username, "password" => password}
 
       login_path = '/api/user/login.json'
@@ -158,9 +158,12 @@ module BCL
       puts "retrieving measures that match search_term: #{search_term.nil? ? 'nil' : search_term} and filters: #{filter_term.nil? ? 'nil' : filter_term}"
       measures = []
       retrieve_measures(search_term, filter_term, return_all_pages) do |m|
-        # parse and save
-        r = parse_measure_metadata(m)
-        measures << r if r
+        begin
+          r = parse_measure_metadata(m)
+          measures << r if r
+        rescue => e
+          puts "[ERROR] Parsing measure #{e.message}:#{e.backtrace.join("\n")}"
+        end
       end
 
       measures
@@ -275,7 +278,7 @@ module BCL
         measure_hash[:version_id] = doc.xpath('/measure/version_id').first.content
         measure_hash[:modeler_description] = doc.xpath('/measure/modeler_description').first.content
         measure_hash[:description] = doc.xpath('/measure/description').first.content
-        measure_hash[:tags] = doc.xpath('/measure/tags/tag').map { |k| k.content }
+        measure_hash[:tags] = doc.xpath('/measure/tags/tag').map(&:content)
         f.close
       end
 
@@ -344,17 +347,22 @@ module BCL
             measure_filename = "#{temp_dir_name}/measure.rb"
             measure_hash = parse_measure_file(measure[:measure][:name], measure_filename)
 
-            unless measure_hash.empty?
+            if measure_hash.empty?
+              puts 'Measure Hash was empty... moving on'
+            else
+              #puts measure_hash.inspect
               m_result = measure_hash
               # move the directory to the class name
               new_dir_name = File.join(@parsed_measures_path, measure_hash[:classname])
-              FileUtils.rm_rf(new_dir_name) if File.exist?(new_dir_name) && temp_dir_name != measure_hash[:classname]
-              FileUtils.move(temp_dir_name, new_dir_name) unless temp_dir_name == measure_hash[:classname]
-
+              #puts "Moving #{temp_dir_name} to #{new_dir_name}"
+              if temp_dir_name == new_dir_name
+                puts "Destination directory is the same as the processed directory"
+              else
+                FileUtils.rm_rf(new_dir_name) if File.exist?(new_dir_name) && temp_dir_name != measure_hash[:classname]
+                FileUtils.move(temp_dir_name, new_dir_name) unless temp_dir_name == measure_hash[:classname]
+              end
               # create a new measure.json file for parsing later if need be
               File.open(File.join(new_dir_name, 'measure.json'), 'w') { |f| f << MultiJson.dump(measure_hash, pretty: true) }
-            else
-              puts 'Measure Hash was empty... moving on'
             end
           else
             puts "Problems downloading #{measure[:measure][:name]}... moving on"
@@ -479,7 +487,7 @@ module BCL
       # TODO remove special characters in the filename; they create firewall errors
       # filename = filename.gsub(/\W/,'_').gsub(/___/,'_').gsub(/__/,'_').chomp('_').strip
 
-      file_b64 = Base64.encode64(File.read(filepath))
+      file_b64 = Base64.encode64(File.binread(filepath))
 
       data = {}
       data['file'] = {
@@ -663,22 +671,22 @@ module BCL
       full_url = '/api/search/'
 
       # add search term
-      if !search_str.nil? and search_str != ''
-        full_url = full_url + search_str
+      if !search_str.nil? && search_str != ''
+        full_url += search_str
         # strip out xml in case it's included. make sure .json is included
         full_url = full_url.gsub('.xml', '')
         unless search_str.include? '.json'
-          full_url = full_url + '.json'
+          full_url += '.json'
         end
       else
-        full_url = full_url + '*.json'
+        full_url += '*.json'
       end
 
       # add api_version
       if @api_version < 2.0
         puts "WARNING:  attempting to use search with api_version #{@api_version}. Use API v2.0 for this functionality."
       end
-      full_url = full_url + "?api_version=#{@api_version}"
+      full_url += "?api_version=#{@api_version}"
 
       # add filters
       unless filter_str.nil?
@@ -702,7 +710,7 @@ module BCL
         if filter_str.include? 'show_rows='
           full_url = full_url.gsub(/show_rows=\d{1,}/, 'show_rows=200')
         else
-          full_url = full_url + '&show_rows=200'
+          full_url += '&show_rows=200'
         end
         # make sure filter_str doesn't already have a page=x
         full_url.gsub(/page=\d{1,}/, '')
@@ -752,12 +760,12 @@ module BCL
 
     def download_component(uid)
       result = @http.get("/api/component/download?uids=#{uid}")
-      puts "DOWNLOADING: /api/component/download?uids=#{uid}"
+      puts "Downloading: http://#{@http.address}/api/component/download?uids=#{uid}"
       # puts "RESULTS: #{result.inspect}"
       # puts "RESULTS BODY: #{result.body}"
       # look at response code
       if result.code == '200'
-        puts 'Download Successful'
+        #puts 'Download Successful'
         result.body ? result.body : nil
       else
         puts "Download fail. Error code #{result.code}"

data/lib/bcl/component_spreadsheet.rb

@@ -172,7 +172,7 @@ module BCL
               filetype = values.delete_at(0)
               filepath = values.delete_at(0)
               # not all components(rows) have all files; skip if filename "" or nil
-              next if filename == '' or filename.nil?
+              next if filename == '' || filename.nil?
               # skip the file if it doesn't exist at the specified location
               unless File.exist?(filepath)
                 puts "[ComponentSpreadsheet] ERROR #{filepath} -> File does not exist, will not be included in component xml"
@@ -208,9 +208,9 @@ module BCL
 
       # find number of rows, first column should be name, should not be empty
       num_rows = 1
-      while true
+      loop do
         test = xlsx_worksheet.Range("A#{num_rows}").Value
-        if test.nil? or test.empty?
+        if test.nil? || test.empty?
           num_rows -= 1
           break
         end
@@ -225,7 +225,7 @@ module BCL
         value1 = col.Rows('1').Value
         value2 = col.Rows('2').Value
 
-        if not value1.nil? and not value1.empty?
+        if !value1.nil? && !value1.empty?
           unless header.nil?
             headers << header
           end
@@ -234,13 +234,13 @@ module BCL
           header.children = []
         end
 
-        if not value2.nil? and not value2.empty?
+        if !value2.nil? && !value2.empty?
           unless header.nil?
             header.children << value2
           end
         end
 
-        if (value1.nil? or value1.empty?) and (value2.nil? or value2.empty?)
+        if (value1.nil? || value1.empty?) && (value2.nil? || value2.empty?)
           break
         end
 
@@ -268,7 +268,7 @@ module BCL
 
         # get uid, if empty set it
         component.uid = xlsx_worksheet.Range("B#{i}").value
-        if component.uid.nil? or component.uid.empty?
+        if component.uid.nil? || component.uid.empty?
           component.uid = UUID.new.generate
           puts "#{component.name} uid missing; creating new one"
           xlsx_worksheet.Range("B#{i}").value = component.uid
@@ -276,7 +276,7 @@ module BCL
 
         # get version_id, if empty set it
         component.version_id = xlsx_worksheet.Range("C#{i}").value
-        if component.version_id.nil? or component.version_id.empty?
+        if component.version_id.nil? || component.version_id.empty?
           component.version_id = UUID.new.generate
           puts "#{component.name} version id missing; creating new one"
           xlsx_worksheet.Range("C#{i}").value = component.version_id

data/lib/bcl/core_ext.rb

@@ -19,18 +19,18 @@
 
 class String
   def to_underscore
-    gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-        gsub(/([a-z\d])([A-Z])/, '\1_\2').
-        tr('-', '_').
-        downcase
+    gsub(/::/, '/')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr('-', '_')
+        .downcase
   end
 
   # simple method to create titles -- very custom to catch known inflections
   def titleize
     arr = %w(a an the by to)
     upcase_arr = %w(DX EDA AEDG LPD COP)
-    r = gsub('_', ' ').gsub(/\w+/) { |match|
+    r = gsub('_', ' ').gsub(/\w+/) do |match|
       match_result = match
       if upcase_arr.include?(match.upcase)
         match_result = upcase_arr[upcase_arr.index(match.upcase)]
@@ -40,7 +40,7 @@ class String
         match_result = match.capitalize
       end
       match_result
-    }
+    end
 
     r
   end

data/lib/bcl/master_taxonomy.rb

@@ -111,9 +111,9 @@ module BCL
 
         # setup the xml file
         xml.instruct!(:xml, version: '1.0', encoding: 'UTF-8')
-        xml.schema('xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance') {
+        xml.schema('xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance') do
           write_tag_to_xml(root_tag, 0, xml, output_type)
-        }
+        end
       end
     end
 
@@ -167,7 +167,7 @@ module BCL
 
       terms = get_terms(tag)
 
-      # todo: check for all required attributes
+      # TODO: check for all required attributes
       terms.each do |_term|
         # if term.required
         # make sure we find attribute
@@ -191,7 +191,7 @@ module BCL
           next
         end
 
-        # todo: validate value, datatype, units
+        # TODO: validate value, datatype, units
 
       end
 
@@ -223,7 +223,7 @@ module BCL
 
       # find number of rows by parsing until hit empty value in first column
       row_num = 3
-      while true
+      loop do
         term = parse_term(terms_worksheet, row_num)
         if term.nil?
           break
@@ -331,7 +331,7 @@ module BCL
       term.tp_additional_data_user_info = terms_worksheet.Columns(33).Rows(row).Value
 
       # trigger to quit parsing the xcel doc
-      if term.first_level.nil? or term.first_level.empty?
+      if term.first_level.nil? || term.first_level.empty?
         return nil
       end
 
@@ -348,7 +348,7 @@ module BCL
         tag = create_tag(level_hierarchy, term.description)
       end
 
-      if term.name.nil? or term.name.strip.empty?
+      if term.name.nil? || term.name.strip.empty?
         # this row is really about the tag
         tag.description = term.description
 
@@ -399,7 +399,7 @@ module BCL
     end
 
     def check_tag(tag)
-      if tag.description.nil? or tag.description.empty?
+      if tag.description.nil? || tag.description.empty?
         puts "[check_tag] tag '#{tag.level_hierarchy}' has no description"
       end
 
@@ -454,7 +454,7 @@ module BCL
     end
 
     def check_term(term)
-      if term.description.nil? or term.description.empty?
+      if term.description.nil? || term.description.empty?
         # puts "[check_term] term '#{term.level_hierarchy}.#{term.name}' has no description"
       end
     end
@@ -464,7 +464,7 @@ module BCL
       terms = get_terms(tag)
       if terms.size > 0
         terms.each do |term|
-          xml.term {
+          xml.term do
             xml.name term.name
             xml.abbr term.abbr unless term.abbr.nil?
             xml.description term.description unless term.description.nil?
@@ -472,13 +472,13 @@ module BCL
             xml.allow_multiple term.allow_multiple unless term.allow_multiple.nil?
 
             if !term.enums.nil? && term.enums != ''
-              xml.enumerations {
+              xml.enumerations do
                 out = term.enums.split('|')
                 out.sort! if @sort_alphabetical
                 out.each do |enum|
                   xml.enumeration enum
                 end
-              }
+              end
             end
             xml.ip_written term.ip_written unless term.ip_written.nil?
             xml.ip_symbol term.ip_symbol unless term.ip_symbol.nil?
@@ -503,7 +503,7 @@ module BCL
               xml.tp_additional_data_user_info term.tp_additional_data_user_info unless term.tp_additional_data_user_info.nil?
               xml.tp_additional_data_submitter_info term.tp_additional_data_submitter_info unless term.tp_additional_data_submitter_info.nil?
             end
-          }
+          end
         end
       end
     end
@@ -511,7 +511,7 @@ module BCL
     # write a tag to xml
     def write_tag_to_xml(tag, level, xml, output_type)
       level_string = "level_#{level}"
-      xml.tag!(level_string) {
+      xml.tag!(level_string) do
         s_temp = tag.name
         xml.name s_temp
         xml.description tag.description
@@ -527,7 +527,7 @@ module BCL
           write_tag_to_xml(child_tag, level, xml, output_type)
         end
 
-      }
+      end
     end
   end
 end # module BCL

data/lib/bcl/tar_ball.rb

@@ -70,9 +70,9 @@ module BCL
     end
 
     if delete_zip
-      fileList = []
-      fileList << filename
-      FileUtils.rm(fileList)
+      file_list = []
+      file_list << filename
+      FileUtils.rm(file_list)
     end
   end
 end

data/lib/bcl/version.rb

@@ -18,5 +18,5 @@
 ######################################################################
 
 module BCL
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcl
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Daniel Macumber
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -173,14 +173,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -201,14 +201,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement