buildr 1.4.4 → 1.4.5

data/lib/buildr/packaging/artifact.rb

@@ -160,11 +160,11 @@ module Buildr
     def install
       invoke
       in_local_repository = Buildr.repositories.locate(self)
+      if pom && pom != self && classifier.nil?
+        pom.invoke
+        pom.install
+      end
       if name != in_local_repository
-        if pom && pom != self
-          pom.invoke
-          pom.install
-        end
         mkpath File.dirname(in_local_repository)
         cp name, in_local_repository, :preserve => false
         info "Installed #{name} to #{in_local_repository}"
@@ -174,7 +174,7 @@ module Buildr
     def uninstall
       installed = Buildr.repositories.locate(self)
       rm installed if File.exist?(installed)
-      pom.uninstall if pom && pom != self
+      pom.uninstall if pom && pom != self && classifier.nil?
     end
 
     # :call-seq:
@@ -208,7 +208,7 @@ module Buildr
 
       unless task = Buildr.application.lookup(uri+path)
         deps = [self]
-        deps << pom.upload_task( upload_to ) if pom && pom != self
+        deps << pom.upload_task( upload_to ) if pom && pom != self && classifier.nil?
 
         task = Rake::Task.define_task uri + path => deps do
           # Upload artifact relative to base URL, need to create path before uploading.
@@ -353,7 +353,7 @@ module Buildr
           if download_needed? task
             info "Downloading #{to_spec}"
             download
-            pom.invoke rescue nil if pom && pom != self
+            pom.invoke rescue nil if pom && pom != self && classifier.nil?
           end
         end
       end
@@ -869,16 +869,15 @@ module Buildr
   #   install artifact('group:id:jar:1.0').from('some_jar.jar')
   #   $ buildr install
   def install(*args, &block)
-    artifacts = artifacts(args)
+    artifacts = artifacts(args).uniq
     raise ArgumentError, 'This method can only install artifacts' unless artifacts.all? { |f| f.respond_to?(:to_spec) }
-    all = (artifacts + artifacts.map { |artifact| artifact.pom }).uniq
     task('install').tap do |install|
-      install.enhance(all) do
-        all.each(&:install)
+      install.enhance(artifacts) do
+        artifacts.each(&:install)
       end
       install.enhance &block if block
       task('uninstall') do
-        all.map(&:to_s ).each { |file| rm file if File.exist?(file) }
+        artifacts.map(&:to_s ).each { |file| rm file if File.exist?(file) }
       end
     end
   end

data/lib/buildr/packaging/tar.rb

@@ -95,7 +95,10 @@ module Buildr
         file_map.each do |path, content|
           if content.respond_to?(:call)
             tar.add_file(path, options) { |os, opts| content.call os }
-          elsif content.nil? || File.directory?(content.to_s)
+          elsif content.nil?
+          elsif File.directory?(content.to_s)
+            stat = File.stat(content.to_s)
+            tar.mkdir(path, options.merge(:mode=>stat.mode, :mtime=>stat.mtime))
           else
             File.open content.to_s, 'rb' do |is|
               tar.add_file path, options.merge(:mode=>is.stat.mode, :mtime=>is.stat.mtime, :uid=>is.stat.uid, :gid=>is.stat.gid) do |os, opts|

data/lib/buildr/packaging/zip.rb

@@ -17,17 +17,19 @@
 if RUBY_VERSION >= '1.9.0' # Required to properly load RubyZip under Ruby 1.9
   $LOADED_FEATURES.unshift 'ftools'
   require 'fileutils'
+
   def File.move(source, dest)
     FileUtils.move source, dest
   end
+
   def File.rm_rf(path)
     FileUtils.rm_rf path
   end
 end
+
 require 'zip/zip'
 require 'zip/zipfilesystem'
 
-
 module Zip #:nodoc:
 
   class ZipCentralDirectory #:nodoc:
@@ -69,5 +71,108 @@ module Zip #:nodoc:
         all? { |pattern| content =~ pattern }
     end
 
+    # Override of write_c_dir_entry to fix comments being set to a fixnum instead of string
+    def write_c_dir_entry(io) #:nodoc:all
+      case @fstype
+        when FSTYPE_UNIX
+          ft = nil
+          case @ftype
+            when :file
+              ft = 010
+              @unix_perms ||= 0644
+            when :directory
+              ft = 004
+              @unix_perms ||= 0755
+            when :symlink
+              ft = 012
+              @unix_perms ||= 0755
+            else
+              raise ZipInternalError, "unknown file type #{self.inspect}"
+          end
+
+          @externalFileAttributes = (ft << 12 | (@unix_perms & 07777)) << 16
+      end
+
+      io <<
+        [0x02014b50,
+         @version,                  # version of encoding software
+         @fstype,                   # filesystem type
+         10,                        # @versionNeededToExtract
+         0,                         # @gp_flags
+         @compression_method,
+         @time.to_binary_dos_time,  # @lastModTime
+         @time.to_binary_dos_date,  # @lastModDate
+         @crc,
+         @compressed_size,
+         @size,
+         @name ? @name.length : 0,
+         @extra ? @extra.c_dir_length : 0,
+         @comment ? comment.to_s.length : 0,
+         0,                         # disk number start
+         @internalFileAttributes,   # file type (binary=0, text=1)
+         @externalFileAttributes,   # native filesystem attributes
+         @localHeaderOffset,
+         @name,
+         @extra,
+         @comment
+      ].pack('VCCvvvvvVVVvvvvvVV')
+
+      io << @name
+      io << (@extra ? @extra.to_c_dir_bin : "")
+      io << @comment
+    end
+
+    # Override write_c_dir_entry to fix comments being set to a fixnum instead of string
+    def write_c_dir_entry(io) #:nodoc:all
+      @comment = "" if @comment.nil? || @comment == -1  # Hack fix @comment being nil or fixnum -1
+
+      case @fstype
+        when FSTYPE_UNIX
+          ft = nil
+          case @ftype
+            when :file
+              ft = 010
+              @unix_perms ||= 0644
+            when :directory
+              ft = 004
+              @unix_perms ||= 0755
+            when :symlink
+              ft = 012
+              @unix_perms ||= 0755
+            else
+              raise ZipInternalError, "unknown file type #{self.inspect}"
+          end
+
+          @externalFileAttributes = (ft << 12 | (@unix_perms & 07777)) << 16
+      end
+
+      io <<
+        [0x02014b50,
+         @version,                  # version of encoding software
+         @fstype,                   # filesystem type
+         10,                        # @versionNeededToExtract
+         0,                         # @gp_flags
+         @compression_method,
+         @time.to_binary_dos_time,  # @lastModTime
+         @time.to_binary_dos_date,  # @lastModDate
+         @crc,
+         @compressed_size,
+         @size,
+         @name ? @name.length : 0,
+         @extra ? @extra.c_dir_length : 0,
+         @comment ? @comment.length : 0,
+         0,                         # disk number start
+         @internalFileAttributes,   # file type (binary=0, text=1)
+         @externalFileAttributes,   # native filesystem attributes
+         @localHeaderOffset,
+         @name,
+         @extra,
+         @comment].pack('VCCvvvvvVVVvvvvvVV')
+
+      io << @name
+      io << (@extra ? @extra.to_c_dir_bin : "")
+      io << @comment
+
+    end
   end
 end

data/lib/buildr/resources/icons-license.txt

@@ -0,0 +1,17 @@
+
+MouseRunner.com Green/Red icons
+-------------------------------
+
+The graphics contained in the 'completed.png' and 'failed.png' files are
+licensed under the Creative Commons Attribution-ShareAlike 2.5 License
+
+Furthermore,
+You may not claim the works as your own.
+You must provide a link back to www.MouseRunner.com when using on a website,
+for commercial purposes, and for applications.
+
+Visit the address below to learn more about the Creative Commons license.
+http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
+
+
+

data/lib/buildr/run.rb

@@ -43,15 +43,15 @@ module Buildr
       attr_reader :project
 
       class << self
-        attr_accessor :name, :languages
+        attr_accessor :runner_name, :languages
 
         def specify(options)
-          @name ||= options[:name]
+          @runner_name ||= options[:name]
           @languages ||= options[:languages]
         end
 
         def to_sym
-          @name ||= name.split('::').last.downcase.to_sym
+          @runner_name || name.split('::').last.downcase.to_sym
         end
       end
 
@@ -128,19 +128,12 @@ module Buildr
         @runner ||= guess_runner
       end
 
-      # :call-seq:
-      #   runner?(clazz) => boolean
-      #
-      # Check if the underlying runner is an instance of the given class.
-      # If no class is supplied, simply check if runner is defined.
-      def runner?(clazz = nil)
-        begin
-          @runner ||= guess_runner if project.compile.language
+      def runner?
+        @runner ||= begin
+          guess_runner if project.compile.language
         rescue
-          return false
+          nil
         end
-        return !@runner.nil? unless clazz
-        @runner.is_a?(clazz) if @runner
       end
 
       def run

data/lib/buildr/scala/#Untitled-2#

@@ -0,0 +1,7 @@
+
+-server started
+
+-update cube-common
+
+-move existing data to new sugarcube server
+

data/lib/buildr/scala/bdd.rb

@@ -32,7 +32,7 @@ module Buildr::Scala
     @lang = :scala
     @bdd_dir = :spec
 
-    VERSION = '1.6.5'
+    VERSION = '1.6.6'
 
     class << self
       def version

data/lib/buildr/scala/compiler.rb

@@ -19,7 +19,7 @@ require 'buildr/core/compile'
 require 'buildr/packaging'
 
 module Buildr::Scala
-  DEFAULT_VERSION = '2.8.0'
+  DEFAULT_VERSION = '2.8.1'
 
   class << self
 

data/lib/buildr/scala/doc.rb

@@ -61,8 +61,11 @@ module Buildr
           info "Generating Scaladoc for #{project.name}"
           trace (['scaladoc'] + cmd_args).join(' ')
           Java.load
-          Java.scala.tools.nsc.ScalaDoc.main(cmd_args.to_java(Java.java.lang.String)) == 0 or
-            fail 'Failed to generate Scaladocs, see errors above'
+          begin
+            Java.scala.tools.nsc.ScalaDoc.process(cmd_args.to_java(Java.java.lang.String))
+          rescue => e
+            fail 'Failed to generate Scaladocs, see errors above: ' + e
+          end
         end
       end
     end
@@ -115,8 +118,23 @@ module Buildr
     end
   end
 
+  module Packaging
+    module Scala
+      def package_as_scaladoc_spec(spec) #:nodoc:
+        spec.merge(:type=>:jar, :classifier=>'scaladoc')
+      end
+
+      def package_as_scaladoc(file_name) #:nodoc:
+        ZipTask.define_task(file_name).tap do |zip|
+          zip.include :from=>doc.target
+        end
+      end
+    end
+  end
+
   class Project
     include ScaladocDefaults
+    include Packaging::Scala
   end
 end
 

data/lib/buildr/scala/shell.rb

@@ -20,41 +20,33 @@ require 'buildr/java/commands'
 module Buildr
   module Scala
     class ScalaShell < Buildr::Shell::Base
-      include Buildr::Shell::JavaRebel
+      include Buildr::JRebel
 
-      class << self
-        def lang
-          :scala
-        end
+      specify :name => :scala, :languages => [:scala]
 
-        def to_sym
-          :scala
-        end
-      end
+      def launch(task)
+        jline = [File.expand_path("lib/jline.jar", Scalac.scala_home)].find_all { |f| File.exist? f }
+        jline = ['jline:jline:jar:0.9.94'] if jline.empty?
 
-      def launch
         cp = project.compile.dependencies +
-          Scalac.dependencies +
-          [project.path_to(:target, :classes)]
+             Scalac.dependencies +
+             project.test.dependencies +
+             task.classpath
 
-        props = {
-          'scala.home' => Scalac.scala_home
-        }
+        java_args = jrebel_args + task.java_args
 
-        jline = [File.expand_path("lib/jline.jar", Scalac.scala_home)].find_all do |f|
-          File.exist? f
-        end
+        props = jrebel_props(project).merge(task.properties)
 
         Java::Commands.java 'scala.tools.nsc.MainGenericRunner',
                             '-cp', cp.join(File::PATH_SEPARATOR),
         {
-          :properties => props.merge(rebel_props(project)),
-          :classpath => Scalac.dependencies + jline,
-          :java_args => rebel_args
+          :properties => props,
+          :classpath => cp + jline,
+          :java_args => java_args
         }
       end
     end
   end
 end
 
-Buildr::ShellProviders << Buildr::Scala::ScalaShell
+Buildr::Shell.providers << Buildr::Scala::ScalaShell

data/lib/buildr/scala/tests.rb

@@ -23,7 +23,7 @@ require 'buildr/java/tests'
 module Buildr::Scala
   # Scala::Check is available when using Scala::Test or Scala::Specs
   module Check
-    VERSION = '1.7'
+    VERSION = '1.8'
 
     class << self
       def version
@@ -60,7 +60,7 @@ module Buildr::Scala
   # * :java_args   -- Arguments passed as is to the JVM.
   class ScalaTest < Buildr::TestFramework::Java
 
-    VERSION = '1.2'
+    VERSION = '1.3'
 
     class << self
       def version

data/lib/buildr/shell.rb

@@ -15,49 +15,73 @@
 
 
 module Buildr
-  module ShellProviders
+  module Shell
+    include Extension
+
     class << self
-      def add(p)
-        @providers ||= {}
-
-        if p.lang == :none
-          @providers[:none] ||= []
-          @providers[:none] << p
-        else
-          @providers[p.lang] = p
-        end
+      def providers
+        @providers ||= []
       end
-      alias :<< :add
 
-      def providers
-        @providers ||= {}
+      def select_by_lang(lang)
+        fail 'Unable to define shell task for nil language' if lang.nil?
+        providers.detect { |e| e.languages.nil? ? false : e.languages.include?(lang.to_sym) }
+      end
+
+      alias_method :select, :select_by_lang
+
+      def select_by_name(name)
+        fail 'Unable to define run task for nil' if name.nil?
+        providers.detect { |e| e.to_sym == name.to_sym }
       end
 
-      def each
-        providers.each do |lang, p|
-          if lang == :none
-            p.each do |x|
-              yield x
-            end
-          else
-            yield p
+      def define_task(project, name, provider = nil)
+        ShellTask.define_task(name).tap do |t|
+          t.send(:associate_with, project)
+          t.enhance([project.compile]) do |t|
+            # double-enhance to execute the provider last
+            t.enhance { |t| t.run }
           end
+          t.using provider.to_sym if provider
         end
       end
     end
-  end
 
-  module Shell
+    first_time do
+      Project.local_task 'shell'
+
+      providers.each { |provider| Project.local_task "shell:#{provider.to_sym}" }
+    end
+
+    before_define(:shell => :compile) do |project|
+      define_task(project, "shell")
+      providers.each { |provider| define_task(project, "shell:#{provider.to_sym}", provider) }
+    end
+
+    after_define(:shell => :compile) do |project|
+      unless project.shell.provider
+        provider = providers.find { |p| p.languages.include? project.compile.language if p.languages }
+        if provider
+          project.shell.using provider.to_sym
+          project.shell.with project.test.compile.dependencies
+        end
+      end
+    end
+
+    # Base class for any shell provider.
     class Base
-      attr_reader :project
+      attr_reader :project # :nodoc:
 
       class << self
-        def lang
-          :none
+        attr_accessor :shell_name, :languages
+
+        def specify(options)
+          @shell_name ||= options[:name]
+          @languages ||= options[:languages]
         end
 
         def to_sym
-          @symbol ||= name.split('::').last.downcase.to_sym
+          @shell_name || name.split('::').last.downcase.to_sym
         end
       end
 
@@ -65,116 +89,97 @@ module Buildr
         @project = project
       end
 
-      def build?
-        true
-      end
-
-      def launch
+      def launch(task)
         fail 'Not implemented'
       end
+
     end
 
-    module JavaRebel
-      def rebel_home
-        unless @rebel_home
-          @rebel_home = ENV['REBEL_HOME'] || ENV['JREBEL'] || ENV['JREBEL_HOME']
+    class ShellTask < Rake::Task
+      attr_reader :project # :nodoc:
 
-          if @rebel_home and File.directory? @rebel_home
-            @rebel_home += File::SEPARATOR + 'jrebel.jar'
-          end
-        end
+      # Classpath dependencies.
+      attr_accessor :classpath
 
-        if @rebel_home and File.exists? @rebel_home
-          @rebel_home
-        else
-          nil
-        end
-      end
+      # Returns the run options.
+      attr_reader :options
 
-      def rebel_args
-        if rebel_home
-          [
-            '-noverify',
-            "-javaagent:#{rebel_home}"
-          ]
-        else
-          []
-        end
-      end
+      # Underlying shell provider
+      attr_reader :provider
 
-      def rebel_props(project)
-        {}
+      def initialize(*args) # :nodoc:
+        super
+        @options = {}
+        @classpath = []
       end
-    end
-  end
-
-  module ShellExtension
-    include Extension
 
-    first_time do
-      Project.local_task 'shell'
-
-      ShellProviders.each { |p| Project.local_task "shell:#{p.to_sym}" }    # TODO  not working
-    end
-
-    before_define(:shell => :compile) do |project|
-      ShellProviders.each do |p|
-        name = p.to_sym
-
-        trace "Defining task #{project.name}:shell:#{name}"
+      # :call-seq:
+      #   with(*artifacts) => self
+      #
+      # Adds files and artifacts as classpath dependencies, and returns self.
+      def with(*specs)
+        @classpath |= Buildr.artifacts(specs.flatten).uniq
+        self
+      end
 
-        p_inst = p.new project
-        deps = if p_inst.build? then [:compile] else [] end
+      # :call-seq:
+      #   using(options) => self
+      #
+      # Sets the run options from a hash and returns self.
+      #
+      # For example:
+      #   shell.using :properties => {'foo' => 'bar'}
+      #   shell.using :bsh
+      def using(*args)
+        if Hash === args.last
+          args.pop.each { |key, value| @options[key.to_sym] = value }
+        end
 
-        project.task "shell:#{name}" => deps do
-          trace "Launching #{name} shell"
-          p_inst.launch
+        until args.empty?
+          new_shell = Shell.select_by_name(args.pop)
+          @provider = new_shell.new(project) unless new_shell.nil?
         end
-      end
-    end
 
-    after_define(:shell => :compile) do |project|
-      default_shell = project.shell.using
+        self
+      end
 
-      if default_shell
-        dep = "shell:#{default_shell.to_sym}"
+      def run
+        fail "No shell provider defined in project '#{project.name}' for language '#{project.compile.language.inspect}'" unless provider
+        provider.launch(self)
+      end
 
-        trace "Defining task shell based on #{dep}"
-        project.task :shell => dep
-      else
-        project.task :shell do
-          fail "No shell provider defined for language '#{project.compile.language}'"
-        end
+      def prerequisites #:nodoc:
+        super + classpath
       end
-    end
 
-    class ShellConfig
-      def initialize(project)
-        @project = project
+      def java_args
+        @options[:java_args] || (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split
       end
 
-      def using(*args)
-        if args.size > 0
-          @using ||= args.first
-        else
-          @using ||= find_shell_task
-        end
+      def properties
+        @options[:properties] || {}
       end
 
     private
-      def find_shell_task
-        lang = @project.compile.language
-        ShellProviders.providers[lang]
+      def associate_with(project)
+        @project ||= project
       end
+
     end
 
-    # TODO  temporary hack
-    def shell
-      @shell ||= ShellConfig.new self
+    # :call-seq:
+    #   shell(&block) => ShellTask
+    #
+    # This method returns the project's shell task. It also accepts a block to be executed
+    # when the shell task is invoked.
+    def shell(&block)
+      task('shell').tap do |t|
+        t.enhance &block if block
+      end
     end
   end
 
   class Project
-    include ShellExtension
+    include Shell
   end
 end