gcloud_hosts 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba67d06a8c97f3882fac1ff37cc025d3d64a7f1
-  data.tar.gz: 7520d469eec780d23438d6985d92e2cf87c75678
+  metadata.gz: d2ddcd65fb8f4196960205752361d591aa7ff7f4
+  data.tar.gz: a37e9aa6c729f372e941149f8797c34598a9432b
 SHA512:
-  metadata.gz: 5a2b239695545db654fe3ad1b01e11e84f2a17da16753f79c9dfea8fee940cfe9b2bf3b1e5c0daf40442df1c2a0817c9783cfb9524902121be993d5aaab24677
-  data.tar.gz: ca94497f4fc039bb66504cecbee41223ab61e11952b775f0949d1354dcedb6f1e5704ca1bf3e15a4fe9b20ff3451edf23678ee2a11ded8fae6ac587d07bda0e5
+  metadata.gz: e226856a75147c8c1e1de93f53986b78af452c6db3ad022c7ef3097816cc558eccc5976cb089c4e05ad1fcd7b5b7b7a144a4539a979cad8044d01a70b50785f7
+  data.tar.gz: 41391e1a31adc2a4c1ab4db9ac8ed57176e5799bfef635ecc58e6bb9580bf2d873011670583a5cd366ff16dc51a779da45c1c8d596989cbdbe36ad6a09b0a75b

data/README.md

@@ -25,6 +25,7 @@ Usage: $ gcloud_hosts [options]
     -n, --network NETWORK            gcloud network to filter on. Defaults nil.
     -d, --domain DOMAIN              Domain to append to all hosts. Default: "c.[PROJECT].internal"
         --public PUBLIC              Pattern to match for public/bastion hosts. Use public IP for these. Defaults to nil
+        --[no-]exclude-public        Exclude public hosts from list when updating hosts file. Allows them to be managed manually. Defaults to false
     -f, --file FILE                  Hosts file to update. Defaults to /etc/hosts
     -b, --backup BACKUP              Path to backup original hosts file to. Defaults to FILE with '.bak' extension appended.
         --[no-]dry-run               Dry run, do not modify hosts file. Defaults to false

data/lib/gcloud_hosts/hosts.rb

@@ -12,18 +12,20 @@ module GcloudHosts
         end.sort { |x,y| x["name"] <=> y["name"] }
     end
 
-    def self.hosts(gcloud_path, project, network, domain, public_pattern)
+    def self.hosts(gcloud_path, project, network, domain, public_pattern, exclude_public)
       instances(gcloud_path, project, network).inject([]) do |list, i|
         begin
           if public_pattern.to_s.strip != "" && i["name"].downcase.include?(public_pattern)
-            # get external ip address
-            i["networkInterfaces"].each do |ni|
-              ni["accessConfigs"].each do |ac|
-                if ac["name"].downcase.include?("nat") && ac["type"].downcase.include?("nat")
-                  if ip = ac["natIP"]
-                    str = "#{ip} #{i["name"]}"
-                    list << str
-                    raise HostError.new
+            if !exclude_public
+              # get external ip address
+              i["networkInterfaces"].each do |ni|
+                ni["accessConfigs"].each do |ac|
+                  if ac["name"].downcase.include?("nat") && ac["type"].downcase.include?("nat")
+                    if ip = ac["natIP"]
+                      str = "#{ip} #{i["name"]}"
+                      list << str
+                      raise HostError.new
+                    end
                   end
                 end
               end

data/lib/gcloud_hosts/options.rb

@@ -12,6 +12,7 @@ module GcloudHosts
         network: nil,
         domain: nil,
         public: nil,
+        exclude_public: false,
         file: '/etc/hosts',
         backup: nil,
         dry_run: false,
@@ -41,6 +42,9 @@ module GcloudHosts
           opts.on('--public PUBLIC', "Pattern to match for public/bastion hosts. Use public IP for these. Defaults to nil") do |opt|
             @options[:public] = opt
           end
+          opts.on('--[no-]exclude-public', "Exclude public hosts from list when updating hosts file. Allows them to be managed manually. Defaults to false") do |opt|
+            @options[:exclude_public] = opt
+          end
           opts.on('-f', '--file FILE', "Hosts file to update. Defaults to /etc/hosts") do |opt|
             @options[:file] = opt
           end

data/lib/gcloud_hosts/runner.rb

@@ -28,7 +28,7 @@ module GcloudHosts
       if @options[:delete]
         new_hosts_list = []
       else
-        new_hosts_list = Hosts.hosts(@options[:gcloud], project, @options[:network], domain, @options[:public])
+        new_hosts_list = Hosts.hosts(@options[:gcloud], project, @options[:network], domain, @options[:public], @options[:exclude_public])
       end
       Updater.update(new_hosts_list.join("\n"), project, @options[:file], backup, @options[:dry_run], @options[:delete])
     end

data/lib/gcloud_hosts/version.rb

@@ -1,3 +1,3 @@
 module GcloudHosts
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gcloud_hosts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Tongen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler