buildr 1.4.13-x86-mswin32 → 1.4.14-x86-mswin32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Q1ODRhMWYxYTNlN2RjZTc4Y2E0MGI1N2RmZGMwOWUxYTU5YWVhMA==
+    M2RlYTk2OTY1MzcyNWFlY2RiNWM2ODRiYjY3NjliNDE2NzVlY2ExNw==
   data.tar.gz: !binary |-
-    ZmYwYjVmYjA1MmU3YzliNjQwNmRmODU2MmRmYmVhMTAxOWU3OTJiMw==
+    NDlkY2RlZTMyMDI1ZTdiZWNlYmI2Y2ZhMjYwNzZjZGU0MmYyMTU4Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzZhOWQ2MWIxMzYyM2EzYmEwYjMxOGY2NTBiYmViMDRjMDJlODJiMmQyYzRj
-    NmIwYzhlOTE0YWIwMTFlNGQ0MzQwYTdiZDVmNzI4ZTlkZDBiNmIxNTJjMmJh
-    NDQ0OWQ0ZjhmNmViMTE1MWMyMTFhMmJkMzNhYmU4NTBmNzk1NzE=
+    MWUyZGE0YTU4OTliNTZkMTQyMWRiZDQzYTg5NTFhMjI5MDA5MzczZWE4MmM3
+    MDJkY2EwNWZkNjllZWNmMTdhMjg4ODIzYzM4YmU5NDYyMmQ5NzdlNjkxNTUz
+    NWQxYzYyNjBlMTk5ZDJkNTEzZWRhODkyMjBlNzhjMGJiYWNmNTA=
   data.tar.gz: !binary |-
-    NzNjOWE4YmUwZTdhZDA4Y2ZmNDg5NWE4OTQzZjIxNTY5ZTA2NTE3MjNiYTkw
-    NzU4ZjJhNzY5MmI5YjhjZDU2NTBiZmZlMDM5N2I0NzhkYTliN2I0NDc2YWYx
-    YjQ0ODMxMDRlMWRlZWZkZjRlNmQyMGNjODZmYmViNTgxOWU4MWM=
+    MmRiN2E0ODlkMTdkNWY1NTgyMWUyNDcxOTVhMzA0ZTlhYWM1ZDBlZDk0ODAz
+    MDUxYTNiZDBlZTU5MzBjYzExZDU1MmFmNWM4YzhiNGUyOGNiYmFjNmM1ODAz
+    YzhkNWZkYzk4Njg4Y2M3ZDFlYjg2NmVjYTM3NTU4YTE5YjM0NmE=

data/CHANGELOG

@@ -1,3 +1,25 @@
+1.4.14 (2013-10-11)
+* Change: Remove highline dependency.
+* Fixed:  BUILDR-682 - Fix the documentation for releasing using
+          your own versioning scheme. Submitted by Jean-Philippe
+          Caruana.
+* Fixed:  BUILDR-681 - Stop empty projects creating target/webapp.
+* Change: Add dependency from generated jws client source directory
+          to the source wsdl in the wsgen addon.
+* Fixed:  Fixed regression in gwt addon due to "pathing_jar"
+          functionality in Java::Commands.java.
+* Change: Support disabling the new "pathing_jar" functionality in
+          Java::Commands.java utility method. Required for tools
+          that introspect the classpath.
+* Change: Update wsgen addon to generate source into a directory
+          hierarchy based on maven conventions.
+* Fixed:  Fixed regression using transitive dependencies due to
+          presence of :scope option in Artifacts.to_hash.
+* Fixed:  Fixed bug in GWT addon that required that the user supply
+          the :dependencies option.
+* Fixed:  Fixed bug in Intellij project file generation when adding
+          a web facet.
+
 1.4.13 (2013-10-02)
 * Fixed:  BUILDR-439 - Fix java command under windows when supplied
           with extremely long classpath. Submitted By Tammo van Lessen.

data/addon/buildr/gwt.rb

@@ -60,7 +60,7 @@ module Buildr
         properties["gwt.persistentunitcache"] = "true"
         properties["gwt.persistentunitcachedir"] = unit_cache_dir
 
-        Java::Commands.java 'com.google.gwt.dev.Compiler', *(args + [{:classpath => cp, :properties => properties, :java_args => options[:java_args]}])
+        Java::Commands.java 'com.google.gwt.dev.Compiler', *(args + [{:classpath => cp, :properties => properties, :java_args => options[:java_args], :pathing_jar => false}])
       end
 
       def superdev_dependencies
@@ -83,7 +83,7 @@ module Buildr
 
         java_args = options[:java_args] ? options[:java_args].dup : {}
 
-        Java::Commands.java 'com.google.gwt.dev.codeserver.CodeServer', *(args + [{:classpath => cp, :properties => properties, :java_args => java_args}])
+        Java::Commands.java 'com.google.gwt.dev.codeserver.CodeServer', *(args + [{:classpath => cp, :properties => properties, :java_args => java_args, :pathing_jar => false}])
       end
     end
 
@@ -96,11 +96,11 @@ module Buildr
         artifacts = (project.compile.sources + project.resources.sources).collect do |a|
           a.is_a?(String) ? file(a) : a
         end
