hostor 1.0.1 → 2.0.0

data/bin/hostor

@@ -1,8 +1,31 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+
 require 'rubygems'
 require 'optparse'
 require 'etc'
-require 'ftools'
+require "iconv" 
+
+host_os = RbConfig::CONFIG['host_os']
+if host_os =~ /mswin|msys|mingw32/
+  alias _puts puts
+  def puts string
+    _puts Iconv.iconv("GB2312","UTF-8", string)   
+  end
+end
+
+if RUBY_VERSION =~ /1\.8\../
+  require 'ftools'
+  def copy(src, dest)
+    File.copy(src, dest)
+  end
+else
+  require 'fileutils'
+  def copy(src, dest)
+    FileUtils.cp(src, dest)
+  end
+end
+
 require 'tempfile'
 require 'rbconfig'
 
@@ -54,6 +77,8 @@ module Hostor
     os.eql? :linux
   end
 
+
+
   #todo: 根据不同平台获取当前目录
   def hostor_dir
     user = Etc.getlogin
@@ -70,16 +95,14 @@ module Hostor
 
   def get_host_name(path)
     unknown = "未定名称的HOST文件"
-    ln = nil
-    File.open(path, 'r').each_line do |line| 
-      ln = line
-      break
-    end
-    return unknown if ln.nil?
+    ln = File.open(path){|f| f.read}
+    return unknown if ln.empty?
 
     if (ln =~ /#==\[.*?\]==/).eql? 0
-      m = ln.match /#==\[(.*)?\.host\]==\B/
-      m[1] || unknown
+      m = ln.match /#==\[(.*)?\]==\B/
+      m1 = m[1].to_s
+      m1.gsub!(/\.host/, "") if m1
+      m1 || unknown
     else
       unknown
     end
@@ -92,7 +115,7 @@ module Hostor
       Dir.mkdir(hostor_dir)
       puts "创建hostor配置目录#{hostor_dir}"
 
-      File.copy(sys_host_file, default_host)
+      copy(sys_host_file, default_host)
       puts "复制#{sys_host_file}到#{default_host}"
 
       File.prepend(default_host, "#==[default.host]==\n")
@@ -111,8 +134,39 @@ module Hostor
     raise "名为#{name}.host的文件不存在"
   end
 
+  def common_host
+    p1 = "#{hostor_dir}/common"
+    return p1 if File.exists?  p1
+    p2 = "#{hostor_dir}/common.host"
+    return p2 if File.exists?  p2
+    return nil
+  end
+
   def switch(file)
-    File.copy(get_path_by_name(file), sys_host_file)
+    if file =~ /\+/
+      pathes  = file.split('+').collect {|f| get_path_by_name(f) }
+      s = File.open(sys_host_file, 'w')
+      s.write("#==[" + file +"]==#\n")
+      pathes.each {|p| s.write(File.read(p)) }
+      s.close
+      return
+    end
+
+    path = get_path_by_name(file)
+    unless file == 'common'
+      comm = common_host()
+      if comm
+        s = File.open(sys_host_file, 'w')
+        head = File.open(path){|f| f.readline }
+        s.write(head)
+        s.write(File.read(comm))
+        s.write(File.read(path))
+        s.close
+        return
+      end
+    end
+
+    copy(path, sys_host_file)
   end
 
   def current
@@ -155,7 +209,7 @@ module Hostor
       if File.exists? dest
         raise "已经添加了名为#{basename}文件，请重命名后添加或者使用#$0 --remove #{basename} 删除已有文件"
       else
-        File.copy(file_bak, dest)
+        copy(file_bak, dest)
         File.prepend(dest, "#==[#{basename}]==\n")
       end
     else
@@ -175,17 +229,21 @@ module Hostor
         init()
       end
 
-      opts.on('-a', '--add <file>', "将指定文件加入hostor管理") do |file|
+      opts.on('--empty', "清空host") do |file|
+        s = File.open(sys_host_file, 'w')
+        #s.write("#==[empty.host]==\n")
+        s.close
+      end
+
+      opts.on('--add <hostname>', "将指定文件加入hostor管理") do |file|
         add(file)
       end
 
-      opts.on('-e', '--edit [file]', "编辑指定的HOST文件") do |file|
+      opts.on('-e', '--edit [hostname]', "编辑指定的HOST文件") do |file|
         f = file || current
         dest = get_path_by_name(f)
-        if is_mac
-          `open -a macvim #{dest}`
-        elsif is_linux
-          `xterm -e vim #{dest}`
+        if is_mac or is_linux
+          system(ENV["EDITOR"] || "vim",dest) 
         elsif is_windows
           `notepad #{dest}`
         end
@@ -194,19 +252,19 @@ module Hostor
         end
       end
 
-      opts.on('-r', '--remove <file>', "从hostor文件夹移除指定的HOST文件") do |file|
+      opts.on('--remove <hostname>', "从hostor文件夹移除指定的HOST文件") do |file|
         remove(file)
       end
 
       #适用于 -a -d 
-      #opts.on('-t', '--target <file>', "指定操作的HOST文件") do |name|
+      #opts.on('-t', '--target <hostname>', "指定操作的HOST文件") do |name|
       #end
 
       opts.on('-l', '--list', "列举当前用户的所有HOST文件") do
         list().each{|l| puts l}
       end
 
-      opts.on('-v', '--view [file]', "查看指定的HOST文件") do |name|
+      opts.on('-v', '--view [hostname]', "查看指定的HOST文件") do |name|
         view(name)
       end
 
@@ -214,13 +272,31 @@ module Hostor
         puts current()
       end
 
-      opts.on('-s', '--switch <file>', "将指定HOST文件设为系统当前HOST文件") do |file|
+      opts.on('-s', '--switch <hostname>', "将指定HOST文件设为系统当前HOST文件") do |file|
         switch(file)
       end
+
+      opts.on('-d', '--delete <host_or_ip> [hostname]', "删除指定设置") do |host_or_ip|
+        path = get_path_by_name(args[0] || current)
+        #puts "ruby -p -e \"gsub(/^.*#{host_or_ip.gsub('.','\.')}.*?$/,'')\" #{path}"
+        `ruby -pi.bak -e "gsub(/^.*#{host_or_ip.gsub('.','\.')}.*?\n/,'')" #{path}`
+      end
+
+      opts.on('-r', '--reload', "重新载入设置") do 
+        switch(current)
+      end
+
+      opts.on('-a', '--append <setting> [hostname]', "追加设置") do |setting|
+        path = get_path_by_name(args[0] || current)
+        File.open(path, 'a') do |f|
+          f.puts setting
+        end
+      end
     end
 
     begin
       if args.length.eql? 0
+        #puts current
         view(nil)
       elsif args.length.eql? 1 and args[0] =~ /^[^-]/
         switch(args[0])
@@ -237,5 +313,3 @@ end
 
 include Hostor
 main ARGV
-
-

metadata

@@ -3,35 +3,35 @@ name: hostor
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-    - 1
-    - 0
-    - 1
-  version: 1.0.1
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
-  - Zhong Xingdou
+- Zhong Xingdou
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 +08:00
+date: 2011-07-21 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
-description: "    system host file manager\n"
+description: "    host management tools\n    host\xE7\xAE\xA1\xE7\x90\x86\xE5\xB7\xA5\xE5\x85\xB7\n"
 email: zhongxingdou@gmail.com
 executables: 
-  - hostor
-  - hostor_gui
+- hostor
+- hostor_gui
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-  - bin/hostor_gui
-  - bin/hostor
-  - bin/hostor.png
-  - bin/hostor_gui.bat
+- bin/hostor_gui
+- bin/hostor
+- bin/hostor.png
+- bin/hostor_gui.bat
 has_rdoc: true
 homepage: 
 licenses: []
@@ -40,29 +40,27 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !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"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: system host file manager
+summary: host management tools
 test_files: []