buildr-iidea 0.0.6 → 0.0.7

data/CHANGELOG

@@ -1,8 +1,11 @@
-0.0.6 (June 5, 2010)
+0.0.7 (July 7, 2010)
+* Fixed: Regression involving source and exclude paths for nested projects.
+
+0.0.6 (July 5, 2010)
 * Fixed: Correctly fixed the default value of iml.local_repository_env_override setting to
   match documentation.
 
-0.0.5 (June 5, 2010)
+0.0.5 (July 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.

data/lib/buildr/intellij_idea/idea_module.rb

@@ -189,14 +189,17 @@ module Buildr
               :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|
+            directories.map { |dir| dir.to_s }.compact.sort.uniq.each do |dir|
               xml.sourceFolder :url => file_path(dir), :isTestSource => (kind == :test ? 'true' : 'false')
             end
           end
 
           # Exclude target directories
-          self.net_excluded_directories.select{|dir| relative_dir_inside_dir?(dir)}.sort.each do |dir|
-            xml.excludeFolder :url => file_path(dir)
+          self.net_excluded_directories.
+            collect { |dir| file_path(dir) }.
+            select{ |dir| relative_dir_inside_dir?(dir) }.
+            sort.each do |dir|
+            xml.excludeFolder :url => dir
           end
         end
       end
@@ -237,7 +240,7 @@ module Buildr
       # Don't exclude things that are subdirectories of other excluded things
       def net_excluded_directories
         net = []
-        all = self.excluded_directories.map { |dir| relative(dir.to_s) }.sort_by { |d| d.size }
+        all = self.excluded_directories.map { |dir| buildr_project._(dir.to_s) }.sort_by { |d| d.size }
         all.each_with_index do |dir, i|
           unless all[0 ... i].find { |other| dir =~ /^#{other}/ }
             net << dir

data/lib/buildr/intellij_idea/version.rb

@@ -3,7 +3,7 @@ module Buildr
     class Version
       MAJOR = "0"
       MINOR = "0"
-      MICRO = "6"
+      MICRO = "7"
 
       STRING = "#{MAJOR}.#{MINOR}.#{MICRO}" 
     end

data/spec/buildr/intellij_idea/module_content_generation_spec.rb

@@ -35,6 +35,26 @@ describe "iidea:generate" do
     end
   end
 
+  describe "with subprojects" do
+    before do
+      @foo = define "foo" do
+        define "bar" do
+          compile.from _(:source, :main, :bar)
+        end
+      end
+      invoke_generate_task
+      @bar_doc = xml_document(project('foo:bar')._('bar.iml'))
+    end
+
+    it "generates the correct source directories" do
+      @bar_doc.should have_xpath("//content/sourceFolder[@url='file://$MODULE_DIR$/src/main/bar']")
+    end
+
+    it "generates the correct exclude directories" do
+      @bar_doc.should have_xpath("//content/excludeFolder[@url='file://$MODULE_DIR$/target']")
+    end
+  end
+
   describe "with report dir outside content" do
     before do
       layout = Layout::Default.new

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 6
-  version: 0.0.6
+    - 7
+  version: 0.0.7
 platform: ruby
 authors: 
   - Rhett Sutphin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +10:00
+date: 2010-07-07 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -72,7 +72,7 @@ licenses: []
 post_install_message: Thanks for installing the Intellij IDEA extension for Buildr
 rdoc_options: 
   - --title
-  - buildr-iidea 0.0.6
+  - buildr-iidea 0.0.7
   - --main
   - README.rdoc
 require_paths: