find_gem 1.1.1 → 1.2.0

data/History.txt

@@ -1,3 +1,9 @@
+== 1.2.0 2007-08-10
+
+* "gem [command]" autocomplete supported too!! e.g. gem up[TAB] -> gem update
+* Also "gem help [command]" autocomplete
+* Reduced to one autocomplete script (for both local and remote)
+
 == 1.1.1 2007-08-10
 
 * Cleaned up the gem description, doh!

data/Manifest.txt

@@ -6,12 +6,13 @@ Rakefile
 bin/edit_gem
 bin/find_gem
 bin/gem_autocomplete
-bin/gem_remote_autocomplete
 lib/find_gem.rb
+lib/find_gem/gem_autocomplete.rb
 lib/find_gem/version.rb
 scripts/txt2html
 setup.rb
 test/test_find_gem.rb
+test/test_gem_autocomplete.rb
 test/test_helper.rb
 website/index.html
 website/index.txt

data/README.txt

@@ -34,7 +34,7 @@ To your ~/.bashrc or ~/.profile add
 
     complete -C gem_autocomplete -o default find_gem
     complete -C gem_autocomplete -o default edit_gem
-    complete -C gem_remote_autocomplete -o default gem
+    complete -C gem_autocomplete -o default gem
 
 And reload your profile: 
 

data/bin/gem_autocomplete

@@ -2,15 +2,18 @@
 
 # To your ~/.bashrc add
 #   complete -C gem_autocomplete -o default find_gem
+#   complete -C gem_autocomplete -o default edit_gem
+#   complete -C gem_autocomplete -o default gem
+# The latter supports autocompletion of gem commands, and then gem names after the command name
 
-def gem_list_clean
-  @list ||= `gem list | grep "^\\w" | sed -e "s/ .*//"`
+begin
+  require 'rubygems'
+rescue LoadError
+  # no rubygems to load, so we fail silently
 end
 
