urbanopt-core 0.3.0.pre1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409ab050dee9022e6546d70cf14e97d74ada5fc23f8335b1d9f0fe522c640af8
-  data.tar.gz: 077f75f95d1cf4d579a47801c14e995792f3c501991ac10cd80a05c1747dbba1
+  metadata.gz: fc861451111a90b47fc25545be97908a9495cc1db9b01cb946bbcbb1f401b783
+  data.tar.gz: f97df481fb8045490388a9e5d0d82bfd5b8682e14c2a299f640388358e1da36c
 SHA512:
-  metadata.gz: f9ac16f7bc87709790b0a139b430d1230adffddd9a950367d951209573034b9f152129fa875de02ace105e958f933be47765a5c1f1d3272f5f9eba3a07349719
-  data.tar.gz: cb062754a81cf959f6ee3aa0094aead70616f0ee264db2cf657808cdc04996c071df8fabbd5c4fc8bd6f295afee59e0adf798ffd3daf181cd65c521847dce102
+  metadata.gz: b759fcaea543f6070e2ddb79d9bbfa1891fde47a64f30f9eb18539681449cfd29bb8f59162ee9e22f02f48520e9934c1c6d881cf3eb4cd859a365179758b73ff
+  data.tar.gz: 44c52dfbe7ef3ca45923a2310b5e7fecec2f0e81461f160875ad5e89605b149b71a792e5537db06c8a76393c0f5afdfc8a53129a9a75ac54f5a131046b40720a

data/CHANGELOG.md

@@ -1,8 +1,32 @@
 # URBANopt Core Gem
