buildr-iidea 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,15 @@
+0.0.5 (June 5, 2010)
+* Changed: The documentation indicated that the iml.local_repository_env_override value
+  defaulted to nil while the code defaulted the value to M2_REPO. The code was changed to
+  Use $MAVEN_REPOSITORY$ to match the behaviour of IDEA 9.x.
+* Added: Dependencies that are not in the maven repository or in projects where
+  iml.local_repository_env_override is set nil will now have paths relative to the
+  module directory.
+* Added: Ability to disable generation of content section using iml.skip_content!
+* Fixed: A project which is tagged with no_iml may have a child with an IML.
+* Changed: Directories that are outside content dir are no longer excluded in the content
+  section.
+
 0.0.4 (May 29, 2010)
 * Added: Ability to disable ipr generation using project.no_ipr
 * Added: Documented the ability to disable the generation of iml files via project.no_iml 

data/README.rdoc

@@ -4,7 +4,7 @@ This extension provides tasks to generate Intellij IDEA project files by issuing
 
   $ buildr iidea:generate
 
-This task will generate an .iml file for every project (or subproject) and a .ipr
+This task will generate an .iml file for every project (or sub-project) and a .ipr
 that you can directly open for the root project.
 
 The generated project files can be removed by issuing;
@@ -14,14 +14,16 @@ The generated project files can be removed by issuing;
 The iidea task generates the project files based on the settings of each project and
 extension specific settings. The main and test source trees are added to the .iml
 file for each project as are the respective resource directories. The target and report
-directories are excluded from the project. If the project files exist on the filesystem
+directories are excluded from the project. If the project files exist on the file system
 the extension will replace specific component sections in the xml with the generated
 component configurations.
 
 Dependencies come in two forms. Dependencies on other projects and dependencies on
 external jars. Dependencies on other projects are added as module dependencies in the
 .iml while jars are added as regular file dependencies. Dependencies are exported from
-the .iml file if they are compile dependencies.
+the .iml file if they are compile dependencies. If a artifact that matches dependency but
+has a classifier of 'sources' is present then it is configured as the source for the
+dependency. Note: Use "buildr artifacts:sources" to download the source for dependencies.
 
 == Installation
 
@@ -43,12 +45,12 @@ The user then needs to add the following require into the build file:
 === Warning
 
 The iidea task may generate project files that conflict with the files generated by the
-builtin 'idea' and 'idea7x' tasks. As a result the builtin tasks would fail if ran while
+built-in 'idea' and 'idea7x' tasks. As a result the built-in tasks would fail if ran while
 the extension is present. To avoid this problem the extension removes these tasks.
 
 == Idea Specific Directives
 
-The extension specific settings of subprojects inherit the parent projects settings
+The extension specific settings of sub-projects inherit the parent projects settings
 unless overwritten.
 
 === Project file naming
@@ -57,8 +59,8 @@ The extension will use the last element of the projects name when generating the
 and .iml files. i.e. A project named "foo" will generate "foo.iml" and "foo.ipr" while
 a project named "foo:bar" will generate "bar/bar.iml" and no ipr. (The .ipr project
 files are only generated for base project). The name can be modified by setting the
-"ipr.suffix" or "iml.suffix" settins which specifies the suffix appended to the
-filenames. The user can also overide the name completely by setting "ipr.id" or "iml.id".
+"ipr.suffix" or "iml.suffix" settings which specifies the suffix appended to the
+file names. The user can also override the name completely by setting "ipr.id" or "iml.id".
 
 ==== Example: Setting id
 
@@ -107,6 +109,19 @@ Will generate:
 
   foo.iml
 
+=== Disabling generation of content section in .iml file
+
+The extension will not generate a content section in an iml file if the "iml.skip_content!" method
+is invoked. This can be useful if a project is just exporting dependencies and has no associated
+source code. This may also be of use in scenarios where the build is repackaging an existing jar with
+more meta-data or the project is just a container for other projects.
+
+==== Example
+
+  define "foo" do
+    iml.skip_content!
+  end
+
 === VCS Integration
 
 The extension will attempt to guess the VCS type of the project by looking for a .svn
