zonify 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 186d36c96eef1d14b65e3f3a576592cdf3db4bdc
-  data.tar.gz: 1505c7e0e7f101d959d3e73c962b8da3e7dc60b7
+  metadata.gz: fcf4c8219b20ead0a338ce0e054a0234f6338879
+  data.tar.gz: 3ea23ee06e011b347bd7302e25c29eb5613cc846
 SHA512:
-  metadata.gz: 1bfcabe561a6ce7f7f0ae7d63c183c110d1af970da427b84d2e944ea80fb5a65efe1dc5472f008ef66c36d23d762c07a6422a6016a0ff4b23a08e3d00bac7d54
-  data.tar.gz: 3250c3104624cc774acfaa8d7f718dc45d835b02fd17cf166c76e3c031e004ded25fd531dcf5963e99a53d50cce11305e7d0de0052098dc51a8d511ab1ca69c1
+  metadata.gz: cd90e1d3932b8fc53746d8d8c1623ca3efe9f7549dc012cc60d9f65cb78e248e8f7cee3db9feae787a23630ad7d592d8e8037e91f660d1fc03458ecdf59e7d47
+  data.tar.gz: f966e6595527331405f6137696104ccc208844ef1be35b144c1b11f475b61d65020813fff92f7f68e6e292b909a043e924cc8a9ee0993f07cb87346e49b0c66a

data/bin/zonify

@@ -14,8 +14,8 @@ require 'zonify'
 
 class CLIAWS
   attr_reader :options
-  def initialize(access=nil, secret=nil)
-    @options = {}
+  def initialize(access=nil, secret=nil, options={})
+    @options = options
     env_adapter
     auth = { :aws_access_key_id     => (access or ENV['AWS_ACCESS_KEY']),
              :aws_secret_access_key => (secret or ENV['AWS_SECRET_KEY']) }
@@ -149,11 +149,12 @@ def main
   end
   #confirm = [ARGV.delete("-c"), ARGV.delete("--confirm")].any?
   confirm = false
-  quiet      = (ARGV.delete("-q") or ARGV.delete("--quiet"))
-  netlogging = (ARGV.delete("-n") or ARGV.delete("--net"))
-  norm       = (ARGV.delete("--srv-singleton") or not
-                ARGV.delete("--no-srv-singleton"))
-  use_iam_profile = ARGV.delete("--use-iam-profile")
+  quiet      = (ARGV.delete('-q') or ARGV.delete('--quiet'))
+  netlogging = (ARGV.delete('-n') or ARGV.delete('--net'))
+  norm       = (ARGV.delete('--srv-singleton') or not
+                ARGV.delete('--no-srv-singleton'))
+  use_iam_profile = ARGV.delete('--use-iam-profile')
+  reverse_public_ip = ARGV.delete('--reverse-public-ip')
   zone = nil
   while i = ARGV.index('--zone')
     raise 'Zone already set...' if zone
@@ -162,6 +163,7 @@ def main
     ARGV.delete_at(i)
   end
   aws = CLIAWS.new
+  aws.options[:reverse] = true if reverse_public_ip
   aws.options[:use_iam_profile] = true if use_iam_profile
   aws.options[:zone] = zone if zone
   types = nil

data/lib/zonify.rb

@@ -19,6 +19,7 @@ class AWS
     def create(options)
       options_ec2 = options.merge( :provider=>'AWS',
                                    :connection_options=>{:nonblock=>false} )
+      options_ec2.delete(:reverse)
       options_ec2.delete(:zone)
       ec2 = Proc.new{|| Fog::Compute.new(options_ec2) }
       options_elb = options_ec2.dup.delete_if{|k, _| k == :provider }
@@ -37,8 +38,12 @@ class AWS
     @ec2_proc = opts[:ec2_proc]
     @elb_proc = opts[:elb_proc]
     @r53_proc = opts[:r53_proc]
+    @reverse  = opts[:reverse]
     @zone     = opts[:zone]
   end
+  def reverse_public_ip?
+    !!@reverse
+  end
   def ec2
     @ec2 ||= @ec2_proc.call
   end
@@ -113,7 +118,12 @@ class AWS
   end
   def instances
     ec2.servers.inject({}) do |acc, i|
-      dns = (i.dns_name or i.private_dns_name)
+      dns = if reverse_public_ip? and not i.public_ip_address.nil?
+              pub = i.public_ip_address
+              dns = "ec2-#{pub.gsub(".", "-")}.compute-1.amazonaws.com"
+            else
+              i.dns_name or i.private_dns_name
+            end
       # The default hostname for EC2 instances is derived from their internal
       # DNS entry.
       terminal_states = %w| terminated shutting-down |
@@ -502,7 +512,7 @@ extend self
   end
   def sorted_hash(h)
     result = ::YAML::quick_emit(h.object_id, {}) do |out|
-      out.map("") do |map|
+      out.map do |map|
         h.keys.sort_by{|k| k.to_s }.each{|k| map.add(k, h[k]) }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zonify
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Jason Dusek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog