ghost 1.0.0.pre → 1.0.0.pre.2

data/README.md

@@ -65,6 +65,11 @@ Command
     Listing 1 host(s):
       staging-server.local -> 64.233.167.99
 
+With RVM you need to add `rvmsudo` before the command:
+
+    $ rvmsudo ghost add mydevsite.local
+      [Adding] mydevsite.local -> 127.0.0.1
+
 Library
 -------
 
@@ -77,23 +82,37 @@ Installation
 
     sudo gem install ghost
 
+If you are using RVM:
+
+    gem install ghost
+
 Contributors
 ============
 
-If this list is ever out of date, you can get full contributor list with `git log --format='%aN (%ae)' | sort -u`
+If this list is ever out of date, you can get full contributor list
+with `git log --format='%aN (%ae)' | sort -u` or from [here](https://github.com/bjeanes/ghost/graphs/contributors).
 
 * [Alkesh Vaghmaria](https://github.com/alkesh)
 * [Andrei Serdeliuc](https://github.com/extraordinaire)
 * [Ben Hoskings](https://github.com/benhoskings)
-* [Bodaniel Jeanes](https://github.com/bjeanes)
-* [Courtois Simon](https://github.com/simonc)
+* [Bo Jeanes](https://github.com/bjeanes)
+* [David Warkentin](https://github.com/ev0rtex)
+* [Duncan Beevers](https://github.com/duncanbeevers)
 * [Felipe Coury](https://github.com/fcoury)
+* [Finn Smith](https://github.com/finn)
+* [Geoff Wagstaff](https://github.com/TheDeveloper)
+* [Johannes Thoenes](https://github.com/jthoenes)
 * [Justin Mazzi](https://github.com/jmazzi)
 * [Lars Fronius](https://github.com/LarsFronius)
 * [Lee Jensen](https://github.com/outerim)
+* [Luiz Galaviz](https://github.com/MGalv)
+* [Luiz Rocha](https://github.com/lsdr)
 * [Mitchell Riley](https://github.com/mitchellvriley)
+* [Noah Kantrowitz](https://github.com/coderanger)
 * [Ryan Bigg](https://github.com/radar)
 * [Sam Beam](https://github.com/sbeam)
+* [Simon Courtois](https://github.com/simonc)
+* [Turadg Aleahmad](https://github.com/turadg)
 
 Legal Stuff
 ===========

data/lib/ghost/cli/task/set.rb

@@ -0,0 +1,25 @@
+Ghost::Cli.task :set do
+  desc "Add a host or modify the IP of an existing host"
+  def perform(host, ip = nil)
+    host = Ghost::Host.new(*[host, ip].compact)
+    Ghost.store.set(host)
+    puts "[Setting] #{host.name} -> #{host.ip}"
+  rescue Ghost::Host::NotResolvable
+    abort "Unable to resolve IP address for target host #{ip.inspect}."
+  end
+
+  help do
+    <<-EOF.unindent
+    Usage: ghost set <local host name> [<remote host name>|<IP address>]
+
+    #{desc}.
+
+    If a second parameter is not provided, it defaults to 127.0.0.1
+
+    Examples:
+      ghost set my-localhost          # points to 127.0.0.1
+      ghost set google.dev google.com # points to the IP of google.com
+      ghost set router 192.168.1.1    # points to 192.168.1.1
+    EOF
+  end
+end

data/lib/ghost/store/hosts_file_store.rb

@@ -2,21 +2,19 @@ require 'set'
 
 require 'ghost/host'
 require 'ghost/tokenized_file'
+require 'resolv'
 
 module Ghost
   module Store
     # TODO: A lot of this duplicates Resolv::Hosts in Ruby stdlib.
     #       Can that be modifiied to use tokens in place of this?
     class HostsFileStore
-      attr_accessor :path, :file
+      attr_accessor :path, :file, :strict
 
-      # TODO: Support windows locations:
-      #   Windows 95/98/Me  c:\windows\hosts
-      #   Windows NT/2000/XP Pro  c:\winnt\system32\drivers\etc\hosts
-      #   Windows XP Home c:\windows\system32\drivers\etc\hosts
-      def initialize(path = "/etc/hosts")
+      def initialize(path = Resolv::Hosts::DefaultFileName)
         self.path = path
         self.file = Ghost::TokenizedFile.new(path, "# ghost start", "# ghost end")
+        self.strict = true
       end
 
       def add(host)
@@ -28,6 +26,16 @@ module Ghost
         true
       end
 
+      def set(host)
+        sync do |buffer|
+          delete_host host, buffer
+          buffer[host.ip] << host.name
+          buffer_changed!
+        end
+
+        true
+      end
+
       def all
         sync do |buffer|
           buffer.map do |ip, hosts|
@@ -41,17 +49,34 @@ module Ghost
       end
 
       def delete(host)
-        result = SortedSet.new
         sync do |buffer|
-          buffer.each do |ip, names|
-            names.dup.each do |name|
-              next unless host.match(name)
-              next if host.respond_to?(:ip) && host.ip != ip
+          delete_host host, buffer, :strict
+        end
+      end
+
+      def purge(host)
+        sync do |buffer|
+          delete_host host, buffer
+        end
+      end
 
-              result << Ghost::Host.new(name, ip)
-              names.delete(name)
-              buffer_changed!
+      def delete_host(host, buffer, strict = false)
+        result = SortedSet.new
+        buffer.each do |ip, names|
+          names.each do |name|
+            if host.kind_of? Host
+              next unless host.name == name
+            elsif host.kind_of? String
+              next unless host == name
+            else
+              next unless host.match(name)
             end
+
+            next if host.respond_to?(:ip) && host.ip != ip && strict
+
+            result << Ghost::Host.new(name, ip)
+            names.delete(name)
+            buffer_changed!
           end
         end
         result.to_a

data/lib/ghost/version.rb

@@ -1,3 +1,3 @@
 module Ghost
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0.pre.2"
 end

data/spec/ghost/cli/task/help_spec.rb

@@ -14,6 +14,7 @@ describe Ghost::Cli, :type => :cli do
           export     Export all hosts in /etc/hosts format
           import     Import hosts in /etc/hosts format
           list       Show all (or a filtered) list of hosts
+          set        Add a host or modify the IP of an existing host
 
         See 'ghost help <task>' for more information on a specific task.
       EOF

data/spec/ghost/store/hosts_file_store_spec.rb

@@ -34,7 +34,10 @@ describe Ghost::Store::HostsFileStore do
   before { write(contents) }
 
   it 'manages the default file of /etc/hosts when no file path is provided' do
-    described_class.new.path.should == "/etc/hosts"
+		previous_hosts_location = Resolv::Hosts::DefaultFileName
+		Resolv::Hosts::DefaultFileName = "hosts_location"
+    described_class.new.path.should == "hosts_location"
+		Resolv::Hosts::DefaultFileName = previous_hosts_location
   end
 
   it 'manages the file at the provided path when given' do
@@ -276,6 +279,95 @@ describe Ghost::Store::HostsFileStore do
     end
   end
 
+  describe "#set" do
+    let(:host) { Ghost::Host.new("github.com", "127.0.0.1") }
+
+    context 'with existing ghost-managed hosts in the file' do
+      let(:contents) do
+        <<-EOF.gsub(/^\s+/,'')
+          127.0.0.1 localhost localhost.localdomain
+          # ghost start
+          192.168.1.1 github.com
+          192.168.1.2 github.com
+          # ghost end
+        EOF
+      end
+
+      context 'when setting the host to an IP' do
+        it 'replaces all instances of that hostname with a single entry for that IP' do
+          store.set(host)
+          read.should == <<-EOF.gsub(/^\s+/,'')
+            127.0.0.1 localhost localhost.localdomain
+            # ghost start
+            127.0.0.1 github.com
+            # ghost end
+          EOF
+        end
+
+        it 'returns true' do
+          store.set(host).should be_true
+        end
+      end
+    end
+  end
+
+  describe "#purge" do
+    context 'with existing ghost-managed hosts in the file' do
+      let(:contents) do
+        <<-EOF.gsub(/^\s+/,'')
+          127.0.0.1 localhost localhost.localdomain
+          # ghost start
+          127.0.0.1 google.com
+          127.0.0.2 gooogle.com
+          192.168.1.1 github.com
+          # ghost end
+        EOF
+      end
+
+      context 'when purging one of the ghost entries' do
+        context 'using a Ghost::Host to identify host' do
+          context 'and the IP does not match an entry' do
+            let(:host) { Ghost::Host.new("google.com", "127.0.0.2") }
+
+            it 'returns array of removed hosts' do
+              store.purge(host).should == [Ghost::Host.new('google.com', '127.0.0.1')]
+            end
+
+            it 'removes the host from the file' do
+              store.purge(host)
+              read.should == <<-EOF.gsub(/^\s+/,'')
+                127.0.0.1 localhost localhost.localdomain
+                # ghost start
+                127.0.0.2 gooogle.com
+                192.168.1.1 github.com
+                # ghost end
+              EOF
+            end
+          end
+
+          context 'and the IP matches an entry' do
+            let(:host) { Ghost::Host.new("google.com", "127.0.0.1") }
+
+            it 'returns array of removed hosts' do
+              store.purge(host).should == [Ghost::Host.new('google.com', '127.0.0.1')]
+            end
+
+            it 'removes the host from the file' do
+              store.purge(host)
+              read.should == <<-EOF.gsub(/^\s+/,'')
+                127.0.0.1 localhost localhost.localdomain
+                # ghost start
+                127.0.0.2 gooogle.com
+                192.168.1.1 github.com
+                # ghost end
+              EOF
+            end
+          end
+        end
+      end
+    end
+  end
+
   describe "#empty" do
     context 'with no ghost-managed hosts in the file' do
       it 'returns false' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghost
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,41 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unindent
-  requirement: &70100277448360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100277448360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70100277447880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70100277447880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70100277447400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70100277447400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 description: Allows you to create, list, and modify local hostnames on POSIX systems
   (e.g. Mac OS X and Linux) and Windows
 email: me@bjeanes.com
@@ -62,6 +77,7 @@ files:
 - lib/ghost/cli/task/help.rb
 - lib/ghost/cli/task/import.rb
 - lib/ghost/cli/task/list.rb
+- lib/ghost/cli/task/set.rb
 - lib/ghost/cli/task.rb
 - lib/ghost/cli.rb
 - lib/ghost/host.rb
@@ -107,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: ghost
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Allows you to create, list, and modify local hostnames