vagrant-aws 0.0.1 → 0.1.0

data/lib/vagrant-aws/util/timer.rb

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module AWS
+    module Util
+      class Timer
+        # A basic utility method that times the execution of the given
+        # block and returns it.
+        def self.time
+          start_time = Time.now.to_f
+          yield
+          end_time = Time.now.to_f
+
+          end_time - start_time
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-aws/version.rb

@@ -1,3 +1,5 @@
-module VagrantAWS
-  VERSION = "0.0.1"
+module VagrantPlugins
+  module AWS
+    VERSION = "0.1.0"
+  end
 end

data/locales/en.yml

@@ -1,64 +1,68 @@
 en:
-  vagrant:
-    plugins:
-      aws:
-        general:
-          getting_status: "Getting latest environment status..." 
-        errors:
-          not_yet_supported: This feature is not yet supported in Vagrant AWS.      
-          key_name_not_specified: An AWS key name was not specified. Set `aws.key_name` in Vagrantfile. 
-          private_key_file_not_specified: |-
-            Private key file was not specified. Set `aws.private_key_file` to
-            point to key file associated with the specified AWS key name.
-          ebs_device_required: |-
-            %{command} requires an EBS-backed instance. Please Amazon AWS documentation for
-            more information about EBS vs. instance store backed instances.
-          vm_create_failure: VM creation failed.
-        commands:
-          status:
-            running: |-
-              The VM is running. To stop this VM, you can run `vagrant aws suspend` to
-              stop but not destroy this VM (you only pay for the backing EBS volume,
-              not the hourly EC2 server cost) or `vagrant aws destroy` to destroy
-              the VM entirely.
-            stopping: |-
-              The VM is in the process of stopping (suspending). To resume this VM
-              after it has completely stopped, simply run `vagrant aws resume`.
-            stopped: To resume this VM, simply run `vagrant resume`.
-            pending: The VM is in the process of resuming.
-            not_created: |-
-              The environment has not yet been created. Run `vagrant aws resume` to
-              create the environment.
-            listing: |-
-              This environment represents multiple VMs. The VMs are all listed
-              above with their current state. For more information about a specific
-              VM, run `vagrant aws status NAME`.
-        actions:
-          create:
-            creating: "Creating VM ..."
-            created: |-
-              Created EC2 server %{id}. Waiting for server to become ready 
-              (this may take a few minutes).
-            available: |-
-              Server available at %{dns}. 
-              Waiting for SSH to become available. When ready run `vagrant aws ssh_config`
-              for more detailed connection information.
-          prepare_provisioners:
-            chef_not_detected: |-
-              %{binary} not detected. Bootstrapping %{binary} installation. This may
-              take a few minutes.
-            uploading_chef_resources: Uploading chef resources to VM.
-          create_image:
-            creating: |- 
-              Creating AWS AMI. This make take a few minutes. The VM will not be available 
-              during this period.
-          deregister_image:
-            deregistering:
-              Deregistering image %{image} with AWS.
-          create_ssh_key:
-            created: |-
-              No key pairs specified. Created AWS key pair named %{name}.
+  vagrant_aws:
+    already_created: |-
+      The machine is already created.
+    launching_instance: |-
+      Launching an instance with the following settings...
+    launch_no_keypair: |-
+      Warning! You didn't specify a keypair to launch your instance with.
+      This can sometimes result in not being able to access your instance.
+    launch_vpc_warning: |-
+      Warning! You're launching this instance into a VPC without an
+      elastic IP. Please verify you're properly connected to a VPN so
+      you can access this machine, otherwise Vagrant will not be able
+      to SSH into it.
+    not_created: |-
+      Instance is not created. Please run `vagrant up` first.
+    ready: |-
+      Machine is booted and ready for use!
+    rsync_folder: |-
+      Rsyncing folder: %{hostpath} => %{guestpath}
+    terminating: |-
+      Terminating the instance...
+    waiting_for_ready: |-
+      Waiting for instance to become "ready"...
+    waiting_for_ssh: |-
+      Waiting for SSH to become available...
+    warn_networks: |-
+      Warning! The AWS provider doesn't support any of the Vagrant
+      high-level network configurations (`config.vm.network`). They
+      will be silently ignored.
 
+    config:
+      access_key_id_required: |-
+        An access key ID must be specified via "access_key_id"
+      ami_required: |-
+        An AMI must be configured via "ami"
+      private_key_missing: |-
+        The specified private key for AWS could not be found
+      region_required: |-
+        A region must be specified via "region"
+      secret_access_key_required: |-
+        A secret access key is required via "secret_access_key"
 
-              
-            
+    errors:
+      fog_error: |-
+        There was an error talking to AWS. The error message is shown
+        below:
+
+        %{message}
+      rsync_error: |-
+        There was an error when attemping to rsync a share folder.
+        Please inspect the error message below for more info.
+
+        Host path: %{hostpath}
+        Guest path: %{guestpath}
+        Error: %{stderr}
+
+    states:
+      short_not_created: |-
+        not created
+      long_not_created: |-
+        The EC2 instance is not created. Run `vagrant up` to create it.
+
+      short_running: |-
+        running
+      long_running: |-
+        The EC2 instance is running. To stop this machine, you can run
+        `vagrant halt`. To destroy the machine, you can run `vagrant destroy`.

data/spec/vagrant-aws/config_spec.rb

@@ -0,0 +1,161 @@
+require "vagrant-aws/config"
+
+describe VagrantPlugins::AWS::Config do
+  let(:instance) { described_class.new }
+
+  describe "defaults" do
+    subject do
+      instance.tap do |o|
+        o.finalize!
+      end
+    end
+
+    its("access_key_id")     { should be_nil }
+    its("ami")               { should be_nil }
+    its("availability_zone") { should be_nil }
+    its("instance_type")     { should == "m1.small" }
+    its("keypair_name")      { should be_nil }
+    its("private_ip_address") { should be_nil }
+    its("region")            { should == "us-east-1" }
+    its("secret_access_key") { should be_nil }
+    its("security_groups")   { should == [] }
+    its("ssh_private_key_path") { should be_nil }
+    its("ssh_username")      { should be_nil }
+    its("subnet_id")         { should be_nil }
+    its("tags")              { should == {} }
+  end
+
+  describe "overriding defaults" do
+    # I typically don't meta-program in tests, but this is a very
+    # simple boilerplate test, so I cut corners here. It just sets
+    # each of these attributes to "foo" in isolation, and reads the value
+    # and asserts the proper result comes back out.
+    [:access_key_id, :ami, :availability_zone, :instance_type,
+      :keypair_name,
+      :region, :secret_access_key, :security_groups,
+      :ssh_private_key_path, :ssh_username, :subnet_id, :tags].each do |attribute|
+
+      it "should not default #{attribute} if overridden" do
+        instance.send("#{attribute}=".to_sym, "foo")
+        instance.finalize!
+        instance.send(attribute).should == "foo"
+      end
+    end
+  end
+
+  describe "region config" do
+    let(:config_access_key_id)     { "foo" }
+    let(:config_ami)               { "foo" }
+    let(:config_instance_type)     { "foo" }
+    let(:config_keypair_name)      { "foo" }
+    let(:config_region)            { "foo" }
+    let(:config_secret_access_key) { "foo" }
+
+    def set_test_values(instance)
+      instance.access_key_id     = config_access_key_id
+      instance.ami               = config_ami
+      instance.instance_type     = config_instance_type
+      instance.keypair_name      = config_keypair_name
+      instance.region            = config_region
+      instance.secret_access_key = config_secret_access_key
+    end
+
+    it "should raise an exception if not finalized" do
+      expect { instance.get_region_config("us-east-1") }.
+        to raise_error
+    end
+
+    context "with no specific config set" do
+      subject do
+        # Set the values on the top-level object
+        set_test_values(instance)
+
+        # Finalize so we can get the region config
+        instance.finalize!
+
+        # Get a lower level region
+        instance.get_region_config("us-east-1")
+      end
+
+      its("access_key_id")     { should == config_access_key_id }
+      its("ami")               { should == config_ami }
+      its("instance_type")     { should == config_instance_type }
+      its("keypair_name")      { should == config_keypair_name }
+      its("region")            { should == config_region }
+      its("secret_access_key") { should == config_secret_access_key }
+    end
+
+    context "with a specific config set" do
+      let(:region_name) { "hashi-region" }
+
+      subject do
+        # Set the values on a specific region
+        instance.region_config region_name do |config|
+          set_test_values(config)
+        end
+
+        # Finalize so we can get the region config
+        instance.finalize!
+
+        # Get the region
+        instance.get_region_config(region_name)
+      end
+
+      its("access_key_id")     { should == config_access_key_id }
+      its("ami")               { should == config_ami }
+      its("instance_type")     { should == config_instance_type }
+      its("keypair_name")      { should == config_keypair_name }
+      its("region")            { should == region_name }
+      its("secret_access_key") { should == config_secret_access_key }
+    end
+
+    describe "inheritance of parent config" do
+      let(:region_name) { "hashi-region" }
+
+      subject do
+        # Set the values on a specific region
+        instance.region_config region_name do |config|
+          config.ami = "child"
+        end
+
+        # Set some top-level values
+        instance.access_key_id = "parent"
+        instance.ami = "parent"
+
+        # Finalize and get the region
+        instance.finalize!
+        instance.get_region_config(region_name)
+      end
+
+      its("access_key_id") { should == "parent" }
+      its("ami")           { should == "child" }
+    end
+
+    describe "shortcut configuration" do
+      subject do
+        # Use the shortcut configuration to set some values
+        instance.region_config "us-east-1", :ami => "child"
+        instance.finalize!
+        instance.get_region_config("us-east-1")
+      end
+
+      its("ami") { should == "child" }
+    end
+
+    describe "merging" do
+      let(:first)  { described_class.new }
+      let(:second) { described_class.new }
+
+      it "should merge the tags" do
+        first.tags["one"] = "one"
+        second.tags["two"] = "two"
+
+        third = first.merge(second)
+        third.tags.should == {
+          "one" => "one",
+          "two" => "two"
+        }
+      end
+    end
+  end
+end

data/vagrant-aws.gemspec

@@ -1,29 +1,58 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
 require "vagrant-aws/version"
 
 Gem::Specification.new do |s|
-  s.name        = "vagrant-aws"
-  s.version     = VagrantAWS::VERSION
-  s.authors     = ["Michael Linderman"]
-  s.email       = ["michael.d.linderman@gmail.com"]
-  s.homepage    = ""
-  s.summary     = %q{A vagrant plugin for working with AWS}
-  s.description = %q{A vagrant plugin for working with AWS}
-
-  s.rubyforge_project = "vagrant-aws"
-
-	s.add_dependency "vagrant", ">= 0.6.0"
-	s.add_dependency "fog", ">= 0.9.0"
-	s.add_dependency "archive-tar-minitar", ">= 0.5.2"
-	s.add_dependency "macaddr", "~> 1.0.0"
-
-  s.add_development_dependency "bundler", ">= 1.0.0"
-	s.add_development_dependency "contest", "~> 0.1.3"
-	s.add_development_dependency "mocha", "~> 0.9.8"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_path  = "lib"
+  s.name          = "vagrant-aws"
+  s.version       = VagrantPlugins::AWS::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = "Mitchell Hashimoto"
+  s.email         = "mitchell@hashicorp.com"
+  s.homepage      = "http://www.vagrantup.com"
+  s.summary       = "Enables Vagrant to manage machines in EC2 and VPC."
+  s.description   = "Enables Vagrant to manage machines in EC2 and VPC."
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "vagrant-aws"
+
+  s.add_runtime_dependency "fog", "~> 1.9.0"
+
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec-core", "~> 2.12.2"
+  s.add_development_dependency "rspec-expectations", "~> 2.12.1"
+  s.add_development_dependency "rspec-mocks", "~> 2.12.1"
+
+  # The following block of code determines the files that should be included
+  # in the gem. It does this by reading all the files in the directory where
+  # this gemspec is, and parsing out the ignored files from the gitignore.
+  # Note that the entire gitignore(5) syntax is not supported, specifically
+  # the "!" syntax, but it should mostly work correctly.
+  root_path      = File.dirname(__FILE__)
+  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
+  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
+  gitignore_path = File.join(root_path, ".gitignore")
+  gitignore      = File.readlines(gitignore_path)
+  gitignore.map!    { |line| line.chomp.strip }
+  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
+
+  unignored_files = all_files.reject do |file|
+    # Ignore any directories, the gemspec only cares about files
+    next true if File.directory?(file)
+
+    # Ignore any paths that match anything in the gitignore. We do
+    # two tests here:
+    #
+    #   - First, test to see if the entire path matches the gitignore.
+    #   - Second, match if the basename does, this makes it so that things
+    #     like '.DS_Store' will match sub-directories too (same behavior
+    #     as git).
+    #
+    gitignore.any? do |ignore|
+      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
+        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+    end
+  end
+
+  s.files         = unignored_files
+  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
+  s.require_path  = 'lib'
 end

metadata

@@ -1,137 +1,134 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
-- Michael Linderman
+- Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000 -07:00
-default_executable: 
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: &2164900000 !ruby/object:Gem::Requirement
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164900000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: fog
-  requirement: &2164899460 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *2164899460
-- !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
-  requirement: &2164898900 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *2164898900
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: macaddr
-  requirement: &2164898440 !ruby/object:Gem::Requirement
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        version: 2.12.2
+  type: :development
   prerelease: false
-  version_requirements: *2164898440
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2164897940 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *2164897940
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
-  name: contest
-  requirement: &2164897460 !ruby/object:Gem::Requirement
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 2.12.1
   type: :development
   prerelease: false
-  version_requirements: *2164897460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &2164896980 !ruby/object:Gem::Requirement
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 2.12.1
   type: :development
   prerelease: false
-  version_requirements: *2164896980
-description: A vagrant plugin for working with AWS
-email:
-- michael.d.linderman@gmail.com
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+description: Enables Vagrant to manage machines in EC2 and VPC.
+email: mitchell@hashicorp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- CHANGELOG.md
+- dummy.box
+- example_box/metadata.json
+- example_box/README.md
 - Gemfile
-- README.md
-- Rakefile
-- lib/vagrant-aws.rb
-- lib/vagrant-aws/action/create.rb
-- lib/vagrant-aws/action/create_image.rb
-- lib/vagrant-aws/action/create_sshkey.rb
-- lib/vagrant-aws/action/deregister_image.rb
-- lib/vagrant-aws/action/populate_ssh.rb
-- lib/vagrant-aws/action/prepare_provisioners.rb
-- lib/vagrant-aws/action/resume.rb
-- lib/vagrant-aws/action/suspend.rb
-- lib/vagrant-aws/action/terminate.rb
-- lib/vagrant-aws/box.rb
-- lib/vagrant-aws/box_collection.rb
-- lib/vagrant-aws/command.rb
+- lib/vagrant-aws/action/connect_aws.rb
+- lib/vagrant-aws/action/is_created.rb
+- lib/vagrant-aws/action/message_already_created.rb
+- lib/vagrant-aws/action/message_not_created.rb
+- lib/vagrant-aws/action/read_ssh_info.rb
+- lib/vagrant-aws/action/read_state.rb
+- lib/vagrant-aws/action/run_instance.rb
+- lib/vagrant-aws/action/sync_folders.rb
+- lib/vagrant-aws/action/terminate_instance.rb
+- lib/vagrant-aws/action/timed_provision.rb
+- lib/vagrant-aws/action/warn_networks.rb
+- lib/vagrant-aws/action.rb
 - lib/vagrant-aws/config.rb
-- lib/vagrant-aws/environment.rb
 - lib/vagrant-aws/errors.rb
-- lib/vagrant-aws/middleware.rb
-- lib/vagrant-aws/system.rb
+- lib/vagrant-aws/plugin.rb
+- lib/vagrant-aws/provider.rb
+- lib/vagrant-aws/util/timer.rb
 - lib/vagrant-aws/version.rb
-- lib/vagrant-aws/vm.rb
-- lib/vagrant_init.rb
+- lib/vagrant-aws.rb
+- LICENSE
 - locales/en.yml
-- test/test_helper.rb
-- test/vagrant-aws/action/create_image_test.rb
-- test/vagrant-aws/action/create_ssh_key_test.rb
-- test/vagrant-aws/action/create_test.rb
-- test/vagrant-aws/action/terminate_test.rb
-- test/vagrant-aws/command_test.rb
-- test/vagrant-aws/config_test.rb
+- Rakefile
+- README.md
+- spec/vagrant-aws/config_spec.rb
 - vagrant-aws.gemspec
-has_rdoc: true
-homepage: ''
+- .gitignore
+homepage: http://www.vagrantup.com
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -143,23 +140,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -678205219636091140
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-aws
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A vagrant plugin for working with AWS
-test_files:
-- test/test_helper.rb
-- test/vagrant-aws/action/create_image_test.rb
-- test/vagrant-aws/action/create_ssh_key_test.rb
-- test/vagrant-aws/action/create_test.rb
-- test/vagrant-aws/action/terminate_test.rb
-- test/vagrant-aws/command_test.rb
-- test/vagrant-aws/config_test.rb
+summary: Enables Vagrant to manage machines in EC2 and VPC.
+test_files: []