buildr-iidea 0.0.7 → 0.0.8

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.0.8 (Pending)
+
 0.0.7 (July 7, 2010)
 * Fixed: Regression involving source and exclude paths for nested projects.
 
@@ -16,6 +18,8 @@
 * 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.
+* Added: Automatic inclusion of source for IML dependencies if already
+  downloaded.
 
 0.0.4 (May 29, 2010)
 * Added: Ability to disable ipr generation using project.no_ipr

data/Rakefile

@@ -2,6 +2,7 @@ require 'rake'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'spec/rake/spectask'
+require File.expand_path("../lib/buildr/intellij_idea/version", __FILE__)
 
 gem_spec = Gem::Specification.load(File.expand_path('buildr-iidea.gemspec', File.dirname(__FILE__)))
 
@@ -21,4 +22,11 @@ Rake::RDocTask.new :rdoc do |rdoc|
   rdoc.rdoc_files.include gem_spec.extra_rdoc_files
 end
 
-Rake::GemPackageTask.new(gem_spec).define
+Rake::GemPackageTask.new(gem_spec).define
+
+namespace :deploy do
+  task :tag do
+    system("git tag -a #{Buildr::IntellijIdea::Version::STRING} -m 'Released #{Buildr::IntellijIdea::Version::STRING}'")
+    info "Tagged locally.  Push if you're sure."
+  end
+end

data/lib/buildr/intellij_idea/idea_module.rb

@@ -131,19 +131,22 @@ module Buildr
           generate_compile_output(xml)
           generate_content(xml) unless skip_content?
           generate_initial_order_entries(xml)
+          project_dependencies = []
 
           # 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, source_path|
             project_for_dependency = Buildr.projects.detect do |project|
-              project.packages.detect { |pkg| pkg.to_s == dependency_path }
+              [project.packages, project.compile.target, project.test.compile.target].flatten.
+                detect { |proj_art| proj_art.to_s == dependency_path }
             end
             if project_for_dependency
-              if project_for_dependency.iml?
+              if project_for_dependency.iml? && !project_dependencies.include?(project_for_dependency)
                 generate_project_dependency( xml, project_for_dependency.iml.name, export )
               end
+              project_dependencies << project_for_dependency
               next
             else
-              generate_module_lib(xml, jar_path(dependency_path), export, (source_path ? jar_path(source_path) : nil))
+              generate_module_lib(xml, url_for_path(dependency_path), export, (source_path ? url_for_path(source_path) : nil))
             end
           end
 
@@ -163,6 +166,14 @@ module Buildr
         "file://#{resolve_path(path)}"
       end
 
+      def url_for_path(path)
+        if path =~ /jar$/i
+          jar_path(path)
+        else
+          file_path(path)
+        end
+      end
+
       def resolve_path(path)
         m2repo = Buildr::Repositories.instance.local
         if path.to_s.index(m2repo) == 0 && !self.local_repository_env_override.nil?

data/lib/buildr/intellij_idea/version.rb

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

data/spec/buildr/intellij_idea/idea_file_generation_spec.rb

@@ -191,4 +191,53 @@ describe "iidea:generate" do
       end
     end
   end
