openstudio-extension 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc5634df3c8c1a9c8a711707cd6b6a9d07b4a0f0f01aed1726576e244a0c5b2
-  data.tar.gz: 8e433cbc4b7cc8b6737544771bb5273d8a7a267b8153ea936a2af3dccb61b486
+  metadata.gz: 27dbd08d5d11f58ea9839b1d8a3750e860964ad4f5075371cacb6f4c1c642c92
+  data.tar.gz: 3353e644a7b21fe23bd9e50dcc4f844e478237868f88001a2c6538c2092464ed
 SHA512:
-  metadata.gz: 455200a3b2e03ae2b5ef3d15f67690297c04f7886ce31a5f358f02a907a394a5cc0f0ba57b7b44efa96633443f4d23316e391716548cbcaf70af11881389fe44
-  data.tar.gz: 9f478fb250845c5e99b9d1d12ba4261b5b7c82fb2f69bffcd594c5ec1f8a5463d76c4de51202cac29b2f875d07bfffd35cc6fa53ae4e8d4baa3732a0d0c57e22
+  metadata.gz: 9c593e49a37e0851ee1886f54f1c1a7b6ed83ef882f6d25ff803c9aefc4067766299f0fa94845cb284101ba02766c6b4c0e8e572a41c25d954ebb4f14314052c
+  data.tar.gz: 10b1a4dade5d911b1611e0d7262fdd3f59d8b7671e1cef0b593e318b50ed4099227b024ed433fe3003d5270984d4e37dd46cf1924d2c978d0061e6a9d1483197

data/.gitignore

@@ -13,6 +13,8 @@
 /test/
 /lib/measures/test_results
 /lib/measures/.rubocop*
