rvm-completion 0.1.0 → 0.2.0

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+tmp

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/install-rvm-completion

@@ -1,18 +1,20 @@
 #!/usr/bin/env ruby
 
 rvm_scripts_path = ENV['rvm_scripts_path']
-completion_source = File.expand_path(File.join(File.dirname(__FILE__), '../lib/rvm-completion.rb'))
-completion_target = File.join(rvm_scripts_path, 'rvm-completion.rb')
 
 if rvm_scripts_path.nil? or not (File.exist?(rvm_scripts_path) and File.directory?(rvm_scripts_path))
   puts "Failed to find rvm scripts path - is rvm installed correctly?"
   exit 1
 end
 
+completion_source = File.expand_path(File.join(File.dirname(__FILE__), '../lib/rvm-completion.rb'))
+completion_target = File.join(rvm_scripts_path, 'rvm-completion.rb')
+
 if system "cp #{completion_source} #{completion_target}"
   puts "Success! rvm completion v#{File.read(File.expand_path(File.join(File.dirname(__FILE__), '../VERSION'))).chomp} installed to #{completion_target}", ""
   
-  puts "If you didn't do so before, please add the following line at the end of your ~/.profile or ~/.bashrc"
+  puts "If you didn't do so before, please add the following line at the end of your"
+  puts "~/.profile or ~/.bashrc and reload your terminal session"
   puts "  complete -C $rvm_scripts_path/#{File.basename(completion_target)} -o default rvm"
 else
   puts "Failed to copy the completion script to #{rvm_scripts_path}!"

data/lib/rvm-completion.rb

@@ -3,6 +3,9 @@
 #
 # Bash completion for Ruby Version Manager commands, Rubies and gemsets
 #
+# See http://github.com/colszowka/rvm-completion#readme
+#
+# For manual setup:
 # Add the following line to your ~/.profile or ~/.bashrc:
 # complete -C PATH/TO/rvm_completion.rb -o default rvm
 # Don't forget to make the completion script executable with chmod +x!
@@ -11,6 +14,7 @@
 # (see http://github.com/ryanb/dotfiles/blob/master/bash/completion_scripts/project_completion)
 #
 class RVMCompletion
+  
   def initialize(comp_line)
     @comp_line = comp_line
   end
@@ -25,14 +29,14 @@ class RVMCompletion
     case shell_argument 
       when /^use|uninstall|remove/
         return [] if shell_argument(3).length > 0
-        select(rubies, shell_argument(2))
+        select(rubies, shell_argument(2), :regexp => true)
       when /^install/
         select(rvm_ruby_aliases, shell_argument(2))
       
       when /^gemset/
         case shell_argument(2)
           when /use|copy|clear|delete|export/
-            select(gemsets, shell_argument(3))
+            select(gemsets, shell_argument(3), :regexp => true)
           else
             select(gemset_commands, shell_argument(2))
         end
@@ -53,15 +57,22 @@ class RVMCompletion
   end
   
   # Matches the given (partial?) command against the given collection
-  def select(collection, command)
+  def select(collection, command, options={})
+    options = {:regexp => false}.merge(options)
+    return [] if collection.any? {|i| i.strip == command.strip}
     collection.select do |item|
-      item[0, command.length] == command or item =~ /#{command}/
+      item[0, command.length] == command or (options[:regexp] and item =~ /#{command}/)
     end.sort
   end
   
+  # Retrieves the current ruby binary path
+  def current_ruby_path
+    @current_ruby_path ||= `which ruby`
+  end
+  
   # Retrieves the current rvm ruby
   def current_ruby
-    @current_ruby ||= `which ruby`.strip.chomp.gsub(ENV['rvm_rubies_path']+'/', '').split('/').first
+    @current_ruby ||= current_ruby_path.strip.chomp.gsub(File.join(ENV['rvm_rubies_path'], '/'), '').split('/').first
   end
   
   # Retrieves all available rubies
@@ -104,6 +115,7 @@ end
 #   f.puts RVMCompletion.new(ENV["COMP_LINE"]).shell_argument(2).inspect
 #   f.puts RVMCompletion.new(ENV["COMP_LINE"]).matches.inspect
 # end
-
-puts RVMCompletion.new(ENV["COMP_LINE"]).matches
-exit 0
+unless ENV['COMP_LINE'].nil?
+  puts RVMCompletion.new(ENV["COMP_LINE"]).matches
+  exit 0
+end

data/rvm-completion.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm-completion}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/colszowka/rvm-completion}
   s.post_install_message = %q{
-To install rvm completion v0.1.0, please run 'install-rvm-completion' in your terminal now!
+To install rvm completion v0.2.0, please run 'install-rvm-completion' in your terminal now!
 
 }
   s.rdoc_options = ["--charset=UTF-8"]

data/test/helper.rb

@@ -1,10 +1,97 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'fileutils'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rvm-completion'
 
+# Define path to tmp directory
+tmp_root = File.expand_path(File.join(File.dirname(__FILE__), '../tmp'))
+
+# Set environment vars used in completion to test-specific ones
+ENV['rvm_rubies_path'] = File.join(tmp_root, 'rubies')
+ENV['rvm_gems_path'] = File.join(tmp_root, 'gems')
+ENV['rvm_gemset_separator'] = '@'
+
+# Clean up and prepare test folders
+FileUtils.rm_rf(tmp_root) if File.exist?(tmp_root)
+
+def mock_gemset(ruby_name, gemset_name=nil)
+  if gemset_name.nil?
+    FileUtils.mkdir_p(File.join(ENV['rvm_gems_path'], "#{ruby_name}"))
+  else
+    FileUtils.mkdir_p(File.join(ENV['rvm_gems_path'], "#{ruby_name}#{ENV['rvm_gemset_separator']}#{gemset_name}"))
+  end
+end
+
+FileUtils.mkdir_p(File.join(ENV['rvm_rubies_path'], 'default'))
+
+["macruby-0.6", "rbx-1.0.1-20100603", "ree-1.8.7-2010.02", "ruby-1.8.7-p174", 
+  "ruby-1.8.7-p299", "ruby-1.9.1-p378", "ruby-1.9.2-rc2"].each do |ruby_name|
+    FileUtils.mkdir_p(File.join(ENV['rvm_rubies_path'], ruby_name))
+    mock_gemset(ruby_name)
+    mock_gemset(ruby_name, 'global')
+end
+
+class RVMCompletion
+  # Required for mocking gemsets based upon selected ruby
+  attr_writer :current_ruby_path
+end
+
 class Test::Unit::TestCase
+  def self.using_ruby(ruby_name, options={})
+    options = {:gemsets => []}.merge(options)
+    options[:gemsets].each do |gemset|
+      mock_gemset ruby_name, gemset
+    end
+    context "using ruby #{ruby_name}" do
+      setup do
+        @current_ruby_path = File.join(File.join(ENV['rvm_rubies_path'], ruby_name, 'bin/ruby'))
+      end
+      yield
+    end
+  end
+  
+  def self.completion_for(*comp_lines)
+    comp_lines.each do |comp_line|
+      context "Completion for '#{comp_line}'" do
+        setup do
+          # Fake the use of a specific ruby by manipulating rvm bin path
+          if @current_ruby_path
+            instance = RVMCompletion.new(comp_line)
+            instance.current_ruby_path = @current_ruby_path
+            @completion = instance.matches
+          else
+            @completion = RVMCompletion.new(comp_line).matches
+          end
+          # puts "DEBUG: Complete '#{comp_line}' => #{@completion.inspect}"
+        end
+        subject { @completion }
+        should "return an Array" do
+          assert subject.instance_of?(Array)
+        end
+        yield
+      end
+    end
+  end
+  
+  def self.should_include(*values)
+    should "return #{values.length} completions" do
+      assert_equal values.length, subject.length
+    end
+    
+    values.each do |value|
+      should "include '#{value}' in completion" do
+        assert subject.include?(value.to_s), "'#{value}' is not included in #{subject.inspect}!"
+      end
+    end
+  end
+  
+  def self.should_include_nothing
+    should "include nothing in completion" do
+      assert_equal 0, subject.length
+    end
+  end
 end

data/test/test_rvm-completion.rb

@@ -1,7 +1,106 @@
 require 'helper'
 
 class TestRvmCompletion < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  completion_for 'rvm' do
+    should_include "debug", "fetch", "gem", "gemdir", "gemset", "implode", "info", "install", "list", 
+                   "monitor", "notes", "package", "rake", "reload", "remove", "reset", "ruby", "specs", 
+                   "srcdir", "tests", "uninstall", "update", "usage", "use", "version", "wrapper"
+  end
+  
+  completion_for 'rvm insta' do
+    should_include 'install'
+  end
+  
+  completion_for 'rvm install' do
+    should_include "ironruby", "jruby", "macruby", "maglev", "mput", "rbx", "ree", "ruby"
+  end
+  
+  completion_for 'rvm install rub' do
+    should_include "ruby"
+  end
+  
+  completion_for 'rvm install ruby' do
+    should_include_nothing
+  end
+  
+  completion_for 'rvm us' do
+    should_include 'use', 'usage'
+  end
+  
+  completion_for 'rvm use', 'rvm uninstall', 'rvm remove' do
+    should_include "system", "default", "macruby-0.6", "rbx-1.0.1-20100603", "ree-1.8.7-2010.02", 
+                   "ruby-1.8.7-p174", "ruby-1.8.7-p299", "ruby-1.9.1-p378", "ruby-1.9.2-rc2"
+  end
+  
+  completion_for 'rvm use ruby', 'rvm uninstall ruby', 'rvm remove ruby' do
+    should_include "macruby-0.6", "ruby-1.8.7-p174", "ruby-1.8.7-p299", "ruby-1.9.1-p378", "ruby-1.9.2-rc2"
+  end
+  
+  completion_for 'rvm use ruby-1.8', 'rvm uninstall ruby-1.8', 'rvm remove ruby-1.8' do
+    should_include "ruby-1.8.7-p174", "ruby-1.8.7-p299"
+  end
+  
+  completion_for 'rvm use ruby-1.8.7-p1', 'rvm uninstall ruby-1.8.7-p1', 'rvm remove ruby-1.8.7-p1' do
+    should_include "ruby-1.8.7-p174"
+  end
+  
+  completion_for 'rvm use ruby-1.8.7-p174', 'rvm uninstall ruby-1.8.7-p174', 'rvm remove ruby-1.8.7-p174' do
+    should_include_nothing
+  end
+  
+  completion_for 'rvm use 174', 'rvm uninstall 174', 'rvm remove 174' do
+    should_include "ruby-1.8.7-p174"
+  end
+  
+  completion_for 'rvm use 1.9.1' do
+    should_include "ruby-1.9.1-p378"
+  end
+  
+  completion_for 'rvm use 1.9', 'rvm uninstall 1.9', 'rvm remove 1.9' do
+    should_include "ruby-1.9.1-p378", "ruby-1.9.2-rc2"
+  end
+  
+  completion_for 'rvm usa' do
+    should_include 'usage'
+  end
+  
+  completion_for 'rvm usage' do
+    should_include_nothing
+  end
+  
+  completion_for 'rvm gems' do
+    should_include 'gemset'
+  end
+  
+  completion_for 'rvm gemset' do
+    should_include "clear", "copy", "create", "delete", "dir", "empty", "export", "gemdir", "import", "install", "list", "name", "pristine", "use"
+  end
+  
+  using_ruby 'ruby-1.8.7-p174', :gemsets => ['foo', 'bar'] do
+    completion_for 'rvm gemset use', 'rvm gemset copy', 'rvm gemset clear', 'rvm gemset delete', 'rvm gemset export' do
+      should_include 'global', 'foo', 'bar'
+    end
+    
+    completion_for 'rvm gemset use o', 'rvm gemset copy o', 'rvm gemset clear o', 'rvm gemset delete o', 'rvm gemset export o' do
+      should_include 'global', 'foo'
+    end
+    
+    completion_for 'rvm gemset use fo', 'rvm gemset copy fo', 'rvm gemset clear fo', 'rvm gemset delete fo', 'rvm gemset export fo' do
+      should_include 'foo'
+    end
+    
+    completion_for 'rvm gemset use foo', 'rvm gemset copy foo', 'rvm gemset clear foo', 'rvm gemset delete foo', 'rvm gemset export foo' do
+      should_include_nothing
+    end
+  end
+  
+  using_ruby 'ruby-1.8.7-p299' do
+    completion_for 'rvm gemset use', 'rvm gemset copy', 'rvm gemset clear', 'rvm gemset delete', 'rvm gemset export' do
+      should_include 'global'
+    end
+    
+    completion_for 'rvm gemset use global', 'rvm gemset copy global', 'rvm gemset clear global', 'rvm gemset delete global', 'rvm gemset export global' do
+      should_include_nothing
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm-completion
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -59,7 +59,7 @@ licenses: []
 
 post_install_message: |+
   
-  To install rvm completion v0.1.0, please run 'install-rvm-completion' in your terminal now!
+  To install rvm completion v0.2.0, please run 'install-rvm-completion' in your terminal now!
   
 rdoc_options: 
 - --charset=UTF-8