OpenStudio CLI

.dockerignore

@@ -9,5 +9,5 @@ vagrant
 /server/spec/runs.txt
 /server/spec/files/tmp/
 /server/spec/files/test_model/tmp_run_single
-/spec/unit-test
+/spec
 /worker-nodes

Dockerfile

@@ -3,12 +3,11 @@
 # TO_BUILD_AND_RUN: docker-compose up
 # NOTES:            Currently this is one big dockerfile and non-optimal.
 
-ARG OPENSTUDIO_VERSION=2.6.1
+
+ARG OPENSTUDIO_VERSION=develop
 FROM nrel/openstudio:$OPENSTUDIO_VERSION as base
 MAINTAINER Nicholas Long [email protected]
 
-RUN ruby -r openstudio -e "require 'openstudio'; puts OpenStudio.openStudioLongVersion"
-
 # Install required libaries.
 #   realpath - needed for wait-for-it
 RUN sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 && \
@@ -85,7 +84,7 @@ ENV RAILS_ENV $rails_env
 ADD /bin /opt/openstudio/bin
 ADD /server/Gemfile /opt/openstudio/server/Gemfile
 WORKDIR /opt/openstudio/server
-RUN bundle install --jobs=3 --retry=3 $bundle_args
+RUN bundle _${OS_BUNDLER_VERSION}_ install --jobs=3 --retry=3 $bundle_args
 
 # Add the app assets and precompile assets. Do it this way so that when the app changes the assets don't
 # have to be recompiled everytime

appveyor.yml

@@ -4,6 +4,7 @@ environment:
   USE_TESTING_TIMEOUTS: "true"
   OPENSTUDIO_VERSION: 2.6.1
   OPENSTUDIO_VERSION_SHA: ab0dddde0b
+
   matrix:
     - RUBY_VERSION: "224-x64"
 

ci/appveyor/setup.cmd

@@ -1,4 +1,4 @@
-set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
+set PATH=C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
 echo Downloading and Installing OpenStudio (%OPENSTUDIO_VERSION%.%OPENSTUDIO_VERSION_SHA%)
 curl -SLO --insecure https://s3.amazonaws.com/openstudio-builds/%OPENSTUDIO_VERSION%/OpenStudio-%OPENSTUDIO_VERSION%.%OPENSTUDIO_VERSION_SHA%-Windows.exe
 OpenStudio-%OPENSTUDIO_VERSION%.%OPENSTUDIO_VERSION_SHA%-Windows.exe --script ci/appveyor/install-windows.qs

ci/travis/setup.sh

@@ -8,7 +8,6 @@ if [ "${BUILD_TYPE}" == "docker" ]; then
     curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
     chmod +x docker-compose
     sudo mv docker-compose /usr/local/bin
-
     # install pipeviewer
     sudo apt-get install -y pv
 else

ci/travis/test.sh

@@ -5,6 +5,8 @@
 if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     # Dir containing openstudio
     export RUBYLIB="${HOME}/openstudio/Ruby"
+#    required as of OS 2.5.1
+#    export PATH="${PATH}:${HOME}/openstudio/bin"
     mongo_dir="/usr/local/bin"
 elif [ "${TRAVIS_OS_NAME}" == "linux" ]; then
     # Dir containing openstudio

docker/deployment/scripts/aws_osserver_init.sh

@@ -78,4 +78,3 @@ echo ""
 sleep 1
 docker volume create --name=osdata
 docker volume create --name=dbdata
-sleep 1