+/lib/measures/staged
+/lib/measures/staged/*
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # OpenStudio Extension Gem
 
+## Version 0.2.2
+
+* Exclude measure tests from being released with the gem (reduces the size of the installed gem significantly)
+* Add BCL commands to upload measures
+* Update GitHub changelog gem to use Octokit compared to github_api (which was last released 3 years ago)
+* Promote GitHub changelog creation to a rake task to be inherited by all downstream extension gems
+
 ## Version 0.2.1
 
 * Changes from 0.1.5 (runner.conf bug)
@@ -40,4 +47,4 @@
 
 ## Version 0.1.1
 
-* Initial release
+* Initial release

data/Rakefile

@@ -36,7 +36,7 @@ RSpec::Core::RakeTask.new(:spec)
 require 'openstudio/extension/rake_task'
 require 'openstudio/extension'
 rake_task = OpenStudio::Extension::RakeTask.new
-rake_task.set_extension_class(OpenStudio::Extension::Extension)
+rake_task.set_extension_class(OpenStudio::Extension::Extension, 'nrel/openstudio-extension-gem')
 
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new

data/lib/change_log.rb

@@ -1,148 +1,132 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'github_api'
+require 'octokit'
 require 'date'
 require 'optparse'
 require 'optparse/date'
 
 # Instructions:
-#   Get a token from github's settings (https://github.com/settings/tokens)
 #
 # Example:
 #   ruby change_log.rb -t abcdefghijklmnopqrstuvwxyz -s 2017-09-06
 #
+#
 
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: change_log.rb [options]\n" \
-                'Prints New, Open, Closed Issues, and number of accepted PRs'
-  opts.separator ''
-
-  # defaults, go back 90 days
-  options[:start_date] = Date.today - 90
-  options[:end_date] = Date.today
-
-  opts.on('-s', '--start-date [DATE]', Date, 'Start of data (e.g. 2017-09-06)') do |v|
-    options[:start_date] = v
-  end
-  opts.on('-e', '--end-date [DATE]', Date, 'End of data (e.g. 2017-09-13)') do |v|
-    options[:end_date] = v
-  end
-  opts.on('-t', '--token [String]', String, 'Github API Token') do |v|
-    options[:token] = v
+class ChangeLog
+  def initialize(user_and_repo, start_date = Date.today - 90, end_date = Date.today, apikey = nil)
+    @user_and_repo = user_and_repo
+    @apikey = apikey
+    @start_date = start_date
+    @end_date = end_date
+
+    # Convert dates to time objects
+    @start_date = Time.parse(@start_date.to_s) if start_date.is_a? String
+    @end_date = Time.parse(@end_date.to_s) if end_date.is_a? String
+    # GitHub API uses Time and not the Date class, so ensure that we have Time
+    @start_date = Time.parse(@start_date.to_s)
+    @end_date = Time.parse(@end_date.to_s)
+
+    @total_open_issues = []
+    @total_open_pull_requests = []
+    @new_issues = []
+    @closed_issues = []
+    @accepted_pull_requests = []
+
+    begin
+      @github = Octokit::Client.new
+      if apikey
+        @github = Octokit::Client.new(access_token: apikey)
+      end
+      @github.auto_paginate = true
+    rescue StandardError => e
+      puts e.message
+      # write out the help message
+      ChangeLog.help
+      exit(1)
+    end
   end
-end.parse!
-
-# Convert dates to time objects
-options[:start_date] = Time.parse(options[:start_date].to_s)
-options[:end_date] = Time.parse(options[:end_date].to_s)
-puts options
-
-### Repository options
-repo_owner = 'NREL'
-repo = 'openstudio-extension-gem'
 
-github = Github.new
-if options[:token]
-  puts 'Using github token'
-  github = Github.new oauth_token: options[:token]
-end
-
-total_open_issues = []
-total_open_pull_requests = []
-new_issues = []
-closed_issues = []
-accepted_pull_requests = []
-
-def get_num(issue)
-  issue.html_url.split('/')[-1].to_i
-end
-
-def get_issue_num(issue)
-  "\##{get_num(issue)}"
-end
-
-def get_html_url(issue)
-  issue.html_url
-end
-
-def get_title(issue)
-  issue.title
-end
-
-def print_issue(issue)
-  is_feature = false
-  issue.labels.each { |label| is_feature = true if label.name == 'Feature Request' }
-
-  if is_feature
-    "- Improved [#{get_issue_num(issue)}]( #{get_html_url(issue)} ), #{get_title(issue)}"
-  else
-    "- Fixed [#{get_issue_num(issue)}]( #{get_html_url(issue)} ), #{get_title(issue)}"
+  # Class method to show how to use the API through Rake.
+  def self.help
+    puts 'Usage: bundle exec rake openstudio:change_log[<start_date>,<end_date>,<apikey>]'
+    puts '       <start_date> = [Optional] Start of data (e.g., 2020-09-06), defaults to 90 days before today'
+    puts '       <end_date> = [Optional] End of data (e.g., 2020-10-06), default to today'
+    puts '       <apikey> = [Optional] GitHub API Key (used for private repos)'
+    puts
+    puts '  Ensure that the GitHub user/repo is set in your Rakefile, for example, '
+    puts "    rake_task.set_extension_class(OpenStudio::Extension::Extension, 'nrel/openstudio-extension-gem')"
+    puts
+    puts '  Example usages:'
+    puts '    bundle exec rake openstudio:change_log[2020-01-01]'
+    puts '    bundle exec rake openstudio:change_log[2020-01-01,2020-06-30]'
+    puts '    bundle exec rake openstudio:change_log[2020-01-01,2020-01-10,<private_api_key>]'
+    puts
+    puts '  Notes:'
+    puts '    For creating token, see https://github.com/settings/tokens.'
+    puts '    Note that if passing apikey, then you must pass start_date and end_date as well. There must be no spaces'
+    puts '    between the arguments (see examples above).'
   end
-end
 
-# Process Open Issues
-results = -1
-page = 1
-while results != 0
-  resp = github.issues.list user: repo_owner, repo: repo, sort: 'created', direction: 'asc',
-                            state: 'open', per_page: 100, page: page
-  results = resp.length
-  resp.env[:body].each do |issue, _index|
-    created = Time.parse(issue.created_at)
-    if !issue.key?(:pull_request)
-      total_open_issues << issue
-      if created >= options[:start_date] && created <= options[:end_date]
-        new_issues << issue
+  # Process Open Issues
+  def process
+    @github.list_issues(@user_and_repo, state: 'all').each do |issue|
+      if issue.state == 'open'
+        if issue.pull_request
+          if issue.created_at >= @start_date && issue.created_at <= @end_date
+            @total_open_pull_requests << issue
+          end
+        else
+          @total_open_issues << issue
+          if issue.created_at >= @start_date && issue.created_at <= @end_date
+            @new_issues << issue
+          end
+        end
+      else
+        # the issue is closed
+        if issue.closed_at >= @start_date && issue.closed_at <= @end_date
+          if issue.pull_request
+            @accepted_pull_requests << issue
+          else
+            @closed_issues << issue
+          end
+        end
       end
-    else
-      total_open_pull_requests << issue
     end
+
+    @closed_issues.sort! { |x, y| x.number <=> y.number }
+    @new_issues.sort! { |x, y| x.number <=> y.number }
+    @accepted_pull_requests.sort! { |x, y| x.number <=> y.number }
+    @total_open_pull_requests.sort! { |x, y| x.number <=> y.number }
+  rescue StandardError => e
+    puts e.message
+    ChangeLog.help
+    exit(1)
   end
 
-  page += 1
-end
+  def print_issue(issue)
+    is_feature = false
+    issue.labels.each { |label| is_feature = true if label.name == 'Feature Request' }
 
-# Process Closed Issues
-results = -1
-page = 1
-while results != 0
-  resp = github.issues.list user: repo_owner, repo: repo, sort: 'created', direction: 'asc',
-                            state: 'closed', per_page: 100, page: page
-  results = resp.length
-  resp.env[:body].each do |issue, _index|
-    created = Time.parse(issue.created_at)
-    closed = Time.parse(issue.closed_at)
-    if !issue.key?(:pull_request)
-      if created >= options[:start_date] && created <= options[:end_date]
-        new_issues << issue
-      end
-      if closed >= options[:start_date] && closed <= options[:end_date]
-        closed_issues << issue
-      end
-    elsif closed >= options[:start_date] && closed <= options[:end_date]
-      accepted_pull_requests << issue
+    if is_feature
+      "- Improved [##{issue.number}]( #{issue.html_url} ), #{issue.title}"
+    else
+      "- Fixed [\##{issue.number}]( #{issue.html_url} ), #{issue.title}"
     end
   end
 
-  page += 1
-end
-
-closed_issues.sort! { |x, y| get_num(x) <=> get_num(y) }
-new_issues.sort! { |x, y| get_num(x) <=> get_num(y) }
-accepted_pull_requests.sort! { |x, y| get_num(x) <=> get_num(y) }
-total_open_pull_requests.sort! { |x, y| get_num(x) <=> get_num(y) }
-
-puts "Total Open Issues: #{total_open_issues.length}"
-puts "Total Open Pull Requests: #{total_open_pull_requests.length}"
-puts "\nDate Range: #{options[:start_date].strftime('%m/%d/%y')} - #{options[:end_date].strftime('%m/%d/%y')}:"
-puts "\nNew Issues: #{new_issues.length} (" + new_issues.map { |issue| get_issue_num(issue) }.join(', ') + ')'
+  def print_issues
+    puts "Total Open Issues: #{@total_open_issues.length}"
+    puts "Total Open Pull Requests: #{@total_open_pull_requests.length}"
+    puts "\nDate Range: #{@start_date.strftime('%m/%d/%y')} - #{@end_date.strftime('%m/%d/%y')}:"
+    puts "\nNew Issues: #{@new_issues.length} (" + @new_issues.map { |issue| issue.number }.join(', ') + ')'
 
-puts "\nClosed Issues: #{closed_issues.length}"
-closed_issues.each { |issue| puts print_issue(issue) }
+    puts "\nClosed Issues: #{@closed_issues.length}"
+    @closed_issues.each { |issue| puts print_issue(issue) }
 
-puts "\nAccepted Pull Requests: #{accepted_pull_requests.length}"
-accepted_pull_requests.each { |issue| puts print_issue(issue) }
+    puts "\nAccepted Pull Requests: #{@accepted_pull_requests.length}"
+    @accepted_pull_requests.each { |issue| puts print_issue(issue) }
 
-puts "\nAll Open Issues: #{total_open_issues.length} (" + total_open_issues.map { |issue| get_issue_num(issue) }.join(', ') + ')'
+    puts "\nAll Open Issues: #{@total_open_issues.length} (" + @total_open_issues.map { |issue| "\##{issue.number}" }.join(', ') + ')'
+  end
+end

data/lib/measures/openstudio_extension_test_measure/measure.xml

@@ -1,17 +1,18 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>openstudio_extension_test_measure</name>
   <uid>36b99a29-41e1-4d85-9272-85d43b966e5a</uid>
-  <version_id>e9fedf04-7619-4c93-a865-0e54adfe3507</version_id>
-  <version_modified>20190430T155209Z</version_modified>
+  <version_id>edf7f103-9f51-4944-a5af-1d8fa2b0c9b7</version_id>
+  <version_modified>20200427T230714Z</version_modified>
   <xml_checksum>49BEF039</xml_checksum>
   <class_name>OpenStudioExtensionTestMeasure</class_name>
   <display_name>OpenStudio Extension Test Measure</display_name>
-  <description>Rotate your building relative to its current orientation. This will not rotate site shading objects.</description>
-  <modeler_description>Get the North Axis field for the  OS:Building object and adjusted it based on the user specified value. If the starting value is 20 degrees and the user value is 5 degrees, then the resulting value is 25 degrees.</modeler_description>
-  <arguments/>
-  <outputs/>
-  <provenances/>
+  <description>A measure that tests OpenStudio Extension gem functionality</description>
+  <modeler_description>This is a test measure that tests OpenStudio Extension gem functionality.</modeler_description>
+  <arguments />
+  <outputs />
+  <provenances />
   <tags>
     <tag>Envelope.Form</tag>
   </tags>
@@ -38,12 +39,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>9640B6CB</checksum>
-    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
@@ -51,16 +46,16 @@
       <checksum>703C9964</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
+      <filename>LICENSE.md</filename>
       <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>7258830F</checksum>
+      <usage_type>license</usage_type>
+      <checksum>E0468DD6</checksum>
     </file>
     <file>
       <filename>OpenStudioExtensionTestMeasure_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>8452EA9A</checksum>
+      <checksum>66A00EA8</checksum>
     </file>
     <file>
       <version>
@@ -71,13 +66,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>E5793A49</checksum>
+      <checksum>51BB85EF</checksum>
     </file>
     <file>
       <filename>os_lib_helper_methods.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>22515A49</checksum>
+      <checksum>07B01D67</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>7258830F</checksum>
     </file>
   </files>
 </measure>

data/lib/openstudio/extension/rake_task.rb

@@ -51,14 +51,16 @@ module OpenStudio
         setup_subtasks(@name)
       end
 
-      def set_extension_class(extension_class)
+      def set_extension_class(extension_class, github_repo='')
         @extension_class = extension_class
         @extension = extension_class.new
         @root_dir = @extension.root_dir
         @measures_dir = @extension.measures_dir
+        @staged_path = @measures_dir + '/staged'
         @core_dir = @extension.core_dir
         @doc_templates_dir = @extension.doc_templates_dir
         @files_dir = @extension.files_dir
+        @github_repo = github_repo
       end
 
       private
@@ -67,14 +69,14 @@ module OpenStudio
         namespace name do
           desc 'Run the CLI task to check for measure updates'
           task update_measures: ['measures:add_license', 'measures:add_readme', 'measures:copy_resources', 'update_copyright'] do
-            puts 'updating measures...'
+            puts 'updating measures'
             runner = OpenStudio::Extension::Runner.new(Dir.pwd)
             runner.update_measures(@measures_dir)
           end
 
           desc 'List measures'
           task :list_measures do
-            puts 'Listing measures...'
+            puts 'Listing measures'
             runner = OpenStudio::Extension::Runner.new(Dir.pwd)
             runner.list_measures(@measures_dir)
           end
@@ -92,12 +94,6 @@ module OpenStudio
             end
           end
 
-          # TODO: Implement this eventually... comment out for now.
-          # desc 'Use openstudio docker image to run tests'
-          # task :test_with_docker do
-          #   puts 'testing with docker'
-          # end
-
           # namespace for measure operations
           namespace 'measures' do
             desc 'Copy the resources files to individual measures'
@@ -145,14 +141,203 @@ module OpenStudio
             runner.update_copyright(@root_dir, @doc_templates_dir)
           end
 
-          desc 'Copy the measures to a location that can be uploaded to BCL'
-          task :stage_bcl do
-            puts 'Staging measures for BCL'
+          desc 'Print the change log from GitHub'
+          task :change_log, [:start_date, :end_date, :apikey] do |t, args|
+            require 'change_log'
+            cl = ChangeLog.new(@github_repo, *args)
+            cl.process
+            cl.print_issues
           end
 
-          desc 'Upload measures from the specified location.'
-          task :push_bcl do
-            puts 'Push measures to BCL'
+          namespace 'bcl' do
+            desc 'Test BCL login'
+            task :test_login do
+              puts 'test BCL login'
+              bcl = ::BCL::ComponentMethods.new
+              bcl.login
+            end
+
+            # for custom search, populate env var: bcl_search_keyword
+            desc 'Search BCL'
+            task :search_measures do
+              puts 'test search BCL'
+              bcl = ::BCL::ComponentMethods.new
+              bcl.login
+
+              # check for env var specifying keyword first
+              if ENV['bcl_search_keyword']
+                keyword = ENV['bcl_search_keyword']
+              else
+                keyword = 'Space'
+              end
+              num_results = 10
+              # bcl.search params: search_string, filter_string, return_all_results?
+              puts "searching BCL measures for keyword: #{keyword}"
+              results = bcl.search(keyword, "fq[]=bundle:nrel_measure&show_rows=#{num_results}", false)
+              puts "there are #{results[:result].count} results"
+              results[:result].each do |res|
+                puts (res[:measure][:name]).to_s
+              end
+            end
+
+            # to call with argument: "openstudio:bcl:stage[true]" (true = remove existing staged content)
+            desc 'Copy the measures/components to a location that can be uploaded to BCL'
+            task :stage, [:reset] do |t, args|
+              puts 'Staging measures for BCL'
+              # initialize BCL and login
+              bcl = ::BCL::ComponentMethods.new
+              bcl.login
+
+              # process reset options: true to clear out old staged content
+              options = { reset: false }
+              if args[:reset].to_s == 'true'
+                options[:reset] = true
+              end
+
+              # ensure staged dir exists
+              FileUtils.mkdir_p(@staged_path)
+
+              # delete existing tarballs if reset is true
+              if options[:reset]
+                puts 'Deleting existing staged content'
+                FileUtils.rm_rf(Dir.glob("#{@staged_path}/*"))
+              end
+
+              # create new and existing directories
+              FileUtils.mkdir_p(@staged_path.to_s + '/update')
+              FileUtils.mkdir_p(@staged_path.to_s + '/push/component')
+              FileUtils.mkdir_p(@staged_path.to_s + '/push/measure')
+
+              # keep track of noop, update, push
+              noops = 0
+              new_ones = 0
+              updates = 0
+
+              # get all content directories to process
+              dirs = Dir.glob("#{@measures_dir}/*")
+
+              dirs.each do |dir|
+                next if dir.include?('Rakefile') || File.basename(dir) == 'staged'
+                current_d = Dir.pwd
+                content_name = File.basename(dir)
+                puts '', '---'
+                puts "Generating #{content_name}"
+
+                Dir.chdir(dir)
+
+                # figure out whether to upload new or update existing
+                files = Pathname.glob('**/*')
+                uuid = nil
+                vid = nil
+                content_type = 'measure'
+
+                paths = []
+                files.each do |file|
+                  # don't tar tests/outputs directory
+                  next if file.to_s.start_with?('tests/output') # From measure testing process
+                  next if file.to_s.start_with?('tests/test') # From openstudio-measure-tester-gem
+                  next if file.to_s.start_with?('tests/coverage') # From openstudio-measure-tester-gem
+                  next if file.to_s.start_with?('test_results') # From openstudio-measure-tester-gem
+                  paths << file.to_s
+                  if file.to_s =~ /^.{0,2}component.xml$/ || file.to_s =~ /^.{0,2}measure.xml$/
+                    if file.to_s.match?(/^.{0,2}component.xml$/)
+                      content_type = 'component'
+                    end
+                    # extract uuid  and vid
+                    uuid, vid = bcl.uuid_vid_from_xml(file)
+                  end
+                end
+                puts "UUID: #{uuid}, VID: #{vid}"
+
+                # note: if uuid is missing, will assume new content
+                action = bcl.search_by_uuid(uuid, vid)
+                puts "#{content_name} ACTION TO TAKE: #{action}"
+                # new content functionality needs to know if measure or component.  update is agnostic.
+                if action == 'noop' # ignore up-to-date content
+                  puts "  - WARNING: local #{content_name} uuid and vid match BCL... no update will be performed"
+                  noops += 1
+                  next
+                elsif action == 'update'
+                  # puts "#{content_name} labeled as update for BCL"
+                  destination = @staged_path + '/' + action + '/' + "#{content_name}.tar.gz"
+                  updates += 1
+                elsif action == 'push'
+                  # puts "#{content_name} labeled as new content for BCL"
+                  destination = @staged_path + '/' + action + '/' + content_type + "/#{content_name}.tar.gz"
+                  new_ones += 1
+                end
+
+                puts "destination: #{destination}"
+
+                # copy over only if 'reset_receipts' is set to TRUE. otherwise ignore if file exists already
+                if File.exist?(destination)
+                  if reset
+                    FileUtils.rm(destination)
+                    ::BCL.tarball(destination, paths)
+                  else
+                    puts "*** WARNING: File #{content_name}.tar.gz already exists in staged directory... keeping existing file. To overwrite, set reset_receipts arg to true ***"
+                  end
+                else
+                  ::BCL.tarball(destination, paths)
+                end
+                Dir.chdir(current_d)
+              end
+              puts '', "****STAGING DONE**** #{new_ones} new content, #{updates} updates, #{noops} skipped (already up-to-date on BCL)", ''
+            end
+
+            desc 'Upload measures from the specified location.'
+            task :push do
+              puts 'Push measures to BCL'
+
+              # initialize BCL and login
+              bcl = ::BCL::ComponentMethods.new
+              bcl.login
+              reset = false
+
+              total_count = 0
+              successes = 0
+              errors = 0
+              skipped = 0
+
+              # grab all the new measure and component tar files and push to bcl
+              ['measure', 'component'].each do |content_type|
+                items = []
+                paths = Pathname.glob(@staged_path.to_s + "/push/#{content_type}/*.tar.gz")
+                paths.each do |path|
+                  # puts path
+                  items << path.to_s
+                end
+
+                items.each do |item|
+                  puts item.split('/').last
+                  total_count += 1
+
+                  receipt_file = File.dirname(item) + '/' + File.basename(item, '.tar.gz') + '.receipt'
+                  if !reset && File.exist?(receipt_file)
+                    skipped += 1
+                    puts 'SKIP: receipt file found'
+                    next
+                  end
+
+                  valid, res = bcl.push_content(item, true, "nrel_#{content_type}")
+                  if valid
+                    successes += 1
+                  else
+                    errors += 1
+                    if res.key?(:error)
+                      puts "  ERROR MESSAGE: #{res[:error]}"
+                    else
+                      puts "ERROR: #{res.inspect.chomp}"
+                    end
+                  end
+                  puts '', '---'
+                end
+              end
+
+              # grab all the updated content (measures and components) tar files and push to bcl
+              items = []
+              paths = Pathname.glob(@staged_path.to_s + '/update/*.tar.gz')
+            end
           end
         end
       end

