lookup 1.0.0.beta2 → 1.0.0.beta3

data/Gemfile

@@ -1,5 +1,5 @@
 source 'http://rubygems.org'
-gem 'activerecord'
+gem 'activerecord', :require => "active_record"
 gem 'nokogiri'
 gem 'find_by_hash'
 gem 'sqlite3-ruby'

data/bin/lookup

@@ -1,5 +1,6 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require 'optparse'
+require 'pathname'
 
 # How many methods / constants to return.
 THRESHOLD = 5
@@ -7,7 +8,7 @@ MAC = !!/darwin/.match(RUBY_PLATFORM)
 WINDOWS = !!/win/.match(RUBY_PLATFORM) if not MAC
 
 def clear_database
-  file = File.join(File.dirname(__FILE__), "lookup.sqlite3")
+  file = Pathname.new(ENV["HOME"]) + ".lookup/lookup.sqlite3"
   FileUtils.rm(file) if File.exists?(file) 
 end
 
@@ -45,9 +46,27 @@ def display_results(results, search_string)
   end
 end
 
+local_lib=File.join(File.dirname(__FILE__), "../lib/lookup")
+if File.exists?(local_lib + ".rb")
+  require local_lib
+else
+  require 'rubygems'
+  require 'lookup' 
+end
+
 OPTIONS = {}
+output = nil
 op=OptionParser.new do |opts|
-  opts.banner = "Usage: lookup <constant|method> [method] [OPTIONS]"
+  opts.banner = %Q{
+    Usage: lookup <api> <constant|method> [method] [OPTIONS]
+    APIs are:
+    v3.0.0 - Rails 3.0.0
+    v2.3.8 - Rails 2.3.8
+    1.9    - Ruby 1.9
+    1.8    - Ruby 1.8
+    
+    Example: lookup v3.0.0 ActiveRecord::Base new
+  }
 
   opts.on("-c", "--clear", "Clear database") do
     OPTIONS[:clear] = true
@@ -56,25 +75,27 @@ op=OptionParser.new do |opts|
   opts.on("-t", "--text", "Text only") do
     OPTIONS[:text] = true
   end
+  
+  opts.on("-v", "--version", "Version of lookup") do
+    output = Lookup::VERSION
+  end
 end
 op.parse!
 
 clear_database if OPTIONS[:clear]
+unless output
+  begin
+    search_string=ARGV[0..-1].join(" ")
+    if search_string.strip.empty?
+      puts op.help
 
-
-local_lib=File.join(File.dirname(__FILE__), "../lib/lookup")
-if File.exists?(local_lib + ".rb")
-  require local_lib
+    else
+      results=Lookup.search(search_string)
+      display_results(results, search_string)
+    end
+  rescue Lookup::APINotFound => e
+    puts e.message
+  end
 else
-  require 'rubygems'
-  require 'lookup' 
+  puts output
 end
-
-search_string=ARGV[0..-1].join(" ")
-if search_string.strip.empty?
-  puts op.help
-  puts
-else
-  results=Lookup.search(search_string)
-  display_results(results, search_string)
-end

data/lib/lookup.rb

@@ -1,12 +1,16 @@
 require 'rubygems'
-require 'bundler'
 require 'net/http'
 
-Bundler.setup
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+require 'bundler'
+ENV['BUNDLE_GEMFILE'] = gemfile
 Bundler.require(:default)
-require 'active_record'
 
 module Lookup
+  VERSION = "1.0.0.beta3"
+  APIS = []
+  
+  class APINotFound < StandardError; end
 
   class << self
     def update!
@@ -23,6 +27,7 @@ module Lookup
     def update_api!(name, url)
       puts "Updating API for #{name}..."
       api = Api.find_or_create_by_name_and_url(name, url)
+      APIS << api
       api.update_methods!
       api.update_classes!
       puts "DONE (with #{name})!"
@@ -110,6 +115,16 @@ module Lookup
         "Rails v#{$1}"
       end
       
+      raise Lookup::APINotFound, %Q{You must specify a valid API as the first keyword. Included APIs:
+   v2.3.8 - Rails 2.3.8 
+   v3.0.0 - Rails 3.0.0
+   1.9    - Ruby 1.9
+   1.8    - Ruby 1.8
+   
+   Example usage: lookup v2.3.8 ActiveRecord::Base
+   } if options[:api].blank?
+          
+      
       options[:api] = Api.find_by_name!(options[:api]) unless options[:api].is_a?(Api)
       
       msg = msg.gsub(/^(.*?)\s/, "") if options[:api]

data/lib/models.rb

@@ -6,7 +6,6 @@ module Lookup
   end
   
   class LookupBase < ActiveRecord::Base
-    include FindByHash
   end
   
   if ENV["HOME"].nil?

data/lookup.gemspec

@@ -4,7 +4,7 @@
 # -*- encoding: utf-8 -*-
 
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/lookup/version", __FILE__)
+require File.expand_path("../lib/lookup", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "lookup"

data/spec/regressions_spec.rb

@@ -5,4 +5,8 @@ describe "testing for regressions" do
     lambda { Lookup.search("v2.3.8 #today?") }.should_not raise_error
   end
   
+  it "must have an API specified" do
+    lambda { Lookup.search("ActiveRecord::Base") }.should raise_error(Lookup::APINotFound)
+  end
+  
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 ENV['HOME'] = File.dirname(__FILE__)
 require 'rubygems'
 require 'bundler'
+
 Bundler.require(:default, :test)
 
 def here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: lookup
 version: !ruby/object:Gem::Version 
-  hash: -1848230054
+  hash: -1848230053
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  - beta3
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - Ryan Bigg
@@ -16,13 +16,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +10:00
+date: 2010-09-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +34,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +50,12 @@ dependencies:
         - 2
         - 5
         version: 1.2.5
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: nokogiri
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +64,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,12 +80,12 @@ dependencies:
         - 3
         - 8
         version: 2.3.8
-  type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,8 +94,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id005
+  requirement: *id005
 description: A gem that provides a lazy man's ri
 email: 
 - radarlistener@gmail.com
@@ -115,7 +115,6 @@ files:
 - install.rb
 - lib/lookup.rb
 - lib/lookup.sqlite3
-- lib/lookup/version.rb
 - lib/models.rb
 - lookup.gemspec
 - spec/.lookup/lookup.sqlite3

data/lib/lookup/version.rb

@@ -1,3 +0,0 @@
-module Lookup
-  VERSION = "1.0.0.beta2"
-end