gjp 0.19.0 → 0.20.0

data/README.md

@@ -93,40 +93,19 @@ Success! Now we have to tell gjp to return in normal mode:
 
 At this point `gjp` restored `src/` as it was before the build and listed outputs in `file_lists/commons-collections_output`. Those will be used later to compile the `%install` and `%files` sections of the project spec.
 
-This should be sufficient to be able to repeat the build on a machine with no Internet access, but what if we wanted to be 100% sure of that?
+Note that, if the build was unsusccesful, the following command can be used to cancel it and return to pre-dry running state:
 
-#### Second, networkless, dry-run build
+    gjp finish --failed
 
-`gjp` has a subcommand to setup a `nonet` user without Internet access, courtesy of `iptables`. You can simply retry the build using that user to see if it works. Note that the following commands will alter group permissions to allow both your current user and `nonet` to work on the same files. 
+#### Generating a build script
 
-    gjp set-up-nonet-user
-    chmod -R g+rw ../../..
-    gjp dry-run
-    su nonet
-    ping www.google.com #this should fail!
-    gjp mvn package
-    chmod -R g+rw .
-    exit
-    gjp finish
-
-The above is obviously not mandatory, but it can be useful for debugging purposes.
-
-#### Adding a build.sh file
-
-One last thing before generating packages is to setup a build script. By default `gjp` will generate a spec file which assumes a `build.sh` script in the source folder of your project that contains all commands needed to build the package itself. At the moment, this needs to be done manually, but it will hopefully be automated in a future release.
-
-Let's just create it:
-
-    cd ../../..
-    vi src/commons-collections/build.sh
+`gjp` expects that all commands needed to build a package are put in a `build.sh` script in `src/<package name>`. If you are a Bash user you are lucky - `gjp` can do this for you by looking at your command history! Just type:
 
-Add the following lines:
+    gjp generate-build-script commons-collections
 
-    #!/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
+Note that `gjp` will substitute the `gjp mvn` calls with equivalent lines that are actually runnable on a build host without `gjp` itself.
 
-Note that `build.sh` gets called from the `gjp` project root, hence the `cd` line, and the Maven line was taken directly from `gjp mvn` output above and pasted verbatim.
+Of course this script can also be manually modified, and it must be in more difficult cases. You don't even have to be afraid of regenerating it later. `gjp` will run a three-way merge and warn if conflicts arise!
 
 #### Generating archives and spec files
 
@@ -154,7 +133,23 @@ commons-collection BuldRequires galaxy-kit, its archive contains only source fil
 
 Packages are ready to be submitted to an OBS project. As OBS integration is not yet implemented, refer to OBS documentation to do that.
 
-#### Kit sources
+#### Optional: running networkless dry-run builds
+
+`gjp` has a subcommand to setup a `nonet` user without Internet access, courtesy of `iptables`. You can simply retry the build using that user to see if it works. Note that the following commands will alter group permissions to allow both your current user and `nonet` to work on the same files.
+
+    gjp set-up-nonet-user
+    chmod -R g+rw ../../..
+    gjp dry-run
+    su nonet
+    ping www.google.com #this should fail!
+    gjp mvn package
+    chmod -R g+rw .
+    exit
+    gjp finish
+
+The above is not mandatory, but it can be useful for debugging purposes.
+
+#### Optional: kit sources
 
 If kit sources are needed for license compliance, some extra work is needed. Fortunately, finding jar source files and adding them to the kit is much easier than packaging its contents in proper RPMs!
 

data/lib/gjp.rb

@@ -2,6 +2,7 @@ require "gjp/version"
 require "gjp/logger"
 require "gjp/template_manager"
 require "gjp/git"
+require "gjp/build_script_generator"
 require "gjp/project"
 require "gjp/pom"
 require "gjp/version_matcher"

data/lib/gjp/build_script_generator.rb