data/lib/openstudio/extension/runner.rb

@@ -43,6 +43,7 @@ require 'openstudio'
 require 'yaml'
 require 'fileutils'
 require 'parallel'
+require 'bcl'
 
 module OpenStudio
   module Extension
@@ -57,7 +58,7 @@ module OpenStudio
       # compatible with the OpenStudio CLI.
       ##
       #  @param [String] dirname Directory to run commands in, defaults to Dir.pwd. If directory includes a Gemfile then create a local bundle.
-      #  @param bundle_without [Hash] Hash describing the distribution of the variable.
+      #  @param bundle_without [Array] List of strings of the groups to exclude when running the bundle command
       #  @param options [Hash] Hash describing options for running the simulation. These are the defaults for all runs unless overriden within the run_* methods. Note if options is used, then a local runner.conf file will not be loaded.
       #  @option options [String] :max_datapoints Max number of datapoints to run
       #  @option options [String] :num_parallel Number of simulations to run in parallel at a time

data/lib/openstudio/extension/version.rb

@@ -37,6 +37,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/openstudio-extension.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   }
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|lib.measures.*tests|spec|features)/})
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -30,12 +30,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.5.0'
 
+  spec.add_dependency 'bcl', '~> 0.6.0'
   spec.add_dependency 'bundler', '~> 2.1'
-  spec.add_dependency 'openstudio-workflow', '~> 2.0.0'
+  spec.add_dependency 'octokit', '~> 4.18.0'  # for change logs
   spec.add_dependency 'openstudio_measure_tester', '~> 0.2.2'
+  spec.add_dependency 'openstudio-workflow', '~> 2.0.0'
   spec.add_dependency 'parallel', '~> 1.19.1'
 
-  spec.add_development_dependency 'github_api', '~> 0.18.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-extension
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Katherine Fleming
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bcl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -27,19 +41,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: openstudio-workflow
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.18.0
 - !ruby/object:Gem::Dependency
   name: openstudio_measure_tester
   requirement: !ruby/object:Gem::Requirement
@@ -55,33 +69,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: openstudio-workflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
-  type: :development
+        version: 1.19.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 1.19.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +168,6 @@ files:
 - lib/measures/openstudio_extension_test_measure/measure.rb
 - lib/measures/openstudio_extension_test_measure/measure.xml
 - lib/measures/openstudio_extension_test_measure/resources/os_lib_helper_methods.rb
-- lib/measures/openstudio_extension_test_measure/tests/openstudio_extension_test_measure_test.rb
 - lib/openstudio-extension.rb
 - lib/openstudio/extension.rb
 - lib/openstudio/extension/core/CreateResults.rb
@@ -205,7 +218,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-extension-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.2.1
+  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.2.2
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/measures/openstudio_extension_test_measure/tests/openstudio_extension_test_measure_test.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-# *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
-# UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
-# THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# *******************************************************************************
-
-require 'openstudio'
-require 'openstudio/measure/ShowRunnerOutput'
-
-require_relative '../measure.rb'
-require 'minitest/autorun'
-
-class OpenStudioExtensionTestMeasureTest < Minitest::Test
-  # def setup
-  # end
-
-  # def teardown
-  # end
-
-  def test_OpenStudioExtensionTestMeasure
-    # create an instance of the measure
-    measure = OpenStudioExtensionTestMeasure.new
-
-    # create an instance of a runner
-    runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
-
-    # make an empty model
-    model = OpenStudio::Model::Model.new
-
-    # get arguments and test that they are what we are expecting
-    arguments = measure.arguments(model)
-    assert_equal(0, arguments.size)
-
-    # set argument values to good values and run the measure on model with spaces
-    arguments = measure.arguments(model)
-    argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
-
-    measure.run(model, runner, argument_map)
-    result = runner.result
-    # show_output(result)
-    assert(result.value.valueName == 'Success')
-    assert(result.warnings.empty?)
-    assert(result.info.empty?)
-  end
-end