bee_java 0.0.3 → 0.0.4

data/egg/xmlrpc.yml

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- build: xmlrpc
-  default: all
+- build:       xmlrpc
+  default:     all
   description: "Generate a sample XML-RPC Java project"
 
 - properties:
@@ -21,13 +21,13 @@
     description: |
       This script will create a sample XML-RPC Java project.
 
-- target: welcome
+- target:      welcome
   description: "Print information message"
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
+- target:      prompt
+  depends:     welcome
   description: "Prompt for project information"
   script:
   - print: "Please answer following questions to generate the project:"
@@ -36,8 +36,8 @@
       default: :name
       property: name
 
-- target: generate
-  depends: prompt
+- target:      generate
+  depends:     prompt
   description: "Generate project"
   script:
   - print: "Generating project..."
@@ -51,8 +51,8 @@
       excludes: "**/build.yml"
       dest:     "#{here}/#{name}"
 
-- target: customization
-  depends: generate
+- target:      customization
+  depends:     generate
   description: "Print information about project customization"
   script:
   - print: |
@@ -60,5 +60,5 @@
       print information about generated build file.
       Enjoy!
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]

data/java.yml

@@ -0,0 +1,144 @@
+- build:       java
+  description: Build file for Java projects
+  default:     [clean, test]
+  alias:
+    compile: jv_compile
+    test:    jv_unit_test
+    run:     jv_run
+    jar:     jv_jar
+    lib:     jv_libs
+    clean:   jv_clean
+
+- properties:
+    # name of the project (used to generate JAR file)
+    name:              ~
+    # project version
+    version:           ~
+    # build directory where live genrated files
+    jv_build_dir:      "build"
+    # java source files directory
+    jv_src:            "src"
+    # java unit test files directory
+    jv_test_src:       "test"
+    # dependency file (defaults to 'dependencies.yml')
+    jv_dep_file:       "dependencies.yml"
+    # type of dependency file (defaults to 'bee')
+    jv_dep_type:       "bee"
+    # directory where are genrated class files
+    jv_classes:        "#{jv_build_dir}/classes"
+    # directory where are generated class files for unit tests
+    jv_test_classes:   "#{jv_build_dir}/test_classes"
+    # glob for unit tests to include
+    jv_test_includes:  ["**/*Test.java"]
+    # glob for unit tests to exclude
+    jv_test_excludes:  []
+    # resources to include in classpath as sets of files (see copy task)
+    jv_res:            []
+    # resources to include in test classpath as sets of files (see copy task)
+    jv_test_res:       []
+    # java main class to run
+    jv_main:           ~
+    # command line arguments for main class
+    jv_args:           ""
+    # JAR file to generate
+    jv_jar:            "#{jv_build_dir}/#{name}-#{version}.jar"
+    # directory where to copy dependencies libraries
+    jv_lib_dir:        "#{jv_build_dir}/lib"
+    # directories to clean
+    jv_clean_dirs:     [:jv_build_dir]
+    # files to clean
+    jv_clean_files:    []
+ 
+- target:      jv_classpath
+  description: Build Java compile, test and runtime classpath
+  script:
+  - java.classpath:
+      file:        :jv_dep_file
+      type:        :jv_dep_type
+      classpath:   jv_compile_cp
+      directories: :jv_classes
+  - java.classpath:
+      file:        :jv_dep_file
+      type:        :jv_dep_type
+      classpath:   jv_test_cp
+      directories: [:jv_classes, :jv_test_classes]
+      scope:       test
+  - java.classpath:
+      file:        :jv_dep_file
+      type:        :jv_dep_type
+      classpath:   jv_runtime_cp
+      directories: :jv_classes
+      scope:       runtime
+
+- target:      jv_compile
+  depends:     jv_classpath
+  description: Compile Java source files and copy resources
+  script:
+  - java.javac:
+      src:       :jv_src
+      dest:      :jv_classes
+      classpath: :jv_compile_cp
+  - copy:
+      sets: :jv_res
+      dest: :jv_classes
+
+- target:      jv_test_compile
+  depends:     [jv_classpath, jv_compile]
+  description: Compile Java test source files
+  script:
+  - java.javac:
+      src:       :jv_test_src
+      dest:      :jv_test_classes
+      classpath: :jv_test_cp
+  - copy:
+      sets: :jv_test_res
+      dest: :jv_classes
+
+- target:      jv_unit_test
+  depends:     jv_test_compile
+  description: Run Java unit tests
+  script:
+  - java.junit:
+      src:       :jv_test_src
+      includes:  :jv_test_includes
+      excludes:  :jv_test_excludes
+      classpath: :jv_test_cp
+
+- target:      jv_run
+  depends:     jv_compile
+  description: Run main class
+  script:
+  - java.java:
+      main:      :jv_main
+      classpath: :jv_runtime_cp
+      arguments: :jv_args
+
+- target:      jv_jar
+  depends:     jv_compile
+  description: Build JAR file
+  script:
+  - java.jar:
+      src:  :jv_classes
+      dest: :jv_jar
+
+- target:      jv_libs
+  depends:     jv_jar
+  description: Assemble rutime classpath in a directory
+  script:
+  - mkdir: :jv_lib_dir
+  - cp:
+      src:  :jv_jar
+      dest: :jv_lib_dir
+  - java.classpath:
+      dependencies: jv_dependencies
+      scope:        runtime
+  - cp:
+      src:  :jv_dependencies
+      dest: :jv_lib_dir
+
+- target:      jv_clean
+  description: Clean generated files
+  script:
+  - rmdir: :jv_clean_dirs
+  - rm:    :jv_clean_files
+

