gjp 0.21.0 → 0.22.0

data/README.md

@@ -109,26 +109,26 @@ Of course this script can also be manually modified, and it must be in more diff
 
 #### Generating archives and spec files
 
-The following command will generate the kit spec:
+The following command will generate the kit archive in `output/galaxy-kit/`:
 
-    gjp generate-kit-spec
-    less output/galaxy-kit/galaxy-kit.spec
+    gjp generate-kit-archive
 
-Nothing fancy here, the spec simply copies `kit/` contents in a special directory to be available for later compilation of packages.
-You can also edit the spec file manually if you want. When you later regenerate it, `gjp` will automatically try to reconcile changes with a [three-way merge](http://en.wikipedia.org/wiki/Three-way_merge#Three-way_merge).
+Note that, in later runs, you can also use the `--incremental` option to create an additional "diff" tar.xz file instead of rebuilding it from scratch.
 
-You can also generate the corresponding .tar.xz file in `output/galaxy-kit/` with:
+The following command will generate the kit spec:
 
-    gjp generate-kit-archive
+    gjp generate-kit-spec
 
+You can inspect the generated "galaxy-kit.spec" file, but in general you should not need to edit it.
 
 You can then generate the project spec and archive files provided you have a pom file (more formats will be supported in future). In this case:
 
-    gjp generate-package-spec commons-collections src/commons-collections/commons-collections-3.2.1-src/pom.xml
     gjp generate-package-archive commons-collections
+    gjp generate-package-spec commons-collections src/commons-collections/commons-collections-3.2.1-src/pom.xml
     less output/commons-collections/commons-collections.spec
 
 commons-collection BuldRequires galaxy-kit, its archive contains only source files and it will install any produced .jar file in `/usr/lib/java`.
+You can also edit the specs file manually if you want. When you later regenerate it, `gjp` will automatically try to reconcile changes with a [three-way merge](http://en.wikipedia.org/wiki/Three-way_merge#Three-way_merge).
 
 Packages are ready to be submitted to an OBS project. As OBS integration is not yet implemented, refer to OBS documentation to do that.
 

data/integration-tests/{commons-collections.sh → commons.sh}

@@ -2,6 +2,7 @@
 
 # A crude integration test that builds commons-collections
 
+rm -Rf galaxy
 mkdir galaxy
 cd galaxy
 gjp init
@@ -21,20 +22,37 @@ cd ..
 
 gjp dry-run
 cd src/commons-collections/commons-collections-3.2.1-src/
-gjp mvn package
+gjp mvn package -DskipTests
+cd ../../..
 gjp finish
 
+gjp generate-kit-archive
+gjp generate-kit-spec
+
+gjp generate-package-archive commons-collections
+gjp generate-package-spec commons-collections src/commons-collections/commons-collections-3.2.1-src/pom.xml
+
+
+cd src
+mkdir commons-fileupload
+cd commons-fileupload
+wget http://mirror.nohup.it/apache//commons/fileupload/source/commons-fileupload-1.3-src.zip
+unzip commons-fileupload-1.3-src.zip
+rm commons-fileupload-1.3-src.zip
+
+gjp dry-run
+cd commons-fileupload-1.3-src/
+gjp mvn package -DskipTests
 cd ../../..
-cat >src/commons-collections/build.sh << "EOF"
-#!/bin/sh
-cd src/commons-collections/commons-collections-3.2.1-src/
-../../../kit/apache-maven-3.1.0/bin/mvn -Dmaven.repo.local=`readlink -e ../../../kit/m2` -s`readlink -e ../../../kit/m2/settings.xml` package
-EOF
+gjp finish
 
+gjp generate-kit-archive -i
 gjp generate-kit-spec
-gjp generate-kit-archive
 
-gjp generate-package-spec commons-collections src/commons-collections/commons-collections-3.2.1-src/pom.xml
-gjp generate-package-archive commons-collections
+gjp generate-package-archive commons-fileupload
+gjp generate-package-spec commons-fileupload src/commons-fileupload/commons-fileupload-1.3-src/pom.xml
+
+
+echo "**************** All Done ****************"
 
-echo "All Done"
+ls -lah output/*

data/lib/gjp.rb

@@ -12,7 +12,8 @@ require "gjp/pom_getter"
 require "gjp/source_address_getter"
 require "gjp/source_getter"
 require "gjp/parent_pom_getter"
-require "gjp/maven_runner"
+require "gjp/kit_runner"
+require "gjp/kit_spec_adapter"
 require "gjp/package_spec_adapter"
 require "gjp/spec_generator"
 require "gjp/archiver"

data/lib/gjp/archiver.rb

@@ -10,14 +10,25 @@ module Gjp
     end
 
     # generates an archive for the kit package
-    def archive_kit
+    def archive_kit(incremental)
       destination_dir = File.join(@project.full_path, "output", "#{@project.name}-kit")
       FileUtils.mkdir_p(destination_dir)
-      destination_file = File.join(destination_dir, "#{@project.name}-kit.tar.xz")
+      destination_file_prefix = "#{@project.name}-kit"
+      destination_file_suffix = ".tar.xz"
 
-      archive("kit", destination_file)
+      @project.take_snapshot "Kit archival started"
+
+      destination_file = if incremental
+        log.debug "doing incremental archive"
+        archive_incremental("kit", destination_dir, destination_file_prefix, destination_file_suffix, :archive_kit)
+      else
+        remove_stale_incremental(destination_dir, destination_file_prefix, destination_file_suffix)
+        archive_single("kit", File.join(destination_dir, destination_file_prefix + destination_file_suffix))
+      end
+
+      @project.take_snapshot "Kit archive generated", :archive_kit
       
-      Pathname.new(destination_file).relative_path_from Pathname.new(@project.full_path)
+      destination_file
     end
 
     # generates an archive for a project's package based on its file list
@@ -26,16 +37,56 @@ module Gjp
       FileUtils.mkdir_p(destination_dir)
       destination_file = File.join(destination_dir, "#{name}.tar.xz")
 
-      archive(File.join("src", name), destination_file)
-
-      Pathname.new(destination_file).relative_path_from Pathname.new(@project.full_path)
+      archive_single(File.join("src", name), destination_file)
     end
 
-    # archives a folder's contents to the destination file
-    def archive(folder, destination_file)
-      @project.from_directory folder do
+    # archives a directory's contents to the destination file
+    def archive_single(source_directory, destination_file)
+      log.debug "creating #{destination_file}"
+      @project.from_directory source_directory do
         `tar -cJf #{destination_file} *`
       end
+
+      destination_file
+    end
+
+    # archives a directory's changed contents since last time archive_incremental was called
+    # uses snapshots with tag_prefix to keep track of calls to this method
+    # destination files will be destination_file_prefix_NNNN_destination_file_suffix
+    def archive_incremental(source_directory, destination_dir, destination_file_prefix, destination_file_suffix, tag_prefix)
+      @project.from_directory do
+        latest_tag_count = @project.latest_tag_count(tag_prefix)
+
+        if latest_tag_count == 0
+          archive_single(source_directory, File.join(destination_dir, destination_file_prefix + destination_file_suffix))
+        else
+          destination_file = File.join(destination_dir, "#{destination_file_prefix}_#{"%04d" % (latest_tag_count)}#{destination_file_suffix}")
+          tag = @project.latest_tag(tag_prefix)
+          log.debug "creating #{destination_file} with files newer than #{tag}"
+
+          log.debug "files that changed since then: #{@project.git.changed_files_since(tag)}"
+          list = @project.git.changed_files_since(tag).select do |file|
+            File.expand_path(file) =~ /^#{File.expand_path(source_directory)}\//            
+          end.map do |file|
+            Pathname.new(file).relative_path_from Pathname.new(source_directory)
+          end
+          @project.from_directory source_directory do
+            `tar -cJf #{destination_file} #{list.join(" ")}`
+          end
+
+          destination_file
+        end
+      end
+    end
+
+    # removes any stale incremental files
+    def remove_stale_incremental(destination_dir, destination_file_prefix, destination_file_suffix)
+      Dir.entries(destination_dir)
+        .select { |f| f =~ /^#{destination_file_prefix}_([0-9]+)#{destination_file_suffix}$/}
+        .each do |f|
+        log.debug "removing stale incremental archive #{f}"
+        File.delete(File.join(destination_dir, f))
+      end
     end
   end
 end

data/lib/gjp/build_script_generator.rb

@@ -7,7 +7,7 @@ module Gjp
 
     def initialize(project, history_path)
       @project = project
-      @maven_runner = Gjp::MavenRunner.new(project)
+      @kit_runner = Gjp::KitRunner.new(project)
       @history_path = history_path
     end
     
@@ -29,7 +29,7 @@ module Gjp
         ] +
         relevant_lines.map do |line|
           if line =~ /gjp +mvn/
-            line.gsub(/gjp +mvn/, "#{@maven_runner.get_maven_commandline("$PROJECT_PREFIX")}")
+            line.gsub(/gjp +mvn/, "#{@kit_runner.get_maven_commandline("$PROJECT_PREFIX")}")
           else
             line
           end

data/lib/gjp/cli.rb

@@ -65,13 +65,29 @@ module Gjp
 
       # override parsing in order to pipe everything to mvn
       def parse(args)
-        @maven_options = args
+        @options = args
       end
 
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          Gjp::MavenRunner.new(project).mvn(@maven_options)
+          Gjp::KitRunner.new(project).mvn(@options)
+        end
+      end
+    end
+
+    subcommand "ant", "Locates and runs Ant from any directory in kit/" do
+      parameter "[ANT OPTIONS] ...", "ant options", :attribute_name => "dummy"
+
+      # override parsing in order to pipe everything to mvn
+      def parse(args)
+        @options = args
+      end
+
+      def execute
+        checking_exceptions do
+          project = Gjp::Project.new(".")
+          Gjp::KitRunner.new(project).ant(@options)
         end
       end
     end
@@ -93,6 +109,14 @@ module Gjp
       end
     end
 
+    subcommand "purge-jars", "Locates jars in src/ and moves them to kit/" do
+      def execute
+        Gjp::Project.new(".").purge_jars.each do |original, final|
+          puts "Replaced #{original} with symlink pointing to to #{final}"
+        end
+      end
+    end
+
     subcommand "generate-build-script", "Create or refresh a build.sh file" do
       parameter "NAME", "name of a package, that is, an src/ subdirectory name"
       def execute
@@ -100,7 +124,7 @@ module Gjp
           project = Gjp::Project.new(".")
           history_file = File.join(Dir.home, ".bash_history")
           result_path, conflict_count = Gjp::BuildScriptGenerator.new(project, history_file).generate_build_script(name)
-          puts "#{result_path} generated"
+          puts "#{format_path(result_path, project)} generated"
           if conflict_count > 0
             puts "Warning: #{conflict_count} unresolved conflicts"
           end
@@ -113,7 +137,7 @@ module Gjp
         checking_exceptions do
           project = Gjp::Project.new(".")
           result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_kit_spec
-          puts "#{result_path} generated"
+          puts "#{format_path(result_path, project)} generated"
           if conflict_count > 0
             puts "Warning: #{conflict_count} unresolved conflicts"
           end
@@ -122,11 +146,12 @@ module Gjp
     end
 
     subcommand "generate-kit-archive", "Create or refresh the kit tarball" do
+      option ["-i", "--incremental"], :flag, "create an archive with only the difference from the previous one"
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          result_path = Gjp::Archiver.new(project).archive_kit
-          puts "#{result_path} generated"
+          result_path = Gjp::Archiver.new(project).archive_kit(incremental?)
+          puts "#{format_path(result_path, project)} generated"
         end
       end
     end
@@ -139,7 +164,7 @@ module Gjp
         checking_exceptions do
           project = Gjp::Project.new(".")
           result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_package_spec name, pom, filter
-          puts "#{result_path} generated"
+          puts "#{format_path(result_path, project)} generated"
           if conflict_count > 0
             puts "Warning: #{conflict_count} unresolved conflicts"
           end
@@ -153,7 +178,7 @@ module Gjp
         checking_exceptions do
           project = Gjp::Project.new(".")
           result_path = Gjp::Archiver.new(project).archive_package name
-          puts "#{result_path} generated"
+          puts "#{format_path(result_path, project)} generated"
         end
       end
     end
@@ -226,6 +251,16 @@ module Gjp
       end    
     end
 
+    # generates a version of path relative to the current directory
+    def format_path(path, project)
+      full_path = if Pathname.new(path).relative?
+        File.join(project.full_path, path)
+      else
+        path
+      end
+      Pathname.new(full_path).relative_path_from(Pathname.new(Dir.pwd))
+    end
+
     # handles most fatal exceptions
     def checking_exceptions
       begin
@@ -240,8 +275,8 @@ module Gjp
         $stderr.puts "This is not a gjp project directory, see gjp init"
       rescue GitAlreadyInitedException
         $stderr.puts "This directory is already a gjp project"
-      rescue Gjp::MavenNotFoundException
-        $stderr.puts "mvn executable not found in kit/ or any of its subdirectories"
+      rescue Gjp::ExecutableNotFoundException
+        $stderr.puts "Executable not found in kit/ or any of its subdirectories"
       end
     end
   end

data/lib/gjp/git.rb

@@ -80,7 +80,9 @@ module Gjp
     # returns the conflict count
     def merge_with_tag(path, new_path, tag)
       Dir.chdir(@directory) do
+        log.debug "calling git show gjp_#{tag}:#{path} > #{path}.old_version, output follows"
         `git show gjp_#{tag}:#{path} > #{path}.old_version`
+        log.debug "calling git merge-file #{path} #{path}.old_version #{new_path}, output follows"
         `git merge-file #{path} #{path}.old_version #{new_path} -L "newly generated" -L "previously generated" -L "user edited"`
         conflict_count = $?.exitstatus
         File.delete "#{path}.old_version"

data/lib/gjp/kit_runner.rb

@@ -0,0 +1,79 @@
+# encoding: UTF-8
+
+require 'find'
+require 'pathname'
+
+module Gjp
+  # runs programs from a gjp kit with gjp-specific options
+  class KitRunner
+    include Logger
+
+    def initialize(project)      
+      @project = project
+    end
+
+    # finds an executable in a bin/ subdirectory of kit
+    def find_executable(name)
+      @project.from_directory do
+        Find.find("kit") do |path|
+          if path =~ /bin\/#{name}$/
+            log.debug("found #{name} executable: #{path}")
+            return path
+          end
+        end
+      end
+
+      log.debug("#{name} executable not found")
+      nil
+    end
+
+    # runs an external executable
+    def run_executable(full_commandline)
+      log.debug "running #{full_commandline}"
+      Process.wait(Process.spawn(full_commandline))
+    end
+
+    # runs mvn in a subprocess
+    def mvn(options)
+      run_executable "#{get_maven_commandline(@project.full_path)} #{options.join(' ')}"
+    end
+
+    # returns a command line for running Maven from the specified
+    # prefix
+    def get_maven_commandline(prefix)
+      executable = find_executable("mvn")
+
+      if executable != nil
+        mvn_path = File.join(prefix, executable)
+        repo_path = File.join(prefix, "kit", "m2")
+        config_path = File.join(prefix, "kit", "m2", "settings.xml")
+
+        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path}"
+      else
+        raise ExecutableNotFoundException
+      end
+    end
+
+    # runs mvn in a subprocess
+    def ant(options)
+      run_executable "#{get_ant_commandline(@project.full_path)} #{options.join(' ')}"
+    end
+
+    # returns a command line for running Ant from the specified
+    # prefix
+    def get_ant_commandline(prefix)
+      executable = find_executable("ant")
+
+      if executable != nil
+        ant_path = File.join(prefix, executable)
+
+        "#{ant_path}"
+      else
+        raise ExecutableNotFoundException
+      end
+    end
+  end
+
+  class ExecutableNotFoundException < Exception
+  end
+end

data/lib/gjp/kit_spec_adapter.rb

@@ -0,0 +1,29 @@
+  # encoding: UTF-8
+
+module Gjp
+  # encapsulates details of a kit needed by the spec file
+  # retrieving them from other objects
+  class KitSpecAdapter
+    attr_reader :name
+    attr_reader :version
+    attr_reader :archives
+
+    def initialize(project)
+      @name = project.name
+      @version = project.version
+
+      @archives =
+        project.from_directory do
+          ["#{name}-kit.tar.xz"] +
+          Dir.entries("output/#{name}-kit")
+            .select { |f| f =~ /_[0-9]+.tar.xz$/ }
+            .sort
+        end
+    end
+
+    def get_binding
+      binding
+    end
+  end
+end
+

data/lib/gjp/project.rb

@@ -8,12 +8,21 @@ module Gjp
     include Logger
 
     attr_accessor :full_path
+    attr_accessor :git
 
     def initialize(path)      
       @full_path = Gjp::Project.find_project_dir(File.expand_path(path))
       @git = Gjp::Git.new(@full_path)
     end
 
+    def name
+      File.basename(@full_path)
+    end
+
+    def version
+      latest_tag_count(:dry_run_finished)
+    end
+
     # finds the project directory up in the tree, like git does
     def self.find_project_dir(starting_dir)
       result = starting_dir
@@ -145,19 +154,24 @@ module Gjp
     # returns the number of conflicts
     def merge_new_content(new_content, path, snapshot_message, tag_prefix)
       from_directory do
+        log.debug "merging new content to #{path} with prefix #{tag_prefix}"
         already_existing = File.exist? path
         previous_tag = latest_tag(tag_prefix)
 
         if already_existing
+          log.debug "moving #{path} to #{path}.gjp_user_edited"
           File.rename path, "#{path}.gjp_user_edited"
         end
 
         File.open(path, "w") { |io| io.write(new_content) }
+        log.debug "taking snapshot with new content: #{snapshot_message}"
         take_snapshot(snapshot_message, tag_prefix)
 
         if already_existing
           if previous_tag == ""
             previous_tag = latest_tag(tag_prefix)
+            log.debug "there was no tag with prefix #{tag_prefix} before snapshot"
+            log.debug "defaulting to #{previous_tag} after snapshot"
           end
 
           # 3-way merge
@@ -204,18 +218,26 @@ module Gjp
     end
 
 
-    # helpers for ERB
-
-    def name
-      File.basename(@full_path)
-    end
-
-    def version
-      latest_tag_count(:dry_run_finished)
-    end
+    # moves any .jar from src/ to kit/ and links it back
+    def purge_jars      
+      from_directory do
+        result = []
+        Find.find("src") do |file|
+          if file =~ /.jar$/ and not File.symlink?(file)
+            new_location = File.join("kit", "jars", Pathname.new(file).split[1])
+            FileUtils.mv(file, new_location)
+
+            link_target = Pathname.new(new_location)
+              .relative_path_from(Pathname.new(file).split.first)
+              .to_s
+
+            File.symlink(link_target, file)
+            result << [file, new_location]
+          end
+        end
 
-    def get_binding
-      binding
+        result
+      end
     end
   end
 

data/lib/gjp/spec_generator.rb

@@ -10,22 +10,29 @@ module Gjp
     end
 
     def generate_kit_spec
-      destination_dir = File.join(@project.full_path, "output", "#{@project.name}-kit")
-      FileUtils.mkdir_p(destination_dir)
-      spec_path = File.join(destination_dir, "#{@project.name}-kit.spec")
-      conflict_count = generate_merging("kit.spec", @project.get_binding, spec_path, :generate_kit_spec)
-      [spec_path, conflict_count]
+      @project.from_directory do
+        destination_dir = File.join("output", "#{@project.name}-kit")
+        FileUtils.mkdir_p(destination_dir)
+        spec_path = File.join(destination_dir, "#{@project.name}-kit.spec")
+
+        adapter = Gjp::KitSpecAdapter.new(@project)
+
+        conflict_count = generate_merging("kit.spec", adapter.get_binding, spec_path, :generate_kit_spec)
+        [spec_path, conflict_count]
+      end
     end
 
     def generate_package_spec(name, pom, filter)
-      destination_dir = File.join(@project.full_path, "output", name)
-      FileUtils.mkdir_p(destination_dir)
-      spec_path = File.join(destination_dir, "#{name}.spec")
+      @project.from_directory do
+        destination_dir = File.join("output", name)
+        FileUtils.mkdir_p(destination_dir)
+        spec_path = File.join(destination_dir, "#{name}.spec")
 
-      adapter = Gjp::PackageSpecAdapter.new(@project, name, Gjp::Pom.new(pom), filter)
+        adapter = Gjp::PackageSpecAdapter.new(@project, name, Gjp::Pom.new(pom), filter)
 
-      conflict_count = generate_merging("package.spec", adapter.get_binding, spec_path, "generate_#{name}_spec")
-      [spec_path, conflict_count]
+        conflict_count = generate_merging("package.spec", adapter.get_binding, spec_path, "generate_#{name}_spec")
+        [spec_path, conflict_count]
+      end
     end
 
     # generates a spec file from a template and 3-way merges it

data/lib/gjp/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Gjp
-  VERSION = "0.21.0"
+  VERSION = "0.22.0"
 end

data/lib/template/kit.spec

@@ -22,7 +22,9 @@ License:        Apache-2.0
 Summary:        Build-time dependencies for gjp project <%= name %>
 Url:            https://github.com/SilvioMoioli/gjp
 Group:          Development/Libraries/Java
-Source0:        %{name}.tar.xz
+<% archives.each_with_index do |archive, i| %>
+Source<%= i %>:        <%= archive %>
+<% end %>
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 BuildRequires:  xz
@@ -38,7 +40,13 @@ not be used except for rebuilding those packages and it should never
 be installed on end users' systems.
 
 %prep
-%setup -q -c
+<% (0..(archives.length-1)).each do |i| %>
+<% if i > 0 %>
+%setup -q -c -T -D -b <%= i %>
+<% else %>
+%setup -q -c -T -b <%= i %>
+<% end %>
+<% end %>
 
 %build
 # nothing to do, gjp kits are precompiled by design

data/lib/template/kit/jars/CONTENTS

@@ -0,0 +1 @@
+This directory contains jars moved here from source archives.

data/lib/template/package.spec

@@ -29,6 +29,7 @@ BuildRequires:  java-devel
 BuildRequires:  <%= project_name %>-kit >= <%= project_version %>
 BuildArch:      noarch
 Provides:       mvn(<%= group_id %>:<%= artifact_id %>) == <%= version %>
+Requires:       java
 <% runtime_dependency_ids.each do |dependency_id| %>
 Requires:       mvn(<%= dependency_id[0] %>:<%= dependency_id[1] %>) <% if dependency_id[3] != nil %>==<%= dependency_id[3] %><% end %>
 <% end %>

data/spec/lib/archiver_spec.rb

@@ -17,28 +17,75 @@ describe Gjp::Archiver do
 
   let(:archiver) { Gjp::Archiver.new(@project) }
 
-  describe "#archive" do
+  describe "#archive_single" do
     it "archives a list of files" do
       @project.from_directory do
         File.open("test", "w") { |io| io.puts "test content" }
 
-        archiver.archive ".", "test.tar.xz"
+        archiver.archive_single(".", "test.tar.xz")
         `tar -Jtf test.tar.xz`.split.should include("test")
       end
     end
   end
 
+  describe "#archive_incremental" do
+    it "archives an increment of a directory" do
+      @project.from_directory do
+        File.open("test", "w") { |io| io.puts "test content 1" }
+        File.open("test2", "w") { |io| io.puts "test content 1" }
+        archiver.archive_incremental(".", ".", "test", ".tar.xz", :archive_kit)
+        `tar -Jtf test.tar.xz`.split.should include("test")
+
+        @project.take_snapshot("test archive snapshot 1", :archive_kit)
+
+        File.open("test", "w") { |io| io.puts "test content 2" }
+        File.open("test3", "w") { |io| io.puts "test content 2" }
+
+        @project.take_snapshot("test archive snapshot 2")
+
+        archiver.archive_incremental(".", ".", "test", ".tar.xz", :archive_kit)
+        files = `tar -Jtf test_0001.tar.xz`.split
+
+        files.should include("test")
+        files.should include("test3")
+        files.should_not include("test2")
+      end
+    end
+  end
+
   describe "#archive_kit" do
-    it "archives a kit package files" do
+    it "archives a kit package files, not incrementally" do
+      @project.from_directory do
+        File.open(File.join("kit","kit_test"), "w") { |io| io.puts "test content" }
+      end
+      @project.finish(false)
+
+      archiver.archive_kit(false)
+      @project.from_directory do
+        `tar -Jtf output/test-project-kit/test-project-kit.tar.xz`.split.should include("kit_test")
+      end
+    end
+    it "archives a kit package files incrementally" do
       @project.from_directory do
         File.open(File.join("kit","kit_test"), "w") { |io| io.puts "test content" }
       end
       @project.finish(false)
 
-      archiver.archive_kit
+      archiver.archive_kit(true)
       @project.from_directory do
         `tar -Jtf output/test-project-kit/test-project-kit.tar.xz`.split.should include("kit_test")
       end
+
+      @project.from_directory do
+        File.open(File.join("kit","kit_test2"), "w") { |io| io.puts "test content" }
+      end
+
+      archiver.archive_kit(true)
+      @project.from_directory do
+        files = `tar -Jtf output/test-project-kit/test-project-kit_0001.tar.xz`.split
+        files.should include("kit_test2")
+        files.should_not include("kit_test")
+      end
     end
   end
 

data/spec/lib/kit_runner_spec.rb

@@ -0,0 +1,98 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gjp::KitRunner do
+
+  before(:each) do
+    @project_path = File.join("spec", "data", "test-project")
+    Dir.mkdir(@project_path)
+
+    Gjp::Project.init(@project_path)
+    @project = Gjp::Project.new(@project_path)
+    @kit_runner = Gjp::KitRunner.new(@project)
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(@project_path)
+  end
+
+  describe "#find_executable"  do
+    it "finds an executable in kit" do
+      mock_executable("mvn")
+      @kit_runner.find_executable("mvn").should eq @executable
+    end
+    it "doesn't find a Maven executable in kit" do
+      @kit_runner.find_executable("mvn").should be_nil
+    end
+  end
+
+  describe "#get_maven_commandline"  do
+    it "returns commandline options for running maven" do
+      mock_executable("mvn")
+
+      @project.from_directory do
+        commandline = @kit_runner.get_maven_commandline(".")
+        commandline.should eq "./#{@executable} -Dmaven.repo.local=./kit/m2 -s./kit/m2/settings.xml"
+      end
+    end
+    it "doesn't return commandline options if Maven is not available" do
+      expect { @kit_runner.get_maven_commandline(".") }.to raise_error(Gjp::ExecutableNotFoundException)
+    end
+  end
+
+  describe "#mvn"  do
+    it "runs maven" do
+      mock_executable("mvn")
+      @project.from_directory do
+        @kit_runner.mvn(["extra-option"])
+        File.read("test_out").strip.should match /extra-option$/
+      end
+    end
+    it "doesn't run Maven if it is not available" do
+      @project.from_directory do
+        expect { @kit_runner.mvn([]) }.to raise_error(Gjp::ExecutableNotFoundException)
+      end
+    end
+  end
+
+
+  describe "#get_ant_commandline"  do
+    it "returns commandline options for running Ant" do
+      mock_executable("ant")
+
+      @project.from_directory do
+        commandline = @kit_runner.get_ant_commandline(".")
+        commandline.should eq "./#{@executable}"
+      end
+    end
+    it "doesn't return commandline options if Ant is not available" do
+      expect { @kit_runner.get_ant_commandline(".") }.to raise_error(Gjp::ExecutableNotFoundException)
+    end
+  end
+
+  describe "#ant"  do
+    it "runs Ant" do
+      mock_executable("ant")
+      @project.from_directory do
+        @kit_runner.ant(["extra-option"])
+        File.read("test_out").strip.should match /extra-option$/
+      end
+    end
+    it "doesn't run Ant if it is not available" do
+      @project.from_directory do
+        expect { @kit_runner.ant([]) }.to raise_error(Gjp::ExecutableNotFoundException)
+      end
+    end
+  end
+
+  def mock_executable(executable)
+    Dir.chdir(@project_path) do
+      @bin_dir = File.join("kit", executable, "bin")
+      FileUtils.mkdir_p(@bin_dir)
+      @executable = File.join(@bin_dir, executable)
+      File.open(@executable, "w") { |io| io.puts "echo $0 $*>test_out" }
+      File.chmod(0777, @executable)
+    end
+  end
+end

data/spec/lib/project_spec.rb

@@ -158,6 +158,23 @@ describe Gjp::Project do
         `git diff-tree --no-commit-id --name-only -r HEAD`.split("\n").should include("src/test")
         `git cat-file tag gjp_dry_run_started_1 | tail -1`.should include("src")
       end
+    end    
+  end
+
+  describe "#purge_jars" do
+    it "moves jars in kit/jars" do
+      @project.from_directory do
+        `echo "jarring" > src/test.jar`
+      end
+      @project.finish(false).should be_false
+
+      @project.purge_jars
+
+      @project.from_directory do
+        File.symlink?(File.join("src", "test.jar")).should be_true
+        File.readlink(File.join("src", "test.jar")).should eq "../kit/jars/test.jar"
+        File.readlines(File.join("kit", "jars", "test.jar")).should include("jarring\n")
+      end
     end
   end
 end

data/spec/lib/spec_generator_spec.rb

@@ -32,7 +32,7 @@ describe Gjp::SpecGenerator do
         spec_lines = File.readlines(File.join("output", "test-project-kit", "test-project-kit.spec"))
         spec_lines.should include("Name:           test-project-kit\n")
         spec_lines.should include("Version:        1\n")
-        spec_lines.should include("Source0:        %{name}.tar.xz\n")
+        spec_lines.should include("Source0:        test-project-kit.tar.xz\n")
       end
     end
     it "generates a second version" do
@@ -54,7 +54,7 @@ describe Gjp::SpecGenerator do
         spec_lines = File.readlines(File.join("output", "test-project-kit", "test-project-kit.spec"))
         spec_lines.should include("Name:           test-project-kit\n")
         spec_lines.should include("Version:        2\n")
-        spec_lines.should include("Source0:        %{name}.tar.xz\n")
+        spec_lines.should include("Source0:        test-project-kit.tar.xz\n")
         spec_lines.should include("nonconflicting line\n")
       end
     end
@@ -81,7 +81,7 @@ describe Gjp::SpecGenerator do
       @project.from_directory do
         spec_lines = File.readlines(File.join("output", "test-project-kit", "test-project-kit.spec"))
         spec_lines.should include("Name:           test-project-kit\n")
-        spec_lines.should include("Source0:        %{name}.tar.xz\n")
+        spec_lines.should include("Source0:        test-project-kit.tar.xz\n")
         spec_lines.should include("<<<<<<< newly generated\n")
         spec_lines.should include("Version:        2\n")
         spec_lines.should include("=======\n")
@@ -109,10 +109,12 @@ describe Gjp::SpecGenerator do
           `touch src/test/out/test#{i}.jar`
         end
 
+
         @project.finish(false)
       end
 
-      @spec_generator.generate_package_spec "test", File.join("spec", "data", "nailgun", "pom.xml"), "*.jar"
+      FileUtils.copy(File.join("spec", "data", "nailgun", "pom.xml"), @project_path)
+      @spec_generator.generate_package_spec "test", "pom.xml", "*.jar"
 
       @project.from_directory do
         spec_lines = File.readlines(File.join("output", "test", "test.spec"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,15 +155,16 @@ files:
 - Rakefile
 - bin/gjp
 - gjp.gemspec
-- integration-tests/commons-collections.sh
+- integration-tests/commons.sh
 - lib/gjp.rb
 - lib/gjp/archiver.rb
 - lib/gjp/build_script_generator.rb
 - lib/gjp/cli.rb
 - lib/gjp/git.rb
+- lib/gjp/kit_runner.rb
+- lib/gjp/kit_spec_adapter.rb
 - lib/gjp/limited_network_user.rb
 - lib/gjp/logger.rb
-- lib/gjp/maven_runner.rb
 - lib/gjp/maven_website.rb
 - lib/gjp/package_spec_adapter.rb
 - lib/gjp/parent_pom_getter.rb
@@ -178,6 +179,7 @@ files:
 - lib/gjp/version_matcher.rb
 - lib/template/kit.spec
 - lib/template/kit/CONTENTS
+- lib/template/kit/jars/CONTENTS
 - lib/template/kit/m2/settings.xml
 - lib/template/output/.gitignore
 - lib/template/output/CONTENTS
@@ -201,8 +203,8 @@ files:
 - spec/data/tomcat/pom.xml
 - spec/lib/archiver_spec.rb
 - spec/lib/build_script_generator_spec.rb
+- spec/lib/kit_runner_spec.rb
 - spec/lib/limited_network_user_spec_interactive.rb
-- spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
 - spec/lib/parent_pom_getter_spec.rb
 - spec/lib/pom_getter_spec.rb
@@ -258,8 +260,8 @@ test_files:
 - spec/data/tomcat/pom.xml
 - spec/lib/archiver_spec.rb
 - spec/lib/build_script_generator_spec.rb
+- spec/lib/kit_runner_spec.rb
 - spec/lib/limited_network_user_spec_interactive.rb
-- spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
 - spec/lib/parent_pom_getter_spec.rb
 - spec/lib/pom_getter_spec.rb

data/lib/gjp/maven_runner.rb

@@ -1,57 +0,0 @@
-# encoding: UTF-8
-
-require 'find'
-require 'pathname'
-
-module Gjp
-  # runs Maven from a gjp kit with gjp-specific options
-  class MavenRunner
-    include Logger
-
-    def initialize(project)      
-      @project = project
-    end
-
-    # finds mvn in kit
-    def find_maven_executable
-      @project.from_directory do
-        Find.find("kit") do |path|
-          if path =~ /bin\/mvn$/
-            log.debug("found Maven executable: #{path}")
-            return path
-          end
-        end
-      end
-
-      log.debug("Maven executable not found")
-      nil
-    end
-
-    # returns a command line for running Maven from the specified
-    # prefix
-    def get_maven_commandline(prefix)
-      maven_executable = find_maven_executable
-
-      if maven_executable != nil
-        mvn_path = File.join(prefix, maven_executable)
-        repo_path = File.join(prefix, "kit", "m2")
-        config_path = File.join(prefix, "kit", "m2", "settings.xml")
-
-        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path}"
-      else
-        raise MavenNotFoundException
-      end
-    end
-
-    # runs mvn in a subprocess
-    def mvn(options)
-      full_commandline = "#{get_maven_commandline(@project.full_path)} #{options.join(' ')}"
-      log.debug full_commandline
-
-      Process.wait(Process.spawn(full_commandline))
-    end
-  end
-
-  class MavenNotFoundException < Exception
-  end
-end

data/spec/lib/maven_runner_spec.rb

@@ -1,68 +0,0 @@
-# encoding: UTF-8
-
-require 'spec_helper'
-
-describe Gjp::MavenRunner do
-
-  before(:each) do
-    @project_path = File.join("spec", "data", "test-project")
-    Dir.mkdir(@project_path)
-
-    Gjp::Project.init(@project_path)
-    @project = Gjp::Project.new(@project_path)
-    @maven_runner = Gjp::MavenRunner.new(@project)
-  end
-
-  after(:each) do
-    FileUtils.rm_rf(@project_path)
-  end
-
-  describe "#find_maven_executable"  do
-    it "finds a Maven executable in kit" do
-      mock_maven_executable
-      @maven_runner.find_maven_executable.should eq @maven_executable
-    end
-    it "doesn't find a Maven executable in kit" do
-      @maven_runner.find_maven_executable.should be_nil
-    end
-  end
-
-  describe "#get_maven_commandline"  do
-    it "returns commandline options for running maven" do
-      mock_maven_executable
-
-      @project.from_directory do
-        commandline = @maven_runner.get_maven_commandline(".")
-        commandline.should eq "./#{@maven_executable} -Dmaven.repo.local=./kit/m2 -s./kit/m2/settings.xml"
-      end
-    end
-    it "doesn't return commandline options if Maven is not available" do
-      expect { @maven_runner.get_maven_commandline(".") }.to raise_error(Gjp::MavenNotFoundException)
-    end
-  end
-
-  describe "#mvn"  do
-    it "runs maven" do
-      mock_maven_executable
-      @project.from_directory do
-        @maven_runner.mvn(["extra-option"])
-        File.read("test_out").strip.should match /extra-option$/
-      end
-    end
-    it "doesn't run Maven if it is not available" do
-      @project.from_directory do
-        expect { @maven_runner.mvn([]) }.to raise_error(Gjp::MavenNotFoundException)
-      end
-    end
-  end
-
-  def mock_maven_executable
-    Dir.chdir(@project_path) do
-      @bin_dir = File.join("kit", "mvn", "bin")
-      FileUtils.mkdir_p(@bin_dir)
-      @maven_executable = File.join(@bin_dir, "mvn")
-      File.open(@maven_executable, "w") { |io| io.puts "echo $0 $*>test_out" }
-      File.chmod(0777, @maven_executable)
-    end
-  end
-end