vagrant-awsinfo 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTYyOGEwNDE1NzZmMGVmZTJkYjQ3ZjJhZTg5NDU4Y2UxNmUwNmUxMA==
+  data.tar.gz: !binary |-
+    NDNkNDQ2ODI3MmE2ZTM5YTE3ODUzZTI0MzVhMDc3OGI2Mjg3ZmRlZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzYxMTE5MDcyMDYwNDFlMjZhMWYyZDM1YWYyNWI1Yzc4ZDRiMzZmODY0Yzk3
+    M2QxZjc3MzU0ZWY0ZGY3YzYyZTM2NDIwZWZhMmZhMzEwMTEwMmY2ODRjNGIy
+    ZWE5ZWNjYTIyOGFhMWE1ZGQzZmU0MmI1OThjM2U2ZmRlNzQzZDY=
+  data.tar.gz: !binary |-
+    YjE0ZTIzODBkN2U1NTQ4NjdmZmMwN2NiNzE4MDRhMmFkNTg2ZWMwNzE5NTA2
+    ODQ2NDhmYTQ4MDE4OWFhOTAxYjQxNDQ5MTdkZDI1ZmZiYzJlZDczM2QwYTlh
+    YzZhYTQwYzcwOTEyM2E5ZTE3N2M2ZjBmNzFjZDAwYWQxODI3MjY=

data/CHANGELOG.md

@@ -1,3 +1,4 @@
+
 # 0.0.1 
 * Initial Release
 
@@ -11,3 +12,8 @@
 # 0.0.4 
 
 * Supports returning only a single value, such as "host", "instance_id", ect
+
+# 0.0.5
+
+* Much more meta data from running instance
+* Pretty print mode

data/README.md

@@ -25,6 +25,29 @@ ec2-174-129-128-49.compute-1.amazonaws.com
 
 % vagrant awsinfo -k host -m default
 ec2-174-129-128-49.compute-1.amazonaws.com
+
+% vagrant awsinfo -k host -m default -p
+{
+  "availability_zone": "us-east-1c",
+  "created_at": "2013-04-20T20:51:10Z",
+  "flavor": "m1.medium",
+  "host": "ec2-50-16-48-88.compute-1.amazonaws.com",
+  "public_ip": "50.16.48.88",
+  "private_ip": "10.151.111.73",
+  "private_dns_name": "ip-10-151-111-73.ec2.internal",
+  "tags": {
+    "Name": "Vagrant-PhonoGateway",
+    "OwnerHostname": "dyer.local",
+    "CreatedAt": "2013-04-20T 4:46:37",
+    "OwnerUsername": "jdyer"
+  },
+  "groups": [
+    "everything_open"
+  ],
+  "ssh_port": 22,
+  "instance_id": "i-28f14e43",
+  "state": "running"
+}
 ```
 
 ## Contributing

data/lib/vagrant-awsinfo/command.rb

@@ -1,8 +1,7 @@
 module VagrantAwsInfo
 
     class Command < Vagrant.plugin(2, :command)
-
-        Settings = Struct.new(:machines,:keys)
+        Settings = Struct.new(:machines,:keys, :pretty)
 
         def execute
 
@@ -20,6 +19,10 @@ module VagrantAwsInfo
                 o.on("-k KEY", "single value to return.") do |value|
                     settings.keys = value
                 end
+
+                o.on("-p", "Pretty print values.") do |value|
+                    settings.pretty = true
+                end
             end
 
             settings.machines = ["default"] if settings.machines.empty?
@@ -36,25 +39,69 @@ module VagrantAwsInfo
                     return 1
                 end
             else
-                @env.ui.info instance_info.to_json
+                if settings.pretty
+                    jj instance_info
+                else
+                    @env.ui.info instance_info.to_json
+                end
             end
 
         end
 
         private
 
+        def get_instance(machine)
+            env = machine.action("read_ssh_info")
+            region = env[:machine].provider_config.region
+
+            # Get the configs
+            region_config     = env[:machine].provider_config.get_region_config(region)
+
+            # Build the fog config
+            fog_config = {
+                :provider              => :aws,
+                :region                => region
+            }
+
+            if region_config.use_iam_profile
+                fog_config[:use_iam_profile] = True
+            else
+                fog_config[:aws_access_key_id] = region_config.access_key_id
+                fog_config[:aws_secret_access_key] = region_config.secret_access_key
+            end
+
+            fog_config[:endpoint] = region_config.endpoint if region_config.endpoint
+            fog_config[:version]  = region_config.version if region_config.version
+            env[:aws_compute] = Fog::Compute.new(fog_config)
+            return env
+        end
+
         def get_info(machine)
             with_target_vms(machine) do |machine|
                 if machine.provider_name == :aws
-                    ssh_info = machine.provider.ssh_info
+                    env = get_instance(machine)
+                    instance = env[:aws_compute].servers.get(machine.id)
                     r = {
-                        host: ssh_info[:host],
-                        ssh_port: ssh_info[:port],
-                        username: ssh_info[:username],
+                        availability_zone: instance.availability_zone,
+                        created_at: instance.created_at,
+                        flavor: instance.flavor_id,
+                        host: instance.dns_name,
+                        public_ip: instance.public_ip_address,
+                        private_ip: instance.private_ip_address,
+                        private_dns_name: instance.private_dns_name,
+                        tags: instance.tags,
+                        security_groups: instance.groups,
+                        ssh_port: env[:machine_ssh_info][:port],
                         instance_id: machine.id,
-                        state: machine.provider.state.short_description,
+                        image_id: instance.image_id,
+                        state: machine.provider.state.short_description
                     }
-                     return r
+
+                    r.merge!(network_interfaces: instance.network_interfaces) unless instance.network_interfaces.empty?
+                    r.merge!(subnet_id: instance.subnet_id) if instance.subnet_id
+                    r.merge!(vpc_id: instance.vpc_id) if instance.vpc_id
+                    return r
+
                 else
                     @env.ui.error "[WARNING] - Sorry this plugin currently only supports machines using the AWS provider"
                     exit 1

data/lib/vagrant-awsinfo/version.rb

@@ -1,3 +1,3 @@
 module VagrantAwsInfo
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/vagrant-awsinfo.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["johntdyer@gmail.com"]
   spec.description   = 'vagrant aws info querying plugin'
   spec.summary       = spec.description
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/johntdyer/vagrant-awsinfo"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-awsinfo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - John Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies: []
 description: vagrant aws info querying plugin
 email:
@@ -29,29 +28,28 @@ files:
 - lib/vagrant-awsinfo/plugin.rb
 - lib/vagrant-awsinfo/version.rb
 - vagrant-awsinfo.gemspec
-homepage: ''
+homepage: https://github.com/johntdyer/vagrant-awsinfo
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: vagrant aws info querying plugin
 test_files: []