gcloud_hosts 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2ddcd65fb8f4196960205752361d591aa7ff7f4
-  data.tar.gz: a37e9aa6c729f372e941149f8797c34598a9432b
+  metadata.gz: 67c9cf2078e975e924cf0c7da637214ef0959379
+  data.tar.gz: 22e9c351e240c14e1e0ec341bd2dee7f7b66020d
 SHA512:
-  metadata.gz: e226856a75147c8c1e1de93f53986b78af452c6db3ad022c7ef3097816cc558eccc5976cb089c4e05ad1fcd7b5b7b7a144a4539a979cad8044d01a70b50785f7
-  data.tar.gz: 41391e1a31adc2a4c1ab4db9ac8ed57176e5799bfef635ecc58e6bb9580bf2d873011670583a5cd366ff16dc51a779da45c1c8d596989cbdbe36ad6a09b0a75b
+  metadata.gz: a97080304ac9a2d7332d9ed2e127478d291e645114b83a7d5b7b9144789d66c692e0c5691169969fe80482f4d5763f8566041f522e09bb6e840d9980c5c37099
+  data.tar.gz: 4597b5ba293d1e6b9dff6126f095a230af5a3373332c9cdd37ef026ddbc85374a697b84f7e556c827528fb6de981c1e30213eb0355280b79018f5423881a1b3f

data/lib/gcloud_hosts/options.rb

@@ -16,7 +16,8 @@ module GcloudHosts
         file: '/etc/hosts',
         backup: nil,
         dry_run: false,
-        delete: false
+        delete: false,
+        clear: false
       }
       parser.parse!(args)
     end
@@ -57,6 +58,9 @@ module GcloudHosts
           opts.on('--[no-]delete', "Delete the project from hosts file. Defaults to false") do |opt|
             @options[:delete] = opt
           end
+          opts.on('--[no-]clear', "Clear all gcloud host entries from hosts file. Defaults to false") do |opt|
+            @options[:clear] = opt
+          end
           opts.on_tail("--help", "Show this message") do
             puts opts
             exit

data/lib/gcloud_hosts/runner.rb

@@ -8,29 +8,39 @@ module GcloudHosts
     end
 
     def run!
-      project = @options[:project]
-      if project.to_s.strip == ""
-        project = env["core"]["project"]
+      project = @options[:project].to_s.strip
+      if @options[:clear]
+        if project != ""
+          raise ArgumentError.new("Cannot specify 'clear' and 'project' at the same time.")
+        end
       end
-      if project.to_s.strip == ""
-        raise AuthError.new("No gcloud project specified.")
+      if project == ""
+        project = env["core"]["project"].to_s.strip
       end
-
-      if @options[:domain]
-        domain = @options[:domain].to_s.strip
-      else
-        domain = "c.#{project}.internal"
+      if project == ""
+        raise AuthError.new("No gcloud project specified.")
       end
 
       backup = @options[:backup] ||
         @options[:file] + '.bak'
 
-      if @options[:delete]
-        new_hosts_list = []
+      if @options[:clear]
+        Updater.clear(@options[:file], backup, @options[:dry_run])
       else
-        new_hosts_list = Hosts.hosts(@options[:gcloud], project, @options[:network], domain, @options[:public], @options[:exclude_public])
+        if @options[:domain]
+          domain = @options[:domain].to_s.strip
+        else
+          domain = "c.#{project}.internal"
+        end
+
+
+        if @options[:delete]
+          new_hosts_list = []
+        else
+          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
-      Updater.update(new_hosts_list.join("\n"), project, @options[:file], backup, @options[:dry_run], @options[:delete])
     end
 
     private

data/lib/gcloud_hosts/updater.rb

@@ -11,8 +11,8 @@ module GcloudHosts
     end
 
     def self.update(new_hosts, project, file, backup_file, dry_run, delete)
-      start_marker = "# START GCLOUD HOSTS - #{project} #"
-      end_marker = "# END GCLOUD HOSTS - #{project} #"
+      start_marker = get_start_marker(project)
+      end_marker = get_end_marker(project)
 
       old_hosts = File.read(file)
 
@@ -98,6 +98,35 @@ module GcloudHosts
       new_content
     end
 
+    def self.clear(file, backup_file, dry_run)
+      old_hosts = File.read(file)
+      new_content = old_hosts.dup
+
+      markers = old_hosts.each_line.map do |line|
+        regex = "\# (START|END) GCLOUD HOSTS - (.+) \#"
+        if m = line.match(/^#{regex}$/)
+          m[2]
+        end
+      end.compact.uniq
+
+      markers.each do |project|
+        start_marker = get_start_marker(project)
+        end_marker = get_end_marker(project)
+
+        new_content = delete_project_hosts(new_content, start_marker, end_marker)
+      end
+      new_content.gsub!(/\s+$/, "\n")
+
+      if dry_run
+        puts new_content
+      elsif new_content != old_hosts
+        # backup old host file
+        File.open(backup_file, 'w') { |f| f << old_hosts }
+        # write new content
+        File.open(file, 'w') { |f| f << new_content }
+      end
+    end
+
     def self.delete_project_hosts(hosts, start_marker, end_marker)
       new_content = ''
       marker_state = Marker::BEFORE
@@ -128,5 +157,13 @@ module GcloudHosts
       new_content
     end
 
+    def self.get_start_marker(project)
+      "# START GCLOUD HOSTS - #{project} #"
+    end
+
+    def self.get_end_marker(project)
+      "# END GCLOUD HOSTS - #{project} #"
+    end
+
   end
 end

data/lib/gcloud_hosts/version.rb

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

metadata

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