mactag 0.3.2 → 0.3.3

data/README.markdown

@@ -16,7 +16,6 @@ that you are using **Exuberant Ctags** and not some other version.
 # Installation
 
 ## Rails 2.x
-Version 0.0.5 is the latest version supporting Rails 2.x.
 
 ### Plugin
 Install the plugin:
@@ -28,10 +27,12 @@ Install the gem:
     
 Load the gem in **config/environments/development.rb**:
     config.gem 'mactag'
+    
+Load the rake tasks in **Rakefile**.
+    require 'mactag/tasks'
 
 
 ## Rails 3.x
-Version 0.2.0 is the latest version supporting Rails 3.x.
 
 ### Plugin
 Install the plugin:
@@ -43,17 +44,10 @@ Install the gem:
     
 Load the gem in **Gemfile**:
     group :development do
-      gem 'mactag', '0.2.0'
+      gem 'mactag', '0.3.3'
     end
 
 
-## When installing as Gem
-If your using Mactag as a gem in a Rails 2 project, you must also
-include it's rake tasks in your **Rakefile**. In Rails 3, this is done
-automatically.
-    require 'mactag/tasks'
-    
-
 # Configuration
 Generate a basic configuration file:
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/mactag.rb

@@ -3,7 +3,7 @@ require 'rails'
 require 'mactag/railtie'
 require 'mactag/config'
 require 'mactag/builder'
-require 'mactag/parser'
+require 'mactag/dsl'
 require 'mactag/ctags'
 require 'mactag/tag'
 

data/lib/mactag/builder.rb

@@ -1,4 +1,8 @@
 module Mactag
+  ##
+  #
+  # Tag builder.
+  #
   class Builder
     def initialize
       @tags = []
@@ -74,8 +78,8 @@ module Mactag
     def self.generate(&block)
       @builder = Mactag::Builder.new
 
-      parser = Mactag::Parser.new(@builder)
-      parser.instance_eval(&block)
+      dsl = Mactag::Dsl.new(@builder)
+      dsl.instance_eval(&block)
     end
 
     ##

data/lib/mactag/{parser.rb → dsl.rb}

@@ -1,9 +1,9 @@
 module Mactag
   ##
   #
-  # Parser for builder.
+  # Mactag DSL.
   #
-  class Parser
+  class Dsl
     def initialize(builder)
       @builder = builder
     end

data/lib/mactag/tag/gem.rb

@@ -42,10 +42,17 @@ module Mactag
 
       ##
       #
-      # Returns all application gems.
+      # Returns all application gems in Bundler default group.
       #
       def self.all
-        Bundler.load.specs.collect { |spec| Gem.new(spec.name, spec.version.to_s) }
+        gems = {}
+        Bundler.load.specs.each do |spec|
+          gems[spec.name] = spec.version.to_s
+        end
+
+        default = Bundler.load.dependencies.select { |dependency| dependency.groups.include?(:default) }.collect(&:name)
+        default.delete('rails')
+        default.collect { |tmp| Gem.new(tmp, gems[tmp]) }
       end
 
       ##

data/lib/mactag/tag/rails.rb

@@ -18,22 +18,22 @@ module Mactag
     #
     # ==== Examples
     #   Mactag do
-    #     # Tag all rails packages, latest version
+    #     # Tag all rails packages, same rails version as application
     #     rails
     #
     #     # Tag all rails packages, version 2.3.5
     #     rails :version => '2.3.5'
     #
-    #     # Tag only activerecord, latest version
+    #     # Tag only activerecord, same rails version as application
     #     rails :only => :active_record
     #
-    #     # Tag all packages except activerecord, latest version
+    #     # Tag all packages except activerecord, same rails version as application
     #     rails :except => :activerecord
     #
-    #     # Tag only activerecord and actionview, latest version
+    #     # Tag only activerecord and actionview, same rails version as application
     #     rails :only => [:activerecord, :action_view]
     #
-    #     # Tag all packages except activerecord and actionview, latest version
+    #     # Tag all packages except activerecord and actionview, same rails version as application
     #     rails :except => ['activerecord', :action_controller]
     #
     #     # Tag all packages except actionmailer, version 2.3.4

data/test/mactag/{parser_test.rb → dsl_test.rb}

@@ -1,66 +1,66 @@
 require 'test_helper'
 
-class ParserTest < ActiveSupport::TestCase
+class DslTest < ActiveSupport::TestCase
   setup do
     @builder = Mactag::Builder.new
-    @parser = Mactag::Parser.new(@builder)
+    @dsl = Mactag::Dsl.new(@builder)
   end
 
   context 'app' do
     should 'be able to handle single argument' do
-      @parser.app('lib/**/*.rb')
+      @dsl.app('lib/**/*.rb')
     end
   end
 
   context 'plugin' do
     should 'be able to handle no arguments' do
-      @parser.plugin
+      @dsl.plugin
     end
 
     should 'be able to handle single argument' do
-      @parser.plugin('devise')
+      @dsl.plugin('devise')
     end
 
     should 'be able to handle multiple arguments' do
-      @parser.plugins('devise', 'rack')
+      @dsl.plugins('devise', 'rack')
     end
   end
 
   context 'gem' do
     should 'be able to handle no arguments' do
-      @parser.gem
+      @dsl.gem
     end
 
     context 'single argument' do
       should 'be able to handle version' do
-        @parser.gem('devise', :version => '1.1.1')
+        @dsl.gem('devise', :version => '1.1.1')
       end
 
       should 'be able to handle no version' do
-        @parser.gem('devise')
+        @dsl.gem('devise')
       end
     end
 
     should 'be able to handle multiple arguments' do
-      @parser.gem('devise', 'rack')
+      @dsl.gem('devise', 'rack')
     end
   end
 
   context 'rails' do
     should 'be able to handle no arguments' do
-      @parser.rails
+      @dsl.rails
     end
 
     should 'be able to handle only' do
-      @parser.rails(:only => [])
+      @dsl.rails(:only => [])
     end
 
     should 'be able to handle except' do
-      @parser.rails(:except => [])
+      @dsl.rails(:except => [])
     end
 
     should 'be able to handle version' do
-      @parser.rails(:version => '3.0.0.rc')
+      @dsl.rails(:version => '3.0.0.rc')
     end
   end
 end

data/test/mactag/tag/gem_test.rb

@@ -40,34 +40,6 @@ class GemTest < ActiveSupport::TestCase
     end
   end
 
-  context '#all' do
-    setup do
-      require 'bundler'
-
-      @runtime = Bundler.load
-
-      devise = ::Gem::Specification.new
-      devise.name = 'devise'
-      devise.version = '1.1.1'
-
-      rack = ::Gem::Specification.new
-      rack.name = 'rack'
-      rack.version = '1.2.1'
-
-      @runtime.stubs(:specs).returns([devise, rack])
-    end
-
-    should 'return the correct gems' do
-      devise = Mactag::Tag::Gem.all.first
-      assert_equal 'devise', devise.instance_variable_get('@name')
-      assert_equal '1.1.1', devise.instance_variable_get('@version')
-
-      rack = Mactag::Tag::Gem.all.last
-      assert_equal 'rack', rack.instance_variable_get('@name')
-      assert_equal '1.2.1', rack.instance_variable_get('@version')
-    end
-  end
-
   context '#most_recent' do
     should 'return most recent gem if more than one version of same gem exists' do
       Dir.stubs(:glob).returns(['vendor/plugins/devise-1.1.1', 'vendor/plugins/devise-1.1.0'])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Johan Andersson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 +02:00
+date: 2010-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ files:
 - lib/mactag/builder.rb
 - lib/mactag/config.rb
 - lib/mactag/ctags.rb
-- lib/mactag/parser.rb
+- lib/mactag/dsl.rb
 - lib/mactag/railtie.rb
 - lib/mactag/tag.rb
 - lib/mactag/tag/app.rb
@@ -74,7 +74,7 @@ files:
 - lib/tasks/mactag.rake
 - test/mactag/builder_test.rb
 - test/mactag/config_test.rb
-- test/mactag/parser_test.rb
+- test/mactag/dsl_test.rb
 - test/mactag/tag/app_test.rb
 - test/mactag/tag/gem_test.rb
 - test/mactag/tag/plugin_test.rb
@@ -115,7 +115,7 @@ summary: Ctags for Rails
 test_files: 
 - test/mactag/builder_test.rb
 - test/mactag/config_test.rb
-- test/mactag/parser_test.rb
+- test/mactag/dsl_test.rb
 - test/mactag/tag/app_test.rb
 - test/mactag/tag/gem_test.rb
 - test/mactag/tag/plugin_test.rb