-        dependencies = artifacts(options[:dependencies]) || project.compile.dependencies
+        dependencies = options[:dependencies] ? artifacts(options[:dependencies]) : project.compile.dependencies
 
         unit_cache_dir = project._(:target, :gwt, :unit_cache_dir, output_key)
 
-        task = file(output_dir) do
+        task = project.file(output_dir) do
           Buildr::GWT.gwtc_main(module_names, dependencies + artifacts, output_dir, unit_cache_dir, options.dup)
         end
         task.enhance(dependencies)

data/addon/buildr/wsgen.rb

@@ -131,7 +131,7 @@ module Buildr
         desc "Generate java from wsdl"
         project.task("wsdl2java")
 
-        ws_dir = File.expand_path(options[:output_dir] || project._(:target, :generated, "main/ws"))
+        ws_dir = File.expand_path(options[:output_dir] || project._(:target, :generated, "ws/main/java"))
         project.file(ws_dir)
         project.task('wsdl2java').enhance([ws_dir])
 
@@ -142,7 +142,7 @@ module Buildr
           service = config[:service] || File.basename(wsdl_file, '.wsdl')
           wsdl_location = config[:wsdl_location]
           java_file = "#{ws_dir}/#{pkg.gsub('.', '/')}/#{service}.java"
-          project.file(java_file) do
+          project.file(java_file => [project.file(wsdl_file)]) do
             mkdir_p ws_dir
             command = []
             command << "wsimport"
@@ -172,6 +172,8 @@ module Buildr
         project.compile.from ws_dir
         project.iml.main_source_directories << ws_dir if project.iml?
         project.compile.enhance(['wsdl2java'])
+
+        ws_dir
       end
     end
   end

data/buildr.gemspec

@@ -59,7 +59,6 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'net-ssh',              '2.7.0'
   spec.add_dependency 'net-sftp',             '2.1.2'
   spec.add_dependency 'rubyzip',              '0.9.9'
-  spec.add_dependency 'highline',             '1.6.19'
   spec.add_dependency 'json_pure',            '1.8.0'
   spec.add_dependency 'rubyforge',            '2.0.4'
   spec.add_dependency 'hoe',                  '3.7.1'
@@ -75,6 +74,7 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'jruby-openssl',        '~> 0.8.2' if $platform.to_s == 'java'
   spec.add_dependency 'bundler'
   spec.add_dependency 'orderedhash'
+  spec.add_dependency 'win32console'          '1.3.2' if $platform.to_s == 'x86-mswin32'
 
   # Unable to get this consistently working under jruby on windows
   unless $platform.to_s == 'java'
@@ -84,13 +84,8 @@ for those one-off tasks, with a language that's a joy to use.
     spec.add_development_dependency 'rdoc', '4.0.1'
   end
 
+  spec.add_development_dependency 'rspec-retry', '0.2.1'
   spec.add_development_dependency 'ci_reporter', '1.9.0'
-
-  # NOTE: Must update all-in-one.rake if this is updated
-  # ffi-ncurses Fails on several varieties of Ubuntu due to being unable to locate ncursesw library
-  # Should be able to just disable it
-  #spec.add_development_dependency 'ffi-ncurses', '0.4.0' if $platform.to_s == 'java'
-  spec.add_development_dependency 'win32console' if $platform.to_s == 'x86-mswin32'
   # Ideally we would depend on psych when the platform has >= 1.9.2 support and jruby platform version > 1.6.6
   #spec.add_development_dependency 'psych' if RUBY_VERSION >= '1.9.2'
   spec.add_development_dependency 'pygmentize', '0.0.3'

data/doc/download.textile

@@ -23,13 +23,13 @@ h2(#dist).  Binaries and Source Code
 h3. buildr 1.4.13 (2013-10-02)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.13-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.13/buildr-1.4.13-java.gem | "ffcc5a2de357ca7bd6b1e0f9b6b03726":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13-java.gem.asc |
-| "buildr-1.4.13-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.13/buildr-1.4.13-x86-mswin32.gem | "8ddd577888adde3de0dfb446dd2ded20":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13-x86-mswin32.gem.asc |
-| "buildr-1.4.13.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.13/buildr-1.4.13.gem | "b55c573116d8ea444c71c3eadff52c46":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13.gem.asc |
-| "buildr-1.4.13.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.13/buildr-1.4.13.tgz | "b3a4c8f22d56e043df8b7a7b862af0e0":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13.tgz.asc |
-| "buildr-1.4.13.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.13/buildr-1.4.13.zip | "58365ecd0fa7f3ec81d2009ffb045505":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.13/buildr-1.4.13.zip.asc |
+| "buildr-1.4.13-java.gem":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13-java.gem | "ffcc5a2de357ca7bd6b1e0f9b6b03726":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13-java.gem.asc |
+| "buildr-1.4.13-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13-x86-mswin32.gem | "8ddd577888adde3de0dfb446dd2ded20":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13-x86-mswin32.gem.asc |
+| "buildr-1.4.13.gem":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.gem | "b55c573116d8ea444c71c3eadff52c46":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.gem.asc |
+| "buildr-1.4.13.tgz":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.tgz | "b3a4c8f22d56e043df8b7a7b862af0e0":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.tgz.asc |
+| "buildr-1.4.13.zip":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.zip | "58365ecd0fa7f3ec81d2009ffb045505":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.13/buildr-1.4.13.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.13/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.13/KEYS)
 
 
 h3. buildr 1.4.12 (2013-05-04)

data/doc/index.textile

@@ -46,6 +46,14 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
+Highlights from Buildr 1.4.14 (2013-10-11)
+* Fixed:  Fixed regression in gwt addon.
+* Fixed:  Fixed regression using transitive dependencies due to
+          presence of :scope option in Artifacts.to_hash.
+* Fixed:  BUILDR-681 - Stop empty projects creating target/webapp.
+* Fixed:  Fixed several regressions in in the Intellij IDE
+          project file generation.
+
 Highlights from Buildr 1.4.13 (2013-10-02)
 
 * Fixed:  Upgrade rjb dependency so that you can change JVMs by

data/doc/releasing.textile

@@ -66,11 +66,13 @@ THIS_VERSION = "1.0.0-SNAPSHOT"
 # a string
 Release.next_version = "2.0.0-SNAPSHOT"
 
-# or a proc
-Release.next_version = lambda do |this_version| # 1.0.0-SNAPSHOT
-    new_version = @THIS_VERSION@.split(/\./)
-    new_version[0] = new_version[0] + 1
-    new_version
+# or a proc - equivalent result
+Release.next_version = lambda do |this_version| # 2.0.0-SNAPSHOT
+    new_version = THIS_VERSION.split /\./
+    new_version[0] = new_version[0].to_i + 1
+    new_version[1] = 0
+    new_version[2] = '0-SNAPSHOT'
+    new_version.join '.'
 end
 
 define 'killer-app' do

data/lib/buildr.rb

@@ -28,7 +28,6 @@ autoload :YAML, 'yaml'
 autoload :REXML, 'rexml/document'
 autoload :XmlSimple, 'xmlsimple'
 autoload :Builder, 'builder' # A different kind of buildr, one we use to create XML.
-require 'highline/import'
 autoload :RSpec, 'rspec'
 require 'erb'
 require 'find'
@@ -39,6 +38,7 @@ require 'orderedhash'
 require 'securerandom'
 
 require 'buildr/core/util'
+require 'buildr/core/console'
 require 'buildr/core/common'
 require 'buildr/core/application'
 require 'buildr/core/jrebel'
@@ -105,3 +105,6 @@ class Object #:nodoc:
   end
 end
 
+# Need to set this again as jruby was not correctly
+# initialized, the first time it was called
+Buildr::Console.use_color = $stdout.isatty

data/lib/buildr/core/application.rb

@@ -242,7 +242,7 @@ module Buildr
             real << ('%ih' % (elapsed / 3600)) if elapsed >= 3600
             real << ('%im' % ((elapsed / 60) % 60)) if elapsed >= 60
             real << ('%.3fs' % (elapsed % 60))
-            puts $terminal.color("Completed in #{real.join}", :green)
+            puts Buildr::Console.color("Completed in #{real.join}", :green)
           end
           # On OS X this will load Cocoa and Growl which takes half a second we
           # don't want to measure, so put this after the console message.
@@ -387,25 +387,25 @@ module Buildr
     end
 
     def ask_generate_buildfile
-      source, fromEclipse = choose do |menu|
-        menu.header = "To use Buildr you need a buildfile. Do you want me to create one?"
-        menu.choice("From eclipse .project files") { [Dir.pwd, true] } if Generate.has_eclipse_project?
-        menu.choice("From Maven2 POM file") { ['pom.xml', false] } if File.exist?('pom.xml')
-        menu.choice("From directory structure") { [Dir.pwd, false] }
-        menu.choice("Cancel") {}
-      end
+      header = "To use Buildr you need a buildfile. Do you want me to create one?"
+      options = {}
+      options["From eclipse .project files"] = [Dir.pwd, true] if Generate.has_eclipse_project?
+      options["From Maven2 POM file"] = ['pom.xml', false] if File.exist?('pom.xml')
+      options["From directory structure"] = [Dir.pwd, false]
+      options["Cancel"]= nil
+      source, from_eclipse = Buildr::Console.present_menu(header, options)
       if source
-        buildfile = raw_generate_buildfile(source, fromEclipse)
+        buildfile = raw_generate_buildfile(source, from_eclipse)
         [buildfile, File.dirname(buildfile)]
       end
     end
 
-    def raw_generate_buildfile(source, fromEclipse=Generate.has_eclipse_project?)
+    def raw_generate_buildfile(source, from_eclipse=Generate.has_eclipse_project?)
       # We need rakefile to be known, for settings.build to be accessible.
       @rakefile = File.expand_path(DEFAULT_BUILDFILES.first)
-      fail "Buildfile already exists" if File.exist?(@rakefile) && !(tty_output? && agree('Buildfile exists, overwrite?'))
+      fail "Buildfile already exists" if File.exist?(@rakefile) && !(tty_output? && Buildr::Console.agree?('Buildfile exists, overwrite?'))
       script = nil
-      if fromEclipse
+      if from_eclipse
         script = Generate.from_eclipse(source)
       elsif File.directory?(source)
         script = Generate.from_directory(source)
@@ -537,7 +537,7 @@ module Buildr
         # Exit silently with current status
         exit(ex.status)
       rescue OptionParser::ParseError => ex
