urbanopt-cli 0.2.0 → 0.3.0

data/lib/uo_cli/version.rb

@@ -1,5 +1,6 @@
+
 module URBANopt
   module CLI
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/uo_cli.gemspec

@@ -29,18 +29,16 @@ Gem::Specification.new do |spec|
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.executables = ['uo']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '~> 2.2.4'
-
-  #   use specific versions of these dependencies while using Ruby 2.2
-  spec.add_development_dependency 'rack', '2.1.2'
+  spec.required_ruby_version = '~> 2.5.0'
 
   #   use specific versions of urbanopt and openstudio dependencies while under heavy development
-  spec.add_dependency 'urbanopt-geojson', '0.2.0'
-  spec.add_dependency 'urbanopt-scenario', '0.2.0'
-
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'github_api', '~> 0.18'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_dependency 'optimist'
+  spec.add_dependency 'urbanopt-geojson', '~> 0.3.0'
+  spec.add_dependency 'urbanopt-reopt', '~> 0.3.0'
+  spec.add_dependency 'urbanopt-scenario', '~> 0.3.0'
+
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.7'
   spec.add_development_dependency 'rubocop', '~> 0.54.0'
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: urbanopt-geojson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: urbanopt-scenario
+  name: urbanopt-reopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: urbanopt-scenario
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
+        version: 0.3.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -162,7 +161,6 @@ files:
 - example_files/weather/USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.ddy
 - example_files/weather/USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.epw
 - example_files/weather/USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.stat
-- lib/change_log.rb
 - lib/uo_cli.rb
 - lib/uo_cli/version.rb
 - uo_cli.gemspec
@@ -179,15 +177,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.2.4
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: URBANopt CLI

data/lib/change_log.rb

@@ -1,152 +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)
-#   For security, set your token as an env variable. This script is prepared for one called GITHUB_CHANGELOG_TOKEN
-#
-# 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
-  # Add one day to end date to make it inclusive of current day.
-  options[:end_date] = Date.today + 1
-
-  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 = 'uo-cli'
-
-github = Github.new
-if options[:token]
-  puts 'Using github token'
-  github = Github.new oauth_token: options[:token]
-elsif ENV['GITHUB_CHANGELOG_TOKEN']
-  puts 'Using Github token from user environment'
-  github = Github.new oauth_token: ENV['GITHUB_CHANGELOG_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(', ') + ')'