awsm 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a7f34771e24d7ec46acbc1f7536c9c7d082c93
-  data.tar.gz: 1caff56b7563e5653f17287196f981473bac700d
+  metadata.gz: 059a7ddc0821863abf79fce6d5c5177ebd20e828
+  data.tar.gz: 847f851e2d3cc69b95257416f2133dc1bab52ce1
 SHA512:
-  metadata.gz: 61748a8c4095bbae326006bdc9fb75b1b6b908c4979f42d78776e6c41d84a10760c2300ffac346c0b56e92248c2a4f6f7a2e1d42bc34c9c4cee742427b4878b8
-  data.tar.gz: b6866f43ecf51429ce3ca4f7d55a77f2c40bfc7f29734570346670e501c96839703291ece96ace64be507a6c84bede15cdc38a3dfe8993f2d251e989e5d84824
+  metadata.gz: 5dac952265d424612e1f9af3b11c77dafa053177f92b605621559186e6227ce3956d91a653c3135a094669f4a109a22ef6a0d906021b35f25f9cfd276ada30b9
+  data.tar.gz: 926f4ce4d1878150df34d08cfee5770fc7a1e47d5d7e99c68b55380075504201658e69c2c2ed37aacd8d14cc5954fa25fb0e3283f983f103b3032df500301d50

data/awsm.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 0.19'
   spec.add_runtime_dependency 'aws-sdk', '~> 2'
   spec.add_runtime_dependency 'terminal-table', '~> 1.4'
-  spec.add_runtime_dependency 'vcr', '~> 2.9'
-  spec.add_runtime_dependency 'fakeweb', '~> 1.3'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency "pry", '~> 0.10'

data/lib/awsm.rb

@@ -1,3 +1,4 @@
+require 'aws-sdk'
 require 'yaml'
 require 'thor'
 require 'terminal-table'
@@ -9,7 +10,6 @@ require 'awsm/configure'
 
 require 'awsm/loadbalancers'
 require 'awsm/autoscalinggroups'
-require 'awsm/dns'
 require 'awsm/instances'
 
 require 'awsm/tablebase'
@@ -18,6 +18,7 @@ require 'awsm/table/image'
 
 require 'awsm/clibase'
 require 'awsm/cli/tag'
+require 'awsm/cli/dns'
 require 'awsm/cli/unused'
 require 'awsm/cli/spin'
 require 'awsm/cli/main'

data/lib/awsm/cli/dns.rb

@@ -0,0 +1,51 @@
+module Awsm
+  module CLI
+    class Dns < Clibase
+
+      desc 'list', 'list'
+      method_option :type, :type => :string, :default => 'A,AAAA,CNAME'
+      method_option :record, :type => :string, :default => nil
+      def list
+        r53 = Aws::Route53::Client.new
+
+        record_sets = []
+        r53.list_hosted_zones_by_name.hosted_zones.each do |hz|
+          r53.list_resource_record_sets( hosted_zone_id: hz.id )
+            .resource_record_sets.each do |rrs|
+            record_sets << rrs
+          end
+        end
+
+        types = []
+        unless options[:type].nil?
+          types = options[:type].dup.upcase.split( ',' )
+          record_sets.select! do |rrs|
+            types.include?( rrs.type )
+          end
+        end
+
+        records = []
+        unless options[:record].nil?
+          records = options[:record].dup.split( ',' )
+          record_sets.select! do |rrs|
+            records.include?( rrs.name )
+          end
+        end
+
+        record_sets.each do |rrs|
+          say "#{rrs.name} ", :green
+          say "(#{rrs.type})", :yellow
+          unless rrs.alias_target.nil?
+            say "\t #{rrs.alias_target.dns_name}"
+          else
+            rrs.resource_records.each do |rr|
+              say "\t #{rr.value}"
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/awsm/cli/main.rb

@@ -19,6 +19,9 @@ module Awsm
       desc 'tag', 'Search by tags'
       subcommand 'tag', Awsm::CLI::Tag
 
+      desc 'dns', 'DNS tools'
+      subcommand 'dns', Awsm::CLI::Dns
+
       desc "specific <comma-separated-elb-names>",
         "Only find specific ELBs named in a comma-separated list."
       def specific( elb_names )
@@ -37,25 +40,6 @@ module Awsm
         results.each { |elb| print_result(elb) }
       end
 
-      desc "r53 [dns-name]",
-        "Show me what <dns-name> points at."
-      def r53( dns_name )
-        dns_len = dns_name.length
-
-        say "#{dns_name} ", :yellow
-        say "=> ", :bold
-        dns.get_by_record( dns_name ).each_with_index do |r, i|
-        if i > 0
-          say " " * ( dns_len + 4 )
-        end
-        say "(#{r.type}) ", :green
-        case r.type
-          when "A"
-            say "#{r.alias_target.dns_name}", :cyan
-          end
-        end
-      end
-
     no_commands do
       def load_balancers
         Awsm::LoadBalancers.new
@@ -65,10 +49,6 @@ module Awsm
         Awsm::Instances.new
       end
 
-      def dns
-        Awsm::Dns.new
-      end
-
       def asg
         Awsm::AutoScalingGroups.new
       end

data/lib/awsm/version.rb

@@ -1,3 +1,3 @@
 module Awsm
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsm
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Daniel Kendell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,34 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,13 +100,13 @@ files:
 - bin/awsm
 - lib/awsm.rb
 - lib/awsm/autoscalinggroups.rb
+- lib/awsm/cli/dns.rb
 - lib/awsm/cli/main.rb
 - lib/awsm/cli/spin.rb
 - lib/awsm/cli/tag.rb
 - lib/awsm/cli/unused.rb
 - lib/awsm/clibase.rb
 - lib/awsm/configure.rb
-- lib/awsm/dns.rb
 - lib/awsm/instances.rb
 - lib/awsm/loadbalancers.rb
 - lib/awsm/table/image.rb

data/lib/awsm/dns.rb

@@ -1,45 +0,0 @@
-require 'aws-sdk-core'
-
-module Awsm
-  class Dns
-    def initialize
-      @client = Aws::Route53::Client.new
-      @dns_map_by_target = {}
-      @records = []
-      load_dns_records
-    end
-
-    def find_for( target )
-      @dns_map_by_target[ target ]
-    end
-
-    def get_by_record( record )
-      @records.select do |r|
-        r.name =~ /^#{record}/
-      end
-    end
-
-    def load_dns_records
-      paged_response = @client.list_resource_record_sets(
-        hosted_zone_id: Awsm::dns_config.hosted_zone
-      )
-
-      paged_response.each_page do |p|
-        records = p.resource_record_sets.select do |r|
-          r.type == 'A' || r.type == 'CNAME'
-        end
-
-        records.each do |r|
-          if r.resource_records == []
-            target = r.alias_target.dns_name
-          else
-            target = r.resource_records[0].value
-          end
-
-          @dns_map_by_target[target] = r.name
-          @records << r
-        end
-      end
-    end
-  end
-end