-        $stderr.puts $terminal.color(ex.message, :red)
+        $stderr.puts Buildr::Console.color(ex.message, :red)
         exit(1)
       rescue Exception => ex
         ex_msg = ex.class.name == "Exception" ? ex.message : "#{ex.class.name} : #{ex.message}"
@@ -545,11 +545,11 @@ module Buildr
         build_failed(title, message, ex)
         # Exit with error message
         $stderr.puts "Buildr aborted!"
-        $stderr.puts $terminal.color(ex_msg, :red)
+        $stderr.puts Buildr::Console.color(ex_msg, :red)
         if options.trace
           $stderr.puts ex.backtrace.join("\n")
         else
-          $stderr.puts ex.backtrace.select { |str| str =~ /#{rakefile}/ }.map { |line| $terminal.color(line, :red) }.join("\n") if rakefile
+          $stderr.puts ex.backtrace.select { |str| str =~ /#{rakefile}/ }.map { |line| Buildr::Console.color(line, :red) }.join("\n") if rakefile
           $stderr.puts "(See full trace by running task with --trace)"
         end
         exit(1)
@@ -597,29 +597,17 @@ module Buildr
 
 end
 
-
-# Add a touch of color when available and running in terminal.
-HighLine.use_color = false
-if $stdout.isatty
-  begin
-    require 'Win32/Console/ANSI' if RbConfig::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i
-    HighLine.use_color = true
-  rescue LoadError
-  end
-end
-
-
 alias :warn_without_color :warn
 
 # Show warning message.
 def warn(message)
-  warn_without_color $terminal.color(message.to_s, :blue) if verbose
+  warn_without_color Buildr::Console.color(message.to_s, :blue) if verbose
 end
 
 # Show error message.  Use this when you need to show an error message and not throwing
 # an exception that will stop the build.
 def error(message)
-  puts $terminal.color(message.to_s, :red)
+  puts Buildr::Console.color(message.to_s, :red)
 end
 
 # Show optional information.  The message is printed only when running in verbose

data/lib/buildr/core/assets.rb

@@ -41,13 +41,16 @@ module Buildr #:nodoc:
       def initialize(*args) #:nodoc:
         super
         enhance do
-          mkdir_p name
-          self.paths.flatten.compact.collect do |a|
-            a.is_a?(String) ? project.file(a) : a
-          end.each do |a|
-            a.invoke if a.respond_to?(:invoke)
-          end.each do |asset|
-            cp_r Dir["#{asset}/*"], "#{name}/"
+          paths = self.paths.flatten.compact
+          if paths.size > 0
+            mkdir_p name
+            paths.collect do |a|
+              a.is_a?(String) ? project.file(a) : a
+            end.each do |a|
+              a.invoke if a.respond_to?(:invoke)
+            end.each do |asset|
+              cp_r Dir["#{asset}/*"], "#{name}/"
+            end
           end
         end
       end

data/lib/buildr/core/cc.rb

@@ -47,7 +47,7 @@ module Buildr #:nodoc:
         each_project { |p| p.test.compile.invoke }
         build_completed(project)
       rescue Exception => ex
-        $stderr.puts $terminal.color(ex.message, :red)
+        $stderr.puts Buildr::Console.color(ex.message, :red)
         $stderr.puts
 
         build_failed(project, ex)
@@ -108,12 +108,12 @@ module Buildr #:nodoc:
             each_project { |p| p.test.compile.invoke }
             build_completed(project)
           rescue Exception => ex
-            $stderr.puts $terminal.color(ex.message, :red)
+            $stderr.puts Buildr::Console.color(ex.message, :red)
             build_failed(project, ex)
             successful = false
           end
 
-          puts $terminal.color("Build complete", :green) if successful
+          puts Buildr::Console.color("Build complete", :green) if successful
         end
       end
     end

data/lib/buildr/core/console.rb

@@ -0,0 +1,216 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr #nodoc
+
+  # A utility class that helps with colorizing output for interactive shells where appropriate
+  class Console
+    class << self
+      def use_color
+        @use_color.nil? ? false : @use_color
+      end
+
+      def use_color=(use_color)
+        return if use_color && !setup_support
+        @use_color = use_color
+      end
+
+      # Emit message with color at the start of the message and the clear color command at the end of the sequence.
+      def color(message, color)
+        raise "Unknown color #{color.inspect}" unless [:green, :red, :blue].include?(color)
+        return message unless use_color
+        constants = {:green => "\e[32m", :red => "\e[31m", :blue => "\e[34m"}
+        @java_console.putString("#{constants[color]}#{message}\e[0m") if @java_console
+        "#{constants[color]}#{message}\e[0m"
+      end
+
+      # Return the [rows, columns] of a console or nil if unknown
+      def console_dimensions
+        return nil unless setup_support
+
+        begin
+          if Buildr::Util.win_os?
+            if Buildr::Util.java_platform?
+              if JRUBY_VERSION =~ /^1.7/
+                [@java_terminal.get_width, @java_terminal.get_height]
+              else
+                [@java_terminal.getTerminalWidth, @java_terminal.getTerminalHeight]
+              end
+            else
+              Win32::Console.new(Win32::Console::STD_OUTPUT_HANDLE).MaxWindow
+            end
+          elsif $stdout.isatty
+            if /solaris/ =~ RUBY_PLATFORM and
+              `stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/
+              [$2, $1].map { |c| x.to_i }
+            else
+              `stty size 2> /dev/null`.split.map { |x| x.to_i }.reverse
+            end
+          else
+            nil
+          end
+        rescue => e
+          nil
+        end
+      end
+
+      # Return the number of columns in console or nil if unknown
+      def output_cols
+        d = console_dimensions
+        d ? d[0] : nil
+      end
+
+      def agree?(message)
+        puts "#{message} (Y or N)"
+        :agree == ask('Y' => :agree, 'N' => :disagree)
+      end
+
+      def ask_password(prompt)
+        puts prompt
+        begin
+          set_no_echo_mode
+          password = $stdin.readline
+          return password.chomp
+        ensure
+          reset_mode
+        end
+      end
+
+      def present_menu(header, options)
+        puts header
+        question_options = {}
+        count = 1
+        options.each_pair do |message, result|
+          puts "#{count}. #{message}"
+          question_options[count.to_s] = result
+          count += 1
+        end
+        ask(question_options)
+      end
+
+      private
+
+      def set_no_echo_mode
+        return unless setup_support
+        if Buildr::Util.win_os?
+          if Buildr::Util.java_platform?
+            if @java_console
+              @state = @java_console.getEchoCharacter
+              @java_console.setEchoCharacter 0
+            end
+          else
+            c = Win32::Console.new(Win32::Console::STD_OUTPUT_HANDLE)
+            c.Echo(false) rescue Exception
+          end
+        else
+          @state = `stty -g 2>/dev/null`
+          `stty -echo -icanon 2>/dev/null`
+        end
+      end
+
+      def reset_mode
+        return unless setup_support
+        if Buildr::Util.win_os?
+          if Buildr::Util.java_platform?
+            if @java_console
+              @java_console.setEchoCharacter @state
+            end
+          else
+            c = Win32::Console.new(Win32::Console::STD_OUTPUT_HANDLE)
+            c.Echo(true) rescue Exception
+          end
+        else
+          `stty #{@state} 2>/dev/null`
+        end
+        @state = nil
+      end
+
+      def ask(options)
+        keys = options.keys
+        keys_downcased = keys.collect { |k| k.downcase }
+        result = nil
+        show_prompt = false
+        until keys_downcased.include?(result)
+          puts "Invalid response. Valid responses include: #{keys.join(', ')}\n" if show_prompt
+          show_prompt = true
+          result = $stdin.readline
+          result = result.strip.downcase if result
+        end
+        options.each_pair do |key, value|
+          if key.downcase == result
+            return value.is_a?(Proc) ? value.call : value
+          end
+        end
+        return nil
+      end
+
+      def setup_support
+        return @initialized unless @initialized.nil?
+        @initialized = false
+        begin
+          if Buildr::Util.win_os?
+            if Buildr::Util.java_platform?
+              require 'java'
+              require 'readline'
+              begin
+                # Attempt jline1
+                java_import 'java.io.OutputStreamWriter'
+                java_import 'java.nio.channels.Channels'
+                java_import 'jline.ConsoleReader'
+                java_import 'jline.Terminal'
+
+                @java_input = Java::JavaNioChannels::Channels.newInputStream($stdin.to_channel)
+                @java_output = Java::JavaIo.OutputStreamWriter.new(Java::JavaNioChannels::Channels.newOutputStream($stdout.to_channel))
+                @java_terminal = Java::Jline::Terminal.getTerminal
+                @java_console = Java::Jline::ConsoleReader.new(@java_input, @java_output)
+                @java_console.setUseHistory(false)
+                @java_console.set_bell_enabled(true)
+                @java_console.setUsePagination(false)
+
+              rescue Exception
+                # attempt jline 2
+                java_import 'jline.console.ConsoleReader'
+
+                @java_console = ConsoleReader.new($stdin.to_inputstream, $stdout.to_outputstream)
+                @java_console.set_history_enabled(false)
+                @java_console.set_bell_enabled(true)
+                @java_console.set_pagination_enabled(false)
+                @java_terminal = @java_console.getTerminal
+              end
+              return false
+            else
+              require 'Win32/Console/ANSI'
+            end
+          end
+        rescue Java::JavaLang::IncompatibleClassChangeError
+          # Unfortunately we have multiple incompatible jline libraries
+          # in the classpath. This is probably because we are using jruby
+          # 1.7.5 with a library like scala and both use incompatible jline
+          # implementations
+          return false
+        rescue NameError
+          return false
+        rescue LoadError
+          return false
+        end
+        @initialized = true
+        return true
+      end
+
+    end
+  end
+end
+
+Buildr::Console.use_color = $stdout.isatty

data/lib/buildr/core/generate.rb

@@ -17,15 +17,18 @@ module Buildr #:nodoc:
   module Generate #:nodoc:
 
     task 'generate' do
-      script = nil
-      choose do |menu|
-        menu.header = "To use Buildr you need a buildfile. Do you want me to create one?"
-        menu.choice("From eclipse .project files") { script = Generate.from_eclipse(Dir.pwd).join("\n") } if has_eclipse_project?
-        menu.choice("From maven2 pom file") { script = Generate.from_maven2_pom('pom.xml').join("\n") } if File.exists?("pom.xml")
-        menu.choice("From directory structure") { script = Generate.from_directory(Dir.pwd).join("\n") }
-        menu.choice("Skip") { }
-      end
 
+      header = "To use Buildr you need a buildfile. Do you want me to create one?"
+      options = {}
+      if Generate.has_eclipse_project?
+        options["From eclipse .project files"] = Proc.new { Generate.from_eclipse(Dir.pwd).join("\n") }
+      end
+      if File.exist?('pom.xml')
+        options["From Maven2 POM file"] = Proc.new { Generate.from_maven2_pom('pom.xml').join("\n") }
+      end
+      options["From directory structure"] = Proc.new { Generate.from_directory(Dir.pwd).join("\n") }
+      options["Skip"]= nil
+      script = Buildr::Console.present_menu(header, options)
       if script
         buildfile = File.expand_path(Buildr::Application::DEFAULT_BUILDFILES.first)
         File.open(buildfile, "w") { |file| file.write script }

data/lib/buildr/core/progressbar.rb

@@ -23,7 +23,7 @@ class ProgressBar
     end
 
     def width
-      @width ||= $terminal.output_cols || 0
+      @width ||= Buildr::Console.output_cols || 0
     end
 
   end

data/lib/buildr/core/transports.rb

@@ -422,7 +422,7 @@ module URI
       rescue Net::SSH::AuthenticationFailed=>ex
         # Only if running with console, prompt for password.
         if !ssh_options[:password] && $stdout.isatty
-          password = ask("Password for #{host}:") { |q| q.echo = '*' }
+          password = Buildr::Console.ask_password("Password for #{host}:") { |q| q.echo = '*' }
           ssh_options[:password] = password
           retry
         end
@@ -465,7 +465,7 @@ module URI
       rescue Net::SSH::AuthenticationFailed=>ex
         # Only if running with console, prompt for password.
         if !ssh_options[:password] && $stdout.isatty
-          password = ask("Password for #{host}:") { |q| q.echo = '*' }
+          password = Buildr::Console.ask_password("Password for #{host}:") { |q| q.echo = '*' }
           ssh_options[:password] = password
           retry
         end

data/lib/buildr/core/util.rb

@@ -19,7 +19,7 @@ module Buildr #:nodoc:
     extend self
 
     def java_platform?
-      RUBY_PLATFORM =~ /java/
+      !!(RUBY_PLATFORM =~ /java/)
     end
 
     # In order to determine if we are running on a windows OS,
@@ -32,7 +32,7 @@ module Buildr #:nodoc:
     # For JRuby, the value for RUBY_PLATFORM will always be 'java'
     # That's why this function checks on Config::CONFIG['host_os']
     def win_os?
-      RbConfig::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
+      !!(RbConfig::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|mswin32|wince/i)
     end
 
     # Runs Ruby with these command line arguments.  The last argument may be a hash,

data/lib/buildr/ide/idea.rb

@@ -328,7 +328,7 @@ module Buildr #:nodoc:
               end
             end
           end
-          default_enable_jsf = webroots.select{|webroot| File.exist?("#{webroot}/WEB-INF/faces-config.xml")}
+          default_enable_jsf = webroots.keys.any?{|webroot| File.exist?("#{webroot}/WEB-INF/faces-config.xml")}
           enable_jsf = options[:enable_jsf].nil? ? default_enable_jsf : options[:enable_jsf]
           enable_jsf = false if root_project.ipr? && root_project.ipr.version >= '13'
           f.facet(:type => 'jsf', :name => 'JSF') do |jsf|

data/lib/buildr/java/bdd.rb

@@ -128,9 +128,9 @@ module Buildr #:nodoc:
       unless jruby_installed?
         jruby_artifact = Buildr.artifact(TestFramework::JRubyBased.jruby_artifact)
         msg = "JRUBY_HOME is not correctly set or points to an invalid JRuby installation: #{jruby_home}"
-        say msg
-        say ''
-        say "You need to install JRuby version #{jruby_artifact.version} using your system package manager."
+        puts msg
+        puts ''
+        puts "You need to install JRuby version #{jruby_artifact.version} using your system package manager."
 
         fail msg unless jruby_installed?
       end

data/lib/buildr/java/commands.rb

@@ -40,10 +40,13 @@ module Java
       # * :properties -- Hash of system properties (e.g. 'path'=>base_dir).
       # * :name -- Shows this name, otherwise shows the first argument (the class name).
       # * :verbose -- If true, prints the command and all its argument.
+      # * :pathing_jar -- If true, forces the use of a "pathing" jar, false disables. Nil
+      #                   will default to using a "pathing" jar under windows with long classpaths.
+      #                   See http://stackoverflow.com/questions/201816/how-to-set-a-long-java-classpath-in-msdos-windows
       def java(*args, &block)
         options = Hash === args.last ? args.pop : {}
         options[:verbose] ||= trace?(:java)
-        rake_check_options options, :classpath, :java_args, :properties, :name, :verbose, :dir
+        rake_check_options options, :classpath, :java_args, :properties, :name, :verbose, :dir, :pathing_jar
 
         name = options[:name]
         if name.nil?
@@ -63,21 +66,27 @@ module Java
         end
         cmd_args << path_to_bin('java')
         cp = classpath_from(options)
-        paths = cp.map do |c|
-          path = File.directory?(c) && !c.end_with?('/') ? "#{c}/" : c.to_s
-          Buildr::Util.win_os? ? "/#{path}" : path
-        end
-        manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.join(" ")}])
 
-        tjar = Tempfile.new(['javacmd', '.jar'])
-        Zip::ZipOutputStream.open(tjar.path) do |zos|
-          zos.put_next_entry('META-INF/MANIFEST.MF')
-          zos.write manifest.to_s
-          zos.write "\n"
-        end
-        tjar.close
+        unless cp.empty?
+          if options[:pathing_jar] == true || (options[:pathing_jar].nil? && Util.win_os? && cp.join(':').size > 2048)
+            paths = cp.map do |c|
+              path = File.directory?(c) && !c.end_with?('/') ? "#{c}/" : c.to_s
+              Buildr::Util.win_os? ? "/#{path}" : path
+            end
+            manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.join(" ")}])
+            tjar = Tempfile.new(['javacmd', '.jar'])
+            Zip::ZipOutputStream.open(tjar.path) do |zos|
+              zos.put_next_entry('META-INF/MANIFEST.MF')
+              zos.write manifest.to_s
+              zos.write "\n"
+            end
+            tjar.close
 
-        cmd_args << '-classpath' << tjar.path
+            cmd_args << '-classpath' << tjar.path
+          else
+            cmd_args << '-classpath' << cp.join(File::PATH_SEPARATOR)
+          end
+        end
         options[:properties].each { |k, v| cmd_args << "-D#{k}=#{v}" } if options[:properties]
         cmd_args += (options[:java_args] || (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split).flatten
         cmd_args += args.flatten.compact

data/lib/buildr/java/rjb.rb

@@ -112,6 +112,12 @@ module Java
       classpath.map! { |path| Proc === path ? path.call : path }
       cp = Buildr.artifacts(classpath).map(&:to_s).each { |path| file(path).invoke }
       java_opts = (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split
+
+      # Prepend the JDK bin directory to the path under windows as RJB can have issues if it picks
+      # up jvm dependencies from other products installed on the system
+      if Buildr::Util.win_os?
+        ENV["PATH"] = "#{ENV['JAVA_HOME']}#{File::SEPARATOR}bin#{File::PATH_SEPARATOR}#{ENV["PATH"]}"
+      end
       ::Rjb.load cp.join(File::PATH_SEPARATOR), java_opts
 
       props = ::Rjb.import('java.lang.System').getProperties

data/lib/buildr/packaging/artifact.rb

@@ -293,7 +293,7 @@ module Buildr #:nodoc:
         if spec.respond_to?(:to_spec)
           to_hash spec.to_spec
         elsif Hash === spec
-          rake_check_options spec, :id, :group, :type, :classifier, :version
+          rake_check_options spec, :id, :group, :type, :classifier, :version, :scope
           # Sanitize the hash and check it's valid.
           spec = ARTIFACT_ATTRIBUTES.inject({}) { |h, k| h[k] = spec[k].to_s if spec[k] ; h }
           fail "Missing group identifier for #{spec.inspect}" unless spec[:group]

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.4.13'.freeze
+  VERSION = '1.4.14'.freeze
 end

data/rakelib/doc.rake

@@ -109,7 +109,9 @@ task 'publish-doc' => %w(buildr.pdf _site setup-local-site-svn) do
 end
 
 task 'publish-site-svn' do
-  sh 'svn', 'add', '--force', 'site'
+  cd 'site'
+  sh 'svn', 'add', '--force', '.'
+  cd '..'
   sh 'svn', 'commit', 'site', '-m', 'Publish latest site'
 end
 
@@ -124,6 +126,8 @@ task 'setup-local-site-svn' do
 end
 
 task 'clobber' do
+  rm_rf 'rake'
+  rm_rf 'site'
   rm_rf '_site'
   rm_f 'buildr.pdf'
   rm_f 'prince_errors.log'

data/rakelib/package.rake

@@ -15,7 +15,7 @@
 
 require 'rubygems/package_task'
 
-package = Gem::PackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true
 end

data/rakelib/release.rake

@@ -167,3 +167,4 @@ The Apache Buildr Team
 end
 
 task('clobber') { rm_rf '_release' }
+task('clobber') { rm_rf 'announce-email.txt' }

data/rakelib/rspec.rake

@@ -56,4 +56,5 @@ task 'ci' => %w(clobber load_ci_reporter spec)
 task 'clobber' do
   rm_f 'failed'
   rm_rf '_reports'
+  rm_rf 'tmp'
 end

data/rakelib/stage.rake

@@ -19,7 +19,7 @@ require 'digest/sha1'
 
 gpg_cmd = 'gpg2'
 
-STAGE_DATE = '2013-10-02'
+STAGE_DATE = Time.now.strftime('%Y-%m-%d')
 
 task 'prepare' do |task, args|
   gpg_arg = args.gpg || ENV['gpg']
@@ -231,3 +231,4 @@ The following changes were made since #{previous_version}:
 end
 
 task('clobber') { rm_rf '_staged' }
+task('clobber') { rm_rf 'vote-email.txt' }

data/spec/core/cc_spec.rb

@@ -113,7 +113,8 @@ describe Buildr::CCTask do
     thread.exit
   end
 
-  it 'should support subprojects' do |spec|
+  # Not sure why this intermittently fails
+  it 'should support subprojects', :retry => 3 do |spec|
     write 'foo/src/main/java/Example.java', "public class Example {}"
     write 'foo/src/test/java/ExampleTest.java', "public class ExampleTest {}"
 

data/spec/core/console_spec.rb

@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
+
+describe Buildr::Console do
+
+  describe 'console_dimensions' do
+
+    it 'should return a value' do
+      Buildr::Console.console_dimensions.should_not be_nil
+    end if $stdout.isatty && !ENV["TRAVIS"]
+  end
+
+  describe 'color' do
+
+    describe 'when use_color is true' do
+      before do
+        Buildr::Console.use_color = true
+      end
+
+      it 'should emit red code when asked' do
+        Buildr::Console.color('message', :red).should eql("\e[31mmessage\e[0m")
+      end
+
+      it 'should emit green code when asked' do
+        Buildr::Console.color('message', :green).should eql("\e[32mmessage\e[0m")
+      end
+
+      it 'should emit blue code when asked' do
+        Buildr::Console.color('message', :blue).should eql("\e[34mmessage\e[0m")
+      end
+    end if $stdout.isatty
+
+    describe ' use_color is false' do
+      before do
+        Buildr::Console.use_color = false
+      end
+
+      it 'should not emit red code when asked' do
+        Buildr::Console.color('message', :red).should eql("message")
+      end
+
+      it 'should not emit green code when asked' do
+        Buildr::Console.color('message', :green).should eql("message")
+      end
+
+      it 'should not emit blue code when asked' do
+        Buildr::Console.color('message', :blue).should eql("message")
+      end
+    end
+  end
+end
+

data/spec/core/project_spec.rb

@@ -672,7 +672,7 @@ describe Project, '#task' do
     project('foo').task('bar').name.should eql('foo:bar')
   end
 
-  it 'should ignore namespace if starting with color' do
+  it 'should ignore namespace if starting with colon' do
     define 'foo' do
       task(':bar').name.should == 'bar'
     end

data/spec/ide/eclipse_spec.rb

@@ -547,6 +547,10 @@ MANIFEST
       end
     end
 
+    after do
+      rm_rf '../libs'
+    end
+
     it 'supports generating library paths with classpath variables' do
       classpath_xml_elements.collect("classpathentry[@kind='var']") { |n| n.attributes['path'] }.
         should include('LIBS/some-local.jar')

data/spec/ide/idea_spec.rb

@@ -406,6 +406,23 @@ describe Buildr::IntellijIdea do
       end
     end
 
+    describe "using add_web_facet should default to no jsf" do
+      before do
+        write "src/main/webapp/WEB-INF/web.xml"
+
+        @foo = define "foo" do
+          iml.add_web_facet
+        end
+        invoke_generate_task
+      end
+
+      it "does not generate a web facet with jsf facet" do
+        doc = xml_document(@foo._("foo.iml"))
+        web_facet_xpath = ensure_facet_xpath(doc, 'web', 'Web')
+        doc.should_not have_xpath("#{web_facet_xpath}/facet[@type='jsf', @name='JSF']")
+      end
+    end
+
     describe "using add_web_facet with jsf and idea version 13" do
       before do
         write "src/main/webapp/WEB-INF/web.xml"

data/spec/java/tests_spec.rb

@@ -308,7 +308,8 @@ describe Buildr::JUnit, 'report' do
     lambda { task('junit:report').invoke }.should change { File.exist?(JUnit.report.target) }.to(true)
   end
 
-  it 'should clean after itself' do
+  # for some reason this will intermittently fail under windows
+  it 'should clean after itself', :retry => (Buildr::Util.win_os? ? 4 : 1) do
     mkpath JUnit.report.target
     lambda { task('clean').invoke }.should change { File.exist?(JUnit.report.target) }.to(false)
   end

data/spec/sandbox.rb

@@ -28,6 +28,11 @@ module Buildr::Scala
 end
 Buildr.settings.build['scala.version'] = Buildr::Scala::SCALA_VERSION_FOR_SPECS
 
+require 'rspec/retry'
+RSpec.configure do |config|
+  config.verbose_retry = true # show retry status in spec process
+end
+
 # Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
 require 'buildr/clojure'
 require 'buildr/groovy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.4.14
 platform: x86-mswin32
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,20 +80,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.9
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.19
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.19
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +276,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: win32console1.3.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -347,33 +347,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: win32console
+  name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: pygmentize
   requirement: !ruby/object:Gem::Requirement
@@ -524,6 +524,7 @@ files:
 - lib/buildr/core/checks.rb
 - lib/buildr/core/common.rb
 - lib/buildr/core/compile.rb
+- lib/buildr/core/console.rb
 - lib/buildr/core/doc.rb
 - lib/buildr/core/environment.rb
 - lib/buildr/core/filter.rb
@@ -611,6 +612,7 @@ files:
 - spec/core/checks_spec.rb
 - spec/core/common_spec.rb
 - spec/core/compile_spec.rb
+- spec/core/console_spec.rb
 - spec/core/doc_spec.rb
 - spec/core/extension_spec.rb
 - spec/core/generate_from_eclipse_spec.rb