-after_match = $'
-gem_match = (after_match.empty? || after_match =~ /\s$/) ? nil : after_match.split.last
-gems = (gem_list_clean.split("\n")[1..-1] || [])
-gems = gems.select { |t| /^#{Regexp.escape gem_match}/ =~ t } if gem_match
+require 'find_gem'
+require 'find_gem/gem_autocomplete'
+include FindGem
 
-puts gems
-exit 0
+GemAutocomplete.new.run(ENV["COMP_LINE"])

data/lib/find_gem/gem_autocomplete.rb

@@ -0,0 +1,65 @@
+module FindGem
+  class GemAutocomplete
+    attr_accessor :comp_line
+    
+    def remote_cmds
+      ['gem install']
+    end
+
+    def local_cmds
+      @local_cmds ||= %w[find_gem edit_gem] + %w[contents dependency rdoc uninstall unpack update].map {|cmd| "gem #{cmd}"}
+    end
+    
+    def gem_cmd
+      ['gem help', 'gem']
+    end
+    
+    def cmds_re(cmds)
+      /^(#{cmds.join('|')})\b/
+    end
+    
+    def list_clean(comp_line)
+      return gem_remote_list($')  if cmds_re(remote_cmds) =~ comp_line
+      return gem_local_list($')   if cmds_re(local_cmds) =~ comp_line
+      return gem_commands_list($')  if cmds_re(gem_cmd) =~ comp_line
+      ""
+    end
+    
+    def filter_by_after_match(list, after_match)
+      list.grep(/^#{Regexp.escape after_match.strip}/)
+    end
+
+    def gem_remote_list(after_match)
+      @remote_list ||= begin
+        list = `gem list --remote | grep "^\\w" | sed -e "s/ .*//"`
+        filter_by_after_match(list, after_match)
+      end
+    end
+
+    def gem_local_list(after_match)
+      @local_list ||= begin
+        list = `gem list | grep "^\\w" | sed -e "s/ .*//"`
+        filter_by_after_match(list, after_match)
+      end
+    end
+
+    def gem_commands_list(after_match)
+      @commands ||= begin
+        list = cmdline_gem_commands.split("\n").map { |line| line.split.first }
+        filter_by_after_match(list, after_match)
+      end
+    end
+    
+    def cmdline_gem_commands
+      `gem help commands | grep "^    \\w"`
+    end
+    
+    def match_gem_commands?
+    end
+    
+    def run(comp_line, _exit = true)
+      puts self.list_clean(comp_line)
+      exit 0 if _exit
+    end
+  end
+end

data/lib/find_gem/version.rb

@@ -1,8 +1,8 @@
 module FindGem #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_gem_autocomplete.rb

@@ -0,0 +1,62 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require File.join(File.dirname(__FILE__), '../lib/find_gem/gem_autocomplete')
+
+class TestGemAutocomplete < Test::Unit::TestCase
+
+  def setup
+    @gem_ac = FindGem::GemAutocomplete.new
+  end
+  
+  def test_gem_commands
+    @gem_ac.expects(:cmdline_gem_commands).returns(<<-EOS
+    install          Install a gem into the local repository
+    pristine         Restores gem directories to pristine condition from files
+    query            Query gem information in local or remote repositories
+    search           Display all gems whose name contains STRING
+    specification    Display gem specification (in yaml)
+    uninstall        Uninstall gems from the local repository
+    unpack           Unpack an installed gem to the current directory
+    update           Update the named gem (or all installed gems) in the local    
+    EOS
+    )
+    expected = %w[install pristine query search specification uninstall unpack update]
+    commands = @gem_ac.gem_commands_list(" ")
+    assert_equal(expected, commands)
+  end
+  
+  def test_trigger_gem_commands_autocomplete
+    @gem_ac.expects(:gem_commands_list).with(" ").returns(%w[install pristine query search specification uninstall unpack update])
+    comp_line = "gem "
+    @gem_ac.list_clean(comp_line)
+  end
+
+  def test_trigger_gem_commands_autocomplete_starting_with_un
+    @gem_ac.expects(:gem_commands_list).with(" un").returns(%w[uninstall unpack update])
+    comp_line = "gem un"
+    @gem_ac.list_clean(comp_line)
+  end
+
+  def test_trigger_gem_local_autocomplete
+    @gem_ac.expects(:gem_local_list).with(" ").returns(%w[active_record active_resource active_support rails])
+    comp_line = "gem uninstall "
+    @gem_ac.list_clean(comp_line)
+  end
+
+  def test_trigger_gem_local_autocomplete_starting_with_act
+    @gem_ac.expects(:gem_local_list).with(" act").returns(%w[active_record active_resource active_support])
+    comp_line = "gem uninstall act"
+    @gem_ac.list_clean(comp_line)
+  end
+
+  def test_trigger_gem_remote_autocomplete
+    @gem_ac.expects(:gem_remote_list).with(" ").returns(%w[active_record active_resource active_support rails])
+    comp_line = "gem install "
+    @gem_ac.list_clean(comp_line)
+  end
+
+  def test_trigger_gem_remote_autocomplete_starting_with_act
+    @gem_ac.expects(:gem_remote_list).with(" act").returns(%w[active_record active_resource active_support])
+    comp_line = "gem install act"
+    @gem_ac.list_clean(comp_line)
+  end
+end

data/test/test_helper.rb

@@ -1,2 +1,10 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/find_gem'
+
+begin
+  require 'rubygems'
+  require 'mocha'
+rescue LoadError
+  puts "Requires 'mocha' RubyGem to run tests"
+  exit 0
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>find_gem</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/find_gem"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/find_gem" class="numbers">1.1.1</a>
+      <a href="http://rubyforge.org/projects/find_gem" class="numbers">1.2.0</a>
     </div>
     <h1>&#x2192; edit_gem name</h1>
 
@@ -112,7 +112,7 @@
 <pre>
 complete -C gem_autocomplete -o default find_gem
 complete -C gem_autocomplete -o default edit_gem
-complete -C gem_remote_autocomplete -o default gem
+complete -C gem_autocomplete -o default gem
 </pre>
 
 	<p>And reload your profile:</p>

data/website/index.txt

@@ -52,7 +52,7 @@ To your ~/.bashrc or ~/.profile add
 <pre>
 complete -C gem_autocomplete -o default find_gem
 complete -C gem_autocomplete -o default edit_gem
-complete -C gem_remote_autocomplete -o default gem
+complete -C gem_autocomplete -o default gem
 </pre>
 
 And reload your profile: 

data/website/stylesheets/screen.css

@@ -1,13 +1,13 @@
 body {
-  background-color: #E1D1F1;
+  background-color: #4D2E67;
   font-family: "Georgia", sans-serif;
   font-size: 16px;
   line-height: 1.6em;
   padding: 1.6em 0 0 0;
-  color: #333;
+  color: #eee;
 }
 h1, h2, h3, h4, h5, h6 {
-  color: #444;
+  color: #A79712;
 }
 h1 { 
   font-family: sans-serif;
@@ -16,28 +16,38 @@ h1 {
   line-height: 0.8em;
   letter-spacing: -0.1ex;
 	margin: 5px;
+  color: #FFEDFA;	
 }
+h1.primary {
+  color: #A79712;	
+}
+
 li {
   padding: 0;
   margin: 0;
   list-style-type: square;
 }
 a {
-  color: #5E5AFF;
-	background-color: #DAC;
+  color: #A79712;
   font-weight: normal;
   text-decoration: underline;
 }
 blockquote {
   font-size: 90%;
   font-style: italic;
-  border-left: 1px solid #111;
+  border-left: 1px solid #eee;
   padding-left: 1em;
 }
 .caps {
   font-size: 80%;
 }
 
+strong {
+	background-color: #D09FDC;
+	color: #1B1B1A;
+	font-weight: normal;
+}
+
 #main {
   width: 45em;
   padding: 0;
@@ -101,12 +111,12 @@ pre, code {
   text-align: right;
   font-family: sans-serif;
   font-weight: normal;
-  background-color: #B3ABFF;
-  color: #141331;
+  color: #FFEDFA;
+  background-color: #A79712;
   padding: 15px 20px 10px 20px;
   margin: 0 auto;
 	margin-top: 15px;
-  border: 3px solid #141331;
+  border: 3px solid #FFEDFA;
 }
 
 #version .numbers {
@@ -114,21 +124,11 @@ pre, code {
   font-size: 4em;
   line-height: 0.8em;
   letter-spacing: -0.1ex;
-	margin-bottom: 15px;
-}
-
-#version p {
-  text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
-	margin: 0;
-	padding: 0;
 }
 
 #version a {
   text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
+  color: #FFEDFA;
 }
 
 .clickable {

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.3
 specification_version: 1
 name: find_gem
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-08-10 00:00:00 +02:00
+  version: 1.2.0
+date: 2007-08-13 00:00:00 +02:00
 summary: bin/find_gem - returns the path to a RubyGem; bin/edit_gem - loads Gem source into editor. Supports auto-completion too!
 require_paths: 
 - lib
@@ -37,12 +37,13 @@ files:
 - bin/edit_gem
 - bin/find_gem
 - bin/gem_autocomplete
-- bin/gem_remote_autocomplete
 - lib/find_gem.rb
+- lib/find_gem/gem_autocomplete.rb
 - lib/find_gem/version.rb
 - scripts/txt2html
 - setup.rb
 - test/test_find_gem.rb
+- test/test_gem_autocomplete.rb
 - test/test_helper.rb
 - website/index.html
 - website/index.txt
@@ -51,6 +52,7 @@ files:
 - website/template.rhtml
 test_files: 
 - test/test_find_gem.rb
+- test/test_gem_autocomplete.rb
 - test/test_helper.rb
 rdoc_options: 
 - --main
@@ -65,7 +67,6 @@ executables:
 - edit_gem
 - find_gem
 - gem_autocomplete
-- gem_remote_autocomplete
 extensions: []
 
 requirements: []

data/bin/gem_remote_autocomplete

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-# To your ~/.bashrc add
-#   complete -C gem_remote_autocomplete -o default gem
-
-exit 0 unless /^(#{VALID_COMMANDS.join('|')})\b/ =~ ENV["COMP_LINE"]
-
-def gem_list_clean
-  @list ||= `gem list --remote | grep "^\\w" | sed -e "s/ .*//"`
-end
-
-after_match = $'
-gem_match = (after_match.empty? || after_match =~ /\s$/) ? nil : after_match.split.last
-gems = (gem_list_clean.split("\n")[1..-1] || [])
-gems = gems.select { |t| /^#{Regexp.escape gem_match}/ =~ t } if gem_match
-
-puts gems
-exit 0