openstudio-analysis 1.0.0.pat2 → 1.0.0.pre.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -1
  3. data/Gemfile +1 -1
  4. data/README.md +1 -1
  5. data/lib/openstudio/analysis/translator/datapoints.rb +57 -26
  6. data/lib/openstudio/analysis/translator/excel.rb +176 -160
  7. data/lib/openstudio/analysis/translator/workflow.rb +2 -1
  8. data/lib/openstudio/analysis/version.rb +1 -1
  9. data/lib/openstudio/analysis/workflow_step.rb +4 -1
  10. data/lib/openstudio/helpers/string.rb +10 -5
  11. data/openstudio-analysis.gemspec +2 -2
  12. data/spec/files/0_1_09_no_variables.xlsx +0 -0
  13. data/spec/files/0_1_09_outputvars.xlsx +0 -0
  14. data/spec/files/0_1_09_setup_version_2.xlsx +0 -0
  15. data/spec/files/0_1_09_small_list.xlsx +0 -0
  16. data/spec/files/0_1_09_small_list_incomplete.xlsx +0 -0
  17. data/spec/files/0_1_09_small_list_repeat_vars.xlsx +0 -0
  18. data/spec/files/0_1_09_small_list_validation_errors.xlsx +0 -0
  19. data/spec/files/0_1_10_proxy.xlsx +0 -0
  20. data/spec/files/0_1_10_proxy_user.xlsx +0 -0
  21. data/spec/files/0_1_10_template_input.xlsx +0 -0
  22. data/spec/files/0_1_11_discrete_variables.xlsx +0 -0
  23. data/spec/files/0_1_12_discrete_dynamic_columns.xlsx +0 -0
  24. data/spec/files/0_2_0_template.xlsx +0 -0
  25. data/spec/files/0_2_0_template_simpletest.xlsx +0 -0
  26. data/spec/files/0_3_0_dynamic_uuids.xlsx +0 -0
  27. data/spec/files/0_3_0_measure_existence.xlsx +0 -0
  28. data/spec/files/0_3_0_outputs.xlsx +0 -0
  29. data/spec/files/0_3_3_short_names.xlsx +0 -0
  30. data/spec/files/0_3_5_multiple_measure_paths.xlsx +0 -0
  31. data/spec/files/0_3_7_unique_measure_names.xlsx +0 -0
  32. data/spec/files/0_3_7_worker_init_final.xlsx +0 -0
  33. data/spec/files/0_4_0_lhs_discrete_continuous.xlsx +0 -0
  34. data/spec/files/0_4_0_multiple_seeds.xlsx +0 -0
  35. data/spec/files/0_4_0_pivot_test.xlsx +0 -0
  36. data/spec/files/workflow/datapoint_0.osd +60 -58
  37. data/spec/files/workflow/datapoint_1.osd +60 -58
  38. data/spec/files/workflow/datapoint_2.osd +60 -58
  39. data/spec/files/workflow/datapoint_wrong_osa_id.osd +62 -62
  40. data/spec/openstudio/excel_spec.rb +2 -8
  41. metadata +5 -5
data/spec/openstudio/excel_spec.rb CHANGED
@@ -291,16 +291,10 @@ describe OpenStudio::Analysis::Translator::Excel do
291
291
 
292
292
  it 'should process' do
293
293
  expect(@excel.process).to eq(true)
294
- end
295
-
296
- it 'should have new setting variables' do
297
294
  expect(@excel.settings['user_id']).to eq('new_user')
298
295
  expect(@excel.settings['openstudio_server_version']).to eq('1.3.2')
299
296
  expect(@excel.cluster_name).to eq('analysis_cluster_name')
300
297
  expect(@excel.run_setup['analysis_name']).to eq('Name goes here')
301
- end
302
-
303
- it 'should have the new measure directory column' do
304
298
  expect(@excel.variables['data'][1]['measure_file_name_directory']).to eq('ReduceLightingLoadsByPercentage')
305
299
  end
306
300
 
@@ -541,7 +535,7 @@ describe OpenStudio::Analysis::Translator::Excel do
541
535
  end
542
536
 
543
537
  expect(@excel.settings['openstudio_server_version']).to eq('1.11.0-rc2')
544
- expect(@excel.settings['spreadsheet_version']).to eq '0.3.7'
538
+ expect(@excel.settings['spreadsheet_version']).to eq '0.4.0'
545
539
  expect(@excel.settings['server_instance_type']).to eq 'm3.xlarge'
546
540
  expect(@excel.settings['worker_instance_type']).to eq 'c3.4xlarge'
547
541
  expect(@excel.aws_tags).to eq(['org=5500'])
@@ -568,7 +562,7 @@ describe OpenStudio::Analysis::Translator::Excel do
568
562
  expect(j['analysis']['problem']['workflow'][1]['variables'][0]['pivot']).to eq nil
569
563
 
570
564
  expect(@excel.settings['openstudio_server_version']).to eq('1.11.0-rc2')
571
- expect(@excel.settings['spreadsheet_version']).to eq '0.3.7'
565
+ expect(@excel.settings['spreadsheet_version']).to eq '0.4.0'
572
566
  expect(@excel.settings['server_instance_type']).to eq 'm3.xlarge'
573
567
  expect(@excel.settings['worker_instance_type']).to eq 'c3.4xlarge'
574
568
  expect(@excel.aws_tags).to eq(['org=5500'])
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openstudio-analysis
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.pat2
4
+ version: 1.0.0.pre.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicholas Long
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-15 00:00:00.000000000 Z
11
+ date: 2016-08-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - ~>
46
46
  - !ruby/object:Gem::Version
47
- version: '2.3'
47
+ version: '2.4'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ~>
53
53
  - !ruby/object:Gem::Version
54
- version: '2.3'
54
+ version: '2.4'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rubyzip
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
271
271
  version: 1.3.6
272
272
  requirements: []
273
273
  rubyforge_project:
274
- rubygems_version: 2.0.14.1
274
+ rubygems_version: 2.6.4
275
275
  signing_key:
276
276
  specification_version: 4
277
277
  summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the