urbanopt-cli 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931758f051eca09e7256fc5bfab130605c65c27307a3cdc77042a263e5475609
-  data.tar.gz: f575bb0873e33c4ee5d76f44cb87fd0bc2ed5d9987902f0f9d5a9277a53a023d
+  metadata.gz: cdbb8ccb8a831bc0fd662c5a4cbcdf4fba8ac395fc783f43a6d6e1e828564b15
+  data.tar.gz: fb06db3924a64118be767d68fa3d336d573f6219cc69ffd6b6d4ec31f0a9c58e
 SHA512:
-  metadata.gz: 5391d6de75b610895fee3099b0913ceef87e3346e6e590ce618f360decdf250f7757cac4812cc7517c80140cc45b2575c58bef723ac91e4154cd8f40728d6246
-  data.tar.gz: 7e7a75284562d80ee26bf9b378f0bbe7746e4ea0c0e7c7345acc099efe1001a90a31e60a0c5afb9c10f034cf399318d36f819f2b7b777a855e8a871b6d7fd36f
+  metadata.gz: 38cf1540424ff83123ad91ca852939c2a232d9d2de822fd391050f6d24d769a1b496a32427fe3202c9fd1c4e133e55ff6c0ff8b2155b53c4de5aadbcb8e3f0d8
+  data.tar.gz: 89c70836f3f3516cd2e59af1ec87d75d456700f60d6da9e8b23a8fe5394065fdc6bf6972041b84a5a849f378d583efe8ac863d7b137ace49da3ee15e3e7d4aca

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Versuib 0.7.1
+
+Date Range 11/23/21 - 12/22/21
+
+- Bugfix: update project gemfile dependencies
+
 ## Version 0.7.0
 
 Date Range 11/4/21 - 11/22/21

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(UrbanOptCLI VERSION 0.6.4)
+project(URBANoptCLI VERSION 0.7.0)
 
 include(FindOpenStudioSDK.cmake)
 
@@ -56,7 +56,7 @@ else()
   set(GIT_DIR "")
 endif()
 
-# UrbanOpt version: Allows to add a pre1 tag as needed.
+# URBANopt version: Allows to add a pre1 tag as needed.
 set(URBANOPT_CLI_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # TODO JM 2019-07-12: Comment out (or delete) if prerelease tag not needed
 set(URBANOPT_CLI_PRERELEASE_TAG "")
@@ -89,16 +89,16 @@ option(BUILD_PACKAGE "Build package" OFF)
 # need to  update the MD5sum for each platform and url below
 if(UNIX)
    if(APPLE)
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-darwin.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "3eeb7ef73b990b74b714650dbd291413")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems=20211217-darwin.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "013879063606d24ccb163304042d704c")
    else()
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-linux.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "63bf2adfd5812252de77f6b35e43c09f")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211217-linux.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "25ee39a3ac39c2354eea28194679aea3")
    endif()
 elseif(WIN32)
   if(CMAKE_CL_64)
-    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "ea3a4d32bf39964c1b374efa1ca6ca18")
+    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211217-windows.tar.gz")
+    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "f5a2e6e9d1861c79b7c9de924da2e316")
   endif()
 endif()
 
@@ -109,7 +109,7 @@ if(EXISTS "${URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH}")
 endif()
 
 if(NOT URBANOPT_CLI_GEMS_ZIP_MD5 STREQUAL URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5)
-  message(STATUS "Downloading UrbanOpt-CLI Gems: ${URBANOPT_CLI_GEMS_ZIP_FILENAME}")
+  message(STATUS "Downloading URBANopt-CLI Gems: ${URBANOPT_CLI_GEMS_ZIP_FILENAME}")
   file(DOWNLOAD "https://urbanopt-cli-resources.s3-us-west-2.amazonaws.com/gems/${URBANOPT_CLI_GEMS_ZIP_FILENAME}"
     ${URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH}
     INACTIVITY_TIMEOUT 300 # 5 minute timeout
@@ -164,19 +164,19 @@ endif()
 ######### Install SDK dependencies here ################
 
 install(DIRECTORY "${OPENSTUDIO_SDK_PATH}/" DESTINATION "OpenStudio" COMPONENT "OpenStudio" USE_SOURCE_PERMISSIONS)
-#install(DIRECTORY "${URBANOPT_CLI_GEMS_DIR}/" DESTINATION ".gems" COMPONENT "UrbanOpt" USE_SOURCE_PERMISSIONS)
+#install(DIRECTORY "${URBANOPT_CLI_GEMS_DIR}/" DESTINATION ".gems" COMPONENT "URBANopt" USE_SOURCE_PERMISSIONS)
 
 
 if(UNIX)
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-unix.sh DESTINATION "." COMPONENT "UrbanOpt" RENAME "setup-env.sh")
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-unix.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
 elseif(WIN32)
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "UrbanOpt" RENAME "setup-env.sh")
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "UrbanOpt")
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "UrbanOpt")
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "URBANopt")
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "URBANopt")
 endif()
 
 install(DIRECTORY "${PROJECT_BINARY_DIR}/ruby" DESTINATION "." COMPONENT "Ruby" USE_SOURCE_PERMISSIONS)
-install(DIRECTORY "${PROJECT_BINARY_DIR}/urbanopt-cli-gems/" DESTINATION "gems" COMPONENT "UrbanOpt" USE_SOURCE_PERMISSIONS)
+install(DIRECTORY "${PROJECT_BINARY_DIR}/urbanopt-cli-gems/" DESTINATION "gems" COMPONENT "URBANopt" USE_SOURCE_PERMISSIONS)
 
 #if(WIN32)
 #  install(PROGRAMS "${OPENSTUDIO_SDK_PATH}/bin/install_utility.exe" DESTINATION bin COMPONENT "CLI")
@@ -193,7 +193,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${URBANOPT_CLI_VERSION_PATCH})
 
 # TODO:/URBANOPT_CLI_VERSION
 # CPACK_DEBIAN_PACKAGE_DESCRIPTION defaults to this one too. dpkg-deb -I xxx.deb will show this description
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "UrbanOptCLI ${URBANOPT_CLI_VERSION} is a CLI software tool to support whole building energy modeling using EnergyPlus and advanced daylight analysis using Radiance")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "URBANoptCLI ${URBANOPT_CLI_VERSION} is a CLI software tool to support whole building energy modeling using EnergyPlus and advanced daylight analysis using Radiance")
 
 # The actual package file name on disk
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${URBANOPT_CLI_LONG_VERSION}-${CMAKE_SYSTEM_NAME}")
@@ -203,8 +203,8 @@ set(CPACK_PACKAGE_CONTACT "openstudio@nrel.gov")
 #install(FILES "${PROJECT_SOURCE_DIR}/LICENSE.md" DESTINATION .)
 
 if (APPLE)
-  #set(CPACK_IFW_TARGET_DIRECTORY "/Applications/UrbanOpt-cli-${URBANOPT_CLI_VERSION}")
-  set(CPACK_IFW_TARGET_DIRECTORY "/Applications/UrbanOptCLI_${URBANOPT_CLI_VERSION}/")
+  #set(CPACK_IFW_TARGET_DIRECTORY "/Applications/URBANopt-cli-${URBANOPT_CLI_VERSION}")
+  set(CPACK_IFW_TARGET_DIRECTORY "/Applications/URBANoptCLI_${URBANOPT_CLI_VERSION}/")
 elseif(UNIX)
 
   # For debug
@@ -235,7 +235,7 @@ elseif(UNIX)
   set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CPACK_DEBIAN_BIN_PACKAGE_CONTROL_EXTRA};${POSTINST_FILE};${POSTRM_FILE}")
 
 elseif(WIN32)
-  set(CPACK_PACKAGE_INSTALL_DIRECTORY "UrbanOpt-cli-${URBANOPT_CLI_VERSION}")
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY "URBANopt-cli-${URBANOPT_CLI_VERSION}")
   set(CPACK_IFW_TARGET_DIRECTORY "C:/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
   set(CPACK_BINARY_IFW ON CACHE BOOL "Enable to build IFW packages")
   set(CPACK_BINARY_NSIS OFF CACHE BOOL "Enable to build NSIS packages")
@@ -243,9 +243,9 @@ endif()
 
 include(CPackIFW)
 
-cpack_add_component(UrbanOpt
-  DISPLAY_NAME "UrbanOpt CLI"
-  DESCRIPTION "UrbanOpt CLI software tool"
+cpack_add_component(URBANopt
+  DISPLAY_NAME "URBANopt CLI"
+  DESCRIPTION "URBANopt CLI software tool"
 )
 
 cpack_add_component(OpenStudio
@@ -253,7 +253,7 @@ cpack_add_component(OpenStudio
   DESCRIPTION "OpenStudio SDK"
 )
 
-cpack_ifw_configure_component(UrbanOpt
+cpack_ifw_configure_component(URBANopt
   REQUIRES_ADMIN_RIGHTS
 )
 

data/FindOpenStudioSDK.cmake

@@ -1,6 +1,6 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
-set(OPENSTUDIO_VERSION_MINOR 2)
-set(OPENSTUDIO_VERSION_PATCH 1)
+set(OPENSTUDIO_VERSION_MINOR 3)
+set(OPENSTUDIO_VERSION_PATCH 0)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
 find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG)
@@ -16,23 +16,23 @@ else()
   set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
     CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
 
-  set(OPENSTUDIO_VERSION_SHA "+bdbdbc9da6")
+  set(OPENSTUDIO_VERSION_SHA "+ad235ff36e")
 
   if(APPLE)
-    set(OPENSTUDIO_EXPECTED_HASH 5733364813912cb5256fb338faa82e47)
+    set(OPENSTUDIO_EXPECTED_HASH 77c2bf77f07dc2e2af7658df55940c49)
     set(OPENSTUDIO_PLATFORM "Darwin")
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(UNIX)
     if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
-      set(OPENSTUDIO_EXPECTED_HASH dce4f2eff5985d94255a1a49bc3aa97f)
+      set(OPENSTUDIO_EXPECTED_HASH 7fca6ef73399fdb21cde01aca4223d7c)
       set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
     else() # Assumes 18.04
-      set(OPENSTUDIO_EXPECTED_HASH 521802b1176ba7cd4a2ed4a94a347484)
+      set(OPENSTUDIO_EXPECTED_HASH 24858ac666a3d2fc40d0cff7b4f444b9)
       set(OPENSTUDIO_PLATFORM "Ubuntu-18.04")
     endif()
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(WIN32)
-    set(OPENSTUDIO_EXPECTED_HASH 0ab2fdc4de81bd268732ffca6cb50a61)
+    set(OPENSTUDIO_EXPECTED_HASH f01ddb50a7ce1f4461e1919350e7c629)
     set(OPENSTUDIO_PLATFORM "Windows")
     set(OPENSTUDIO_EXT "tar.gz")
   endif()

data/example_files/Gemfile

@@ -31,7 +31,7 @@ if allow_local && File.exist?('../openstudio-common-measures-gem')
 elsif allow_local
   gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
 else
-  gem 'openstudio-common-measures', '~> 0.4.0'
+  gem 'openstudio-common-measures', '~> 0.5.0'
 end
 
 if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -39,7 +39,7 @@ if allow_local && File.exist?('../openstudio-model-articulation-gem')
 elsif allow_local
   gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
 else
-  gem 'openstudio-model-articulation', '~> 0.4.0'
+  gem 'openstudio-model-articulation', '~> 0.5.0'
 end
 
 if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
@@ -47,7 +47,7 @@ if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
 elsif allow_local
   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'master'
 else
-  gem 'openstudio-load-flexibility-measures', '~> 0.3.2'
+  gem 'openstudio-load-flexibility-measures', '~> 0.4.0'
 end
 
 if allow_local && File.exist?('../openstudio-ee-gem')
@@ -55,7 +55,7 @@ if allow_local && File.exist?('../openstudio-ee-gem')
 elsif allow_local
   gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'develop'
 else
-  gem 'openstudio-ee', '~> 0.4.0'
+  gem 'openstudio-ee', '~> 0.5.0'
 end
 
 if allow_local && File.exist?('../openstudio-calibration-gem')
@@ -63,7 +63,7 @@ if allow_local && File.exist?('../openstudio-calibration-gem')
 elsif allow_local
   gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'develop'
 else
-  gem 'openstudio-calibration', '~> 0.4.0'
+  gem 'openstudio-calibration', '~> 0.5.0'
 end
 
 if allow_local && File.exists?('../urbanopt-geojson-gem')
@@ -71,7 +71,7 @@ if allow_local && File.exists?('../urbanopt-geojson-gem')
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
-  gem 'urbanopt-geojson', '~> 0.6.6'
+  gem 'urbanopt-geojson', '~> 0.7.0'
 end
 
 # NEVER put SCENARIO-GEM in this file...it will make all simulations fail due to the sqlite dependency
@@ -82,5 +82,5 @@ if allow_local && File.exists?('../urbanopt-reporting-gem')
 elsif allow_local
   gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 else
-  gem 'urbanopt-reporting', '~> 0.4.2'
+  gem 'urbanopt-reporting', '~> 0.5.0'
 end

data/lib/uo_cli/version.rb

@@ -40,6 +40,6 @@
 
 module URBANopt
   module CLI
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.7.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nathan Moore
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist