openstudio-aws 0.5.0.rc2 → 0.5.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e388aa0be78ded9805099223d0d4b448b1a6830
-  data.tar.gz: 591b32d3e619a3772c972afd6f1bcd04c999d7bb
+  metadata.gz: e2ce57260b6ee993709bf25f2c74d3fc63f10d89
+  data.tar.gz: 7d7aad718c864f0f8ab29ecada4bcf5310cd67ae
 SHA512:
-  metadata.gz: a2f9a92a9a26f0f4ebdc380e8ab16154c7fadadbad159312894e84d370419d659a91805f9cb51d717ecc69e32c641e036192c833420b2e178e7193c749bdb7e6
-  data.tar.gz: 336f34740bdc97c15047d0d43d5629fcc7b63395a18aa0bd6be67d380f0e0bf0278c964fa6f33d8c4b7a85b3716ce0639920b8e8fa966ed4360007c16520d33e
+  metadata.gz: f9ba8dbfc583a631aadaa16e61de11b33ca3e8a3790b50c9caf54c5b42ec6b1a0bd962ab3cd032398ca7199e6ee66f8e3d223f3f6c94a17bc466ad0f0aaac33b
+  data.tar.gz: c512024e2000ffa70d8366a2082828d60fcb5839fb35e89a8b27b785036bc6d1ce073e56538d057cc48b001e904d49ebd9344932f89db4ce1c5f1303deb46936

data/lib/openstudio/aws/aws.rb

@@ -246,8 +246,15 @@ module OpenStudio
 
         logger.info 'Waiting for server/worker configurations'
 
-        return @os_aws.configure_server_and_workers unless @dockerized
-        @os_aws.configure_swarm_cluster if @dockerized
+        begin
+          if @dockerized
+            @os_aws.configure_swarm_cluster
+          else
+            @os_aws.configure_server_and_workers
+          end
+        rescue => e
+          fail "Configuring the cluster failed with error `#{e.message}` in:\n#{e.backtrace.join('\n')}"
+        end
       end
 
       # Write out to the terminal the connection information for the servers and workers

data/lib/openstudio/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Aws
-    VERSION = '0.5.0.rc2'
+    VERSION = '0.5.0.rc3'
   end
 end

data/spec/openstudio-aws/ami_list_spec.rb

@@ -29,66 +29,11 @@ describe OpenStudioAmis do
   end
 
   context 'version 2' do
-    it 'should return openstudio server version 1.21.14 correctly' do
-      a = OpenStudioAmis.new(2, openstudio_server_version: '1.21.14')
-
-      amis = a.get_amis
-
-      expect(amis[:server]).to eq('ami-43a74255')
-      expect(amis[:worker]).to eq('ami-24a04532')
-      expect(amis[:cc2worker]).to eq(nil)
-    end
-  end
-
-  context 'version 2' do
-    it 'should return openstudio version 1.7.1 when stable is passed to 1.7.5' do
-      a = OpenStudioAmis.new(2, openstudio_version: '1.7.5', stable: true)
-
-      amis = a.get_amis
-
-      expect(amis[:server]).to eq('ami-845a54ec')
-      expect(amis[:worker]).to eq('ami-3a5a5452')
-    end
-
-    it 'should return openstudio version 1.7.1 stable & default versions correctly' do
-      a = OpenStudioAmis.new(2, openstudio_version: '1.7.1')
-
-      amis = a.get_amis
-
-      expect(amis[:server]).to eq('ami-845a54ec')
-      expect(amis[:worker]).to eq('ami-3a5a5452')
-    end
-
-    it 'should return openstudio version 1.7.0 default version correctly' do
-      a = OpenStudioAmis.new(2, openstudio_version: '1.7.0')
-
-      amis = a.get_amis
-
-      expect(amis[:server]).to eq('ami-725b701a')
-      expect(amis[:worker]).to eq('ami-4a446f22')
-    end
-
-    it 'should return openstudio version 1.7.0 stable version correctly' do
-      a = OpenStudioAmis.new(2, openstudio_version: '1.7.0', stable: true)
-
-      amis = a.get_amis
-
-      expect(amis[:server]).to eq('ami-c06b40a8')
-      expect(amis[:worker]).to eq('ami-9a97bff2')
-    end
 
     it 'should fail when trying to find a stable version for older releases' do
       a = OpenStudioAmis.new(2, openstudio_version: '1.5.0', stable: true)
 
       expect { a.get_amis }.to raise_error(/Could not find a stable version for openstudio version 1.5.0/)
     end
-
-    it 'should return latest version when passing in a future version' do
-      a = OpenStudioAmis.new(2, openstudio_version: '4.8.15', stable: true)
-
-      a = a.get_amis
-
-      expect(a).not_to be nil
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc2
+  version: 0.5.0.rc3
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Start AWS EC2 instances for running distributed OpenStudio-based analyses