mactag 0.1.1 → 0.2.0

data/README.markdown

@@ -7,7 +7,7 @@ to their definitions.
 
 
 # Exuberant Ctags
-First off you must install [Ctags](http://ctags.sourceforge.net/).
+First off, you must install [Ctags](http://ctags.sourceforge.net/).
 Some systems comes with a ctags command already. If you have the ctags
 executable, but have problems creating the tags file. Then make sure
 that you are using **Exuberant Ctags** and not some other version.
@@ -24,29 +24,31 @@ Install the plugin:
 
 ### Gem
 Install the gem:
-    $ sudo gem install mactag --version='0.0.5'
+    $ gem install mactag --version='0.0.5'
     
 Load the gem in **config/environments/development.rb**:
     config.gem 'mactag'
 
+
 ## Rails 3.x
-Version 0.1.1 is the only version supporting Rails 3.x.
+Version 0.1.1 is the latest version supporting Rails 3.x.
 
 ### Plugin
 Install the plugin:
-    $ rails plugin install git://github.com/rejeep/mactag.git --revision 'tags/v0.1.1'
+    $ rails plugin install git://github.com/rejeep/mactag.git
 
 ### Gem
 Install the gem:
-    $ sudo gem install mactag --version='0.1.1'
+    $ gem install mactag
     
 Load the gem in **Gemfile**:
     group :development do
-      gem 'mactag'
+      gem 'mactag', '0.1.1'
     end
 
-## Note when installing as Gem
-When you install mactag as a gem you must also include it's rake tasks
+
+## When installing as Gem
+When you install Mactag as a gem you must also include it's rake tasks
 in your **Rakefile**.
     require 'mactag/tasks'
     
@@ -63,25 +65,26 @@ Generate a basic configuration file:
 This will create the file **config/mactag.rb**, which contains some
 examples of how to configure Mactag.
 
-
 ## Options
 
+* **Mactag::Config.rvm:** If true, use RVM gems. Defaults to **true**
 * **Mactag::Config.gem_home:** The path where the gems are located. Defaults to **/Library/Ruby/Gems/1.8/gems**
 * **Mactag::Config.binary:** The command to run when creating the TAGS-file. Defaults to **ctags -o TAGS -e**
 
 ## Example mactag.rb file
-    Mactag::Config.gem_home = "/usr/lib/ruby/gems/1.8/gems"
-    Mactag::Config.binary = "etags -o TAGS"
+    Mactag::Config.rvm = false
+    Mactag::Config.gem_home = '/usr/lib/ruby/gems/1.8/gems'
+    Mactag::Config.binary = 'etags -o TAGS'
 
     Mactag::Table.generate do
-      app "app/**/*.rb", "lib/*.rb"
+      app 'app/**/*.rb', 'lib/*.rb'
 
-      plugins "thinking-sphinx", "whenever"
+      plugins 'thinking-sphinx', 'whenever'
 
-      gems "paperclip", "authlogic"
-      gem "formtastic", :version => "0.9.7"
+      gems 'paperclip', 'authlogic'
+      gem 'formtastic', :version => '0.9.7'
 
-      rails :except => :actionmailer, :version => "2.3.5"
+      rails :except => :actionmailer, :version => '2.3.5'
     end
 
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/features/app.feature

@@ -8,37 +8,103 @@ Feature: Tag application files
     And mactag is installed
     
   Scenario: Tag single file
-    Given a javascript function "show" in "whitebox"
-    And a mactag config file with this contents:
+    Given file "public/javascripts/mactag.js" with contents:
+      """
+      function mactag() {
+        // ...
+      }
+      """
+    And this mactag config file:
+      """
+      Mactag::Table.generate do
+        app 'public/javascripts/mactag.js'
+      end
+      """
+    When I create the tags file
+    Then "mactag" should be tagged
+
+  Scenario: Tag multiple files different calls
+    Given file "public/javascripts/application.js" with contents:
+      """
+      function app() {
+        // ...
+      }
+      """
+    Given file "public/javascripts/base.js" with contents:
+      """
+      function base() {
+        // ...
+      }
+      """
+    And this mactag config file:
       """
       Mactag::Table.generate do
-        app "public/javascripts/whitebox.js"
+        app 'public/javascripts/application.js'
+        app 'public/javascripts/base.js'
       end
       """
     When I create the tags file
-    Then the tags file should contain "show"
+    Then "app" should be tagged
+    Then "base" should be tagged
 
-  Scenario: Tag multiple files
-    Given a javascript function "hide" in "whitebox"
-    And a ruby method "to_s" in the "user" model
-    And a mactag config file with this contents:
+  Scenario: Tag multiple files same call
+    Given file "public/javascripts/application.js" with contents:
+      """
+      function app() {
+        // ...
+      }
+      """
+    Given file "public/javascripts/base.js" with contents:
+      """
+      function base() {
+        // ...
+      }
+      """
+    And this mactag config file:
+      """
+      Mactag::Table.generate do
+        app 'public/javascripts/application.js', 'public/javascripts/base.js'
+      end
+      """
+    When I create the tags file
+    Then "app" should be tagged
+    Then "base" should be tagged
+    
+  Scenario: Tag multiple files using asterix
+    Given file "public/javascripts/application.js" with contents:
+      """
+      function app() {
+        // ...
+      }
+      """
+    Given file "public/javascripts/base.js" with contents:
+      """
+      function base() {
+        // ...
+      }
+      """
+    And this mactag config file:
       """
       Mactag::Table.generate do
-        app "public/javascripts/whitebox.js"
-        app "app/models/user.rb"
+        app 'public/javascripts/*.js'
       end
       """
     When I create the tags file
-    Then the tags file should contain "hide"
-    And the tags file should contain "to_s"
+    Then "app" should be tagged
+    Then "base" should be tagged
 
   Scenario: Tag files recursive
-    Given a ruby method "kill!" in the "user" model
-    And a mactag config file with this contents:
+    Given file "public/javascripts/mactag.js" with contents:
+      """
+      function mactag() {
+        // ...
+      }
+      """
+    And this mactag config file:
       """
       Mactag::Table.generate do
-        app "app/**/*.rb"
+        app 'public/**/*.js'
       end
       """
     When I create the tags file
-    Then the tags file should contain "kill!"
+    Then "mactag" should be tagged

data/features/gem.feature

@@ -9,66 +9,146 @@ Feature: Tag Gems
   
   Scenario: Tag single gem
     Given the gem "superduper" version "1.0.0" is installed
-    And an acts as method for the "superduper-1.0.0" gem
-    And a mactag config file with this contents:
+    And file "vendor/gems/superduper-1.0.0/lib/superduper.rb" with contents:
       """
-      Mactag::Config.gem_home = File.join("vendor", "gems")
+      class SuperDuper
+        def i_really_am
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
+      """
+      Mactag::Config.rvm = false
+      Mactag::Config.gem_home = File.join('vendor', 'gems')
       Mactag::Table.generate do
-        gem "superduper"
+        gem 'superduper'
       end
       """
     When I create the tags file
-    Then the tags file should contain "acts_as_superduper"
+    Then "i_really_am" should be tagged
 
-  Scenario: Tag multiple gems
+  Scenario: Tag multiple gems different calls
     Given the gem "superduper" version "1.0.0" is installed
-    And the gem "dunder" version "1.0.0" is installed
-    And an acts as method for the "superduper-1.0.0" gem
-    And an acts as method for the "dunder-1.0.0" gem
-    And a mactag config file with this contents:
+    Given the gem "dunder" version "0.3.2" is installed
+    And file "vendor/gems/superduper-1.0.0/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def i_really_am
+          # ...
+        end
+      end
+      """
+    And file "vendor/gems/dunder-0.3.2/lib/dunder.rb" with contents:
+      """
+      class Dunder
+        def and_brak
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
       """
-      Mactag::Config.gem_home = File.join("vendor", "gems")
+      Mactag::Config.rvm = false
+      Mactag::Config.gem_home = File.join('vendor', 'gems')
       Mactag::Table.generate do
-        gems "superduper", "dunder"
+        gem 'superduper'
+        gem 'dunder'
       end
       """
     When I create the tags file
-    Then the tags file should contain "acts_as_superduper"
-    Then the tags file should contain "acts_as_dunder"
+    Then "i_really_am" should be tagged
+    Then "and_brak" should be tagged
+    
+  Scenario: Tag multiple gems same call
+    Given the gem "superduper" version "1.0.0" is installed
+    Given the gem "dunder" version "0.3.2" is installed
+    And file "vendor/gems/superduper-1.0.0/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def i_really_am
+          # ...
+        end
+      end
+      """
+    And file "vendor/gems/dunder-0.3.2/lib/dunder.rb" with contents:
+      """
+      class Dunder
+        def and_brak
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
+      """
+      Mactag::Config.rvm = false
+      Mactag::Config.gem_home = File.join('vendor', 'gems')
+      Mactag::Table.generate do
+        gem 'superduper', 'dunder'
+      end
+      """
+    When I create the tags file
+    Then "i_really_am" should be tagged
+    Then "and_brak" should be tagged
 
   Scenario: Tag specific version
-    Given the gem "superduper" version "1.0.0" is installed
-    And the gem "superduper" version "1.0.1" is installed
-    And an acts as method for the "superduper-1.0.0" gem
-    And an acts as method for the "superduper-1.0.1" gem
-    And a mactag config file with this contents:
+    Given the gem "superduper" version "0.0.3" is installed
+    And the gem "superduper" version "1.0.0" is installed
+    And file "vendor/gems/superduper-0.0.3/lib/superduper.rb" with contents:
       """
-      Mactag::Config.gem_home = File.join("vendor", "gems")
+      class SuperDuper
+        def still_in_beta
+          # ...
+        end
+      end
+      """
+    And file "vendor/gems/superduper-1.0.0/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def ready_for_production
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
+      """
+      Mactag::Config.rvm = false
+      Mactag::Config.gem_home = File.join('vendor', 'gems')
       Mactag::Table.generate do
-        gem "superduper", :version => "1.0.0"
+        gem 'superduper', :version => '1.0.0'
       end
       """
     When I create the tags file
-    Then the tags file should contain "acts_as_superduper"
-    And the tags file should contain "1.0.0"
-    And the tags file should not contain "1.0.1"
+    Then "ready_for_production" should be tagged
+    And "still_in_beta" should not be tagged
 
   Scenario: Tag latest version
-    Given the gem "superduper" version "1.0.2" is installed
-    And the gem "superduper" version "1.0.1" is installed
+    Given the gem "superduper" version "0.0.3" is installed
     And the gem "superduper" version "1.0.0" is installed
-    And an acts as method for the "superduper-1.0.2" gem
-    And an acts as method for the "superduper-1.0.1" gem
-    And an acts as method for the "superduper-1.0.0" gem
-    And a mactag config file with this contents:
+    And file "vendor/gems/superduper-0.0.3/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def still_in_beta
+          # ...
+        end
+      end
+      """
+    And file "vendor/gems/superduper-1.0.0/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def ready_for_production
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
       """
-      Mactag::Config.gem_home = File.join("vendor", "gems")
+      Mactag::Config.rvm = false
+      Mactag::Config.gem_home = File.join('vendor', 'gems')
       Mactag::Table.generate do
-        gem "superduper"
+        gem 'superduper'
       end
       """
     When I create the tags file
-    Then the tags file should contain "acts_as_superduper"
-    And the tags file should contain "1.0.2"
-    And the tags file should not contain "1.0.0"
-    And the tags file should not contain "1.0.1"
+    Then "ready_for_production" should be tagged
+    And "still_in_beta" should not be tagged

data/features/plugin.feature

@@ -1,7 +1,7 @@
 Feature: Tag Plugins
   In order to create a TAGS file
   As a user
-  I want to tag plugins
+  I want to tag application plugins
 
   Background:
     Given a Rails application
@@ -9,42 +9,107 @@ Feature: Tag Plugins
   
   Scenario: Tag single plugin
     Given the plugin "superduper" is installed
-    And an acts as method for the "superduper" plugin
-    And a mactag config file with this contents:
+    And file "vendor/plugins/superduper/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def i_really_am
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
       """
       Mactag::Table.generate do
-        plugin "superduper"
+        plugin 'superduper'
       end
       """
     When I create the tags file
-    Then the tags file should contain "acts_as_superduper"
-
-  Scenario: Tag multiple plugins
+    Then "i_really_am" should be tagged
+  
+  Scenario: Tag multiple plugins different calls
     Given the plugin "superduper" is installed
-    And the plugin "dunder" is installed
-    And an acts as method for the "superduper" plugin
-    And an acts as method for the "dunder" plugin
-    And a mactag config file with this contents:
+    Given the plugin "dunder" is installed
+    And file "vendor/plugins/superduper/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def i_really_am
+          # ...
+        end
+      end
+      """
+    And file "vendor/plugins/dunder/lib/dunder.rb" with contents:
+      """
+      class Dunder
+        def and_brak
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
       """
       Mactag::Table.generate do
-        plugin "superduper", "dunder"
+        plugin 'superduper'
+        plugin 'dunder'
       end
       """
     When I create the tags file
-    Then the tags file should contain "acts_as_superduper"
-    Then the tags file should contain "acts_as_dunder"
-
+    Then "i_really_am" should be tagged
+    Then "and_brak" should be tagged
+  
+  Scenario: Tag multiple plugins same call
+    Given the plugin "superduper" is installed
+    Given the plugin "dunder" is installed
+    And file "vendor/plugins/superduper/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def i_really_am
+          # ...
+        end
+      end
+      """
+    And file "vendor/plugins/dunder/lib/dunder.rb" with contents:
+      """
+      class Dunder
+        def and_brak
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
+      """
+      Mactag::Table.generate do
+        plugins 'superduper', 'dunder'
+      end
+      """
+    When I create the tags file
+    Then "i_really_am" should be tagged
+    Then "and_brak" should be tagged
+    
   Scenario: Tag all plugins
     Given the plugin "superduper" is installed
-    And the plugin "dunder" is installed
-    And an acts as method for the "superduper" plugin
-    And an acts as method for the "dunder" plugin
-    And a mactag config file with this contents:
+    Given the plugin "dunder" is installed
+    And file "vendor/plugins/superduper/lib/superduper.rb" with contents:
+      """
+      class SuperDuper
+        def i_really_am
+          # ...
+        end
+      end
+      """
+    And file "vendor/plugins/dunder/lib/dunder.rb" with contents:
+      """
+      class Dunder
+        def and_brak
+          # ...
+        end
+      end
+      """
+    And this mactag config file:
       """
       Mactag::Table.generate do
         plugins
       end
       """
     When I create the tags file
-    Then the tags file should contain "acts_as_superduper"
-    Then the tags file should contain "acts_as_dunder"
+    Then "i_really_am" should be tagged
+    Then "and_brak" should be tagged