mactag 0.0.4 → 0.0.5

data/README.markdown

@@ -16,15 +16,15 @@ that you are using **Exuberant Ctags** and not some other version.
 # Installation
 
 ## Rails 2.x
-Version 0.0.4 is the latest version supporting Rails 2.x.
+Version 0.0.5 is the latest version supporting Rails 2.x.
 
 ### Plugin
 Install the plugin:
-    $ ./script/plugin install git://github.com/rejeep/mactag.git --revision 'tags/v0.0.4'
+    $ ./script/plugin install git://github.com/rejeep/mactag.git --revision 'tags/v0.0.5'
 
 ### Gem
 Install the gem:
-    $ sudo gem install mactag --version='0.0.4'
+    $ sudo gem install mactag --version='0.0.5'
     
 Load the gem in **config/environments/development.rb**:
     config.gem 'mactag'

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/mactag/tag/gem.rb

@@ -30,19 +30,21 @@ module Mactag
       end
 
       def files
-        @gems.collect do |gem_name|
+        result = []
+        @gems.each do |gem_name|
           if version = @options[:version]
             gem = File.join(Mactag::Config.gem_home, "#{gem_name}-#{version}")
           else
             gem = latest(gem_name)
           end
-          
+
           if gem
-            File.join(gem, "lib", "**", "*.rb")
+            result << File.join(gem, "lib", "**", "*.rb")
           else
             $stderr.puts "Gem #{gem_name} not found"
           end
         end
+        result
       end
 
     end

data/lib/mactag/tag/plugin.rb

@@ -1,6 +1,6 @@
 module Mactag
   module Tag
-    
+
     # Tag for the current project plugins.
     #
     # ==== Examples
@@ -12,25 +12,27 @@ module Mactag
     #     plugins "thinking-sphinx", "formtastic"
     #   do
     class Plugin
-      
+
       PLUGIN_PATH = File.join("vendor", "plugins")
-      
+
       def initialize(*plugins)
         @plugins = plugins
       end
-      
+
       def files
         return File.join(PLUGIN_PATH, "*", "lib", "**", "*.rb") if @plugins.empty?
 
-        @plugins.collect do |plugin|
-          if plugin
-            File.join(PLUGIN_PATH, plugin, "lib", "**", "*.rb")
+        result = []
+        @plugins.each do |plugin|
+          if File.exist?(File.join(PLUGIN_PATH, plugin))
+            result << File.join(PLUGIN_PATH, plugin, "lib", "**", "*.rb")
           else
             $stderr.puts "Plugin #{plugin} not found"
           end
         end
+        result
       end
-      
+
     end
   end
 end

data/test/mactag/tag/gem_test.rb

@@ -47,7 +47,9 @@ class GemTest < ActiveSupport::TestCase
     end
 
     should "not raise exception because no such gem" do
-      assert_nothing_raised { @gem.files }
+      assert_nothing_raised do
+        assert_equal [], @gem.files
+      end
     end
   end
 

data/test/mactag/tag/plugin_test.rb

@@ -2,49 +2,59 @@ require 'test_helper'
 
 class PluginTest < ActiveSupport::TestCase
   
-  # should "have correct plugin path" do
-  #   assert_equal "vendor/plugins", Mactag::Tag::Plugin::PLUGIN_PATH
-  # end
-  
-  # context "without arguments" do
-  #   setup do
-  #     @plugin = Mactag::Tag::Plugin.new
-  #   end
-
-  #   should "return all plugins as path" do
-  #     assert_equal @plugin.files, "vendor/plugins/*/lib/**/*.rb"
-  #   end
-  # end
-  
-  # context "with one plugin argument" do
-  #   setup do
-  #     @plugin = Mactag::Tag::Plugin.new("thinking-sphinx")
-  #   end
-    
-  #   should "return the path to that plugin" do
-  #     assert_equal ["vendor/plugins/thinking-sphinx/lib/**/*.rb"], @plugin.files
-  #   end
-  # end
-  
-  # context "with more thatn one plugin argument" do
-  #   setup do
-  #     @plugin = Mactag::Tag::Plugin.new("thinking-sphinx", "formtastic")
-  #   end
-    
-  #   should "return the paths to those plugins" do
-  #     assert_contains @plugin.files, "vendor/plugins/thinking-sphinx/lib/**/*.rb"
-  #     assert_contains @plugin.files, "vendor/plugins/formtastic/lib/**/*.rb"
-  #   end
-  # end
-  
+  should "have correct plugin path" do
+    assert_equal "vendor/plugins", Mactag::Tag::Plugin::PLUGIN_PATH
+  end
+
+  context "without arguments" do
+    setup do
+      File.stubs(:exist?).returns(true)
+      
+      @plugin = Mactag::Tag::Plugin.new
+    end
+
+    should "return all plugins as path" do
+      assert_equal @plugin.files, "vendor/plugins/*/lib/**/*.rb"
+    end
+  end
+
+  context "with one plugin argument" do
+    setup do
+      File.stubs(:exist?).returns(true)
+      
+      @plugin = Mactag::Tag::Plugin.new("thinking-sphinx")
+    end
+
+    should "return the path to that plugin" do
+      assert_equal ["vendor/plugins/thinking-sphinx/lib/**/*.rb"], @plugin.files
+    end
+  end
+
+  context "with more thatn one plugin argument" do
+    setup do
+      File.stubs(:exist?).returns(true)
+      
+      @plugin = Mactag::Tag::Plugin.new("thinking-sphinx", "formtastic")
+    end
+
+    should "return the paths to those plugins" do
+      assert_contains @plugin.files, "vendor/plugins/thinking-sphinx/lib/**/*.rb"
+      assert_contains @plugin.files, "vendor/plugins/formtastic/lib/**/*.rb"
+    end
+  end
+
   context "plugin that does not exist" do
     setup do
-      @plugin = Mactag::Tag::Plugin.new(nil)
+      File.stubs(:exist?).returns(false)
+      
+      @plugin = Mactag::Tag::Plugin.new("typo")
     end
 
     should "not raise exception because no such plugin" do
-      assert_nothing_raised { @plugin.files }
+      assert_nothing_raised do
+        assert_equal [], @plugin.files
+      end
     end
   end
-  
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Johan Andersson