+
+  describe "with extensive intermodule dependencies" do
+    before do
+      mkdir_p 'foo/src/main/resources'
+      mkdir_p 'foo/src/main/java/foo'
+      touch 'foo/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
+      define "root" do
+        repositories.remote << 'http://mirrors.ibiblio.org/pub/mirrors/maven2/'
+        project.version = "2.5.2"
+        define 'foo' do
+          resources.from _(:source, :main, :resources)
+          compile.with 'org.slf4j:slf4j-api:jar:1.5.11'
+          test.using(:junit)
+          package(:jar)
+        end
+
+        define 'bar' do
+          # internally transitive dependencies on foo, both runtime and test
+          compile.with project('root:foo'), project('root:foo').compile.dependencies
+          test.using(:junit).with [project('root:foo').test.compile.target,
+            project('root:foo').test.resources.target,
+            project('root:foo').test.compile.dependencies].compact
+          package(:jar)
+        end
+      end
+
+      invoke_generate_task
+      @bar_iml = xml_document(project('root:bar')._('bar.iml'))
+      @bar_lib_urls = @bar_iml.get_elements("//orderEntry[@type='module-library']/library/CLASSES/root").collect do |root|
+        root.attribute('url').to_s
+      end
+    end
+
+    it "depends on the associated module exactly once" do
+      @bar_iml.should have_nodes("//orderEntry[@type='module', @module-name='foo']", 1)
+    end
+
+    it "does not depend on the other project's packaged JAR" do
+      @bar_lib_urls.grep(%r{#{project('root:foo').packages.first}}).should == []
+    end
+
+    it "does not depend on the the other project's target/classes directory" do
+      @bar_lib_urls.grep(%r{foo/target/classes}).should == []
+    end
+
+    it "depends on the the other project's target/resources directory" do
+      @bar_lib_urls.grep(%r{file://\$MODULE_DIR\$/../foo/target/resources}).size.should == 1
+    end
+  end
 end

data/spec/buildr_dir

@@ -0,0 +1 @@
+/Users/rsutphin/buildr/svn/trunk

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-iidea
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
-    - 0
-    - 0
-    - 7
-  version: 0.0.7
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
-  - Rhett Sutphin
-  - Peter Donald
+- Rhett Sutphin
+- Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +10:00
+date: 2010-07-15 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -25,74 +26,77 @@ description: |
   settings of each project and extension specific settings. 
 
 email: 
-  - rhett@detailedbalance.net
-  - peter@realityforge.org
+- rhett@detailedbalance.net
+- peter@realityforge.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-  - README.rdoc
-  - LICENSE
-  - NOTICE
-  - CHANGELOG
+- README.rdoc
+- LICENSE
+- NOTICE
+- 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
-  - lib/buildr/intellij_idea/idea_file.rb
-  - spec/spec_helper.rb
-  - spec/xpath_matchers.rb
-  - spec/spec.opts
-  - spec/buildr/intellij_idea/inform_spec.rb
-  - spec/buildr/intellij_idea/facet_generation_spec.rb
-  - spec/buildr/intellij_idea/project_extension_spec.rb
-  - spec/buildr/intellij_idea/module_property_inheritance_spec.rb
-  - spec/buildr/intellij_idea/idea_file_generation_spec.rb
-  - spec/buildr/intellij_idea/module_defaults.rb
-  - spec/buildr/intellij_idea/group_spec.rb
-  - spec/buildr/intellij_idea/extra_modules_spec.rb
-  - 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
-  - NOTICE
-  - README.rdoc
-  - CHANGELOG
-  - Rakefile
+- lib/buildr/intellij_idea/idea_file.rb
+- lib/buildr/intellij_idea/idea_module.rb
+- lib/buildr/intellij_idea/idea_project.rb
+- lib/buildr/intellij_idea/project_extension.rb
+- lib/buildr/intellij_idea/version.rb
+- lib/buildr_iidea.rb
+- spec/buildr/intellij_idea/clean_spec.rb
+- spec/buildr/intellij_idea/dependency_spec.rb
+- spec/buildr/intellij_idea/extra_modules_spec.rb
+- spec/buildr/intellij_idea/facet_generation_spec.rb
+- spec/buildr/intellij_idea/group_spec.rb
+- spec/buildr/intellij_idea/idea_file_generation_spec.rb
+- spec/buildr/intellij_idea/inform_spec.rb
+- spec/buildr/intellij_idea/initial_components_spec.rb
+- spec/buildr/intellij_idea/module_content_generation_spec.rb
+- spec/buildr/intellij_idea/module_defaults.rb
+- spec/buildr/intellij_idea/module_property_inheritance_spec.rb
+- spec/buildr/intellij_idea/project_extension_spec.rb
+- spec/buildr/intellij_idea/template_spec.rb
+- spec/buildr_dir
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/xpath_matchers.rb
+- buildr-iidea.gemspec
+- LICENSE
+- NOTICE
+- README.rdoc
+- CHANGELOG
+- Rakefile
 has_rdoc: true
 homepage: http://github.com/realityforge/buildr-iidea
 licenses: []
 
 post_install_message: Thanks for installing the Intellij IDEA extension for Buildr
 rdoc_options: 
-  - --title
-  - buildr-iidea 0.0.7
-  - --main
-  - README.rdoc
+- --title
+- buildr-iidea 0.0.8
+- --main
+- README.rdoc
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: