bosh_cli_plugin_aws 1.1798.0 → 1.1836.0

data/lib/bosh_cli_plugin_aws/bosh_bootstrap.rb

@@ -2,8 +2,7 @@ require_relative 'bootstrap'
 require 'net/https'
 require 'bosh/stemcell/archive'
 require 'bosh/stemcell/archive_filename'
-require 'bosh/stemcell/infrastructure'
-require 'bosh/stemcell/operating_system'
+require 'bosh/stemcell/definition'
 
 module Bosh
   module Aws
@@ -17,6 +16,7 @@ module Bosh
         self.options[:non_interactive] = true
         self.director = director
         self.s3 = s3
+        @env = ENV.to_hash
       end
 
       def validate_requirements
@@ -53,6 +53,8 @@ This command should be used for bootstrapping bosh from scratch.
 
       private
 
+      attr_reader :env
+
       def manifest
         unless @manifest
           vpc_receipt_filename = File.expand_path('aws_vpc_receipt.yml')
@@ -109,7 +111,7 @@ This command should be used for bootstrapping bosh from scratch.
 
       def fetch_and_upload_stemcell
         stemcell_command = Bosh::Cli::Command::Stemcell.new
-        stemcell_command.options = self.options
+        stemcell_command.options = options
         stemcell_path = bosh_stemcell
         stemcell_command.upload(stemcell_path)
         stemcell_path
@@ -127,9 +129,8 @@ This command should be used for bootstrapping bosh from scratch.
       end
 
       def latest_aws_ubuntu_bosh_stemcell_filename
-        infrastructure = Bosh::Stemcell::Infrastructure.for('aws')
-        operating_system = Bosh::Stemcell::OperatingSystem.for('ubuntu')
-        Bosh::Stemcell::ArchiveFilename.new('latest', infrastructure, operating_system, 'bosh-stemcell', true)
+        definition = Bosh::Stemcell::Definition.for('aws', 'ubuntu', 'ruby')
+        Bosh::Stemcell::ArchiveFilename.new('latest', definition, 'bosh-stemcell', true)
       end
 
       def bosh_release
@@ -141,16 +142,15 @@ This command should be used for bootstrapping bosh from scratch.
       end
 
       def bosh_stemcell_override
-        ENV['BOSH_OVERRIDE_LIGHT_STEMCELL_URL']
+        env['BOSH_OVERRIDE_LIGHT_STEMCELL_URL']
       end
 
       def bosh_release_override
-        ENV['BOSH_OVERRIDE_RELEASE_TGZ']
+        env['BOSH_OVERRIDE_RELEASE_TGZ']
       end
 
       def bosh_version
-        ENV['BOSH_VERSION_OVERRIDE'] ||
-            Bosh::Aws::VERSION.split('.')[1]
+        env['BOSH_VERSION_OVERRIDE'] || Bosh::Aws::VERSION.split('.')[1]
       end
     end
   end

data/lib/bosh_cli_plugin_aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Aws
-    VERSION = '1.1798.0'
+    VERSION = '1.1836.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli_plugin_aws
 version: !ruby/object:Gem::Version
-  version: 1.1798.0
+  version: 1.1836.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
 - !ruby/object:Gem::Dependency
   name: bosh_cli_plugin_micro
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
 - !ruby/object:Gem::Dependency
   name: bosh-stemcell
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH plugin to easily create and delete an AWS VPC
 
-  4c516b'
+  f49b5d'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2344933530944399406
+      hash: 3841580927099894369
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23