openstudio-aws 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b339787cd0967f1ab44992733179e27cfa05cfc
-  data.tar.gz: a2f888edb0fd50d97a76476a7ced3e61ea04237a
+  metadata.gz: 4624c9a6d3d224d6f9027d2b9ad3656825425f9a
+  data.tar.gz: dd87ae4236d716745c7c9b7789734b576ba61925
 SHA512:
-  metadata.gz: 17bad2a4a1199649a49a1dbd4d415a3e2a9a50c1cb77738abcef8bf0ad4e17871988e0ff95455657449a4d2e03b5303489ad4413b7a961de4c239dd3e55424e6
-  data.tar.gz: 0d9d356fec2819cde276c2697b853e15784989c097a8953feda6ace4485c8342cf278f0c96dda96e9333b1276490aa73eecf878f0d033d8dadb8c7a21435b2ca
+  metadata.gz: c63b655b893617754e33982fe73841efb33819c5ccb49577ec27eae3b489e7b6ea35e22aa22bbb486c4e2b51dcce2aafa4c5a7931b979823de113902fc7188eb
+  data.tar.gz: 55a4d419a28279db424a213a2537f4472db04762fbeb399490e453b45a14e61fd398bcd114485e097a2ac00d7e2dfd833e73eb8e639ee400185bd403227cfdfd

data/lib/openstudio/aws/version.rb

@@ -1,6 +1,6 @@
 module OpenStudio
   module Aws
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
     OPENSTUDIO_VERSION = "1.1.4"
   end
 end

data/lib/openstudio/lib/os-aws.rb

@@ -45,8 +45,6 @@ require 'net/ssh'
 require 'tempfile'
 require 'time'
 
-OPENSTUDIO_VERSION='1.1.4'
-
 def error(code, msg)
   puts ({:error => {:code => code, :message => msg},
          :arguments => ARGV[2..-1]}.to_json)
@@ -90,21 +88,28 @@ end
 
 if ARGV.length == 6
   @params = JSON.parse(ARGV[5])
+  OPENSTUDIO_VERSION = @params['openstudio_version'] if @params.include?('openstudio_version')
+  @server_image_id = @params['server_ami'] if @params.include?('server_ami')
+  @worker_image_id = @params['worker_ami'] if @params.include?('worker_ami')
 end
 
-resp = Net::HTTP.get_response('developer.nrel.gov','/downloads/buildings/openstudio/rsrc/amis.json')
-if resp.code == '200'
-  result = JSON.parse(resp.body)
-  version = result.has_key?(OPENSTUDIO_VERSION) ? OPENSTUDIO_VERSION : 'default'
+OPENSTUDIO_VERSION = '1.1.4' unless defined?(OPENSTUDIO_VERSION)
+
+if (!defined?(@server_image_id) || !defined?(@worker_image_id))
+  resp = Net::HTTP.get_response('developer.nrel.gov','/downloads/buildings/openstudio/rsrc/amis.json')
+  if resp.code == '200'
+    result = JSON.parse(resp.body)
+    version = result.has_key?(OPENSTUDIO_VERSION) ? OPENSTUDIO_VERSION : 'default'
 
-  @server_image_id = result[version]['server']
-  if ARGV.length >= 6 && @params['instance_type'] == 'cc2.8xlarge'
-    @worker_image_id = result[version]['cc2worker']
+    @server_image_id = result[version]['server']
+    if ARGV.length >= 6 && @params['instance_type'] == 'cc2.8xlarge'
+      @worker_image_id = result[version]['cc2worker']
+    else
+      @worker_image_id = result[version]['worker']
+    end
   else
-    @worker_image_id = result[version]['worker']
+    error(resp.code, 'Unable to download AMI IDs')
   end
-else
-  error(resp.code, 'Unable to download AMI IDs')
 end
 
 def create_struct(instance, procs)
@@ -345,7 +350,7 @@ def download_file(host, remote_path, local_path)
 end
 
 begin
-  @logger = Logger.new("aws.log")
+  @logger = Logger.new(File.expand_path("~/.aws.log"))
   @logger.info("initialized")
   case ARGV[4]
     when 'describe_availability_zones'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nicholas Long
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: 1.30.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: 1.30.1
 description: Custom classes for configuring clusters for OpenStudio & EnergyPlus analyses
 email:
 - Nicholas.Long@nrel.gov