@@ -0,0 +1,46 @@
+# encoding: UTF-8
+
+module Gjp
+  # generates build scripts from bash_history
+  class BuildScriptGenerator
+    include Logger
+
+    def initialize(project, history_path)
+      @project = project
+      @maven_runner = Gjp::MavenRunner.new(project)
+      @history_path = history_path
+    end
+    
+    def generate_build_script(name)
+      @project.from_directory do
+        history_lines = File.readlines(@history_path).map { |e| e.strip }
+        relevant_lines =
+          history_lines
+            .reverse
+            .take_while { |e| e.match(/gjp +dry-run/) == nil }
+            .reverse
+            .take_while { |e| e.match(/gjp +finish/) == nil }
+            .select { |e| e.match(/^#/) == nil }
+
+        script_lines = [
+          "#!/bin/bash",
+          "PROJECT_PREFIX=`readlink -e .`",
+          "cd #{@project.latest_dry_run_directory}"
+        ] +
+        relevant_lines.map do |line|
+          if line =~ /gjp +mvn/
+            line.gsub(/gjp +mvn/, "#{@maven_runner.get_maven_commandline("$PROJECT_PREFIX")}")
+          else
+            line
+          end
+        end
+
+        new_content = script_lines.join("\n") + "\n"
+
+        result_path = File.join("src", name, "build.sh")
+        conflict_count = @project.merge_new_content(new_content, result_path, "Build script generated", "generate_#{name}_build_script")
+        [result_path, conflict_count]
+      end
+    end
+  end
+end

data/lib/gjp/cli.rb

@@ -41,8 +41,7 @@ module Gjp
         checking_exceptions do
           Gjp::Project.init(".")
           puts "Project inited."
-          puts "Any file added to kit/ will be added to the kit package."
-          puts "Any file added to src/<name> will be added to the corresponding package."
+          puts "Add sources to src/<package name>, binary dependencies to kit/."
           puts "When you are ready to test a build, use \"gjp dry-run\"."
         end
       end
@@ -53,10 +52,9 @@ module Gjp
         checking_exceptions do
           if Gjp::Project.new(".").dry_run
             puts "Now dry-running, please start your build."
-            puts "Any file added to kit/, presumably downloaded dependencies, will be added to the kit."
-            puts "The src/ directory and all files in it will be brought back to the current state when finished."
-            puts "To run Maven from the kit, use \"gjp mvn\"."
-            puts "To end this dry run, use \"gjp finish\"."
+            puts "To run a Maven installation from the kit, use \"gjp mvn\"."
+            puts "If the build succeedes end this dry run with \"gjp finish\"."
+            puts "If the build does not succeed use \"gjp finish --failed\" to restore files."
           end
         end
       end
@@ -73,18 +71,21 @@ module Gjp
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          result = Gjp::MavenRunner.new(project).mvn(@maven_options)
-          puts "Real commandline was:"
-          puts "#{result}"
+          Gjp::MavenRunner.new(project).mvn(@maven_options)
         end
       end
     end
 
     subcommand "finish", "Ends the current dry-run" do
+      option ["-f", "--failed"], :flag, "build failed, restore files as before dry-run"
       def execute
         checking_exceptions do
-          if Gjp::Project.new(".").finish
-            puts "Dry-run finished."
+          if Gjp::Project.new(".").finish(failed?)
+            if failed?
+              puts "Project reverted as before dry-run."
+            else
+              puts "Dry-run finished."
+            end
           else
             puts "No dry-run is in progress."
           end
@@ -92,12 +93,30 @@ module Gjp
       end
     end
 
+    subcommand "generate-build-script", "Creates or refreshes a build.sh file" do
+      parameter "NAME", "name of a package, that is, an src/ subdirectory name"
+      def execute
+        checking_exceptions do
+          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"
+          if conflict_count > 0
+            puts "Warning: #{conflict_count} unresolved conflicts"
+          end
+        end
+      end
+    end
+
     subcommand "generate-kit-spec", "Creates or refreshes a spec file for the kit" do
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          result_path = Gjp::SpecGenerator.new(project).generate_kit_spec
+          result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_kit_spec
           puts "#{result_path} generated"
+          if conflict_count > 0
+            puts "Warning: #{conflict_count} unresolved conflicts"
+          end
         end
       end
     end
@@ -119,9 +138,12 @@ module Gjp
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          result_path = Gjp::SpecGenerator.new(project).generate_package_spec name, pom, filter
+          result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_package_spec name, pom, filter
           if result_path != nil
             puts "#{result_path} generated"
+            if conflict_count > 0
+              puts "Warning: #{conflict_count} unresolved conflicts"
+            end
           else
             $stderr.puts "file_list/#{name}_output not found. Ensure you have already run a" +
             "\"gjp dry run\" and \"gjp finish\"."

data/lib/gjp/git.rb

@@ -1,65 +1,103 @@
 # encoding: UTF-8
 
 module Gjp
-  # encapsulates git, all methods refer to the current directory
+  # facade to git, currently implemented with calls to the git command
+  # prefixes all tags with "gjp_"
   class Git
     include Logger
 
+    # inits a new git manager object pointing to the specified
+    # directory
+    def initialize(directory)
+      @directory = directory
+    end
+
     # inits a repo
-    def self.init
-      if Dir.exists?(".git") == false
-        `git init`
-      else
-        raise GitAlreadyInitedException
+    def init
+      Dir.chdir(@directory) do
+        if Dir.exists?(".git") == false
+          `git init`
+        else
+          raise GitAlreadyInitedException
+        end
       end
     end
 
     # returns a list of filenames that changed in the repo
     # since the specified tag
     def changed_files_since(tag)
-      `git diff-tree --no-commit-id --name-only -r gjp_#{tag} HEAD`.split("\n")
+      Dir.chdir(@directory) do
+        `git diff-tree --no-commit-id --name-only -r gjp_#{tag} HEAD`.split("\n")
+      end
     end
 
     # adds all files in the current directory and removes
     # all files not in the current directory.
     # if tag is given, commit is also tagged
-    def commit_whole_directory(message, tag = nil)
-      log.debug "committing with message: #{message}"
+    def commit_whole_directory(message, tag = nil, tag_message = nil)
+      Dir.chdir(@directory) do
+        log.debug "committing with message: #{message}"
 
-      `git rm -r --cached --ignore-unmatch .`
-      `git add .`
-      `git commit -m "#{message}"`
+        `git rm -r --cached --ignore-unmatch .`
+        `git add .`
+        `git commit -m "#{message}"`
 
-      if tag != nil
-        `git tag gjp_#{tag}`
+        if tag != nil
+          if tag_message != nil
+            `git tag gjp_#{tag} -m "#{tag_message}"`
+          else
+            `git tag gjp_#{tag}`
+          end
+        end
       end
     end
 
     # returns the highest suffix found in tags with the given prefix
     def get_tag_maximum_suffix(prefix)
-      `git tag`.split.map do |tag|
-        if tag =~ /^gjp_#{prefix}_([0-9]+)$/
-          $1.to_i
-        else
-          0
-        end
-       end.max or 0
+      Dir.chdir(@directory) do
+        `git tag`.split.map do |tag|
+          if tag =~ /^gjp_#{prefix}_([0-9]+)$/
+            $1.to_i
+          else
+            0
+          end
+         end.max or 0
+      end
     end
 
     # reverts path contents as per specified tag
     def revert_whole_directory(path, tag)
-      `git rm -rf --ignore-unmatch #{path}`
-      `git checkout -f gjp_#{tag} -- #{path}`
+      Dir.chdir(@directory) do
+        `git rm -rf --ignore-unmatch #{path}`
+        `git checkout -f gjp_#{tag} -- #{path}`
 
-      `git clean -f -d #{path}`
+        `git clean -f -d #{path}`
+      end
     end
 
     # 3-way merges the git file at path with the one in new_path
     # assuming they have a common ancestor at the specified tag
+    # returns the conflict count
     def merge_with_tag(path, new_path, tag)
-      `git show gjp_#{tag}:#{path} > #{path}.old_version`
-      `git merge-file --ours #{path} #{path}.old_version #{new_path}`
-      File.delete "#{path}.old_version"
+      Dir.chdir(@directory) do
+        `git show gjp_#{tag}:#{path} > #{path}.old_version`
+        `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"
+        return conflict_count
+      end
+    end
+
+    # deletes a tag
+    def delete_tag(tag)
+      Dir.chdir(@directory) do
+        `git tag -d gjp_#{tag}`
+      end
+    end
+
+    # returns the tag message
+    def get_message(tag)
+      `git cat-file tag gjp_#{tag}`.split.last
     end
   end
 

data/lib/gjp/maven_runner.rb

@@ -27,9 +27,9 @@ module Gjp
       nil
     end
 
-    # returns a command line for running Maven
-    def get_maven_commandline(kit_full_path, running_full_path)
-      prefix = path_from running_full_path, kit_full_path
+    # 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
@@ -37,29 +37,18 @@ module Gjp
         repo_path = File.join(prefix, "kit", "m2")
         config_path = File.join(prefix, "kit", "m2", "settings.xml")
 
-        "#{mvn_path} -Dmaven.repo.local=`readlink -e #{repo_path}` -s`readlink -e #{config_path}`"
+        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path}"
+      else
+        raise MavenNotFoundException
       end
     end
 
-    # returns a path from origin to destination, provided they are both absolute
-    def path_from(origin, destination)
-      (Pathname.new(destination).relative_path_from Pathname.new(origin)).split.first
-    end
-
     # runs mvn in a subprocess
     def mvn(options)
-      kit_full_path = File.join(@project.full_path, "kit")
-      running_full_path = File.expand_path(".")
-      maven_commandline = get_maven_commandline(kit_full_path, running_full_path)
-      if maven_commandline == nil
-        raise MavenNotFoundException
-      end
-
-      full_commandline = "#{maven_commandline} #{options.join(' ')}"
+      full_commandline = "#{get_maven_commandline(@project.full_path)} #{options.join(' ')}"
       log.debug full_commandline
 
       Process.wait(Process.spawn(full_commandline))
-      full_commandline
     end
   end
 

data/lib/gjp/project.rb

@@ -11,7 +11,7 @@ module Gjp
 
     def initialize(path)      
       @full_path = Gjp::Project.find_project_dir(File.expand_path(path))
-      @git = Gjp::Git.new
+      @git = Gjp::Git.new(@full_path)
     end
 
     # finds the project directory up in the tree, like git does
@@ -36,7 +36,7 @@ module Gjp
     # inits a new project directory structure
     def self.init(dir)
       Dir.chdir(dir) do
-        Gjp::Git.init
+        Gjp::Git.new(".").init
 
         Dir.mkdir "src"
         Dir.mkdir "kit"
@@ -50,6 +50,7 @@ module Gjp
         template_manager.copy "kit", "."
         template_manager.copy "specs", "."
         template_manager.copy "src", "."
+        template_manager.copy ".gitignore", ".gitignore"
 
         project.take_snapshot "Template files added", :init
       end
@@ -59,14 +60,13 @@ module Gjp
     # to the kit package, src/ will be reset at the current state
     # when finished
     def dry_run
-      from_directory do
-        if is_dry_running
-          return false
-        end
-
-        take_snapshot "Dry-run started", :dry_run_started
+      if is_dry_running
+        return false
       end
 
+      current_directory = Pathname.new(Dir.pwd).relative_path_from Pathname.new(@full_path)
+
+      take_snapshot("Dry-run started", :dry_run_started, current_directory)
       true
     end
 
@@ -75,11 +75,15 @@ module Gjp
       latest_tag_count(:dry_run_started) > latest_tag_count(:dry_run_finished)
     end
 
-    # ends any phase that was previously started, 
-    # generating file lists
-    def finish
-      from_directory do
-        if is_dry_running
+    # ends a dry-run.
+    # if failed is true, reverts the whole directory
+    # if failed is false, reverts sources and updates output file lists
+    def finish(failed)
+      if is_dry_running
+        if failed
+          @git.revert_whole_directory(".", latest_tag(:dry_run_started))
+          @git.delete_tag(latest_tag(:dry_run_started))
+        else
           take_snapshot "Changes during dry-run"
 
           update_output_file_lists
@@ -89,9 +93,8 @@ module Gjp
           take_snapshot "Sources reverted as before dry-run"
 
           take_snapshot "Dry run finished", :dry_run_finished
-
-          return true
         end
+        return true
       end
       false
     end
@@ -99,58 +102,74 @@ module Gjp
     # updates files that contain lists of the output files produced by
     # the build of each package
     def update_output_file_lists
-      Dir.foreach("src") do |entry|
-        if File.directory?(File.join(Dir.getwd, "src", entry)) and entry != "." and entry != ".."
-          directory = File.join("src", entry)
-          file_name = "#{entry}_output"
-          list_file = File.join("file_lists", file_name)
-          tracked_files = if File.exists?(list_file)
-            File.readlines(list_file).map { |line| line.strip }
-          else
-            []
-          end
-
-          new_tracked_files = (
-            @git.changed_files_since(latest_tag(:dry_run_started))
-              .select { |file| file.start_with?(directory) }
-              .map { |file|file[directory.length + 1, file.length] }
-              .concat(tracked_files)
-              .uniq
-              .sort
-          )
-
-          log.debug("writing file list for #{directory}: #{new_tracked_files.to_s}")
-
-          File.open(list_file, "w+") do |file_list|
-            new_tracked_files.each do |file|
-              file_list.puts file
-            end
+      each_package_directory do |directory|
+        files = (
+          @git.changed_files_since(latest_tag(:dry_run_started))
+            .select { |file| file.start_with?(directory) }
+            .map { |file|file[directory.length + 1, file.length] }
+            .sort
+        )
+
+        log.debug("writing file list for #{directory}: #{files.to_s}")
+
+        list_path = File.join("file_lists", "#{Pathname.new(directory).basename}_output")
+        File.open(list_path, "w+") do |file_list|
+          files.each do |file|
+            file_list.puts file
           end
         end
       end
     end
 
     # takes a revertable snapshot of this project
-    def take_snapshot(message, prefix = nil)
-      tag = if prefix
-        "#{prefix}_#{latest_tag_count(prefix) + 1}"
+    def take_snapshot(message, tag_prefix = nil, tag_message = nil)
+      tag = if tag_prefix
+        "#{tag_prefix}_#{latest_tag_count(tag_prefix) + 1}"
       else
         nil
       end
 
-      @git.commit_whole_directory(message, tag)
+      @git.commit_whole_directory(message, tag, tag_message)
+    end
+
+    # replaces content in path with new_content, takes a snapshot using
+    # snapshot_message and tag_prefix and 3-way merges new and old content
+    # with a previous snapshotted file same path tag_prefix, if it exists.
+    # returns the number of conflicts
+    def merge_new_content(new_content, path, snapshot_message, tag_prefix)
+      from_directory do
+        already_existing = File.exist? path
+        previous_tag = latest_tag(tag_prefix)
+
+        if already_existing
+          File.rename path, "#{path}.gjp_user_edited"
+        end
+
+        File.open(path, "w") { |io| io.write(new_content) }
+        take_snapshot(snapshot_message, tag_prefix)
+
+        if already_existing
+          if previous_tag == ""
+            previous_tag = latest_tag(tag_prefix)
+          end
+
+          # 3-way merge
+          conflict_count = @git.merge_with_tag("#{path}", "#{path}.gjp_user_edited", previous_tag)
+          File.delete "#{path}.gjp_user_edited"
+          return conflict_count
+        end
+        return 0
+      end
     end
 
-    # returns the last tag of its type corresponding to a
-    # gjp snapshot
-    def latest_tag(tag_type)
-      "#{tag_type}_#{latest_tag_count(tag_type)}"
+    # returns the tag with maximum count for a given tag prefix
+    def latest_tag(prefix)
+      "#{prefix}_#{latest_tag_count(prefix)}"
     end
 
-    # returns the last tag count of its type corresponding
-    # to a gjp snapshot
-    def latest_tag_count(tag_type)
-      @git.get_tag_maximum_suffix(tag_type)
+    # returns the maximum tag count for a given tag prefix
+    def latest_tag_count(prefix)
+      @git.get_tag_maximum_suffix(prefix)
     end
 
     # runs a block from the project directory or a subdirectory
@@ -160,6 +179,24 @@ module Gjp
       end
     end
 
+    # runs a block for each package directory in src/
+    def each_package_directory
+      from_directory do
+        Dir.foreach("src") do |entry|
+          if File.directory?(File.join(Dir.getwd, "src", entry)) and entry != "." and entry != ".."
+            directory = File.join("src", entry)
+            yield directory
+          end
+        end
+      end
+    end
+
+    # returns the latest dry run start directory
+    def latest_dry_run_directory
+      @git.get_message(latest_tag(:dry_run_started))
+    end
+
+
     # helpers for ERB
 
     def name

data/lib/gjp/spec_generator.rb

@@ -7,13 +7,12 @@ module Gjp
 
     def initialize(project)
       @project = project
-      @git = Gjp::Git.new
     end
 
     def generate_kit_spec
       spec_path = File.join("specs", "#{@project.name}-kit.spec")
-      generate_merging "kit.spec", @project.get_binding, spec_path, :generate_kit_spec
-      spec_path
+      conflict_count = generate_merging("kit.spec", @project.get_binding, spec_path, :generate_kit_spec)
+      [spec_path, conflict_count]
     end
 
     def generate_package_spec(name, pom, filter)
@@ -26,32 +25,14 @@ module Gjp
 
       adapter = Gjp::PackageSpecAdapter.new(@project, name, Gjp::Pom.new(pom), filter)
 
-      generate_merging "package.spec", adapter.get_binding, spec_path, "generate_#{name}_spec"
-
-      spec_path
+      conflict_count = generate_merging("package.spec", adapter.get_binding, spec_path, "generate_#{name}_spec")
+      [spec_path, conflict_count]
     end
 
-    # generates a file in result_path from template together with binding.
-    # if a file already exists at that position, 3-way merge it with the
-    # common ancestor. Takes a snapshot in the end for future merges
-    def generate_merging(template, binding, result_path, tag_prefix)
-      @project.from_directory do
-        TemplateManager.new.generate template, binding, "#{result_path}.new_version"
-
-        already_generated = @project.latest_tag(tag_prefix) != ""
-        already_existing = File.exist? result_path
-
-        if already_generated and already_existing
-          # 3-way merge
-          @git.merge_with_tag("#{result_path}", "#{result_path}.new_version", @project.latest_tag(tag_prefix))
-          File.delete "#{result_path}.new_version"
-        else
-          # just replace
-          File.rename "#{result_path}.new_version", result_path
-        end
-
-        @project.take_snapshot("Spec generated", tag_prefix)
-      end
+    # generates a spec file from a template and 3-way merges it
+    def generate_merging(template, binding, path, tag_prefix)
+      new_content = TemplateManager.new.generate(template, binding)
+      @project.merge_new_content(new_content, path, "Spec generated", tag_prefix)      
     end
   end
 end

data/lib/gjp/template_manager.rb

@@ -13,13 +13,23 @@ module Gjp
       @template_path = File.join(File.dirname(__FILE__), "..", "template")
     end
 
+    # copies a template file in a directory
     def copy(template_name, destination_dir)
       FileUtils.cp_r(File.join(template_path, template_name), destination_dir)
     end
 
-    def generate(template_name, object_binding, destination_path)
+    # generates content from an ERB template and an object binding
+    # if destination_path is given, write it to that file, otherwise just
+    # return it
+    def generate(template_name, object_binding, destination_path = nil)
       erb = ERB.new File.read(File.join(template_path, template_name)), nil, "<>"
-      File.open(destination_path, "w") { |io| io.write erb.result(object_binding) }
+      new_content =  erb.result(object_binding)
+
+      if destination_path != nil
+        File.open(destination_path, "w") { |io| io.write new_content }
+      end
+
+      new_content
     end
   end
 end

data/lib/gjp/version.rb

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

data/lib/template/.gitignore

@@ -0,0 +1,2 @@
+*.gjp_user_edited
+archives/

data/lib/template/kit.spec

@@ -26,6 +26,7 @@ Source0:        %{name}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 BuildRequires:  xz
+BuildRequires:  fdupes
 Provides:       gjp(kit)
 # no two kits should ever be installed at any given time
 Conflicts:      otherproviders(gjp(kit))
@@ -45,6 +46,7 @@ be installed on end users' systems.
 %install
 install -d -m 0755 %{buildroot}%{_datadir}/gjp/%{name}/
 cp -a * %{buildroot}%{_datadir}/gjp/%{name}/
+%fdupes -s %{buildroot}%{_datadir}/gjp/%{name}/
 
 %files
 %defattr(-,root,root)

data/lib/template/package.spec

@@ -26,7 +26,7 @@ Source0:        %{name}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  xz
 BuildRequires:  java-devel
-BuildRequires:  <%= project_name %>-kit == <%= project_version %>
+BuildRequires:  <%= project_name %>-kit >= <%= project_version %>
 BuildArch:      noarch
 Provides:       mvn(<%= group_id %>:<%= artifact_id %>) == <%= version %>
 <% runtime_dependency_ids.each do |dependency_id| %>

data/spec/lib/archiver_spec.rb

@@ -33,7 +33,7 @@ describe Gjp::Archiver do
       @project.from_directory do
         File.open(File.join("kit","kit_test"), "w") { |io| io.puts "test content" }
       end
-      @project.finish
+      @project.finish(false)
 
       archiver.archive_kit
       @project.from_directory do
@@ -48,7 +48,7 @@ describe Gjp::Archiver do
         Dir.mkdir(File.join("src", "package-name"))
         File.open(File.join("src", "package-name", "src_test"), "w") { |io| io.puts "test content" }
       end
-      @project.finish
+      @project.finish(false)
 
       archiver.archive_package "package-name"
       @project.from_directory do

data/spec/lib/build_script_generator_spec.rb

@@ -0,0 +1,65 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gjp::BuildScriptGenerator 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)
+
+    @project.from_directory do
+      File.open("history", "w") do |io|
+        io.puts "some earlier command"
+        io.puts "gjp dry-run --unwanted-options"
+        io.puts "cd somewhere significant"
+        io.puts "gjp mvn --options"
+        io.puts "gjp finish -a"
+        io.puts "some later command"
+      end
+
+      FileUtils.mkdir_p(File.join("src", "test-package"))
+
+      @generator = Gjp::BuildScriptGenerator.new(@project, "history")
+    end
+
+    mock_maven_executable
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(@project_path)
+  end
+
+  describe "#generate_build_script" do
+    it "generates a build script from the history" do
+      @project.from_directory do
+        @generator.generate_build_script("test-package")
+
+        lines = File.readlines(File.join("src", "test-package", "build.sh"))
+
+        lines.should include("#!/bin/bash\n")
+        lines.should include("cd somewhere significant\n")
+        lines.should include("$PROJECT_PREFIX/kit/mvn/bin/mvn -Dmaven.repo.local=$PROJECT_PREFIX/kit/m2 -s$PROJECT_PREFIX/kit/m2/settings.xml --options\n")
+
+        lines.should_not include("some earlier command\n")
+        lines.should_not include("gjp dry-run --unwanted-options\n")
+        lines.should_not include("gjp dry-run --unwanted-options\n")
+        lines.should_not include("gjp finish -a\n")
+        lines.should_not include("some later command\n")
+      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
+

data/spec/lib/maven_runner_spec.rb

@@ -30,16 +30,14 @@ describe Gjp::MavenRunner do
   describe "#get_maven_commandline"  do
     it "returns commandline options for running maven" do
       mock_maven_executable
-      kit_full_path = File.join(@project.full_path, "kit")
-      commandline = @maven_runner.get_maven_commandline(kit_full_path, @project.full_path)
 
-      commandline.should eq "./#{@maven_executable} -Dmaven.repo.local=`readlink -e ./kit/m2` -s`readlink -e ./kit/m2/settings.xml`"
+      @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
-      kit_full_path = File.join(@project.full_path, "kit")
-      commandline = @maven_runner.get_maven_commandline(kit_full_path, @project.full_path)
-
-      commandline.should be_nil
+      expect { @maven_runner.get_maven_commandline(".") }.to raise_error(Gjp::MavenNotFoundException)
     end
   end
 
@@ -53,7 +51,7 @@ describe Gjp::MavenRunner do
     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)
+        expect { @maven_runner.mvn([]) }.to raise_error(Gjp::MavenNotFoundException)
       end
     end
   end

data/spec/lib/project_spec.rb

@@ -57,7 +57,7 @@ describe Gjp::Project do
         @project.is_dry_running.should be_false
         @project.dry_run
         @project.is_dry_running.should be_true
-        @project.finish
+        @project.finish(false)
         @project.is_dry_running.should be_false
       end
     end
@@ -77,13 +77,14 @@ describe Gjp::Project do
   end
   
   describe "#finish" do
-    it "ends the current dry-run phase" do
+    it "ends the current dry-run phase after a successful build" do
       @project.from_directory do
         Dir.mkdir("src/abc")
         `echo A > src/abc/test`
       end
 
-      @project.finish.should be_false
+      @project.finish(true).should be_false
+      @project.finish(false).should be_false
 
       @project.dry_run.should be_true
 
@@ -92,7 +93,7 @@ describe Gjp::Project do
         `touch src/abc/test2`
       end
 
-      @project.finish.should be_true
+      @project.finish(false).should be_true
       @project.is_dry_running.should be_false
 
       @project.from_directory do
@@ -104,22 +105,58 @@ describe Gjp::Project do
         File.exists?("src/abc/test2").should be_false
       end
     end
+    it "ends the current dry-run phase after a failed build" do
+      @project.from_directory do
+        Dir.mkdir("src/abc")
+        `echo A > src/abc/test`
+        `echo A > kit/test`
+      end
+
+      @project.finish(true).should be_false
+      @project.finish(false).should be_false
+
+      @project.dry_run.should be_true
+
+      @project.from_directory do
+        `echo B > src/abc/test`
+        `touch src/abc/test2`
+        `echo B > kit/test`
+        `touch kit/test2`
+      end
+
+      @project.finish(true).should be_true
+      @project.is_dry_running.should be_false
+
+      @project.from_directory do
+        `git rev-list --all`.split("\n").length.should eq 2
+        File.read("src/abc/test").should eq "A\n"
+        File.exists?("src/abc/test2").should be_false
+
+        File.read("kit/test").should eq "A\n"
+        File.exists?("kit/test2").should be_false
+
+        File.exists?(File.join("file_lists", "abc_output")).should be_false
+      end
+    end
   end
 
   describe "#dry_run" do
     it "starts a dry running phase" do
-      @project.finish.should be_false
+      @project.finish(false).should be_false
 
       @project.from_directory do
         `touch src/test`
       end
 
-      @project.dry_run.should be_true
+      @project.from_directory("src") do
+        @project.dry_run.should be_true
+      end
 
       @project.from_directory do
         @project.is_dry_running.should be_true
         `git rev-list --all`.split("\n").length.should eq 2
         `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

data/spec/lib/spec_generator_spec.rb

@@ -15,7 +15,7 @@ describe Gjp::SpecGenerator do
       test_file = File.join("kit", "test")
       File.open(test_file, "w") { |io| io.puts "kit content test file" }
     end
-    @project.finish
+    @project.finish(false)
 
     @spec_generator = Gjp::SpecGenerator.new(@project)
   end
@@ -46,7 +46,7 @@ describe Gjp::SpecGenerator do
           io.write("nonconflicting line")
         end
       end
-      @project.finish
+      @project.finish(false)
 
       @spec_generator.generate_kit_spec.should be_true
 
@@ -74,7 +74,7 @@ describe Gjp::SpecGenerator do
           io.write(spec_contents)
         end
       end
-      @project.finish
+      @project.finish(false)
 
       @spec_generator.generate_kit_spec.should be_true
 
@@ -82,8 +82,11 @@ describe Gjp::SpecGenerator do
         spec_lines = File.readlines(File.join("specs", "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("<<<<<<< newly generated\n")
+        spec_lines.should include("Version:        2\n")
+        spec_lines.should include("=======\n")
         spec_lines.should include("CONFLICTING!\n")
-        spec_lines.should_not include("Version:        2\n")
+        spec_lines.should include(">>>>>>> user edited\n")
       end
     end
   end
@@ -106,7 +109,7 @@ describe Gjp::SpecGenerator do
           `touch src/test/out/test#{i}.jar`
         end
 
-        @project.finish
+        @project.finish(false)
       end
 
       @spec_generator.generate_package_spec "test", File.join("spec", "data", "nailgun", "pom.xml"), "*.jar"
@@ -117,7 +120,7 @@ describe Gjp::SpecGenerator do
         spec_lines.should include("License:        The Apache Software License, Version 2.0\n")
         spec_lines.should include("Summary:        Nailgun is a client, protocol, and server for running Java\n")
         spec_lines.should include("Url:            http://martiansoftware.com/nailgun\n")
-        spec_lines.should include("BuildRequires:  #{@project.name}-kit\n")
+        spec_lines.should include("BuildRequires:  #{@project.name}-kit >= 2\n")
         spec_lines.should include("Provides:       mvn(com.martiansoftware:nailgun-all) == 0.9.1\n")
         spec_lines.should include("cp -a out/test3.jar %{buildroot}%{_javadir}/test3.jar\n")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -158,6 +158,7 @@ files:
 - integration-tests/commons-collections.sh
 - lib/gjp.rb
 - lib/gjp/archiver.rb
+- lib/gjp/build_script_generator.rb
 - lib/gjp/cli.rb
 - lib/gjp/git.rb
 - lib/gjp/limited_network_user.rb
@@ -175,6 +176,7 @@ files:
 - lib/gjp/template_manager.rb
 - lib/gjp/version.rb
 - lib/gjp/version_matcher.rb
+- lib/template/.gitignore
 - lib/template/archives/CONTENTS
 - lib/template/file_lists/CONTENTS
 - lib/template/kit.spec
@@ -200,6 +202,7 @@ files:
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
 - spec/lib/archiver_spec.rb
+- spec/lib/build_script_generator_spec.rb
 - spec/lib/limited_network_user_spec_interactive.rb
 - spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
@@ -256,6 +259,7 @@ test_files:
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
 - spec/lib/archiver_spec.rb
+- spec/lib/build_script_generator_spec.rb
 - spec/lib/limited_network_user_spec_interactive.rb
 - spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb