urbanopt-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b94efb3b879736fb2ae42066df09074df251a867bc9a6e5445176b22f8f6f98
-  data.tar.gz: 66675088de2f51c32e75412b96ba1668a413237cfab5dfa7393770c2d5f6af87
+  metadata.gz: 656a49250fd1a04c5efe9db71d577832ec8f46cfcdd0c02c1f7ee877677fd796
+  data.tar.gz: 95e26852dccf178bf58fe61b5ba7e771acd89f2bd4bc919131f8bff6157dea32
 SHA512:
-  metadata.gz: 50315f0fc6c9e65046f64d8e32d24fdd33ead8c6ae26e2269c148caf98c75f034ddf4d3c9b6c359d5c9aba8aa8b7b36e32aaffa0924274a5e2ab54424330540b
-  data.tar.gz: de80f0f613d5fd773e521b0c423a9bdcf647d9bd87b7d2d64c5963b3870f0f6eb2030e5ab9cbfed12a49e0ef1ed226f271efd25bfd4e46f8758293ecade93e43
+  metadata.gz: 03a36eea762adcd0f455a48879aca93d1a11fe62a450b2350e8c56fe07328bac19ead110730e02f09fc6fba6ee1231d62e740a43b248ddda4433fc57e03b0156
+  data.tar.gz: 2bf26b6d71d9dca6e8aae3b12670a7cf94e8c4ef632009a091f8b30ac8196cd9bfd13f3eba7ff9ad45260145b19a03e324980eeb7f504aa9fa4d4eda9a873802

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 0.3.1
+
+Date Range: 06/05/20 - 06/10/20:
+
+- Fixed [#113]( https://github.com/urbanopt/urbanopt-cli/issues/113 ), CLI crashes if reopt folder missing from project directory
+
 ## Version 0.3.0
 
 Date Range: 04/23/20 - 06/05/20

data/lib/uo_cli.rb

@@ -190,10 +190,6 @@ module URBANopt
       mapper_files_dir = File.join(@root_dir, 'mappers')
       reopt_files_dir = File.join(@root_dir, 'reopt/')
       num_header_rows = 1
-      # FIXME: This can be cleaned up in Ruby 2.5 with Dir.children(<"foldername">)
-      # TODO: Better way of grabbing assumptions file than the first file in the folder
-      reopt_files_dir_contents_list = Dir["#{reopt_files_dir}/*"]
-      reopt_assumptions_filename = File.basename(reopt_files_dir_contents_list[0])
 
       if @feature_id
         feature_run_dir = File.join(run_dir, @feature_id)
@@ -203,6 +199,9 @@ module URBANopt
 
       feature_file = URBANopt::GeoJSON::GeoFile.from_file(featurefile)
       if @opthash.subopts[:reopt] == true || @opthash.subopts[:reopt_scenario] == true || @opthash.subopts[:reopt_feature] == true
+        # TODO: Better way of grabbing assumptions file than the first file in the folder
+        reopt_files_dir_contents_list = Dir.children(reopt_files_dir.to_s)
+        reopt_assumptions_filename = File.basename(reopt_files_dir_contents_list[0])
         scenario_output = URBANopt::Scenario::REoptScenarioCSV.new(name, @root_dir, run_dir, feature_file, mapper_files_dir, csv_file, num_header_rows, reopt_files_dir, reopt_assumptions_filename)
       else
         scenario_output = URBANopt::Scenario::ScenarioCSV.new(name, @root_dir, run_dir, feature_file, mapper_files_dir, csv_file, num_header_rows)

data/lib/uo_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nathan Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist