Merge pull request #94 from urbanopt/develop

Version 0.2.3

.gitignore

@@ -6,11 +6,20 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store
+
+# local dev IDE settings
+.vscode/
+.idea/
 
 # rbenv virtualenv management file
 .ruby-version
 
 # rspec failure tracking
 .rspec_status
 
-Gemfile.lock
+# rspec test folder
+spec/test_directory
+
+Gemfile.lock
+.rubocop*

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 
+## Version 0.2.3
+
+Date Range: 04/01/20 - 04/23/20:
+
+- Fixed [#65]( https://github.com/urbanopt/urbanopt-cli/issues/65 ), Add more tests
+- Fixed [#81]( https://github.com/urbanopt/urbanopt-cli/issues/81 ), Mappers weren't updated for version 0.2
+- Fixed [#83]( https://github.com/urbanopt/urbanopt-cli/issues/83 ), Recommend using absolute paths
+- Fixed [#85]( https://github.com/urbanopt/urbanopt-cli/issues/85 ), reopt dependency not installed
+- Fixed [#88]( https://github.com/urbanopt/urbanopt-cli/issues/88 ), Reopt tests are failing
+- Fixed [#90]( https://github.com/urbanopt/urbanopt-cli/issues/90 ), Update baseline mapper
+- Fixed [#92]( https://github.com/urbanopt/urbanopt-cli/issues/92 ), baseline mapper bug reading json file
+
 ## Version 0.2.2
+
 Date Range: 3/31/20 - 3/31/20
 
 - Fixing simplecov / json native extension dependency

Gemfile

@@ -6,7 +6,6 @@ gemspec
 # simplecov has a dependency on native json gem, use fork that does not require this
 gem 'certified'
 gem 'simplecov', github: 'NREL/simplecov'
-gem 'urbanopt-reopt', '0.2.0'
 
 # Local gems are useful when developing and integrating the various dependencies.
 # To favor the use of local gems, set the following environment variable:
@@ -38,23 +37,31 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 #   gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
 # end
 
-if allow_local && File.exist?('../urbanopt-scenario-gem')
-  gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
-elsif allow_local
-  gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
-else
-  gem 'urbanopt-scenario', '0.2.0'
-  # temporary
-  # gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
-end
-
-if allow_local && File.exist?('../urbanopt-geojson-gem')
-  # gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
-  gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
-elsif allow_local
-  gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
-else
-  gem 'urbanopt-geojson', '0.2.0'
-  # temporary
-  # gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
-end
+# if allow_local && File.exist?('../urbanopt-scenario-gem')
+#   gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
+# elsif allow_local
+#   gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
+# else
+#   gem 'urbanopt-scenario', '0.2.0'
+#   # temporary
+#   # gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
+# end
+
+# if allow_local && File.exist?('../urbanopt-geojson-gem')
+#   # gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
+#   gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
+# elsif allow_local
+#   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
+# else
+#   gem 'urbanopt-geojson', '0.2.0'
+#   # temporary
+#   # gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
+# end
+
+# if allow_local && File.exist?('../urbanopt-reopt-gem')
+#   gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
+# elsif allow_local
+#   gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
+# else
+#   gem 'urbanopt-reopt', '0.2.1'
+# end

example_files/Gemfile

@@ -46,29 +46,26 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 #   gem 'openstudio-model-articulation', '0.1.0'
 # end
 
-gem 'urbanopt-reopt', '0.2.0'
+gem 'urbanopt-reopt', '0.2.1'
 
 if allow_local && File.exist?('../urbanopt-scenario-gem')
   gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
 elsif allow_local
   gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 else
   gem 'urbanopt-scenario', '0.2.0'
-  # gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 end
 
 if allow_local && File.exist?('../urbanopt-geojson-gem')
-  # gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
   gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem'
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
   gem 'urbanopt-geojson', '0.2.0'
-  # gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 end
 
 # simplecov has an unneccesary dependency on native json gem, use fork that does not require this
 gem 'simplecov', github: 'NREL/simplecov'
 
-# Fix rack version temporarily to work with Ruby 2.2.4
+# Specify exact rack version temporarily to work with Ruby 2.2.4
 gem 'rack', '2.1.2'

example_files/example_project.json

@@ -13,7 +13,7 @@
                 "cec_climate_zone": null,
                 "climate_zone": "6A",
                 "default_template": "90.1-2013",
-                "end_date": "2017-13-31T07:00:00.000Z",
+                "end_date": "2017-12-31T07:00:00.000Z",
                 "id": "53340c2c-ab20-40db-aba1-11ac607c52a7",
                 "import_surrounding_buildings_as_shading": null,
                 "name": "Site Origin",