gjp 0.18.0 → 0.19.0

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# A crude integration test that builds commons-lang
+# A crude integration test that builds commons-collections
 
 mkdir galaxy
 cd galaxy

data/lib/gjp.rb

@@ -1,6 +1,7 @@
 require "gjp/version"
 require "gjp/logger"
 require "gjp/template_manager"
+require "gjp/git"
 require "gjp/project"
 require "gjp/pom"
 require "gjp/version_matcher"
@@ -12,7 +13,7 @@ require "gjp/source_getter"
 require "gjp/parent_pom_getter"
 require "gjp/maven_runner"
 require "gjp/package_spec_adapter"
-require "gjp/scaffolder"
+require "gjp/spec_generator"
 require "gjp/archiver"
 
 require "gjp/cli"

data/lib/gjp/cli.rb

@@ -38,23 +38,26 @@ module Gjp
     # Subcommands
     subcommand "init", "Inits a gjp project in the current directory" do
       def execute
-        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 "When you are ready to test a build, use \"gjp dry-run\"."
+        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 "When you are ready to test a build, use \"gjp dry-run\"."
+        end
       end
     end
 
     subcommand "dry-run", "Starts a dry-run build" do
       def execute
-        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 "Note that .gitignore files are honored!"
-          puts "To run Maven from the kit, use \"gjp mvn\"."
-          puts "To end this dry run, use \"gjp finish\"."
+        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\"."
+          end
         end
       end
     end
@@ -68,55 +71,61 @@ module Gjp
       end
 
       def execute
-        begin
+        checking_exceptions do
           project = Gjp::Project.new(".")
           result = Gjp::MavenRunner.new(project).mvn(@maven_options)
           puts "Real commandline was:"
           puts "#{result}"
-        rescue Gjp::MavenNotFoundException
-          puts "mvn executable not found in kit/ or any of its subdirectories"
         end
       end
     end
 
     subcommand "finish", "Ends the current dry-run" do
       def execute
-        if Gjp::Project.new(".").finish
-          puts "Dry-run finished."
-        else
-          puts "No dry-run is in progress."
+        checking_exceptions do
+          if Gjp::Project.new(".").finish
+            puts "Dry-run finished."
+          else
+            puts "No dry-run is in progress."
+          end
         end
       end
     end
 
-    subcommand "generate-kit-spec", "Scaffolds or refreshes a spec file for the kit" do
+    subcommand "generate-kit-spec", "Creates or refreshes a spec file for the kit" do
       def execute
-        project = Gjp::Project.new(".")
-        result_path = Gjp::Scaffolder.new(project).generate_kit_spec
-        puts "#{result_path} generated"
+        checking_exceptions do
+          project = Gjp::Project.new(".")
+          result_path = Gjp::SpecGenerator.new(project).generate_kit_spec
+          puts "#{result_path} generated"
+        end
       end
     end
 
     subcommand "generate-kit-archive", "Archives contents of kit in archives/" do
       def execute
-        project = Gjp::Project.new(".")
-        result_path = Gjp::Archiver.new(project).archive_kit
-        puts "#{result_path} generated"
+        checking_exceptions do
+          project = Gjp::Project.new(".")
+          result_path = Gjp::Archiver.new(project).archive_kit
+          puts "#{result_path} generated"
+        end
       end
     end
 
-    subcommand "generate-package-spec", "Scaffolds or refreshes a spec file for a package" do
+    subcommand "generate-package-spec", "Creates or refreshes a spec file for a package" do
       option ["-f", "--filter"], "FILTER", "filter files to be installed by this spec", :default => "*.jar"
       parameter "NAME", "name of a package, that is, an src/ subdirectory name"
       parameter "POM", "a pom file path or URI"
       def execute
-        project = Gjp::Project.new(".")
-        result_path = Gjp::Scaffolder.new(project).generate_package_spec name, pom, filter
-        if result_path != nil
-          puts "#{result_path} generated"
-        else
-          "The file_list/#{name}_output file was not found. Ensure you have already run a" +
-          "dry run and ensure you ended that phase with \"gjp finish\"."
+        checking_exceptions do
+          project = Gjp::Project.new(".")
+          result_path = Gjp::SpecGenerator.new(project).generate_package_spec name, pom, filter
+          if result_path != nil
+            puts "#{result_path} generated"
+          else
+            $stderr.puts "file_list/#{name}_output not found. Ensure you have already run a" +
+            "\"gjp dry run\" and \"gjp finish\"."
+          end
         end
       end
     end