- 
-## Version 0.3.0.pre1
+
+## Version 0.5.1
+
+Date Range: 11/26/20 - 12/08/20
+
+- Fixed [#15]( https://github.com/urbanopt/urbanopt-core-gem/issues/15 ), Updated urbanopt-reopt-example-project to simulate and generate results for multiple PVs
+- Fixed [#30]( https://github.com/urbanopt/urbanopt-core-gem/issues/30 ), Update extension-gem dependency
+
+## Version 0.5.0
+
+Date Range: 09/18/20 - 11/25/20
+
+Updated dependencies for OpenStudio 3.1.0
+
+## Version 0.4.0
+
+Date Range: 06/05/20 - 09/17/20
+
+- Fixed [#7]( https://github.com/urbanopt/urbanopt-core-gem/issues/7 ), Remove travis in favor of Jenkins
+- Fixed [#24]( https://github.com/urbanopt/urbanopt-core-gem/issues/24 ), Chore: Add TM to first mention URBANopt on LICENSE file and LICENSE section
+
+
+## Version 0.3.0
+
+Date Range: 03/31/20 - 06/04/20
 
 - Updated dependencies for ruby 2.5.x and OpenStudio 3.x
+- Remove old changelog script functionality in favor of new extension-gem functionality (can be run via rake task)
 
 ## Version 0.2.0
 
@@ -19,7 +43,7 @@ Closed Issues and Features
 
 * Update travis tests to include openstudio related tests
 
-## Version 0.1.0 
+## Version 0.1.0
 
 * Initial release of the URBANopt Core Extension
-* Define the feature and feature_file that will be inherited.
+* Define the feature and feature_file that will be inherited.

data/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Version 1.0
 
-The URBANopt team welcomes your contribution to the project. You can contribute to the URBANopt project in several ways: by using the software, reporting issues, contributing documentation, or contributing code back to the project. The GitHub [Contributing to Open Source](https://opensource.guide/how-to-contribute/) guide provides a good overview. If you contribute code, you agree that your contribution may be incorporated into the URBANopt Software Development Kit (SDK) and made available under the URBANopt SDK license.
+The URBANopt<sup>&trade;</sup> team welcomes your contribution to the project. You can contribute to the URBANopt project in several ways: by using the software, reporting issues, contributing documentation, or contributing code back to the project. The GitHub [Contributing to Open Source](https://opensource.guide/how-to-contribute/) guide provides a good overview. If you contribute code, you agree that your contribution may be incorporated into the URBANopt Software Development Kit (SDK) and made available under the URBANopt SDK license.
 
 The contribution process for URBANopt is composed of three steps:
 

data/Gemfile

@@ -14,5 +14,5 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 if allow_local && File.exist?('../OpenStudio-extension-gem')
   gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
 elsif allow_local
-  gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
+ gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
 end

data/Jenkinsfile

@@ -0,0 +1,10 @@
+//Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs 
+ 
+@Library('cbci_shared_libs') _
+
+// Build for PR to develop branch only. 
+if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
+
+  openstudio_urbanopt_extension_gems()
+    
+}

data/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
+URBANopt<sup>&trade;</sup>, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

data/README.md

@@ -1,6 +1,6 @@
 # URBANopt Core
 
-URBANopt core libraries and measures.
+URBANopt<sup>TM</sup> core libraries and measures.
 
 ## Installation
 
@@ -29,4 +29,4 @@ This Extension Gem stores the base information needed for all derivative URBANop
 * Update version in `/lib/urbanopt/core/version.rb`
 * Create PR to master, after tests and reviews complete, then merge
 * Locally - from the master branch, run `rake release`
-& On GitHub, go to the releases page and update the latest release tag. Name it “Version x.y.z” and copy the CHANGELOG entry into the description box.
+& On GitHub, go to the releases page and update the latest release tag. Name it “Version x.y.z” and copy the CHANGELOG entry into the description box.

data/Rakefile

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -37,7 +37,7 @@ RSpec::Core::RakeTask.new(:spec)
 require 'openstudio/extension/rake_task'
 require 'urbanopt/core'
 rake_task = OpenStudio::Extension::RakeTask.new
-rake_task.set_extension_class(URBANopt::Core::Extension)
+rake_task.set_extension_class(URBANopt::Core::Extension, 'urbanopt/urbanopt-core-gem')
 
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new

data/doc_templates/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
+URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

data/doc_templates/copyright_erb.txt

@@ -1,6 +1,6 @@
 <%
   # *********************************************************************************
-  # URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+  # URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
   # contributors. All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without modification,

data/doc_templates/copyright_js.txt

@@ -1,4 +1,4 @@
 /* @preserve
- * URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
+ * URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
  * Use of this source code is governed by the BSD 3-Clause license.
 */

data/doc_templates/copyright_ruby.txt

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/core.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/core/extension.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/core/feature.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/core/feature_file.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/core/version.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -30,6 +30,6 @@
 
 module URBANopt
   module Core
-    VERSION = '0.3.0.pre1'.freeze
+    VERSION = '0.5.1'.freeze
   end
 end

data/urbanopt-core-gem.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.7'
 
-  spec.add_dependency 'openstudio-extension', '~> 0.2.3'
+  spec.add_dependency 'openstudio-extension', '~> 0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre1
+  version: 0.5.1
 platform: ruby
 authors:
 - Dan Macumber
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.2
 description: URBANopt core library and measures
 email:
 - nicholas.long@nrel.gov
@@ -81,6 +81,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Jenkinsfile
 - LICENSE.md
 - README.md
 - Rakefile
@@ -89,7 +90,6 @@ files:
 - doc_templates/copyright_erb.txt
 - doc_templates/copyright_js.txt
 - doc_templates/copyright_ruby.txt
-- lib/change_log.rb
 - lib/measures/.gitkeep
 - lib/urbanopt/core.rb
 - lib/urbanopt/core/extension.rb
@@ -111,11 +111,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: URBANopt core library and measures

data/lib/change_log.rb

@@ -1,147 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'github_api'
-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
-  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 = 'URBANopt'
-repo = 'urbanopt-core-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)}"
-  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
-      end
-    else
-      total_open_pull_requests << issue
-    end
-  end
-
-  page += 1
-end
-
-# 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
-    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(', ') + ')'
-
-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 "\nAll Open Issues: #{total_open_issues.length} (" + total_open_issues.map { |issue| get_issue_num(issue) }.join(', ') + ')'