buildr 1.1.2 → 1.1.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.1.3 (6/12/2007)
+* Added: Long awaited idea project files generation. Very early code, the iml seems to be generated okay but needs testing. The ipr is still missing but will come in due time (and it's not always necessary anyway).
+*Fixed: Doc bug: unzip doesn't have an into(dir) method.
+*Fixed: File names don't always have a dot.
+*Fixed: For Jetty servers, http://foo//bar is not http://foo/bar
+
 1.1.2 (5/29/2007)
 * Added: Allow passing :java_args option to the junit task
 * Added: Hibernate XDoclet and SchemaExport tasks. (Requires buildr/hibernate)

data/lib/buildr.rb

@@ -1,6 +1,4 @@
 require "highline"
-# returning(obj)
-require "facet/kernel/with"
 # &:symbol goodness.
 require "facet/symbol/to_proc"
 # blank? on string and nil
@@ -19,6 +17,7 @@ require "facet/array/head"
 require "facet/string/starts_with"
 require "facet/openobject"
 require "facets/core/kernel/tap"
+require "facets/core/kernel/with"
 # A different kind of buildr, one we use to create XML.
 require "builder"
 
@@ -32,7 +31,7 @@ end
 
 
 module Buildr
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end
 
 $LOAD_PATH.unshift __DIR__

data/lib/core/transports.rb

@@ -188,6 +188,7 @@ module Buildr
           # Squeeze the filename into 30 characters.
           if file_name.size > 30
             base, ext = file_name.split(".")
+            ext ||= ""
             truncated = "#{base[0..26-ext.size]}...#{ext}"
           else
             truncated = file_name
@@ -312,6 +313,7 @@ module Buildr
           last_modified = File.stat(target).mtime.utc 
           headers = { "If-Modified-Since" => CGI.rfc1123_date(last_modified) }
         end
+        path = path[1..-1] if path[0..0] == '/'
         @http.request_get(@base_path + path, headers) do |response|
           case response
           when Net::HTTPNotModified

data/lib/java/idea.rb

@@ -0,0 +1,124 @@
+require "pathname"
+require "core/project"
+require "java/artifact"
+
+module Buildr
+
+  # Global task "idea" generates artifacts for all projects.
+  desc "Generate Idea artifacts for all projects"
+  Project.local_task "idea"=>"artifacts"
+
+  Project.on_define do |project|
+    idea = project.recursive_task("idea")
+
+    project.enhance do |project|
+
+      # We need paths relative to the top project's base directory.
+      root_path = lambda { |p| f = lambda { |p| p.parent ? f[p.parent] : p.base_dir } ; f[p] }[project]
+      # We want the Eclipse files changed every time the Rakefile changes, but also anything loaded by
+      # the Rakefile (buildr.rb, separate file listing dependencies, etc), so we add anything required
+      # after the Rakefile. So which don't know where Buildr shows up exactly, ignore files that show
+      # in $LOADED_FEATURES that we cannot resolve.
+      sources = ($LOADED_FEATURES - Buildr.instance_eval("@loaded_features_to_ignore")).
+        map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
+      sources << File.expand_path(Rake.application.rakefile, root_path) if Rake.application.rakefile
+
+      # Only for projects that are packagable.
+      if project.packages.detect { |pkg| pkg.type.to_s =~ /(jar)|(war)|(rar)|(mar)|(aar)/ }
+        task_name = project.path_to("#{project.name.sub(':', '-')}.iml")
+        idea.enhance [ file(task_name) ]
+        
+        # The only thing we need to look for is a change in the Rakefile.
+        file(task_name=>sources) do |task|
+          puts "Writing #{task.name}" # if verbose
+
+          # Find a path relative to the project's root directory.
+          relative = lambda do |path|
+            msg = [:to_path, :to_str, :to_s].find { |msg| path.respond_to? msg }
+            path = path.__send__(msg)
+            Pathname.new(path).relative_path_from(Pathname.new(project.path_to)).to_s
+          end
+
+          m2repo = Buildr::Repositories.instance.local
+          excludes = [ '**/.svn/', '**/CVS/' ].join('|')
+
+          # Idea handles modules slightly differently if they're WARs
+          idea_types = {"jar"=>"JAVA_MODULE", "war"=>"J2EE_WEB_MODULE"}
+          idea_types["rar"] = idea_types["mar"] = idea_types["jar"]
+
+          # Note: Use the test classpath since Eclipse compiles both "main" and "test" classes using the same classpath
+          cp = project.test.compile.classpath.map(&:to_s) - [ project.compile.target.to_s ]
+
+          # Convert classpath elements into applicable Project objects
+          cp.collect! { |path| projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
+
+          # project_libs: artifacts created by other projects
+          project_libs, others = cp.partition { |path| path.is_a?(Project) }
+
+          # Separate artifacts from Maven2 repository
+          m2_libs, others = others.partition { |path| path.to_s.index(m2repo) == 0 }
+
+          # Generated: classpath elements in the project are assumed to be generated
+          generated, libs = others.partition { |path| path.to_s.index(project.path_to.to_s) == 0 }
+
+          File.open(task.name, "w") do |file|
+            xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
+            # Project type is going to be the first package type
+            xml.module(:version=>"4", :relativePaths=>"false", :type=>idea_types[project.packages.first.type.to_s]) do
+
+              xml.component :name=>"ModuleRootManager"
+              xml.component "name"=>"NewModuleRootManager", "inherit-compiler-output"=>"false" do
+                xml.output :url=>"file://$MODULE_DIR$/#{relative[project.compile.target]}"
+
+                # TODO project.test.target isn't recognized, what's the proper way to get the test compile path?
+                xml.tag! "output-test", :url=>"file://$MODULE_DIR$/target/test-classes"
+                xml.tag! "exclude-output"
+
+                xml.content do
+                  srcs = project.compile.sources.map { |src| relative[src] } + generated.map { |src| relative[src] }
+                  srcs.sort.uniq.each do |path|
+                    xml.sourceFolder :url=>"file://$MODULE_DIR$/#{path}", :isTestSource=>"false"
+                  end
+                  test_sources = project.test.compile.sources.map { |src| relative[src] }
+                  test_sources.each do |paths|
+                    paths.sort.uniq.each do |path|
+                      xml.sourceFolder :url=>"file://$MODULE_DIR$/#{path}", :isTestSource=>"true"
+                    end
+                  end
+                  xml.excludeFolder :url=>"file://$MODULE_DIR$/#{relative[project.compile.target]}"
+                end
+
+                xml.orderEntry :type=>"sourceFolder", :forTests=>"false"
+                xml.orderEntry :type=>"inheritedJdk"
+
+                # Classpath elements from other projects
+                project_libs.map(&:id).sort.uniq.each do |project_id|
+                  xml.orderEntry :type=>'module', :name=>project_id
+                end
+
+                # Libraries
+                ext_libs = libs.map {|path| "$MODULE_DIR$/#{path.to_s}" } + 
+                  m2_libs.map { |path| path.to_s.sub(m2repo, "$M2_REPO$") }                  
+                ext_libs.each do |path|
+                  xml.orderEntry :type=>"module-library" do
+                    xml.library do
+                      xml.CLASSES do
+                        xml.root :url=>"jar://#{path}!/"
+                      end
+                      xml.JAVADOC
+                      xml.SOURCES
+                    end
+                  end
+                end
+
+                xml.orderEntryProperties
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+
+end # module Buildr

data/lib/tasks/zip.rb

@@ -461,11 +461,11 @@ module Buildr
     # Expands the file relative to that path.
     #
     # For example:
-    #   unzip("test.jar").into(Dir.pwd).from_path("etc").include("LICENSE")
+    #   unzip(Dir.pwd=>"test.jar").from_path("etc").include("LICENSE")
     # will unzip etc/LICENSE into ./LICENSE.
     #
     # This is different from:
-    #  unzip("test.jar").into(Dir.pwd).include("etc/LICENSE")
+    #  unzip(Dir.pwd=>"test.jar").include("etc/LICENSE")
     # which unzips etc/LICENSE into ./etc/LICENSE.
     def from_path(name)
       @paths[name] ||= FromPath.new(name)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2007-05-29 00:00:00 -07:00
+  version: 1.1.3
+date: 2007-06-12 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib
@@ -30,17 +30,16 @@ authors:
 - Assaf Arkin
 files: 
 - lib/tasks
-- lib/core
-- lib/buildr.rb
-- lib/buildr
-- lib/java
 - lib/tasks/concat.rb
 - lib/tasks/zip.rb
+- lib/core
 - lib/core/transports.rb
 - lib/core/build.rb
 - lib/core/project.rb
 - lib/core/rake_ext.rb
 - lib/core/common.rb
+- lib/buildr.rb
+- lib/buildr
 - lib/buildr/jetty.rb
 - lib/buildr/hibernate.rb
 - lib/buildr/xmlbeans.rb
@@ -53,7 +52,9 @@ files:
 - lib/buildr/jetty/JettyWrapper$1.class
 - lib/buildr/jetty/JettyWrapper$BuildrHandler.class
 - lib/buildr/jetty/JettyWrapper.class
+- lib/java
 - lib/java/test.rb
+- lib/java/idea.rb
 - lib/java/eclipse.rb
 - lib/java/java.rb
 - lib/java/ant.rb
@@ -117,7 +118,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-sftp
@@ -153,7 +154,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.3
+        version: 1.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: Antwrap