@@ -124,47 +133,57 @@ module Gjp
     subcommand "generate-package-archive", "Archives contents of a package in archives/" do
       parameter "NAME", "name of a package, that is, an src/ subdirectory name"
       def execute
-        project = Gjp::Project.new(".")
-        result_path = Gjp::Archiver.new(project).archive_package name
-        puts "#{result_path} generated"
+        checking_exceptions do
+          project = Gjp::Project.new(".")
+          result_path = Gjp::Archiver.new(project).archive_package name
+          puts "#{result_path} generated"
+        end
       end
     end
 
     subcommand "set-up-nonet-user", "Sets up a \"nonet\" user that cannot access the network" do
       def execute
-        user = Gjp::LimitedNetworkUser.new("nonet")
-        user.set_up
-
-        "sudo #{user.get_path("useradd")} nonet\n" +
-        "sudo #{user.get_path("iptables")} -A OUTPUT -m owner --uid-owner nonet -j DROP\n" +
-        "User \"nonet\" set up, you can use \"sudo nonet\" to dry-run your build with no network access.\n" +
-        "Note that the above iptables rule will be cleared at next reboot, you can use your distribution " +
-        "tools to make it persistent or run \"gjp set-up-limited-nertwork-user\" again next time."
+        checking_exceptions do
+          user = Gjp::LimitedNetworkUser.new("nonet")
+          user.set_up
+
+          "sudo #{user.get_path("useradd")} nonet\n" +
+          "sudo #{user.get_path("iptables")} -A OUTPUT -m owner --uid-owner nonet -j DROP\n" +
+          "User \"nonet\" set up, you can use \"sudo nonet\" to dry-run your build with no network access.\n" +
+          "Note that the above iptables rule will be cleared at next reboot, you can use your distribution " +
+          "tools to make it persistent or run \"gjp set-up-limited-nertwork-user\" again next time."
+        end
       end
     end
 
     subcommand "tear-down-nonet-user", "Deletes a user previously created by gjp" do
       def execute
-        user = Gjp::LimitedNetworkUser.new("nonet")
+        checking_exceptions do
+          user = Gjp::LimitedNetworkUser.new("nonet")
 
-        user.tear_down
+          user.tear_down
 
-        "sudo #{user.get_path("iptables")} -D OUTPUT -m owner --uid-owner nonet -j DROP\n" +
-        "sudo #{user.get_path("userdel")} nonet\n"
+          "sudo #{user.get_path("iptables")} -D OUTPUT -m owner --uid-owner nonet -j DROP\n" +
+          "sudo #{user.get_path("userdel")} nonet\n"
+        end
       end
     end
 
     subcommand "get-pom", "Retrieves a pom corresponding to a filename" do
       parameter "NAME", "a jar file path, a project directory path or a non-existing filename in the `project-version` form"
       def execute
-        puts Gjp::PomGetter.new.get_pom(name)
+          checking_exceptions do
+          puts Gjp::PomGetter.new.get_pom(name)
+        end
       end
     end
 
     subcommand "get-parent-pom", "Retrieves a pom that is the parent of an existing pom" do
       parameter "POM", "a pom file path or URI"
       def execute
-        puts Gjp::ParentPomGetter.new.get_parent_pom(pom)
+          checking_exceptions do
+          puts Gjp::ParentPomGetter.new.get_parent_pom(pom)
+        end
       end
     end
       
@@ -172,8 +191,10 @@ module Gjp
       parameter "POM", "a pom file path or URI"
 
       def execute
-        puts Gjp::SourceAddressGetter.new.get_source_address(pom)
-      end    
+        checking_exceptions do
+          puts Gjp::SourceAddressGetter.new.get_source_address(pom)
+        end
+      end
     end
     
     subcommand "get-source", "Retrieves a project's source code directory" do
@@ -182,8 +203,29 @@ module Gjp
       parameter "[DIRECTORY]", "directory in which to save the source code", :default => "."
 
       def execute
-        puts Gjp::SourceGetter.new.get_source(address, pom, directory)
+        checking_exceptions do
+          puts Gjp::SourceGetter.new.get_source(address, pom, directory)
+        end    
       end    
     end
+
+    # handles most fatal exceptions
+    def checking_exceptions
+      begin
+        yield
+      rescue Errno::EACCES => e
+        $stderr.puts e
+      rescue Errno::ENOENT => e
+        $stderr.puts e
+      rescue Errno::EEXIST => e
+        $stderr.puts e
+      rescue NotGjpDirectoryException
+        $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"
+      end
+    end
   end
 end

data/lib/gjp/git.rb

@@ -0,0 +1,68 @@
+# encoding: UTF-8
+
+module Gjp
+  # encapsulates git, all methods refer to the current directory
+  class Git
+    include Logger
+
+    # inits a repo
+    def self.init
+      if Dir.exists?(".git") == false
+        `git init`
+      else
+        raise GitAlreadyInitedException
+      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")
+    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}"
+
+      `git rm -r --cached --ignore-unmatch .`
+      `git add .`
+      `git commit -m "#{message}"`
+
+      if tag != nil
+        `git tag gjp_#{tag}`
+      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
+    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}`
+
+      `git clean -f -d #{path}`
+    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
+    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"
+    end
+  end
+
+  class GitAlreadyInitedException < Exception
+  end
+end

data/lib/gjp/package_spec_adapter.rb

@@ -10,6 +10,7 @@ module Gjp
     attr_reader :summary
     attr_reader :url
     attr_reader :project_name
+    attr_reader :project_version
     attr_reader :group_id
     attr_reader :artifact_id
     attr_reader :version
@@ -28,6 +29,7 @@ module Gjp
       @summary = cleanup_description(pom.description, 60)
       @url = pom.url
       @project_name = project.name
+      @project_version = project.version
       @group_id = pom.group_id
       @artifact_id = pom.artifact_id
       @version = pom.version

data/lib/gjp/pom.rb

@@ -19,45 +19,45 @@ module Gjp
     end
     
     def group_id
-      @doc.xpath("project/groupId/text()").to_s
+      @doc.xpath("project/groupId").text
     end
     
     def artifact_id
-      @doc.xpath("project/artifactId/text()").to_s
+      @doc.xpath("project/artifactId").text
     end
     
     def version
-      @doc.xpath("project/version/text()").to_s
+      @doc.xpath("project/version").text
     end
 
     def description
-      @doc.xpath("project/description/text()").to_s
+      @doc.xpath("project/description").text
     end
 
     def url
-      @doc.xpath("project/url/text()").to_s
+      @doc.xpath("project/url").text
     end
 
     def license_name
-      @doc.xpath("project/licenses/license/name/text()").to_s
+      @doc.xpath("project/licenses/license/name").text
     end
 
     def runtime_dependency_ids
       result = @doc.xpath("project/dependencies/dependency[not(optional='true') and not(scope='provided') and not(scope='test') and not(scope='system')]").map do |element|
-        [element.xpath("groupId/text()").to_s, element.xpath("artifactId/text()").to_s, element.xpath("version/text()").to_s]
+        [element.xpath("groupId").text, element.xpath("artifactId").text, element.xpath("version").text]
       end
     end
 
     def parent_group_id
-      @doc.xpath("project/parent/groupId/text()").to_s
+      @doc.xpath("project/parent/groupId").text
     end
     
     def parent_artifact_id
-      @doc.xpath("project/parent/artifactId/text()").to_s
+      @doc.xpath("project/parent/artifactId").text
     end
     
     def parent_version
-      @doc.xpath("project/parent/version/text()").to_s
+      @doc.xpath("project/parent/version").text
     end
   end
 end

data/lib/gjp/project.rb

@@ -7,13 +7,11 @@ module Gjp
   class Project
     include Logger
 
-    # list of possible statuses
-    @@statuses = [:dry_running]
-
     attr_accessor :full_path
 
     def initialize(path)      
       @full_path = Gjp::Project.find_project_dir(File.expand_path(path))
+      @git = Gjp::Git.new
     end
 
     # finds the project directory up in the tree, like git does
@@ -23,7 +21,7 @@ module Gjp
         result = File.expand_path("..", result)
       end
 
-      raise ArgumentError, "This is not a gjp project directory" if result == "/"
+      raise NotGjpDirectoryException if result == "/"
 
       result
     end
@@ -38,9 +36,7 @@ module Gjp
     # inits a new project directory structure
     def self.init(dir)
       Dir.chdir(dir) do
-        if Dir.exists?(".git") == false
-          `git init`
-        end
+        Gjp::Git.init
 
         Dir.mkdir "src"
         Dir.mkdir "kit"
@@ -64,33 +60,34 @@ module Gjp
     # when finished
     def dry_run
       from_directory do
-        status = get_status
-        if status == :dry_running
+        if is_dry_running
           return false
         end
 
-        set_status :dry_running
         take_snapshot "Dry-run started", :dry_run_started
       end
 
       true
     end
 
+    # returns true iff we are currently dry-running
+    def is_dry_running
+      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
-        status = get_status
-        if status == :dry_running
+        if is_dry_running
           take_snapshot "Changes during dry-run"
 
           update_output_file_lists
           take_snapshot "File list updates"
 
-          revert "src", :dry_run_started
+          @git.revert_whole_directory("src", latest_tag(:dry_run_started))
           take_snapshot "Sources reverted as before dry-run"
 
-          set_status nil
           take_snapshot "Dry run finished", :dry_run_finished
 
           return true
@@ -114,12 +111,12 @@ module Gjp
           end
 
           new_tracked_files = (
-            `git diff-tree --no-commit-id --name-only -r #{latest_tag(:dry_run_started)} HEAD`.split("\n")
-            .select { |file| file.start_with?(directory) }
-            .map { |file|file[directory.length + 1, file.length] }
-            .concat(tracked_files)
-            .uniq
-            .sort
+            @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}")
@@ -133,80 +130,27 @@ module Gjp
       end
     end
 
-    # adds the project's whole contents to git
-    # if tag is given, commit is tagged
-    def take_snapshot(message, tag = nil)
-      log.debug "committing with message: #{message}"
-
-      `git rm -r --cached --ignore-unmatch .`
-      `git add .`
-      `git commit -m "#{message}"`
-
-      if tag != nil
-        `git tag gjp_#{tag}_#{latest_tag_count(tag) + 1}`
+    # takes a revertable snapshot of this project
+    def take_snapshot(message, prefix = nil)
+      tag = if prefix
+        "#{prefix}_#{latest_tag_count(prefix) + 1}"
+      else
+        nil
       end
+
+      @git.commit_whole_directory(message, tag)
     end
 
     # returns the last tag of its type corresponding to a
     # gjp snapshot
     def latest_tag(tag_type)
-      "gjp_#{tag_type}_#{latest_tag_count(tag_type)}"
+      "#{tag_type}_#{latest_tag_count(tag_type)}"
     end
 
     # returns the last tag count of its type corresponding
     # to a gjp snapshot
     def latest_tag_count(tag_type)
-      `git tag`.split.map do |tag|
-        if tag =~ /^gjp_#{tag_type}_([0-9]+)$/
-          $1.to_i
-        else
-          0
-        end
-       end.max or 0
-    end
-
-    # reverts path contents as per latest tag
-    def revert(path, tag)
-      `git rm -rf --ignore-unmatch #{path}`
-      `git checkout -f #{latest_tag(tag)} -- #{path}`
-
-      `git clean -f -d #{path}`
-    end
-
-    # returns a symbol with the current status
-    # flag
-    def get_status
-      from_directory do
-        @@statuses.each do |status|
-          if File.exists?(status_file_name(status))
-            return status
-          end
-        end
-      end
-
-      nil
-    end
-
-    # sets a project status flag. if status = nil,
-    # clears all status flags
-    def set_status(status)
-      from_directory do
-        @@statuses.each do |a_status|
-          file_name = status_file_name(a_status)
-          if File.exists?(file_name)
-            File.delete(file_name)
-          end
-
-          if a_status == status
-            FileUtils.touch(file_name)
-          end
-        end
-      end
-    end
-
-    # returns a file name that represents a status
-    def status_file_name(status)
-      ".#{status.to_s}"
+      @git.get_tag_maximum_suffix(tag_type)
     end
 
     # runs a block from the project directory or a subdirectory
@@ -223,11 +167,14 @@ module Gjp
     end
 
     def version
-      `git rev-parse --short #{latest_tag(:dry_run_finished)}`.strip
+      latest_tag_count(:dry_run_finished)
     end
 
     def get_binding
       binding
     end
   end
+
+  class NotGjpDirectoryException < Exception
+  end
 end

data/lib/gjp/{scaffolder.rb → spec_generator.rb}

@@ -2,11 +2,12 @@
 
 module Gjp
   # creates and updates spec files
-  class Scaffolder
+  class SpecGenerator
     include Logger
 
     def initialize(project)
       @project = project
+      @git = Gjp::Git.new
     end
 
     def generate_kit_spec
@@ -25,36 +26,32 @@ module Gjp
 
       adapter = Gjp::PackageSpecAdapter.new(@project, name, Gjp::Pom.new(pom), filter)
 
-      generate_merging "package.spec", adapter.get_binding, spec_path, "scaffold_#{name}_spec"
+      generate_merging "package.spec", adapter.get_binding, spec_path, "generate_#{name}_spec"
 
       spec_path
     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
-    # version with the latest tag specified. Takes a snapshot in the end
-    # for future merges
-    def generate_merging(template, binding, result_path, tag)
+    # 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_scaffold"
+        TemplateManager.new.generate template, binding, "#{result_path}.new_version"
 
-        already_scaffolded = @project.latest_tag(tag) != ""
+        already_generated = @project.latest_tag(tag_prefix) != ""
         already_existing = File.exist? result_path
 
-        if already_scaffolded and already_existing
+        if already_generated and already_existing
           # 3-way merge
-          `git show #{@project.latest_tag(tag)}:#{result_path} > #{result_path}.old_scaffold`
-          `git merge-file --ours #{result_path} #{result_path}.old_scaffold #{result_path}.new_scaffold`
-          File.delete "#{result_path}.new_scaffold"
-          File.delete "#{result_path}.old_scaffold"
+          @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_scaffold", result_path
+          File.rename "#{result_path}.new_version", result_path
         end
 
-        @project.take_snapshot "Kit spec scaffolded", tag
+        @project.take_snapshot("Spec generated", tag_prefix)
       end
     end
-
   end
 end

data/lib/gjp/version.rb

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

data/lib/template/kit.spec

@@ -44,12 +44,10 @@ be installed on end users' systems.
 
 %install
 install -d -m 0755 %{buildroot}%{_datadir}/gjp/%{name}/
-mv README.SUSE ../
 cp -a * %{buildroot}%{_datadir}/gjp/%{name}/
 
 %files
 %defattr(-,root,root)
-%doc ../README.SUSE
 %{_datadir}/gjp/
 
 %changelog

data/lib/template/kit/CONTENTS

@@ -1,9 +1,8 @@
-Any files you put here will be copied as is in the "kit" package.
+This directory contains all binary files needed to build a gjp project's
+packages.
 
-You should add all dependencies and build tools here, so that they are
-available at build time.
-
-gjp will recognise Maven, Ant and other popular build tool binaries in here.
+These files should only be used during build and should not be installed
+on users' systems.
 
 Some generally useful configuration files are also placed here (eg.
-m2/settings.xml for Maven builds.
+m2/settings.xml for Maven builds).

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
+BuildRequires:  <%= project_name %>-kit == <%= project_version %>
 BuildArch:      noarch
 Provides:       mvn(<%= group_id %>:<%= artifact_id %>) == <%= version %>
 <% runtime_dependency_ids.each do |dependency_id| %>

data/lib/template/src/CONTENTS

@@ -1,13 +1,6 @@
 For each package you want to create, you should create a subdirectory here
-named after the package Maven name "orgId:artifactId:version", eg.
-
-./commons-collections:commons-collections:3.2/
+named after the package name itself.
 
 In that directory, place all the source files "verbatim" (as checked out from
-the original source repository).
-
-You can create any other directory for your convenience here. In case of git-
-tracked projects, for example, you can clone the whole repository and copy the
-version you want to build in orgId_artifactId_version.
-
-Please note that .gitignore files are honored!
+the original source repository, ideally in a different subdirectory)
+plus any additional files you might need for the build.

data/spec/lib/project_spec.rb

@@ -31,7 +31,7 @@ describe Gjp::Project do
 
       expect {
         Gjp::Project.find_project_dir(File.expand_path("..", @project_path)).should raise_error
-      }.to raise_error(ArgumentError)
+      }.to raise_error(Gjp::NotGjpDirectoryException)
     end
   end
 
@@ -51,21 +51,14 @@ describe Gjp::Project do
     end
   end
 
-  describe "#set_status" do
-    it "stores a project's status flag" do
+  describe "#is_dry_running" do
+    it "checks if a project is dry running" do
       @project.from_directory do
-        @project.set_status :dry_running
-        File.exists?(".dry_running").should be_true
-     end
-    end
-  end
-
-  describe "#get_status" do
-    it "gets a project's status flag" do
-      @project.from_directory do
-        @project.get_status.should be_nil
-        @project.set_status :dry_running
-        @project.get_status.should eq :dry_running
+        @project.is_dry_running.should be_false
+        @project.dry_run
+        @project.is_dry_running.should be_true
+        @project.finish
+        @project.is_dry_running.should be_false
       end
     end
   end
@@ -78,7 +71,7 @@ describe Gjp::Project do
          @project.take_snapshot "test", :revertable
 
         `git rev-list --all`.split("\n").length.should eq 2
-         @project.latest_tag(:revertable).should eq "gjp_revertable_1"
+         @project.latest_tag(:revertable).should eq "revertable_1"
       end
     end
   end
@@ -100,14 +93,14 @@ describe Gjp::Project do
       end
 
       @project.finish.should be_true
-      @project.get_status.should be_nil
+      @project.is_dry_running.should be_false
 
       @project.from_directory do
-        `git rev-list --all`.split("\n").length.should eq 6
+        `git rev-list --all`.split("\n").length.should eq 5
         File.read("src/abc/test").should eq "A\n"
         File.readlines(File.join("file_lists", "abc_output")).should include("test2\n")
 
-        `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should_not include("src/abc/test2")
+        `git diff-tree --no-commit-id --name-only -r HEAD~`.split("\n").should_not include("src/abc/test2")
         File.exists?("src/abc/test2").should be_false
       end
     end
@@ -124,7 +117,7 @@ describe Gjp::Project do
       @project.dry_run.should be_true
 
       @project.from_directory do
-        @project.get_status.should eq :dry_running
+        @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")
       end

data/spec/lib/{scaffolder_spec.rb → spec_generator_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gjp::Scaffolder do
+describe Gjp::SpecGenerator do
   before(:each) do
     @project_path = File.join("spec", "data", "test-project")
     Dir.mkdir(@project_path)
@@ -15,8 +15,9 @@ describe Gjp::Scaffolder do
       test_file = File.join("kit", "test")
       File.open(test_file, "w") { |io| io.puts "kit content test file" }
     end
+    @project.finish
 
-    @scaffolder = Gjp::Scaffolder.new(@project)
+    @spec_generator = Gjp::SpecGenerator.new(@project)
   end
 
   after(:each) do
@@ -24,21 +25,18 @@ describe Gjp::Scaffolder do
   end
 
   describe "#generate_kit_spec" do
-    it "scaffolds the first version" do
-      @project.dry_run
-      @project.finish
-
-      @scaffolder.generate_kit_spec.should be_true
+    it "generates the first version" do
+      @spec_generator.generate_kit_spec.should be_true
 
       @project.from_directory 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("Version:        #{`git rev-parse --short #{@project.latest_tag(:dry_run_finished)}`}")
+        spec_lines.should include("Version:        1\n")
         spec_lines.should include("Source0:        %{name}.tar.xz\n")
       end
     end
-    it "scaffolds a second version" do
-      @scaffolder.generate_kit_spec.should be_true
+    it "generates a second version" do
+      @spec_generator.generate_kit_spec.should be_true
       @project.dry_run
       Dir.chdir(@project_path) do
         test_file = File.join("kit", "test")
@@ -50,18 +48,18 @@ describe Gjp::Scaffolder do
       end
       @project.finish
 
-      @scaffolder.generate_kit_spec.should be_true
+      @spec_generator.generate_kit_spec.should be_true
 
       @project.from_directory 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("Version:        #{`git rev-parse --short #{@project.latest_tag(:dry_run_finished)}`}")
+        spec_lines.should include("Version:        2\n")
         spec_lines.should include("Source0:        %{name}.tar.xz\n")
         spec_lines.should include("nonconflicting line\n")
       end
     end
-    it "scaffolds a conflicting version" do
-      @scaffolder.generate_kit_spec.should be_true
+    it "generates a conflicting version" do
+      @spec_generator.generate_kit_spec.should be_true
       @project.dry_run
       Dir.chdir(@project_path) do
         test_file = File.join("kit", "test")
@@ -76,21 +74,22 @@ describe Gjp::Scaffolder do
           io.write(spec_contents)
         end
       end
+      @project.finish
 
-      @scaffolder.generate_kit_spec.should be_true
+      @spec_generator.generate_kit_spec.should be_true
 
       @project.from_directory 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("CONFLICTING!\n")
-        spec_lines.should_not include("Version:        #{`git rev-parse --short #{@project.latest_tag(:dry_run_finished)}`}")
+        spec_lines.should_not include("Version:        2\n")
       end
     end
   end
 
   describe "#generate_package_spec" do
-    it "scaffolds the first version" do
+    it "generates the first version" do
 
       @project.from_directory do
         FileUtils.mkdir_p File.join("src", "test", "out")
@@ -110,7 +109,7 @@ describe Gjp::Scaffolder do
         @project.finish
       end
 
-      @scaffolder.generate_package_spec "test", File.join("spec", "data", "nailgun", "pom.xml"), "*.jar"
+      @spec_generator.generate_package_spec "test", File.join("spec", "data", "nailgun", "pom.xml"), "*.jar"
 
       @project.from_directory do
         spec_lines = File.readlines(File.join("specs", "test.spec"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
   prerelease: 
 platform: ruby
 authors:
@@ -155,10 +155,11 @@ files:
 - Rakefile
 - bin/gjp
 - gjp.gemspec
-- integration-tests/commons-io.sh
+- integration-tests/commons-collections.sh
 - lib/gjp.rb
 - lib/gjp/archiver.rb
 - lib/gjp/cli.rb
+- lib/gjp/git.rb
 - lib/gjp/limited_network_user.rb
 - lib/gjp/logger.rb
 - lib/gjp/maven_runner.rb
@@ -168,9 +169,9 @@ files:
 - lib/gjp/pom.rb
 - lib/gjp/pom_getter.rb
 - lib/gjp/project.rb
-- lib/gjp/scaffolder.rb
 - lib/gjp/source_address_getter.rb
 - lib/gjp/source_getter.rb
+- lib/gjp/spec_generator.rb
 - lib/gjp/template_manager.rb
 - lib/gjp/version.rb
 - lib/gjp/version_matcher.rb
@@ -178,7 +179,6 @@ files:
 - lib/template/file_lists/CONTENTS
 - lib/template/kit.spec
 - lib/template/kit/CONTENTS
-- lib/template/kit/README.SUSE
 - lib/template/kit/m2/settings.xml
 - lib/template/package.spec
 - lib/template/specs/CONTENTS
@@ -207,9 +207,9 @@ files:
 - spec/lib/pom_getter_spec.rb
 - spec/lib/pom_spec.rb
 - spec/lib/project_spec.rb
-- spec/lib/scaffolder_spec.rb
 - spec/lib/source_address_getter_spec.rb
 - spec/lib/source_getter_spec.rb
+- spec/lib/spec_generator_spec.rb
 - spec/lib/template_manager_spec.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb
@@ -263,9 +263,9 @@ test_files:
 - spec/lib/pom_getter_spec.rb
 - spec/lib/pom_spec.rb
 - spec/lib/project_spec.rb
-- spec/lib/scaffolder_spec.rb
 - spec/lib/source_address_getter_spec.rb
 - spec/lib/source_getter_spec.rb
+- spec/lib/spec_generator_spec.rb
 - spec/lib/template_manager_spec.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb

data/lib/template/kit/README.SUSE

@@ -1,4 +0,0 @@
-Contents of this package are automatically packaged by the gjp program in order
-to build other Java packages from source. They are not needed after rpm files
-are created, so this package should only be used by the Build Service and
-should never be installed on end users' systems.