rhosts 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aa43a36fdbc77c86d21e7de74c8bf38016e93908
+  data.tar.gz: 359709c1b178116b2704731a28cc3b75d2bdc027
+SHA512:
+  metadata.gz: a88d2772c2d6f6c842f64c34e043b90e3447d63b62f8e59121bee513507d4ffccf416289e6088b311b2d95ecb66b83a8eda66467ea2f9ce1ad966bf121e04ee2
+  data.tar.gz: 7a2ef8048fa29442ca4f7dbdab0d026b142fb6634bcf75cacfe7cb4918c2f5dbe82b150e66ee6c972b4dd1b75bc104a3afc093c931fe8bfa16d6843acba59bd1

data/README.md

@@ -95,3 +95,10 @@ rhosts> actives
   stg-www.example.com
 
 ```
+
+## advanced
+You can override default settings.
+You can add original rule to map/unmap.
+You can define alias name to IP/host.
+
+see .rhostsrc

data/lib/rhosts/commands/console.rb

@@ -10,9 +10,6 @@ module RHosts
     include RHosts::Rulable
     include RHosts::Alias
 
-    alias_host 'exp',       'www.example.com'
-    alias_ip   'localhost', '127.0.0.1'
-
     class << self
       def start
         @console = new
@@ -20,8 +17,8 @@ module RHosts
         load_default_rules
         load_run_command
 
-        unless File.writable?(RHosts.config.hosts_file_path)
-          STDERR.puts "Hosts file is not writable. Please check permission"
+        unless File.writable?(RHosts.config.hosts_file_path) and RHosts.config.sudo?
+          warn "Hosts file is not writable. Please check permission"
           exit 1
         end
 

data/lib/rhosts/configuration.rb

@@ -1,9 +1,13 @@
 module RHosts
   class Configuration
-    attr_accessor :hosts_file_path, :backup_dir, :make_backup
+    attr_accessor :hosts_file_path, :backup_dir, :make_backup, :sudo
 
     def make_backup?
       make_backup
     end
+
+    def sudo?
+      sudo
+    end
   end
 end

data/lib/rhosts/console/app.rb

@@ -13,11 +13,14 @@ module RHosts
 
     def map(target)
       process(target) do |host, ip|
+        inactivate(host)
+
         unless inactives[ip].empty?
           inactives[ip].delete_if{ |h| h == host }
-          inactives.delete(ip) if inactives[ip].empty?
         end
 
+        inactives.delete(ip) if inactives[ip].empty?
+
         actives[ip] << host
         puts "map #{host} to #{ip}"
       end
@@ -27,9 +30,10 @@ module RHosts
       process(target) do |host, ip|
         unless actives[ip].empty?
           actives[ip].delete_if{ |h| h == host }
-          actives.delete(ip) if actives[ip].empty?
         end
 
+        actives.delete(ip) if actives[ip].empty?
+
         inactives[ip] << host
         puts "unmap #{host} from #{ip}"
       end
@@ -58,7 +62,7 @@ module RHosts
 
         ip_without_zone_index = ip.split('%')[0]
         unless IPAddress.valid?(ip_without_zone_index)
-          STDERR.puts "#{ip} is invalid IP Address!"
+          warn "#{ip} is invalid IP Address!"
           next
         end
 
@@ -71,5 +75,16 @@ module RHosts
       # TODO
       # after_actions.each{ |action| action.call }
     end
+
+    def inactivate(host)
+      actives.each do |active_ip, active_hosts|
+        if active_hosts.include?(host)
+          active_hosts.delete(host)
+          actives.delete(active_ip) if active_hosts.empty?
+
+          inactives[active_ip] << host
+        end
+      end
+    end
   end
 end

data/lib/rhosts/filer.rb

@@ -22,13 +22,15 @@ module RHosts
               ip_without_zone_index = ip.split('%')[0]
               next unless IPAddress.valid?(ip_without_zone_index)
 
-              storage[ip] ||= []
               storage[ip] += hosts
             end
           end
         end
 
         [actives, inactives]
+      rescue
+        warn "hosts file load error. #{RHosts.config.hosts_file_path}"
+        exit
       end
 
       def backup
@@ -38,28 +40,50 @@ module RHosts
         if File.writable?(RHosts.config.backup_dir)
           FileUtils.cp(hosts_file_path, bk_file_path)
           puts "backup: #{bk_file_path}"
+        elsif RHosts.config.sudo?
+          system "sudo cp #{hosts_file_path} #{bk_file_path}"
+          puts "backup: #{bk_file_path}"
         else
-          STDERR.puts "backup file is not writable. #{bk_file_path}"
-          STDERR.puts 'So we will backup to tmp dir'
+          warn "backup file is not writable. #{bk_file_path}"
+          warn 'So we will backup to tmp dir'
           tmp = tmp_file_path
           FileUtils.cp(hosts_file_path, tmp)
-          STDERR.puts "backup: #{tmp}"
+          warn "backup: #{tmp}"
         end
       end
 
       def save(actives, inactives)
         # TODO: reload hosts file if chnaged after load
         hosts_file_path = RHosts.config.hosts_file_path
-        unless File.writable?(hosts_file_path)
-          STDERR.puts "Hosts file is not writable. Please check permission"
-          exit 1
-        end
 
-        File.open(RHosts.config.hosts_file_path, 'w') do |file|
-          actives.each{ |ip, hosts| file.write("#{ip} #{hosts.to_a.join(' ')}\n") }
-          inactives.each{ |ip, hosts| file.write("##{ip} #{hosts.to_a.join(' ')}\n") }
+        contents = []
+        contents += actives.map do |ip, hosts|
+          hosts.map do |host|
+            "#{ip} #{host}"
+          end
+        end.flatten
+        contents += inactives.map do |ip, hosts|
+          hosts.map do |host|
+            "##{ip} #{host}"
+          end
+        end.flatten
+
+        if File.writable?(hosts_file_path)
+          File.open(hosts_file_path, 'w') do |file|
+            file.write contents.join("\n")
+          end
+          puts "save: #{hosts_file_path}"
+        elsif RHosts.config.sudo?
+          tmp = tmp_file_path
+          File.open(tmp, 'w') do |file|
+            file.write contents.join("\n")
+          end
+          system "sudo mv #{tmp} #{hosts_file_path}"
+          puts "save: #{hosts_file_path}"
+        else
+          warn "Hosts file is not writable. Please check permission"
+          exit 1
         end
-        puts "save: #{hosts_file_path}"
       end
 
       private

data/lib/rhosts/version.rb

@@ -1,5 +1,5 @@
 module RHosts # :nodoc:
   module Version # :nodoc:
-    STRING = '0.0.2'
+    STRING = '0.1.0'
   end
 end

data/lib/rhosts.rb

@@ -25,4 +25,5 @@ RHosts.configure do |c|
   c.hosts_file_path = '/etc/hosts'
   c.backup_dir      = '/etc'
   c.make_backup     = true
+  c.sudo            = false
 end

data/spec/lib/rhosts/console/app_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+require 'rhosts/filer'
+require 'rhosts/console/app'
+
+describe 'ConsoleMethods' do
+  include RHosts::ConsoleMethods
+
+  include_context 'alias_stub'
+  include_context 'filer_stub'
+
+  describe '#map' do
+    context 'new host' do
+      before do
+        map 'localhost' => '127.0.0.1'
+      end
+
+      it 'mapped to actives' do
+        expect(actives).to eq({ '127.0.0.1' => Set.new(['localhost']) })
+        expect(inactives).to eq({ })
+      end
+    end
+
+    context 'duplicated host' do
+      before do
+        actives['127.0.0.1'] << 'localhost'
+        map 'localhost' => '127.0.0.1'
+      end
+
+      it 'mapped only one to actives' do
+        expect(actives).to eq({ '127.0.0.1' => Set.new(['localhost']) })
+        expect(inactives).to eq({ })
+      end
+    end
+
+    context 'unmapped host' do
+      before do
+        inactives['127.0.0.1'] << 'localhost'
+        map 'localhost' => '127.0.0.1'
+      end
+
+      it 'mapped to actives' do
+        expect(actives).to eq({ '127.0.0.1' => Set.new(['localhost']) })
+        expect(inactives).to eq({ })
+      end
+    end
+
+    context 'mapped other host' do
+      before do
+        actives['127.0.0.2'] << 'localhost'
+        map 'localhost' => '127.0.0.1'
+      end
+
+      it 'mapped to actives' do
+        expect(actives).to eq({ '127.0.0.1' => Set.new(['localhost']) })
+        expect(inactives).to eq({ '127.0.0.2' => Set.new(['localhost']) })
+      end
+    end
+  end
+
+  describe '#unmap' do
+    context 'new host' do
+      before do
+        unmap 'localhost' => '127.0.0.1'
+      end
+
+      it 'mapped to inactive' do
+        expect(actives).to eq({ })
+        expect(inactives).to eq({ '127.0.0.1' => Set.new(['localhost']) })
+      end
+    end
+
+    context 'duplicated host' do
+      before do
+        inactives['127.0.0.1'] << 'localhost'
+        unmap 'localhost' => '127.0.0.1'
+      end
+
+      it 'mapped only one to actives' do
+        expect(actives).to eq({ })
+        expect(inactives).to eq({ '127.0.0.1' => Set.new(['localhost']) })
+      end
+    end
+
+    context 'mapped host' do
+      before do
+        actives['127.0.0.1'] << 'localhost'
+        unmap 'localhost' => '127.0.0.1'
+      end
+
+      it 'mapped to actives' do
+        expect(actives).to eq({ })
+        expect(inactives).to eq({ '127.0.0.1' => Set.new(['localhost']) })
+      end
+    end
+
+    context 'unmapped other host' do
+      before do
+        inactives['127.0.0.2'] << 'localhost'
+        unmap 'localhost' => '127.0.0.1'
+      end
+
+      it 'mapped to actives' do
+        expect(actives).to eq({ })
+        expect(inactives).to eq({ '127.0.0.1' => Set.new(['localhost']), '127.0.0.2' => Set.new(['localhost']) })
+      end
+    end
+  end
+end

data/spec/lib/rhosts/filer_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+require 'rhosts/filer'
+require 'stringio'
+
+describe 'Filer' do
+  include_context 'capture_stderr'
+
+  context 'hosts file is not exist' do
+    before do
+      RHosts::Filer::Mock.error('read')
+    end
+
+    it 'should display error message and exit' do
+      err = capture_stderr do
+        expect{ RHosts::Filer.load }.to raise_error(SystemExit)
+      end
+
+      expect(err.chomp).to eq("hosts file load error. #{RHosts.config.hosts_file_path}")
+    end
+  end
+
+  context 'hosts file is exist' do
+    before do
+      @input  = input
+      @output = output
+
+      RHosts::Filer::Mock.read(@input)
+      RHosts::Filer::Mock.writable(true)
+      RHosts::Filer::Mock.write(@output)
+
+      @actives, @inactives = RHosts::Filer.load
+      RHosts::Filer.save(@actives, @inactives)
+    end
+
+    context 'but empty' do
+      let(:input){ StringIO.new }
+      let(:output){ StringIO.new }
+
+      it 'should not have any mapping' do
+        expect(@actives).to eq({})
+        expect(@inactives).to eq({})
+      end
+
+      it 'should save nothing' do
+        expect(@output.string).to be_empty
+      end
+    end
+
+    context 'hosts file include active mapping' do
+      let(:input){ StringIO.new("127.0.0.1 localhost") }
+      let(:output){ StringIO.new }
+
+      it 'should be loaded as active' do
+        hosts = Set.new()
+        hosts += ['localhost']
+        expect(@actives).to eq({ '127.0.0.1' => hosts })
+        expect(@inactives).to eq({})
+      end
+
+      it 'should be saved as active' do
+        expect(@output.string).to eq(@input.string)
+      end
+    end
+
+    context 'hosts file include inactive mapping' do
+      let(:input){ StringIO.new("#127.0.0.1 localhost") }
+      let(:output){ StringIO.new }
+
+      it 'should be loaded as inactive' do
+        hosts = Set.new()
+        hosts += ['localhost']
+        expect(@actives).to eq({})
+        expect(@inactives).to eq({ '127.0.0.1' => hosts })
+      end
+
+      it 'should be saved as inactive' do
+        expect(@output.string).to eq(@input.string)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'pry'
 require File.expand_path('../../lib/rhosts',  __FILE__)
 
 # This file was generated by the `rspec --init` command. Conventionally, all
@@ -17,3 +18,5 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
+
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f }

data/spec/support/alias_stub.rb

@@ -0,0 +1,4 @@
+shared_context 'alias_stub' do
+  def alias_hosts; {} end
+  def alias_ips; {} end
+end

data/spec/support/capture_stderr.rb

@@ -0,0 +1,17 @@
+# http://stackoverflow.com/questions/4459330/how-do-i-temporarily-redirect-stderr-in-ruby
+
+require 'stringio'
+
+shared_context 'capture_stderr' do
+  def capture_stderr
+    # The output stream must be an IO-like object. In this case we capture it in
+    # an in-memory IO object so we can return the string value. You can assign any
+    # IO object here.
+    previous_stderr, $stderr = $stderr, StringIO.new
+    yield
+    $stderr.string
+  ensure
+    # Restore the previous value of stderr (typically equal to STDERR).
+    $stderr = previous_stderr
+  end
+end

data/spec/support/filer_mock.rb

@@ -0,0 +1,51 @@
+module RHosts
+  module Filer
+    module Mock
+      class << self
+        def read(io)
+          open('r')
+            .and_yield(io)
+        end
+
+        def writable(bool)
+          File
+            .stub(:writable?)
+            .with(RHosts.config.hosts_file_path)
+            .and_return(bool)
+        end
+
+        def write(io)
+          open('w')
+            .and_yield(io)
+        end
+
+        def error(action)
+          case action
+          when 'read'
+            open('r')
+              .and_raise(Errno::ENOENT.new)
+          when 'write'
+            open('w')
+              .and_raise(Errno::ENOENT.new)
+          when 'writable'
+            File
+              .stub(:writable?)
+              .and_raise(Errno::ENOENT.new)
+          end
+        end
+
+        def reset
+          File.unstub(:open)
+          File.unstub(:writable?)
+        end
+
+        private
+        def open(mode)
+          File
+            .stub(:open)
+            .with(RHosts.config.hosts_file_path, mode)
+        end
+      end
+    end
+  end
+end

data/spec/support/filer_stub.rb

@@ -0,0 +1,7 @@
+shared_context 'filer_stub' do
+  before do
+    RHosts::Filer.stub(:load).and_return(true)
+    RHosts::Filer.stub(:backup).and_return(true)
+    RHosts::Filer.stub(:save).and_return(true)
+  end
+end

metadata

@@ -1,46 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rhosts
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Takeshi Takizawa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-24 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ipaddress
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: hosts file manager
 email: TakiTake.create@gmail.com
-executables: 
+executables:
 - rhosts
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/rhosts.rb
 - lib/rhosts/alias.rb
 - lib/rhosts/cli.rb
@@ -53,41 +44,44 @@ files:
 - lib/rhosts/version.rb
 - License.txt
 - README.md
-- spec/console/app_spec.rb
+- spec/lib/rhosts/console/app_spec.rb
+- spec/lib/rhosts/filer_spec.rb
 - spec/spec_helper.rb
+- spec/support/alias_stub.rb
+- spec/support/capture_stderr.rb
+- spec/support/filer_mock.rb
+- spec/support/filer_stub.rb
 - bin/rhosts
-has_rdoc: true
 homepage: http://github.com/TakiTake/rhosts
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rhosts
-rubygems_version: 1.3.7
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: rhosts-0.0.2
-test_files: 
-- spec/console/app_spec.rb
+specification_version: 4
+summary: rhosts-0.1.0
+test_files:
+- spec/lib/rhosts/console/app_spec.rb
+- spec/lib/rhosts/filer_spec.rb
 - spec/spec_helper.rb
+- spec/support/alias_stub.rb
+- spec/support/capture_stderr.rb
+- spec/support/filer_mock.rb
+- spec/support/filer_stub.rb

data/spec/console/app_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-require 'rhosts/console/app'
-
-describe 'ConsoleMethods' do
-  include RHosts::ConsoleMethods
-
-  describe '#map' do
-    before do
-      map 'example.com' => '127.0.0.1'
-    end
-
-    after do
-      @actives.clear
-      @inactives.clear
-    end
-
-    it 'map example.com to 127.0.0.1' do
-      expect(actives).to eq('127.0.0.1' => ['example.com'])
-      expect(inactives).to eq({ })
-    end
-  end
-end