@@ -122,25 +137,36 @@ the project to one of either 'Git' or 'svn' using the ipr.vcs setting.
 
 === Dependency generation
 
-When file dependencies are inserted into an .iml file absolute paths are used by default.
-The user can override this by setting the "iml.local_repository_env_override" setting.
-If set to nil absolute paths are used. If set to a non-null value the path to the local
-maven repository will be replaced with the specified environment variable.
+A file dependency that exists in the local maven 2 repository is stored in the IML file
+relative to the $MAVEN_REPOSITORY$ environment variable (that defaults to ~/.m2/repository).
+The user can override the environment variable by setting the "iml.local_repository_env_override"
+setting. If the dependency does not exist in to maven repository or the "iml.local_repository_env_override"
+setting is set to nil, then the path stored in the IML is relative to the IML file.
 
 ==== Example: Setting local_repository_env_override
 
   define "foo" do
-    iml.local_repository_env_override = "MAVEN_REPOSITORY"
+    iml.local_repository_env_override = nil
     compile.with 'group:id:jar:1.0'
   end
 
 Will generate a dependency with a path like:
 
-  jar://$MAVEN_REPOSITORY$/group/id/1.0/id-1.0.jar!/
+  jar:///home/peter/.m2/repository/group/id/1.0/id-1.0.jar!/
 
 rather than the default
 
-  jar:///home/peter/.m2/repository/group/id/1.0/id-1.0.jar!/
+  jar://$MAVEN_REPOSITORY$/group/id/1.0/id-1.0.jar!/
+
+==== Example: A dependency outside the maven repository
+
+  define "foo" do
+    compile.with _("foos-dep.jar")
+  end
+
+Will generate a dependency with a path like:
+
+  jar://$MODULE_DIR$/foo-dep.jar!/
 
 === Module Facets
 
@@ -149,7 +175,7 @@ core java. A facet can be added to a project so that it can be deployed as a web
 or a hibernate application. A facet can also be used t provide support for other languages
 such as ruby and scala. The extension makes it possible to generate .iml with the appropriate
 facets via the "iml.add_facet" method. It should be noted that facets are NOT inherited by 
-subprojects.
+sub-projects.
 
 ==== Example
 
@@ -261,7 +287,7 @@ Will place the generated .imls in the following groups:
 === Add Extra .iml files to .ipr
 
 The 'ipr.extra_modules' setting makes it possible to add extra modules to the generated iml file.
-The setting is an array of filenames relative to the base project directory.
+The setting is an array of file names relative to the base project directory.
 
 ==== Example
 
@@ -283,7 +309,7 @@ jump in and supply a patch if you have gone ahead and implemented the feature.
 
 === Auto-generate Web Facet
 
-Any project that defines a war package should have a web facet autogenerated for it.
+Any project that defines a war package should have a web facet auto-generated for it.
 
 === Auto-generate Scala Facet
 
@@ -295,14 +321,6 @@ Add the ability for the module and project files to be generated off into a diff
 directory hierarchy. i.e. Generate project modules into .idea_project in projects base
 directory.
 
-=== Populate SOURCES and JAVADOC for dependencies
-
-Add tasks 'iidea:deps:sources:download' and 'iidea:deps:javadoc:download' that downloads
-missing :classifier => 'sources' and :classifier => 'javadoc' dependencies for all the
-:classifier => 'jar' dependencies in the project. When generating the project files the task
-should populate the SOURCES and JAVADOC if the relevant artifact is present in the local
-repository.
-
 === Fix tests to work when installed as a gem
 
 The library should determine whether it is installed as a gem and if so use the gem to

data/buildr-iidea.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/buildr/intellij_idea/version')
+
 Gem::Specification.new do |spec|
   spec.name           = 'buildr-iidea'
