openstudio-extension 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d0b42ef4c9c5ee88e2e750956e7147ec1971614d9bc46b0f8926332937aabbb
-  data.tar.gz: 2177f877389dcc3587c575f361d10d0228269d875c59f22ba7f03bd5fa829d06
+  metadata.gz: 75c383235ef747996dd9484f715ab090201aeae62521c44f7166e4664057c83b
+  data.tar.gz: dc5e71c966b27041394772057b6c2625a735d34e6f1864e39d46378483743f3e
 SHA512:
-  metadata.gz: a6796c88ae5bdd6a269377c4d9845421aa36318f60297dc55bba600f4ebc83143f0ed21fbae5d6ea0c1c05be3363dfdc97f4109866959070fb86dcbe27174dbe
-  data.tar.gz: a96dd4fc093da1528f39b4401b0cab6a0ca195877dd979ace7e285fdb83674b19885a901f5df8d18c77a3a37a19f40a4683bbdf82e3181df4e575bb92dec97b5
+  metadata.gz: 0bca71f3d261ddd15966a690859f01c5c6344259e96069f844ebf0da0bd395c18d79d6d8e48a680faa74a627e30aae38833c00a4c3ae3f29dfd8f4f47a2499b8
+  data.tar.gz: b50492d24de160505451599128ee177289ceac185bfd9ea560cd2447683ecef7c569699f59094c6b531feaf61810c18e027c0aa8ab11b2c9f9b3748a3fae4ee4

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/.rubocop.yml

@@ -6,5 +6,5 @@ AllCops:
     - lib/openstudio/extension/core/**/*
 
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
 

data/CHANGELOG.md

@@ -1,11 +1,55 @@
 # OpenStudio Extension Gem
 
+## Version 0.2.5
+
+* Support runner options for bundle_install_path and gemfile_path
+* Laboratory and Data Center Support
+
+- Fixed [#71]( https://github.com/NREL/openstudio-extension-gem/pull/71 ), another fix for bcl rake tasks
+- Fixed [#72]( https://github.com/NREL/openstudio-extension-gem/pull/72 ), Add laboratory and data centers to os_lib_model_generation
+- Fixed [#74]( https://github.com/NREL/openstudio-extension-gem/pull/74 ), adding bundle path and gemfile path options
+
+## Version 0.2.4
+
+* Fixed upload of measures to BCL using rake tasks.
+* Support economizer modeling when create_typical measure is split into two parts
+
+Closed Issues: 1
+- Fixed [#64]( https://github.com/NREL/openstudio-extension-gem/issues/64 ), README updates
+
+## Version 0.2.3
+
+* Use new version of rubocop style from S3
+* Remove frozen string literals in comments
+
+## 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)
+* Changes from 0.1.6 (update core library)
+* Update measure tester to 0.2.2 (with Rubocop 0.54)
+
 ## Version 0.2.0
 
 * Upgrade Bundler to 2.1.x
 * Restrict to Ruby ~> 2.5.0
 * Remove json_pure gem
 * Update measure tester to 0.2.0 (removes need for github checkout)
+* Note that this version does not include the changes from Version 0.1.5
+
+## Version 0.1.6
+
+* Update core library methods with what was in OpenStudio-measures
+
+## Version 0.1.5
+
+* Fix bug to respect the runner.conf file when using Extension::Runner with no options
 
 ## Version 0.1.4
 
@@ -25,4 +69,4 @@
 
 ## Version 0.1.1
 
-* Initial release
+* Initial release

data/Jenkinsfile

@@ -1,10 +1,10 @@
-//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs 
+//Jenkins pipelines are stored in shared libaries. 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_extension_gems_3_x()
+  openstudio_extension_gems()
     
 }

data/README.md

@@ -31,27 +31,27 @@ Each OpenStudio extension gem should define its own module name to ensure that t
 
 ## Installation
 
-To use this and other extension gems, you will need Ruby 2.2.4 and OpenStudio 2.7.1 or greater.  
+To use this and other extension gems, you will need Ruby 2.5.x and OpenStudio 3.0.0 or greater.  
 
 ### Windows Installation
-Install Ruby using the [RubyInstaller](https://rubyinstaller.org/downloads/archives/) for [Ruby 2.2.4 (x64)](https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.2.4-x64.exe).
+Install Ruby using the [RubyInstaller](https://rubyinstaller.org/downloads/archives/) for [Ruby 2.5.5 (x64)](https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.5.5-x64.exe).
 
 Install Devkit using the [mingw64](https://dl.bintray.com/oneclick/rubyinstaller/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe) installer.
 
-Check the ruby installation returns the correct Ruby version (2.2.4):
+Check the ruby installation returns the correct Ruby version (2.5.x):
 ```
 ruby -v
 ```
 
 Install bundler from the command line
 ```
-gem install bundler -v 1.17
+gem install bundler -v 2.1
 ```
 
-Install OpenStudio.  Create a file ```C:\ruby-2.2.4-x64-mingw32\lib\ruby\site_ruby\openstudio.rb``` and point it to your OpenStudio installation by editing the contents.  E.g.:
+Install OpenStudio.  Create a file ```C:\ruby-2.5.5-x64-mingw32\lib\ruby\site_ruby\openstudio.rb``` and point it to your OpenStudio installation by editing the contents.  E.g.:
 
 ```ruby
-require 'C:\openstudio-2.7.1\Ruby\openstudio.rb'
+require 'C:\openstudio-3.0.0\Ruby\openstudio.rb'
 ```
 
 Verify your OpenStudio and Ruby configuration:
@@ -65,19 +65,20 @@ rbenv can be installed via [Homebrew](https://brew.sh/):
 ```
 brew install rbenv
 rbenv init
-rbenv install 2.2.4
+rbenv install 2.5.5
 ```
 
 Also install bundler
 ```
-gem install bundler -v 1.17
+gem install bundler -v 2.1
 ```
 
 Install [OpenStudio](https://www.openstudio.net/downloads).
 
-Add the RUBYLIB environment variable to your `bash_profile` (or similar) file. It should point to the Ruby folder within the OpenStudio Application you just downloaded (replace 2.7.2 with the version you are using):
+Add the RUBYLIB environment variable to your `bash_profile` (or similar) file. It should point to the Ruby folder within
+the OpenStudio Application you just downloaded (replace 3.0.0 with the version you are using):
 ```
-export RUBYLIB=/Applications/OpenStudio-2.7.2/Ruby
+export RUBYLIB=/Applications/OpenStudio-3.0.0/Ruby
 ```
 
 
@@ -145,14 +146,17 @@ Common Rake Tasks that are available to derivative extension gems include:
 
 | Rake Task | Description |
 | --------- | ----------- |
+| openstudio:bcl:test_login            | Test BCL login |
+| openstudio:bcl:search_measures       | Search BCL |
+| openstudio:bcl:stage[reset]          | Copy the measures/components to a staging location |
+| openstudio:bcl:push                  | Upload measures from the staging location |
+| openstudio:change_log[start_date,end_date,apikey] | Print the change log from GitHub. Specify dates in yyyy-mm-dd format |
 | openstudio:list_measures             | List all measures in the calling gem |
 | openstudio:measures:add_license      | Add License File to measures in the calling gem |
 | openstudio:measures:add_readme       | Add README.md.erb file if it and the README markdown file do not already exist for a measure |
 | openstudio:measures:copy_resources   | Copy the resources files to individual measures in the calling gem |
 | openstudio:measures:update_copyright | Update copyright on measure files in the calling gem |
-| openstudio`:runner:`init          | Create a runner.conf file running simulations |
-| openstudio:stage_bcl                 | Copy the measures to a location that can be uploaded to BCL |
-| openstudio:push_bcl                  | Upload measures from the specified location to the BCL |
+| openstudio`:runner:`init             | Create a runner.conf file running simulations |
 | openstudio:test_with_docker          | Use openstudio docker image to run tests |
 | openstudio:test_with_openstudio      | Use openstudio system ruby to run tests |
 | openstudio:update_measures           | Run the CLI task to check for measure updates and update the measure xml files |
@@ -175,8 +179,12 @@ The following table contains all current extension gems.
 | OpenStudio Common Measures Gem  | openstudio-common-measures | https://github.com/NREL/openstudio-common-measures-gem |
 | OpenStudio Model Articulation Gem   | openstudio-model-articulation | https://github.com/NREL/openstudio-model-articulation-gem |
 | OpenStudio AEDG Gem | openstudio-aedg | https://github.com/NREL/openstudio-aedg-gem | 
+| OpenStudio Calibration Gem | openstudio-calibration | https://github.com/NREL/openstudio-calibration-gem |
+| OpenStudio EE Gem | openstudio-ee | https://github.com/NREL/openstudio-ee-gem | 
 | OpenStudio District Systems Gem | openstudio-district-systems | https://github.com/NREL/openstudio-district-systems-gem | 
-| UrbanOpt GeoJSON Gem | urbanopt-geojson | https://github.com/urbanopt/urbanopt-geojson-gem | 
+| URBANopt Core Gem | urbanopt-core | https://github.com/urbanopt/urbanopt-core-gem |
+| URBANopt GeoJSON Gem | urbanopt-geojson | https://github.com/urbanopt/urbanopt-geojson-gem | 
+| URBANopt Scenario Gem | urbanopt-scenario | https://github.com/urbanopt/urbanopt-scenario-gem |
 | BuildingSync Gem | buildingsync | https://github.com/BuildingSync/BuildingSync-gem | 
 
 ### Initializing a new Extension Gem
@@ -235,22 +243,8 @@ Or install it yourself as:
 
 # TODO
 
-- [X] Finalize documentation on naming conventions, etc
-- [X] Add test measure
-- [X] Rake task ```openstudio:update_measures```
-- [X] Rake task ```openstudio:test_with_openstudio```
-- [ ] Rake task ```stage_bcl``` _DLM: BCL gem should be a development dependency only until we can reduce its dependencies and remove native dependencies? should probably put it into a special group so we can bundle without it in openstudio-gems._
-- [ ] Rake task ```push_bcl``` _DLM: how do we want to test this?
-- [X] Get all rake tasks working on Travis
 - [ ] Capture useful output from Travis (measure dashboard results, log files, zip of build products, etc) and put it somewhere (s3?  naming convention?)
-- [X] ```Extension::openstudio_extension_version``` _DLM: should we rename? should people overwrite this in their class?_
-- [X] ```Extension::measures_dir``` _DLM: I think this can have a default implementation, right? If something does not need to be overridden should it be a module method rather than a class one?  KAF: this is in rake task for now
-- [X] ```Extension::list_measures``` _DLM: I think this can have a default implementation, right?_KAF: In Rake task for now
 - [ ] ```Extension::files_dir``` _DLM: I think this can have a default implementation, right?_
 - [ ] ```Extension::minimum_openstudio_version``` _DLM: should we rename? should people overwrite this in their class?_
-- [X] ```Runner::initialize``` _DLM: should say that the path argument should be for a dir with a Gemfile right?_
-- [X] ```Runner::configure_osw``` _DLM: should take in an OSW, add paths to all measure and file dirs for loaded OpenStudio Extensions, write out configured OSW_
-- [ ] Run rubocop on all of the core files and remove exclusion from .rubocop.yml file.
 - [ ] Cleanup task after running tests (may need to be in the OpenStudio Measure Tester)
-- [X] Add a `rake init new_ext_gem` to Rakefile
 - [ ] Add tests to the extension/core

data/Rakefile

@@ -34,7 +34,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,147 +1,157 @@
-#!/usr/bin/env ruby
-
-require 'github_api'
+# *******************************************************************************
+# 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 '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(&: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