data/lib/bee_task_java.rb

@@ -166,7 +166,7 @@ module Bee
         # select files to include in the Jar file
         files = []
         if includes
-          files = filter_files(includes, excludes)
+          files = filter_files(nil, includes, excludes)
           files.map! { |file| "\"#{file}\"" }
         end
         # run command line
@@ -322,7 +322,7 @@ module Bee
           end
         end
         if includes
-          files = filter_files(includes, excludes)
+          files = filter_files(nil, includes, excludes)
         end
         files.map! { |file| "\"#{file}\"" }
         # run command line
@@ -389,7 +389,7 @@ module Bee
           # select test files to run
           files = []
           for dir in src
-            files += filter_files(includes, excludes, dir)
+            files += filter_files(dir, includes, excludes)
           end
           files.uniq!
           classes = files.map do |file|
@@ -411,10 +411,17 @@ module Bee
         end
       end
 
-      # Resolve dependencies and genrate a classpath for a given Maven file.
-      # - file: Dependencies file to parse (dependencies.yml, project.xml or
-      #   pom.xml depending on type). Defaults to dependencies.yml.
-      # - type: the dependencies type: maven1, maven2 or bee. Defaults to bee.
+      # Resolve dependencies and generate a classpath for a given dependencies
+      # file. Synchronize dependencies with local repository if necessary
+      # (default location is ~/.java/dependencies directory).
+      #
+      # - file: Dependencies file to parse ('dependencies.yml', 'project.xml'
+      #   or 'pom.xml' depending on type). Defaults to 'dependencies.yml'.
+      # - type: the dependencies type: 'bee', 'maven1' or 'maven2'. Defaults to
+      #   'bee'.
+      # - scope: the scope of the classpath to build ('compile', 'test' and so
+      #   on, as defined in dependencies file).
+      # - directories: directory or list of directories to add to classpath.
       # - classpath: the property name to set with classpath.
       # - dependencies: the property name to set with the list of dependencies
       #   files.
@@ -453,15 +460,14 @@ module Bee
         end
         if classpath
           path = resolver.classpath
-          if directories
-            for directory in directories
-              path += File::PATH_SEPARATOR+directory
-            end
-          end
+          path += ':' + directories.join(File::PATH_SEPARATOR) if directories
           @build.context.set_property(classpath, path)
         end
-        @build.context.set_property(dependencies, resolver.dependencies) if
-          dependencies
+        if dependencies
+          deps = resolver.dependencies
+          deps += directories if directories
+          @build.context.set_property(dependencies, deps)
+        end
       end
 
       private

data/lib/dependency_resolver.rb

@@ -17,6 +17,7 @@ require 'fileutils'
 require 'rexml/document'
 require 'rexml/xpath'
 require 'bee_util'
+require 'pathname'
 
 module Bee
   
@@ -31,8 +32,6 @@ module Bee
       DEFAULT_REPOSITORY = nil
       # Default cache location.
       DEFAULT_CACHE      = nil
-      # Default dependency scope.
-      DEFAULT_SCOPE      = 'compile'
 
       # Constructor:
       # - file: dependency file (should be maven.xml).
@@ -51,11 +50,7 @@ module Bee
 
       # Return the classpath.
       def classpath
-        synchronize
-        classpath = @dependencies.map do |dependency| 
-          build_path(@cache, dependency)
-        end
-        return classpath.join(File::PATH_SEPARATOR)
+        return dependencies.join(File::PATH_SEPARATOR)
       end
 
       # Return dependencies as a list.
@@ -83,7 +78,7 @@ module Bee
         for dependency in @dependencies
           tofile = build_path(@cache, dependency)
           if not File.exists?(tofile)
-            save_file(download(dependency), tofile)
+            download_save(dependency, tofile)
           else
             puts "Dependency '#{build_name(dependency)}' already downloaded" if
               @verbose
@@ -103,18 +98,48 @@ module Bee
       def download(dependency, log=true)
         name = build_name(dependency)
         puts "Downloading dependency '#{name}'..." if log or @verbose
-        for repository in @repositories
-          url = build_path(repository, dependency)
-          puts "Trying '#{url}'..." if @verbose
-          begin
-            return fetch(url)
-          rescue
+        if dependency[:path]
+          path = Pathname.new(dependency[:path])
+          path = File.join(File.dirname(@file), path) if !path.absolute?
+          return File.open(path) { |f| f.read() }
+        else
+          for repository in @repositories
+            url = build_path(repository, dependency)
+            puts "Trying '#{url}'..." if @verbose
+            begin
+              return fetch(url)
+            rescue
+            end
           end
+          error "Dependency '#{name}' not found"
         end
-        error "Dependency '#{name}' not found"
       end
 
-      # Build a Maven path.
+      # Download a given dependency and save in a file.
+      # - dependency: dependency as a map.
+      # - file: the file where to save depndency.
+      def download_save(dependency, file, log=true)
+        name = build_name(dependency)
+        puts "Downloading dependency '#{name}'..." if log or @verbose
+        if dependency[:path]
+          path = Pathname.new(dependency[:path])
+          path = File.join(File.dirname(@file), path) if !path.absolute?
+          return File.open(path) { |f| f.read() }
+        else
+          for repository in @repositories
+            url = build_path(repository, dependency)
+            puts "Trying '#{url}'..." if @verbose
+            begin
+              fetch_save(url, file)
+              return
+            rescue
+            end
+          end
+          error "Dependency '#{name}' not found"
+        end
+      end
+
+      # Build a path.
       # - root: the path root (root directory for repository or cache).
       # - dependency: dependency as a map.
       # Return: path as a string.
@@ -141,32 +166,6 @@ module Bee
         raise 'Not implemented'
       end
 
-      # Tells if a given dependency should be selected.
-      # - dependency: the dependency to consider.
-      def selected?(dependency)
-        return false if dependency[:optional] == 'true'
-        dep_scope = dependency[:scope] || DEFAULT_SCOPE
-        if @scope == 'compile'
-          if dep_scope == 'compile'
-            return true
-          else
-            return false
-          end
-        elsif @scope == 'runtime'
-          if dep_scope == 'compile' or dep_scope == 'runtime'
-            return true
-          else
-            return false
-          end
-        elsif @scope == 'test'
-          if dep_scope == 'compile' or dep_scope == 'runtime' or dep_scope == 'test'
-            return true
-          else
-            return false
-          end
-        end
-      end
-
       # Save a given binary in a file and create directories as necessary.
       # - binary: data to save.
       # - tofile: file to save into.
@@ -197,6 +196,29 @@ module Bee
         end
       end
 
+      # Get a given URL and save body in a file.
+      # - url: URL to get.
+      # - file: the file where to save the body.
+      # - limit: redirectrion limit (defaults to HTTP_REDIRECTIONS_LIMIT).
+      def fetch_save(url, file, limit = HTTP_REDIRECTIONS_LIMIT)
+        puts "Fetching '#{url}'..." if @verbose
+        raise 'HTTP redirect too deep' if limit == 0
+        directory = File.dirname(file)
+        FileUtils.makedirs(directory) if not File.exists?(directory)
+        File.open(file,'wb') do |f|
+          uri = URI.parse(url)
+          Net::HTTP.start(uri.host, uri.port) do |http| 
+            http.request_get(uri.path) do |response| 
+              response.read_body do |segment|
+                f.write(segment)
+                # hack, else 100% CPU
+                sleep 0.001
+              end
+            end
+          end
+        end
+      end
+
     end
   
     # Bee dependency resolver.
@@ -225,17 +247,19 @@ module Bee
         new_dependencies = []
         for dependency in dependencies
           if dependency['group']
-            new_dependency = {}
-            for key in dependency.keys
-              if key != 'group' and key != 'artifact'
-                new_dependency[key.to_sym] = dependency[key]
-              elsif key == 'group'
-                new_dependency[:groupid] = dependency['group']
-              elsif key == 'artifact'
-                new_dependency[:artifactid] = dependency['artifact']
+            if Array(dependency['scope']).include?(@scope) or !dependency['scope']
+              new_dependency = {}
+              for key in dependency.keys
+                if key != 'group' and key != 'artifact'
+                  new_dependency[key.to_sym] = dependency[key]
+                elsif key == 'group'
+                  new_dependency[:groupid] = dependency['group']
+                elsif key == 'artifact'
+                  new_dependency[:artifactid] = dependency['artifact']
+                end
               end
+              new_dependencies << new_dependency
             end
-            new_dependencies << new_dependency
           end
         end
         return new_dependencies
@@ -286,6 +310,13 @@ module Bee
       DEFAULT_CACHE      = File.expand_path('~/.maven/repository')
       # Default dependency scope.
       DEFAULT_SCOPE      = 'compile'
+      # scope availability: list for a given dependency scope the implied classpath scopes
+      SCOPE_AVAILABILITY = {
+        'compile'  => ['compile', 'test', 'runtime'],
+        'provided' => ['compile', 'test'],
+        'runtime'  => ['test', 'runtime'],
+        'test'     => ['test'],
+      }
 
       # Constructor:
       # - file: dependency file (should be maven.xml).
@@ -298,20 +329,6 @@ module Bee
 
       private
 
-      # Synchronize dependencies with local cache.
-      def synchronize
-        resolve
-        for dependency in @dependencies
-          tofile = build_path(@cache, dependency)
-          if not File.exists?(tofile)
-            save_file(download(dependency), tofile)
-          else
-            puts "Dependency '#{build_name(dependency)}' already downloaded" if
-              @verbose
-          end
-        end
-      end
-
       # Extract repository list from file.
       # Return: repository list.
       def parse_repositories
@@ -368,6 +385,16 @@ module Bee
         return dependencies
       end
 
+      # Tells if a given dependency should be selected.
+      # - dependency: the dependency to consider.
+      def selected?(dependency)
+        return false if dependency[:optional] == 'true'
+        dep_scope = dependency[:scope] || DEFAULT_SCOPE
+        raise "Unknown dependency scope '#{dep_scope}'" if
+          !SCOPE_AVAILABILITY.keys.include?(dep_scope)
+        return SCOPE_AVAILABILITY[dep_scope].include?(@scope)
+      end
+
     end
 
     # Maven 2 dependency resolver.
@@ -468,11 +495,12 @@ module Bee
         version = dependency[:version]
         type = dependency[:type] || 'jar'
         classifier = dependency[:classifier]
+        path = dependency[:path]
         if classifier
           return "#{root}/#{groupid}/#{artifactid}/#{version}/#{artifactid}-#{version}-#{classifier}.#{type}"
         else
           return "#{root}/#{groupid}/#{artifactid}/#{version}/#{artifactid}-#{version}.#{type}"
-        end        
+        end
       end
 
     end

data/maven2.yml

@@ -0,0 +1,15 @@
+- build:       maven2
+  description: Build file for Maven 2 projects
+  extends:     ":java:java.yml"
+
+- properties:
+    name:         ~
+    jv_build_dir: "target"
+    jv_src:       "src/main/java"
+    jv_test_src:  "src/test/java"
+    jv_res:
+      root:       "src/main/resources"
+      includes:   "**/*"
+    jv_test_res:
+      root:       "src/test/resources"
+      includes:   "**/*"

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bee_java
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  hash: 23
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Michel Casabianca
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +01:00
+date: 2012-06-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bee
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
         version: 0.11.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: michel.casabianca@gmail.com
 executables: 
@@ -34,52 +46,43 @@ extra_rdoc_files:
 - build/README
 - LICENSE
 files: 
-- bin/maven2bee
-- bin/beedoc
-- bin/gendeps
-- bin/bee2maven
-- lib/dependency_resolver.rb
 - lib/bee_task_java.rb
-- test/build.yml
-- test/manifest.erb
-- test/test/test/TestTest.java
-- test/test_build.rb
-- test/dependencies.xml
-- test/dependencies.yml
-- test/pom.xml
-- test/ts_bee_java.rb
-- test/test_build_listener.rb
-- test/tc_bee_task_java.rb
-- test/src/test/Test.java
-- test/tc_dependency_resolver.rb
-- egg/tiny.yml
-- egg/lib/test.erb
+- lib/dependency_resolver.rb
+- egg/lib/build.erb
 - egg/lib/dependencies.yml
 - egg/lib/source.erb
-- egg/lib/build.erb
-- egg/xmlrpc/build.yml
-- egg/xmlrpc/dependencies.yml
-- egg/xmlrpc/src/test/handlers.properties
-- egg/xmlrpc/src/test/Server.java
-- egg/xmlrpc/src/test/Client.java
-- egg/xmlrpc/src/test/TestHandler.java
-- egg/servlet.yml
-- egg/tiny/source.erb
-- egg/tiny/build.erb
+- egg/lib/test.erb
 - egg/lib.yml
-- egg/xmlrpc.yml
-- egg/servlet/tomcat-server.xml
-- egg/servlet/tomcat-users.xml
 - egg/servlet/build.yml
-- egg/servlet/tomcat-web.xml
 - egg/servlet/dependencies.yml
-- egg/servlet/ServletTest.java
 - egg/servlet/MANIFEST.MF
 - egg/servlet/Servlet.java
+- egg/servlet/ServletTest.java
+- egg/servlet/tomcat-server.xml
+- egg/servlet/tomcat-users.xml
+- egg/servlet/tomcat-web.xml
 - egg/servlet/tomcat.yml
 - egg/servlet/web.xml
+- egg/servlet.yml
+- egg/tiny/build.erb
+- egg/tiny/dependencies.yml
+- egg/tiny/source.erb
+- egg/tiny.yml
+- egg/xmlrpc/build.yml
+- egg/xmlrpc/dependencies.yml
+- egg/xmlrpc/src/test/Client.java
+- egg/xmlrpc/src/test/handlers.properties
+- egg/xmlrpc/src/test/Server.java
+- egg/xmlrpc/src/test/TestHandler.java
+- egg/xmlrpc.yml
+- java.yml
+- maven2.yml
 - build/README
 - LICENSE
+- test/ts_bee_java.rb
+- bin/bee2maven
+- bin/maven2bee
+- bin/gendeps
 has_rdoc: true
 homepage: http://bee.rubyforge.org
 licenses: []
@@ -90,21 +93,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: none
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: BeeJava is a package to build and generate Java project using Bee.