-  spec.version        = `git describe`.strip.split('-').first
+  spec.version        = Buildr::IntellijIdea::Version::STRING
   spec.authors        = ['Rhett Sutphin', 'Peter Donald']
   spec.email          = ["rhett@detailedbalance.net","peter@realityforge.org"]
   spec.homepage       = "http://github.com/realityforge/buildr-iidea"

data/lib/buildr/intellij_idea/idea_module.rb

@@ -2,10 +2,8 @@ module Buildr
   module IntellijIdea
     class IdeaModule < IdeaFile
       DEFAULT_TYPE = "JAVA_MODULE"
-      DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE = "M2_REPO"
-      MODULE_DIR_URL = "file://$MODULE_DIR$"
+      DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE = nil
 
-      attr_writer :buildr_project
       attr_accessor :type
       attr_accessor :local_repository_env_override
       attr_accessor :group
@@ -14,12 +12,12 @@ module Buildr
       def initialize
         @type = DEFAULT_TYPE
         @local_repository_env_override = DEFAULT_LOCAL_REPOSITORY_ENV_OVERRIDE
-        @facets = []
       end
 
       def buildr_project=(buildr_project)
         @id = nil
         @facets = []
+        @skip_content = false
         @buildr_project = buildr_project
       end
 
@@ -63,12 +61,21 @@ module Buildr
         [buildr_project.test.resources.target, buildr_project.resources.target].compact
       end
 
-      def main_dependencies
-        buildr_project.compile.dependencies.map(&:to_s)
-      end
-
       def test_dependencies
-        buildr_project.test.compile.dependencies.map(&:to_s) - [ buildr_project.compile.target.to_s ]
+        main_dependencies_paths = buildr_project.compile.dependencies.map(&:to_s)
+        target_dir = buildr_project.compile.target.to_s
+        buildr_project.test.compile.dependencies.select{|d| d.to_s != target_dir}.collect do |d|
+          dependency_path = d.to_s
+          export = main_dependencies_paths.include?(dependency_path)
+          source_path = nil
+          if d.respond_to?(:to_spec_hash)
+            source_spec = d.to_spec_hash.merge(:classifier => 'sources')
+            source_path = Buildr.artifact(source_spec).to_s
+            source_path = nil unless File.exist?(source_path)
+          end
+          [dependency_path, export, source_path]
+        end
+
       end
 
       def base_directory
@@ -83,6 +90,14 @@ module Buildr
         self.facets << REXML::Document.new(target.string).root
       end
 
+      def skip_content?
+        !!@skip_content
+      end
+
+      def skip_content!
+        @skip_content = true
+      end
+
       protected
 
       def base_document
@@ -112,16 +127,13 @@ module Buildr
       end
 
       def module_root_component
-        m2repo = Buildr::Repositories.instance.local
-
         create_component("NewModuleRootManager", "inherit-compiler-output" => "false") do |xml|
           generate_compile_output(xml)
-          generate_content(xml)
+          generate_content(xml) unless skip_content?
           generate_initial_order_entries(xml)
 
           # Note: Use the test classpath since IDEA compiles both "main" and "test" classes using the same classpath
-          self.test_dependencies.each do |dependency_path|
-            export = self.main_dependencies.include?(dependency_path)
+          self.test_dependencies.each do |dependency_path, export, source_path|
             project_for_dependency = Buildr.projects.detect do |project|
               project.packages.detect { |pkg| pkg.to_s == dependency_path }
             end
@@ -130,52 +142,69 @@ module Buildr
                 generate_project_dependency( xml, project_for_dependency.iml.name, export )
               end
               next
-            elsif dependency_path.to_s.index(m2repo) == 0
-              entry_path = dependency_path
-              unless self.local_repository_env_override.nil?
-                entry_path = entry_path.sub(m2repo, "$#{self.local_repository_env_override}$")
-              end
-              generate_module_lib(xml, "jar://#{entry_path}!/", export )
+            else
+              generate_module_lib(xml, jar_path(dependency_path), export, (source_path ? jar_path(source_path) : nil))
             end
           end
 
           self.resources.each do |resource|
-            generate_module_lib(xml, "#{MODULE_DIR_URL}/#{relative(resource.to_s)}", true)
+            generate_module_lib(xml, file_path(resource.to_s), true, nil)
           end
 
           xml.orderEntryProperties
         end
       end
 
+      def jar_path(path)
+        "jar://#{resolve_path(path)}!/"
+      end
+
+      def file_path(path)
+        "file://#{resolve_path(path)}"
+      end
+
+      def resolve_path(path)
+        m2repo = Buildr::Repositories.instance.local
+        if path.to_s.index(m2repo) == 0 && !self.local_repository_env_override.nil?
+          return path.sub(m2repo, "$#{self.local_repository_env_override}$")
+        else
+          return "$MODULE_DIR$/#{relative(path)}"
+        end
+      end
+
       def relative(path)
-        Util.relative_path(File.expand_path(path.to_s), self.base_directory)
+        ::Buildr::Util.relative_path(File.expand_path(path.to_s), self.base_directory)
       end
 
       def generate_compile_output(xml)
-        xml.output(:url => "#{MODULE_DIR_URL}/#{relative(self.main_output_dir.to_s)}")
-        xml.tag!("output-test", :url => "#{MODULE_DIR_URL}/#{relative(self.test_output_dir.to_s)}")
+        xml.output(:url => file_path(self.main_output_dir.to_s))
+        xml.tag!("output-test", :url => file_path(self.test_output_dir.to_s))
         xml.tag!("exclude-output")
       end
 
       def generate_content(xml)
-        xml.content(:url => MODULE_DIR_URL) do
+        xml.content(:url => "file://$MODULE_DIR$") do
           # Source folders
           {
               :main => self.main_source_directories,
               :test => self.test_source_directories
           }.each do |kind, directories|
             directories.map { |dir| relative(dir) }.compact.sort.uniq.each do |dir|
-              xml.sourceFolder :url => "#{MODULE_DIR_URL}/#{dir}", :isTestSource => (kind == :test ? 'true' : 'false')
+              xml.sourceFolder :url => file_path(dir), :isTestSource => (kind == :test ? 'true' : 'false')
             end
           end
 
           # Exclude target directories
-          self.net_excluded_directories.sort.each do |dir|
-            xml.excludeFolder :url => "#{MODULE_DIR_URL}/#{dir}"
+          self.net_excluded_directories.select{|dir| relative_dir_inside_dir?(dir)}.sort.each do |dir|
+            xml.excludeFolder :url => file_path(dir)
           end
         end
       end
 
+      def relative_dir_inside_dir?(dir)
+        !dir.include?("../")
+      end
+
       def generate_initial_order_entries(xml)
         xml.orderEntry :type => "sourceFolder", :forTests => "false"
         xml.orderEntry :type => "inheritedJdk"
@@ -187,7 +216,7 @@ module Buildr
         xml.orderEntry attribs
       end
 
-      def generate_module_lib(xml, path, export)
+      def generate_module_lib(xml, path, export, source_path)
         attribs = {:type => 'module-library'}
         attribs[:exported] = '' if export
         xml.orderEntry attribs do
@@ -196,7 +225,11 @@ module Buildr
               xml.root :url => path
             end
             xml.JAVADOC
-            xml.SOURCES
+            xml.SOURCES do
+              if source_path
+                xml.root :url => source_path
+              end
+            end
           end
         end
       end

data/lib/buildr/intellij_idea/project_extension.rb

@@ -42,9 +42,10 @@ module Buildr
           iidea.enhance [ file(ideafile.filename) ]
           file(ideafile.filename => [Buildr.application.buildfile, module_dir]) do |task|
             info "Writing #{task.name}"
-            temp_filename = nil
-            Tempfile.open("buildr-iidea") do |f|
-              temp_filename = f.path
+            t = Tempfile.open("buildr-iidea")
+            temp_filename = t.path
+            t.close!
+            File.open(temp_filename, "w") do |f|
               ideafile.write f
             end
             mv temp_filename, ideafile.filename
@@ -74,7 +75,11 @@ module Buildr
       def iml
         if iml?
           unless @iml
-            @iml = self.parent ? self.parent.iml.clone : IdeaModule.new
+            inheritable_iml_source = self.parent
+            while inheritable_iml_source && !inheritable_iml_source.iml?
+              inheritable_iml_source = inheritable_iml_source.parent;
+            end
+            @iml = inheritable_iml_source ? inheritable_iml_source.iml.clone : IdeaModule.new
             @iml.buildr_project = self
           end
           return @iml

data/lib/buildr/intellij_idea/version.rb

@@ -0,0 +1,11 @@
+module Buildr
+  module IntellijIdea
+    class Version
+      MAJOR = "0"
+      MINOR = "0"
+      MICRO = "5"
+
+      STRING = "#{MAJOR}.#{MINOR}.#{MICRO}" 
+    end
+  end
+end

data/lib/buildr_iidea.rb

@@ -1,4 +1,5 @@
 require 'buildr'
+require File.expand_path(File.dirname(__FILE__) + '/buildr/intellij_idea/version')
 require File.expand_path(File.dirname(__FILE__) + '/buildr/intellij_idea/idea_file')
 require File.expand_path(File.dirname(__FILE__) + '/buildr/intellij_idea/idea_module')
 require File.expand_path(File.dirname(__FILE__) + '/buildr/intellij_idea/idea_project')

data/spec/buildr/intellij_idea/dependency_spec.rb

@@ -2,6 +2,7 @@ require File.expand_path('../../../spec_helper', __FILE__)
 
 ORDER_ENTRY_XPATH = "/module/component[@name='NewModuleRootManager']/orderEntry"
 DEPENDENCY_NAME = 'group:id:jar:1.0'
+DEPENDENCY_SOURCES_NAME = 'group:id:jar:sources:1.0'
 DEPENDENCY2_NAME = 'group:id2:jar:1.0'
 
 describe "iidea:generate" do
@@ -20,7 +21,7 @@ describe "iidea:generate" do
       end
 
       it "generates one exported 'module-library' orderEntry in IML" do
-        root_module_xml(@foo).should have_nodes("#{ORDER_ENTRY_XPATH}[@type='module-library', @exported='']", 1)
+        root_module_xml(@foo).should have_nodes("#{ORDER_ENTRY_XPATH}[@type='module-library', @exported='']/library/CLASSES/root", 1)
       end
     end
 
@@ -33,8 +34,22 @@ describe "iidea:generate" do
       end
 
       it "generates one non-exported 'module-library' orderEntry in IML" do
-        root_module_xml(@foo).should have_nodes("#{ORDER_ENTRY_XPATH}[@type='module-library' and @exported]", 0)
-        root_module_xml(@foo).should have_nodes("#{ORDER_ENTRY_XPATH}[@type='module-library']", 1)
+        root_module_xml(@foo).should have_nodes("#{ORDER_ENTRY_XPATH}[@type='module-library' and @exported]/library/CLASSES/root", 0)
+        root_module_xml(@foo).should have_nodes("#{ORDER_ENTRY_XPATH}[@type='module-library']/library/CLASSES/root", 1)
+      end
+    end
+
+    describe "with sources artifact present" do
+      before do
+        artifact(DEPENDENCY_SOURCES_NAME) { |t| write t.to_s }
+        @foo = define "foo" do
+          compile.with DEPENDENCY_NAME
+        end
+        invoke_generate_task
+      end
+
+      it "generates 'module-library' orderEntry in IML with SOURCES specified" do
+        root_module_xml(@foo).should have_nodes("#{ORDER_ENTRY_XPATH}[@type='module-library', @exported='']/library/SOURCES/root", 1)
       end
     end
 
@@ -49,7 +64,7 @@ describe "iidea:generate" do
 
       it "generates orderEntry with absolute path for classes jar" do
         root_module_xml(@foo).should match_xpath("#{ORDER_ENTRY_XPATH}/library/CLASSES/root/@url",
-                                                 "jar://#{@artifact.to_s}!/")
+                                                 "jar://$MODULE_DIR$/home/.m2/repository/group/id/1.0/id-1.0.jar!/")
       end
     end
     describe "with local_repository_env_override set to MAVEN_REPOSITORY" do
@@ -82,4 +97,20 @@ describe "iidea:generate" do
       root_module_xml(@foo).should have_nodes("#{ORDER_ENTRY_XPATH}[@type='module-library']", 2)
     end
   end
+
+  describe "with a single non artifact dependency" do
+    before do
+      @foo = define "foo" do
+        filename = _("foo-dep.jar")
+        File.open(filename,"w") { |t| write t.to_s }
+        compile.with filename
+      end
+      invoke_generate_task
+    end
+
+    it "generates one exported 'module-library' orderEntry in IML" do
+      root_module_xml(@foo).should match_xpath("#{ORDER_ENTRY_XPATH}/library/CLASSES/root/@url",
+                                               "jar://$MODULE_DIR$/foo-dep.jar!/")
+    end
+  end
 end

data/spec/buildr/intellij_idea/module_content_generation_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe "iidea:generate" do
+  describe "with iml.skip_content! specified" do
+    before do
+      @foo = define "foo" do
+        iml.skip_content!
+      end
+      invoke_generate_task
+    end
+
+    it "generate an IML with no content section" do
+      doc = xml_document(@foo._(root_module_filename(@foo)))
+      doc.should_not have_xpath("/module/component[@name='NewModuleRootManager']/content")
+    end
+  end
+
+  describe "with iml.skip_content! not specified and standard layout" do
+    before do
+      @foo = define "foo" do
+      end
+      invoke_generate_task
+    end
+
+    it "generate an IML with content section" do
+      root_module_xml(@foo).should have_xpath("/module/component[@name='NewModuleRootManager']/content")
+    end
+
+    it "generate an exclude in content section for reports" do
+      root_module_xml(@foo).should have_xpath("/module/component[@name='NewModuleRootManager']/content/excludeFolder[@url='file://$MODULE_DIR$/reports']")
+    end
+
+    it "generate an exclude in content section for target" do
+      root_module_xml(@foo).should have_xpath("/module/component[@name='NewModuleRootManager']/content/excludeFolder[@url='file://$MODULE_DIR$/target']")
+    end
+  end
+
+  describe "with report dir outside content" do
+    before do
+      layout = Layout::Default.new
+      layout[:reports] = "../reports"
+
+      @foo = define "foo", :layout => layout do
+      end
+      invoke_generate_task
+    end
+
+    it "generate an exclude in content section for target" do
+      root_module_xml(@foo).should have_xpath("/module/component[@name='NewModuleRootManager']/content/excludeFolder[@url='file://$MODULE_DIR$/target']")
+    end
+
+    it "generates an content section without an exclude for report dir" do
+      root_module_xml(@foo).should have_nodes("/module/component[@name='NewModuleRootManager']/content/excludeFolder", 1)
+    end
+  end
+
+  describe "with target dir outside content" do
+    before do
+      layout = Layout::Default.new
+      layout[:target] = "../target"
+      layout[:target, :main] = "../target"
+
+      @foo = define "foo", :layout => layout do
+      end
+      invoke_generate_task
+    end
+
+    it "generate an exclude in content section for reports" do
+      root_module_xml(@foo).should have_xpath("/module/component[@name='NewModuleRootManager']/content/excludeFolder[@url='file://$MODULE_DIR$/reports']")
+    end
+
+    it "generates an content section without an exclude for target dir" do
+      root_module_xml(@foo).should have_nodes("/module/component[@name='NewModuleRootManager']/content/excludeFolder", 1)
+    end
+  end
+end

data/spec/buildr/intellij_idea/project_extension_spec.rb

@@ -28,4 +28,69 @@ describe "project extension" do
   it "removes the 'idea7x:clean' task" do
     Rake::Task.tasks.detect{|task| task.to_s == "idea7x:clean"}.should be_nil
   end
+
+  describe "#no_iml" do
+    it "makes #iml? false" do
+      @foo = define "foo" do
+        project.no_iml
+      end
+      @foo.iml?.should be_false
+    end
+  end
+
+  describe "#iml" do
+    before do
+      define "foo" do
+        iml.suffix = "-top"
+
+        define "bar" do
+          iml.suffix = "-mid"
+
+          define "baz" do
+          end
+        end
+      end
+    end
+
+    it "inherits the direct parent's IML settings" do
+      project('foo:bar:baz').iml.suffix.should == "-mid"
+    end
+
+    it "does not modify the parent's IML settings" do
+      project('foo').iml.suffix.should == "-top"
+    end
+
+    it "works even when the parent has no IML" do
+      lambda {
+        define "a" do
+          project.no_iml
+          define "b" do
+            iml.suffix = "-alone"
+          end
+        end
+      }.should_not raise_error
+    end
+
+    it "inherits from the first ancestor which has an IML" do
+      define "a" do
+        iml.suffix = "-a"
+        define "b" do
+          iml.suffix = "-b"
+          define "c" do
+            project.no_iml
+            define "d" do
+              project.no_iml
+              define "e" do
+                project.no_iml
+                define "f" do
+                end
+              end
+            end
+          end
+        end
+      end
+
+      project("a:b:c:d:e:f").iml.suffix.should == "-b"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -2,10 +2,19 @@ require 'spec'
 require File.expand_path(File.dirname(__FILE__) + '/xpath_matchers.rb')
 
 DEFAULT_BUILDR_DIR=File.expand_path(File.dirname(__FILE__) + '/../../buildr')
-BUILDR_DIR=ENV['BUILDR_DIR'] || DEFAULT_BUILDR_DIR
+BUILDR_DIR =
+  begin
+    if ENV['BUILDR_DIR']
+      ENV['BUILDR_DIR']
+    elsif File.exist?(File.expand_path('../buildr_dir', __FILE__))
+      File.read(File.expand_path('../buildr_dir', __FILE__)).strip
+    else
+      DEFAULT_BUILDR_DIR
+    end
+  end
 
 unless File.exist?("#{BUILDR_DIR}/buildr.gemspec")
-  raise "Unable to find buildr.gemspec in #{BUILDR_DIR == DEFAULT_BUILDR_DIR ? 'guessed' : 'specified'} $BUILD_DIR (#{BUILDR_DIR})"
+  raise "Unable to find buildr.gemspec in #{BUILDR_DIR == DEFAULT_BUILDR_DIR ? 'guessed' : 'specified'} $BUILDR_DIR (#{BUILDR_DIR})"
 end
 
 require 'rubygems'

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: 
   - Rhett Sutphin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 +10:00
+date: 2010-07-05 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,7 @@ extra_rdoc_files:
   - CHANGELOG
 files: 
   - lib/buildr_iidea.rb
+  - lib/buildr/intellij_idea/version.rb
   - lib/buildr/intellij_idea/idea_project.rb
   - lib/buildr/intellij_idea/project_extension.rb
   - lib/buildr/intellij_idea/idea_module.rb
@@ -55,6 +56,7 @@ files:
   - spec/buildr/intellij_idea/initial_components_spec.rb
   - spec/buildr/intellij_idea/clean_spec.rb
   - spec/buildr/intellij_idea/dependency_spec.rb
+  - spec/buildr/intellij_idea/module_content_generation_spec.rb
   - spec/buildr/intellij_idea/template_spec.rb
   - buildr-iidea.gemspec
   - LICENSE
@@ -69,7 +71,7 @@ licenses: []
 post_install_message: Thanks for installing the Intellij IDEA extension for Buildr
 rdoc_options: 
   - --title
-  - buildr-iidea 0.0.4
+  - buildr-iidea 0.0.5
   - --main
   - README.rdoc
 require_paths: