whos 0.1.1 → 0.1.2

data/README.md

@@ -1 +1,45 @@
-wraps `whois` and removes the registrar boilerplate
+# Summary
+
+* wraps `whois` and removes the registrar boilerplate legal/marketing spam BS
+* pass in a FQDN and it checks it
+* pass in a base name and it checks for .com,.net,.org,etc.
+
+# Install
+
+    gem install whos
+    
+## Optional Install
+
+    echo "alias whois=whos" >> ~/.bash_profile
+    
+# Usage
+
+`whos foo.com` - runs `whois foo.com`. If it is available, or not, it says so in a single line.
+
+`whos -v foo.com` - If `foo.com` is not available, it shows you the whois response, minus the boilerplate legal/marketing registrar text
+
+`whos foo` - runs `whos foo.com` then `whos foo.com` then `whos foo.net` then `whos foo.org` etc.
+
+`whos -o foo.com` - If `foo.com` is taken, opens `http://foo.com` in a browser
+
+Multiple args work as expected.
+
+# Got more spam?
+
+Fork <http://github.com/alexch/whos> on github, add a file to the spam folder, run `rake install`, then send me a pull request
+
+# Credits
+
+Written in a fit of pique by Alex Chaffee <http://alexch.github.com>
+
+# Possible Improvements
+
+* shared spam db _a la_ [cheat](http://cheat.errtheblog.com)
+
+# Release History
+
+== 0.1.2 2011/08/07
+
+First real release
+
+

data/Rakefile

@@ -15,10 +15,10 @@ end
 
 $spec =
   begin
-    require 'rubygems/specification'
+    require 'rubygems/specification'    
     data = File.read('whos.gemspec')
     spec = nil
-    Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
+    Thread.new { spec = eval("$SAFE = 2\n#{data}") }.join
     spec
   end
 
@@ -52,7 +52,66 @@ file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
   sh cmd.gsub(/ +/, ' ')
 end
 
-desc 'Publish gem and tarball to rubyforge'
-task 'release' => [package('.gem'), package('.tar.gz')] do |t|
+module System
+  def sys(cmd, *flags)
+    fail_ok = flags.include? :fail_ok
+    quiet = flags.include? :quiet
+    puts ">> #{cmd}" unless quiet
+    result = `#{cmd}`
+    raise "#{cmd} failed with exit status #{$?.exitstatus}" unless $?.success? || fail_ok
+    result.chomp
+  end
+
+  def find_git
+    dirs = ["", "/opt/local/bin/", "/usr/local/bin/", "/usr/bin/"]
+    dirs.each do |dir|
+      file = dir + "git"
+      if File.exist?(file)
+        return file
+      end
+    end
+    raise "Couldn't find git in #{dirs.inspect}"
+  end
+
+  def git(cmd, *flags)
+    flags << :fail_ok  # why?
+    bin = @git_bin || find_git
+    sys("#{bin} #{cmd}", *flags)
+  end
+  
+  def git_clean?
+    out = git("status --porcelain", :quiet)
+    out.strip == ""
+  end
+  
+  def git_branch
+    git("branch").split.last
+  end
+
+  def heroku(cmd)
+    sys("heroku #{cmd}")
+  end
+
+  def timed(msg)
+    start =Time.now
+    puts "#{msg} starting"
+    yield
+    dur = Time.now - start
+    puts "#{msg} took %d:%02d" % [dur / 60, dur % 60]
+  end
+end
+
+task :tag do
+  include System
+  unless git_clean?
+    warn "Can't tag an unclean git repo."
+    puts git( "status --short")
+    exit 1
+  end
+  git "tag --force v#{$spec.version}", false
+end
+
+desc 'Tag and publish gem to rubygems'
+task 'release' => [package('.gem'), package('.tar.gz'), :tag] do
   sh "gem push #{package('.gem')}"
 end

data/bin/whos

@@ -26,7 +26,7 @@ opts = OptionParser.new("", 24, '  ') { |opts|
     $verbose = true
   end
 
-  opts.on("-o", "--open", "open found host in web browser") do
+  opts.on("-o", "--open", "open found host(s) in web browser") do
     $open = true
   end
 
@@ -46,39 +46,6 @@ opts = OptionParser.new("", 24, '  ') { |opts|
 if ARGV.empty?
   puts opts
   exit
+else
+  Whos::Check.new.many(ARGV)
 end
-
-
-@spam = Whos::Spam.new
-
-def check domain
-  print "Checking #{domain}..."
-  response = `whois #{domain}`
-
-  if response =~ /^No match for/
-    puts " AVAILABLE!"
-    true
-  else
-    puts " exists :-("
-    if $verbose
-      response.each_line do |line|
-        puts line unless @spam.include? line.strip
-      end
-    end
-    false
-  end
-end
-
-ARGV.each do |domain|
-  if domain =~ /\./
-    check domain
-  else
-    puts "no dot in #{domain}"
-    %w{com net org biz}.each do |tld|
-      host = "#{domain}.#{tld}"
-      available = check(host)
-      `open http://#{host}` if !available and $open
-    end
-  end
-end
-

data/lib/whos/check.rb

@@ -0,0 +1,42 @@
+module Whos
+  class Check
+    def initialize
+      @spam = Whos::Spam.new
+    end
+
+    def available? domain
+      print "Checking #{domain}..."
+      response = `whois #{domain}`
+
+      if response =~ /^No match for/
+        puts " AVAILABLE!"
+        true
+      else
+        puts " exists :-("
+        if $verbose
+          puts @spam.filter(response)
+        end
+        false
+      end
+    end
+
+    def many names
+      domains = names.map do |domain|
+        if domain =~ /\./
+          domain
+        else
+          %w{com net org biz}.map do |tld|
+            "#{domain}.#{tld}"
+          end
+        end
+      end.flatten
+        
+      domains.each do |domain|
+        available = available? domain
+        `open http://#{host}` if !available and $open
+      end
+    end
+  end
+end
+
+

data/lib/whos/spam.rb

@@ -5,20 +5,25 @@ module Whos
       here = File.expand_path(File.dirname(__FILE__))      
       spam_dir = "#{here}/../../spam"
       Dir.glob("#{spam_dir}/*").each do |file|
-        puts "reading spam: #{file}"
         read file
       end
-      puts
     end
     
     def read file
       File.read(file).each_line do |line|
-        @lines << line.strip
+        @lines << line.chomp.strip
       end
     end
     
     def include? s
-      @lines.include? s
+      @lines.include? s.strip
+    end
+    
+    def filter s
+      s.each_line.reject do |line|
+        line.chomp!
+        include? line
+      end.join("\n")
     end
   end
 end

data/lib/whos.rb

@@ -2,4 +2,4 @@ here = File.expand_path(File.dirname(__FILE__))
 $: << here unless $:.include?(here)
 
 require "whos/spam"
-
+require "whos/check"

data/whos.gemspec

@@ -3,10 +3,10 @@ $spec = Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'whos'
-  s.version = '0.1.1'
+  s.version = '0.1.2'
 
   s.description = "Wraps whois and removes the BS"
-  s.summary     = "Wraps whois and removes the BS."
+  s.summary     = "Wraps whois and removes the registrar legal/marketing spam from the response."
 
   s.authors = ["Alex Chaffee"]
   s.email = "alex@stinky.com"
@@ -16,10 +16,7 @@ $spec = Gem::Specification.new do |s|
     LICENSE
     Rakefile
     whos.gemspec
-    bin/whos
-    lib/whos.rb
-    lib/whos/spam.rb
-  ]
+    bin/whos] + Dir.glob("lib/**/*.rb")
   s.executables = ['whos']
   s.test_files = s.files.select {|path| path =~ /^spec\/.*_spec.rb/}
 
@@ -29,6 +26,5 @@ $spec = Gem::Specification.new do |s|
 
   s.homepage = "http://github.com/alexch/whos/"
   s.require_paths = %w[lib]
-  s.rubyforge_project = 'pivotalrb'
   s.rubygems_version = '1.1.1'
 end

metadata

@@ -1,56 +1,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: whos
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
-authors:
+authors: 
 - Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-07 00:00:00.000000000 Z
+
+date: 2011-08-07 00:00:00 -07:00
+default_executable: 
 dependencies: []
+
 description: Wraps whois and removes the BS
 email: alex@stinky.com
-executables:
+executables: 
 - whos
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - README.md
 - LICENSE
 - Rakefile
 - whos.gemspec
 - bin/whos
-- lib/whos.rb
+- lib/whos/check.rb
 - lib/whos/spam.rb
+- lib/whos.rb
+has_rdoc: true
 homepage: http://github.com/alexch/whos/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -4463681893974033648
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: pivotalrb
-rubygems_version: 1.8.5
+
+rubyforge_project: 
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
-summary: Wraps whois and removes the BS.
+summary: Wraps whois and removes the registrar legal/marketing spam from the response.
 test_files: []
+