bee_java 0.0.5 → 0.0.6

data/bin/gendeps

@@ -18,7 +18,7 @@
 
 require 'erb'
 
-DEFAULT_REPOSITORY = 'http://mirrors.ibiblio.org/pub/mirrors/maven2'
+DEFAULT_REPOSITORY = 'http://mirrors.ibiblio.org/maven2'
 
 TEMPLATE = ERB.new('- group:      "<%= group %>"
   artifact:   "<%= artifact %>"

data/build/README

@@ -20,4 +20,4 @@ or go to URL http://www.apache.org/licenses/LICENSE-2.0).
 
 = Copyright
 
-Bee_java version 0.0.5 (C) Michel Casabianca - 2008-2012
+Bee_java version 0.0.6 (C) Michel Casabianca - 2008-2012

data/egg/lib/dependencies.yml

@@ -1,4 +1,4 @@
-- repository: http://mirrors.ibiblio.org/pub/mirrors/maven2
+- repository: http://mirrors.ibiblio.org/maven2
 
 - group:    "junit"
   artifact: "junit"

data/egg/servlet/build.yml

@@ -3,6 +3,8 @@
   extends:
   - ":java:java.yml"
   - tomcat.yml
+  alias:
+    run: ~
 
 - properties:
     name:        "<%= name %>"

data/egg/servlet/dependencies.yml

@@ -1,4 +1,4 @@
-- repository: http://mirrors.ibiblio.org/pub/mirrors/maven2
+- repository: http://mirrors.ibiblio.org/maven2
 
 - group:    junit
   artifact: junit

data/egg/tiny/build.erb

@@ -1,6 +1,8 @@
 - build:       <%= name %>
   description: Build file for project <%= name.capitalize %>
   extends:     ":java:java.yml"
+  alias:
+    test: ~
 
 - properties:
     name:       "<%= name %>"

data/egg/tiny/dependencies.yml

@@ -1,4 +1,4 @@
-- repository: http://mirrors.ibiblio.org/pub/mirrors/maven2
+- repository: http://mirrors.ibiblio.org/maven2
 
 #- group:    junit
 #  artifact: junit

data/egg/xmlrpc/build.yml

@@ -2,14 +2,14 @@
   description: Build file for project <%= name.capitalize %>
   extends:
   - ":java:java.yml"
+  alias:
+    test: ~
 
 - properties:
     name:         "<%= name %>"
     version:      "0.0.1"
     jv_main:      "test.Server"
-    jv_res:
-      root:     :jv_src
-      includes: "**/*.properties"
+    jv_res:       :jv_src
     client_main:  "test.Client"
 
 - target:      client

data/egg/xmlrpc/dependencies.yml

@@ -1,4 +1,4 @@
-- repository: http://mirrors.ibiblio.org/pub/mirrors/maven2
+- repository: http://mirrors.ibiblio.org/maven2
 
 - group:    org.apache.xmlrpc
   artifact: xmlrpc-common

data/java.yml

@@ -28,14 +28,20 @@
     jv_classes:        "#{jv_build_dir}/classes"
     # directory where are generated class files for unit tests
     jv_test_classes:   "#{jv_build_dir}/test_classes"
+    # directories to add to compile classpath
+    jv_cp_comp_dirs:   [:jv_classes]
+    # directories to add to test classpath
+    jv_cp_test_dirs:   [:jv_classes, :jv_test_classes]
+    # directories to add to runtime classpath
+    jv_cp_run_dirs:    [:jv_classes]
     # glob for unit tests to include
     jv_test_includes:  ["**/*Test.java"]
     # glob for unit tests to exclude
     jv_test_excludes:  []
     # directory where are resources to include in classpath
-    jv_res:            []
+    jv_res:            ~
     # directory where are resources to include in test classpath
-    jv_test_res:       []
+    jv_test_res:       ~
     # java main class to run
     jv_main:           ~
     # command line arguments for main class
@@ -48,7 +54,9 @@
     jv_clean_dirs:     [:jv_build_dir]
     # files to clean
     jv_clean_files:    []
- 
+    # JUnit version
+    jv_junit_version:  '4'
+
 - target:      jv_classpath
   description: Build Java compile, test and runtime classpath
   script:
@@ -56,18 +64,18 @@
       file:        :jv_dep_file
       type:        :jv_dep_type
       classpath:   jv_compile_cp
-      directories: :jv_classes
+      directories: :jv_cp_comp_dirs
   - java.classpath:
       file:        :jv_dep_file
       type:        :jv_dep_type
       classpath:   jv_test_cp
-      directories: [:jv_classes, :jv_test_classes]
+      directories: :jv_cp_test_dirs
       scope:       test
   - java.classpath:
       file:        :jv_dep_file
       type:        :jv_dep_type
       classpath:   jv_runtime_cp
-      directories: :jv_classes
+      directories: :jv_cp_run_dirs
       scope:       runtime
 
 - target:      jv_compile
@@ -78,7 +86,7 @@
       src:       :jv_src
       dest:      :jv_classes
       classpath: :jv_compile_cp
-  - if: jv_res
+  - if: defined?(jv_res) and File.exists?(jv_res)
     then:
     - copy:
         root: :jv_res
@@ -92,7 +100,7 @@
       src:       :jv_test_src
       dest:      :jv_test_classes
       classpath: :jv_test_cp
-  - if: jv_test_res
+  - if: defined?(jv_test_res) and File.exists?(jv_test_res)
     then:
     - copy:
         root: :jv_test_res
@@ -107,6 +115,7 @@
       includes:  :jv_test_includes
       excludes:  :jv_test_excludes
       classpath: :jv_test_cp
+      version:   :jv_junit_version
 
 - target:      jv_run
   depends:     jv_compile

data/lib/bee_task_java.rb

@@ -349,6 +349,11 @@ module Bee
       #   class files for classes under test and unit tests themselves.
       # - skip: tells if we should skip test. Optional, defaults to false.
       # - options: custom options to use on command line (optional).
+      # - version: the JUnit version (defaults to 4 and later). This may
+      #   be important for 3 and earlier versions where runner is in
+      #   'junit.runner' package instead of 'org.junit.runner'. Note that
+      #   for JUnit 3 and earlier, JUnit test runner will run once for
+      #   each test class.
       #
       # Example
       #
@@ -366,7 +371,9 @@ module Bee
           :dependencies => { :mandatory => false, :type => :string_or_array },
           :skip         => { :mandatory => false, :type => :boolean,
                              :default => false },
-          :options      => { :mandatory => false, :type => :string }
+          :options      => { :mandatory => false, :type => :string },
+          :version      => { :mandatory => false, :type => :string,
+                             :default => '4' }
         }
         check_parameters(params, params_desc)
         src          = params[:src]
@@ -376,6 +383,7 @@ module Bee
         dependencies = params[:dependencies]
         skip         = params[:skip]
         options      = params[:options]
+        version      = params[:version]
         for dir in src
           error "junit 'src' directory was not found" unless
             File.exists?(dir) and File.directory?(dir)
@@ -398,14 +406,31 @@ module Bee
             "\"#{file}\""
           end
           # run command line
-          puts "Running JUnit on #{files.length} test file(s)"
-          command = "java "
-          command += "#{options} " if options
-          command += "-classpath #{path} " if path
-          command += "org.junit.runner.JUnitCore #{classes.join(' ')}"
-          puts "Running command '#{command}'" if @verbose
-          ok = system(command)
-          error "Error running JUnit" unless ok
+          major_version = version.split('.')[0].to_i
+          if major_version > 3
+            main_class = 'org.junit.runner.JUnitCore'
+            puts "Running JUnit on #{files.length} test file(s)"
+            command = "java "
+            command += "#{options} " if options
+            command += "-classpath #{path} " if path
+            command += "#{main_class} #{classes.join(' ')}"
+            puts "Running command '#{command}'" if @verbose
+            ok = system(command)
+            error "Error running JUnit" unless ok
+          else
+            main_class = 'junit.textui.TestRunner'
+            for test_class in classes
+              puts "Running JUnit on '#{test_class}' test class"
+              command = "java "
+              command += "#{options} " if options
+              command += "-classpath #{path} " if path
+              command += "#{main_class} #{test_class}"
+              puts "Running command '#{command}'" if @verbose
+              ok = system(command)
+              error "Error running JUnit" unless ok
+            end
+          end
+          # run command line
         else
           puts "Skipping unit tests!!!"
         end

data/lib/dependency_resolver.rb

@@ -176,13 +176,13 @@ module Bee
         File.open(tofile, 'wb') { |file| file.write(binary) }    
       end
 
-      # Maximum number of HTTP redirections.
-      HTTP_REDIRECTIONS_LIMIT = 10
+      # Maximum number of HTTP redirection.
+      HTTP_REDIRECTION_LIMIT = 10
   
       # Get a given URL.
       # - url: URL to get.
-      # - limit: redirectrion limit (defaults to HTTP_REDIRECTIONS_LIMIT).
-      def fetch(url, limit = HTTP_REDIRECTIONS_LIMIT)
+      # - limit: redirection limit (defaults to HTTP_REDIRECTION_LIMIT).
+      def fetch(url, limit = HTTP_REDIRECTION_LIMIT)
         puts "Fetching '#{url}'..." if @verbose
         raise 'HTTP redirect too deep' if limit == 0
         response = Net::HTTP.get_response(URI.parse(url))
@@ -190,7 +190,8 @@ module Bee
         when Net::HTTPSuccess
           response.body
         when Net::HTTPRedirection
-          fetch(response['location'], limit - 1)
+        when Net::HTTPMovedPermanently
+          fetch(build_url(url, response['location']), limit - 1)
         else
           response.error!
         end
@@ -199,16 +200,21 @@ module Bee
       # 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)
+      # - limit: redirection limit (defaults to HTTP_REDIRECTION_LIMIT).
+      def fetch_save(url, file, limit = HTTP_REDIRECTION_LIMIT)
         puts "Fetching '#{url}'..." if @verbose
-        raise 'HTTP redirect too deep' if limit == 0
+        raise 'HTTP redirect too deep' if limit <= 0
         directory = File.dirname(file)
         FileUtils.makedirs(directory) if not File.exists?(directory)
         uri = URI.parse(url)
-        Net::HTTP.start(uri.host, uri.port) do |http| 
+        Net::HTTP.start(uri.host, uri.port) do |http|
           http.request_get(uri.path) do |response|
-            raise "Bad status code '#{response.code}'" if !response.is_a?(Net::HTTPSuccess)
+            if response.is_a?(Net::HTTPRedirection) or response.is_a?(Net::HTTPMovedPermanently)
+              fetch_save(build_url(url, response['location']), file, limit - 1)
+              return
+            elsif !response.is_a?(Net::HTTPSuccess)
+              raise "Bad status code '#{response.code}'"
+            end
             File.open(file,'wb') do |f|
               response.read_body do |segment|
                 f.write(segment)
@@ -220,6 +226,15 @@ module Bee
         end
       end
 
+      def build_url(base, path)
+        if path =~ /^http:\/\//
+          return path
+        else
+          uri = URI(base)
+          return "#{uri.scheme}://#{uri.host}#{path}"
+        end
+      end
+
     end
   
     # Bee dependency resolver.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bee_java
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michel Casabianca
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-04 00:00:00 Z
+date: 2012-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bee