openstudio-aws 0.1.7 → 0.1.8

data/spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper unauthenticated session" tests="1" time="1.384048" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAwsWrapper unauthenticated session should fail to authenticate" time="1.383907">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper.0.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper" tests="0" time="9.0e-05" failures="0" errors="0" skipped="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper" tests="0" time="7.0e-05" failures="0" errors="0" skipped="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.31.3
+        version: 2.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.31.3
+        version: 2.0.0.rc3
 description: Custom classes for configuring clusters for OpenStudio & EnergyPlus analyses
 email:
 - Nicholas.Long@nrel.gov
@@ -47,17 +47,49 @@ extra_rdoc_files: []
 files:
 - lib/openstudio/aws/aws.rb
 - lib/openstudio/aws/config.rb
-- lib/openstudio/aws/send_data.rb
 - lib/openstudio/aws/version.rb
+- lib/openstudio/lib/ami_list.rb
 - lib/openstudio/lib/mongoid.yml.template
+- lib/openstudio/lib/openstudio_aws_instance.rb
+- lib/openstudio/lib/openstudio_aws_logger.rb
+- lib/openstudio/lib/openstudio_aws_methods.rb
+- lib/openstudio/lib/openstudio_aws_wrapper.rb
 - lib/openstudio/lib/os-aws.rb
 - lib/openstudio/lib/server_script.sh
 - lib/openstudio/lib/worker_script.sh.template
 - lib/openstudio-aws.rb
 - README.md
 - Rakefile
-- spec/openstudio-aws/aws_spec.rb
+- spec/aws_instances/aws_spec_api.rb
+- spec/openstudio-aws/ami_list_spec.rb
+- spec/openstudio-aws/aws_methods_spec.rb
 - spec/openstudio-aws/config_spec.rb
+- spec/openstudio-aws/lib_spec.rb
+- spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-workers-before-server.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.0.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.0.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.0.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.xml
+- spec/reports/SPEC-OpenStudioAmis.0.xml
+- spec/reports/SPEC-OpenStudioAmis.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.0.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.0.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.xml
 - spec/spec_helper.rb
 homepage: http://openstudio.nrel.gov
 licenses:
@@ -71,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -79,11 +111,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Start AWS EC2 instances for running distributed OpenStudio-based analyses
 test_files:
-- spec/openstudio-aws/aws_spec.rb
+- spec/aws_instances/aws_spec_api.rb
+- spec/openstudio-aws/ami_list_spec.rb
+- spec/openstudio-aws/aws_methods_spec.rb
 - spec/openstudio-aws/config_spec.rb
+- spec/openstudio-aws/lib_spec.rb
+- spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-workers-before-server.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.0.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.0.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.0.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.xml
+- spec/reports/SPEC-OpenStudioAmis.0.xml
+- spec/reports/SPEC-OpenStudioAmis.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.0.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.0.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.0.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.xml
 - spec/spec_helper.rb

data/lib/openstudio/aws/send_data.rb

@@ -1,42 +0,0 @@
-# This is taken out of the OpenStudio AWS config file to do some testing
-#def send_command(host, command, key)
-#  require 'net/http'
-#  require 'net/scp'
-#  require 'net/ssh'
-#
-#  retries = 0
-#  begin
-#    puts "connecting.."
-#    output = ''
-#    Net::SSH.start(host, 'ubuntu', :key_data => [key]) do |ssh|
-#      response = ssh.exec!(command)
-#      output += response if !response.nil?
-#    end
-#    return output
-#  rescue Net::SSH::HostKeyMismatch => e
-#    e.remember_host!
-#    # key mismatch, retry
-#    return if retries == 2
-#    retries += 1
-#    sleep 1
-#    retry
-#  rescue Net::SSH::AuthenticationFailed
-#    error(-1, "Incorrect private key")
-#  rescue SystemCallError, Timeout::Error => e
-#    # port 22 might not be available immediately after the instance finishes launching
-#    return if retries == 2
-#    retries += 1
-#    sleep 1
-#    retry
-#  rescue Exception => e
-#    puts e.message
-#    puts e.backtrace.inspect
-#  end
-#end
-#
-#server_json = JSON.parse(File.read("server_data.json"), :symbolize_names => true)
-#
-#b = Time.now
-#delta = b.to_f - a.to_f
-#puts "startup time is #{delta}"
-##puts send_command(server_json[:server_ip], 'nproc | tr -d "\n"', File.read("ec2_server_key.pem"))

data/spec/openstudio-aws/aws_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-
-describe OpenStudio::Aws::Aws do
-  context "create a new instance" do
-    before(:all) do
-      @aws = OpenStudio::Aws::Aws.new
-    end
-
-    it "should create a new instance" do
-      @aws.should_not be_nil
-    end
-
-    it "should ask the user to create a new config file" do
-    end
-
-    it "should create a server" do
-      # use the default instance type
-      #options = {instance_type: "t1.micro" }
-      options = {instance_type: "m1.small" }
-      @aws.create_server(options)
-      @aws.server_data[:server_dns].should_not be_nil 
-    end
-    
-    it "should create a 1 worker" do
-      #options = {instance_type: "t1.micro" }
-      options = {instance_type: "m1.small" }
-      #server_json[:instance_type] = "m2.4xlarge"
-      #server_json[:instance_type] = "m2.2xlarge"
-      #server_json[:instance_type] = "t1.micro"
-      @aws.create_workers(1, options)
-      
-      @aws.worker_data[:workers].size.should eq(1)
-      @aws.worker_data[:workers][0][:dns].should_not be_nil
-    end
-  end
-
-  context "workers before server" do
-    before(:all) do
-      @aws = OpenStudio::Aws::Aws.new
-    end
-
-    it "should not create any workers" do
-      
-      expect {@aws.create_workers(5)}.to raise_error
-    end
-
-  end
-  
-  context "larger cluster" do
-    
-  end
-
-end