gjp 0.11.2 → 0.13.1

data/.gitignore

@@ -15,6 +15,7 @@ tmp
 # SPEC generated files
 spec/data/nailgun/com.martiansoftware\:nailgun-all\:0.9.1
 spec/data/struts-apps/org.apache.struts\:struts2-apps\:
+spec/data/test-project
 
 # YARD artifacts
 .yardoc

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Silvio Moioli and Duncan Mac-Vicar Prett.
+Copyright (c) 2013 SUSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -24,6 +24,7 @@ Currently available tools:
 * `gjp finish` marks the end of a phase;
 * `gjp dry-run` starts a new dry-run phase, where you attempt to build your package. Any change to src/ will be reverted after you call `gjp finish`;
 * `gjp mvn` locates and runs Maven from any directory in kit/, using options to force repository in kit/m2 and settings in kit/m2/settings.xml;
+* `gjp scaffold-kit-spec` creates or refreshes a spec file for the kit package;
 * `gjp set-up-nonet-user` sets up a user named `nonet` without Internet access using `iptables`, needs superuser privileges. You can then use it for networkless dry-runs;
 * `gjp tear-down-nonet-user` removes a user previously created by gjp;
 * `gjp scaffold-jar-table DIRECTORY` looks for jars in the project's DIRECTORY and classifies them as build-time dependencies (b), run-time dependencies (r) or products (p);

data/lib/gjp/archiver.rb

@@ -0,0 +1,49 @@
+# encoding: UTF-8
+
+module Gjp
+  # generates file archives that accompany spec files
+  class Archiver
+    include Logger
+
+    def initialize(project)
+      @project = project
+    end
+
+    # generates an archive for the project's kit package based on
+    # its file list
+    def archive_kit
+      list_file = File.join(@project.full_path, "file_lists/kit")
+      if not File.exist? list_file
+        return false
+      end
+      destination_file = File.join(@project.full_path, "archives/#{@project.name}-kit.tar.xz")
+
+      @project.from_directory "kit" do
+        archive list_file, destination_file
+      end
+      
+      true
+    end
+
+    # generates an archive for a project's source package based on
+    # its file list
+    def archive_src(name)
+      list_file = File.join(@project.full_path, "file_lists/#{name}_input")
+      if not File.exist? list_file
+        return false
+      end
+      destination_file = File.join(@project.full_path, "archives/#{@project.name}-#{name}.tar.xz")
+
+      @project.from_directory File.join("src", name) do
+        archive list_file, destination_file
+      end
+
+      true
+    end
+
+    # compresses files specified in the list file to the destination file
+    def archive(list_file, destination_file)
+      `tar --files-from=#{list_file} -cJf #{destination_file}`
+    end
+  end
+end

data/lib/gjp/cli.rb

@@ -82,8 +82,12 @@ module Gjp
       end
 
       def execute
-        project = Gjp::Project.new(".")
-        Gjp::MavenRunner.new(project).mvn(@maven_options)
+        begin
+          project = Gjp::Project.new(".")
+          Gjp::MavenRunner.new(project).mvn(@maven_options)
+        rescue Gjp::MavenNotFoundException
+          puts "mvn executable not found in kit/ or any of its subdirectories, gather it"
+        end
       end
     end
 
@@ -105,6 +109,41 @@ module Gjp
       end
     end
 
+    subcommand "scaffold-kit-spec", "Scaffolds or refreshes a spec file for the kit package" do
+      def execute
+        project = Gjp::Project.new(".")
+        success = Gjp::Scaffolder.new(project).scaffold_kit_spec        
+        if not success
+          puts "You must be gathering before scaffolding."
+          puts "Use \"gjp gather\" to start a new gathering."
+        end
+      end
+    end
+
+    subcommand "generate-kit-archive", "Archives contents of the kit package in a tarball" do
+      def execute
+        project = Gjp::Project.new(".")
+        success = Gjp::Archiver.new(project).archive_kit
+        if not success
+          "The file_list/kit file was not found. Ensure you already added content to kit/ " +
+          "during a gathering and/or dry-running phase, and ensure you ended that phase " +
+          "with \"gjp finish\"."
+        end
+      end
+    end
+
+    subcommand "generate-src-archive", "Archives contents of one src package in a tarball" do
+      parameter "NAME", "name of a package in src/"
+      def execute
+        project = Gjp::Project.new(".")
+        success = Gjp::Archiver.new(project).archive_src name
+        if not success
+          "The file_list/#{name}_input file was not found. Ensure you already added content to " +
+          "src/#{name} during a gathering phase, and ensure you ended that phase with \"gjp finish\"."
+        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")

data/lib/gjp/maven_runner.rb

@@ -23,6 +23,7 @@ module Gjp
         end
       end
 
+      log.debug("Maven executable not found")
       nil
     end
 
@@ -31,11 +32,13 @@ module Gjp
       prefix = path_from running_full_path, kit_full_path
       maven_executable = find_maven_executable
 
-      mvn_path = File.join(prefix, maven_executable)
-      repo_path = File.join(prefix, "kit", "m2")
-      config_path = File.join(prefix, "kit", "m2", "settings.xml")
+      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=`readlink -e #{repo_path}` -s`readlink -e #{config_path}`"
+        "#{mvn_path} -Dmaven.repo.local=`readlink -e #{repo_path}` -s`readlink -e #{config_path}`"
+      end
     end
 
     # returns a path from origin to destination, provided they are both absolute
@@ -47,7 +50,14 @@ module Gjp
     def mvn(options)
       kit_full_path = File.join(@project.full_path, "kit")
       running_full_path = File.expand_path(".")
-      Process.wait(Process.spawn("#{get_maven_commandline(kit_full_path, running_full_path)} #{options.join(' ')}"))
+      maven_commandline = get_maven_commandline(kit_full_path, running_full_path)
+      if maven_commandline == nil
+        raise MavenNotFoundException
+      end
+      Process.wait(Process.spawn("#{maven_commandline} #{options.join(' ')}"))
     end
   end
+
+  class MavenNotFoundException < Exception
+  end
 end

data/lib/gjp/project.rb

@@ -42,9 +42,12 @@ module Gjp
           `git init`
         end
 
-        copy_from_template "file_lists", "."
-        copy_from_template "src", "."
-        copy_from_template "kit", "."
+        template_manager = Gjp::TemplateManager.new
+        template_manager.copy "archives", "."
+        template_manager.copy "file_lists", "."
+        template_manager.copy "kit", "."
+        template_manager.copy "specs", "."
+        template_manager.copy "src", "."
 
         `git add .`
         `git commit -m "Project initialized"`
@@ -54,11 +57,6 @@ module Gjp
       end
     end
 
-    # copies a file/dir from the template directory to the destination directory
-    def self.copy_from_template(template_file, destination_dir)
-      FileUtils.cp_r(File.join(File.dirname(__FILE__), "..", "template", template_file), destination_dir)
-    end
-
     # starts a gathering phase, all files added to the project
     # will be added to packages (including kit)
     def gather
@@ -71,7 +69,7 @@ module Gjp
         end
 
         set_status :gathering
-        take_snapshot "Gathering started", :revertable
+        take_snapshot "Gathering started", :gathering_started
       end
 
       true
@@ -90,7 +88,7 @@ module Gjp
         end
 
         set_status :dry_running
-        take_snapshot "Dry-run started", :revertable
+        take_snapshot "Dry-run started", :dry_run_started
       end
 
       true
@@ -104,41 +102,45 @@ module Gjp
         if status == :gathering
           take_snapshot "Changes during gathering"
 
-          update_changed_file_list("kit", "kit")
-          update_changed_src_file_list(:input)
+          update_changed_file_list "kit", "kit", :gathering_started
+          update_changed_src_file_list :input, :gathering_started
           take_snapshot "File list updates"
 
           set_status nil
-          take_snapshot "Gathering finished", :revertable
+          take_snapshot "Gathering finished", :gathering_finished
 
           :gathering
         elsif status == :dry_running
           take_snapshot "Changes during dry-run"
 
-          update_changed_file_list("kit", "kit")
-          update_changed_src_file_list(:output)
+          update_changed_file_list "kit", "kit", :dry_run_started
+          update_changed_src_file_list :output, :dry_run_started
           take_snapshot "File list updates"
 
-          revert("src")
+          revert "src", :dry_run_started
           take_snapshot "Sources reverted as before dry-run"
 
           set_status nil
-          take_snapshot "Dry run finished", :revertable
+          take_snapshot "Dry run finished", :dry_run_finished
 
           :dry_running
         end
       end
     end
 
-    def update_changed_src_file_list(list_name)
+    # updates one of the files that tracks changes in src/ directories form a certain tag
+    # list_name is the name of the list of files to update, there will be one for each
+    # package in src/
+    def update_changed_src_file_list(list_name, tag)
       Dir.foreach("src") do |entry|
         if File.directory?(File.join(Dir.getwd, "src", entry)) and entry =~ /([^:\/]+:[^:]+:[^:]+)$/
-          update_changed_file_list(File.join("src", entry), "#{$1}_#{list_name.to_s}")
+          update_changed_file_list(File.join("src", entry), "#{$1}_#{list_name.to_s}", tag)
         end
       end
     end
 
-    def update_changed_file_list(directory, file_name)
+    # updates file_name with the file names changed in directory since tag
+    def update_changed_file_list(directory, file_name, tag)
       list_file = File.join("file_lists", file_name)
       tracked_files = if File.exists?(list_file)
         File.readlines(list_file)
@@ -147,7 +149,7 @@ module Gjp
       end
 
       new_tracked_files = (
-        `git diff-tree --no-commit-id --name-only -r HEAD`.split("\n")
+        `git diff-tree --no-commit-id --name-only -r #{latest_tag(tag)} HEAD`.split("\n")
         .select { |file| file.start_with?(directory) }
         .map { |file|file[directory.length + 1, file.length]  }
         .concat(tracked_files)
@@ -157,7 +159,6 @@ module Gjp
 
       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
@@ -167,34 +168,34 @@ module Gjp
 
     # adds the project's whole contents to git
     # if tag is given, commit is tagged
-    def take_snapshot(message, revertability = :not_revertable)
+    def take_snapshot(message, tag = nil)
       log.debug "committing with message: #{message}"
 
       `git rm -r --cached .`
       `git add .`
       `git commit -m "#{message}"`
 
-      if revertability == :revertable
-        latest_count = if latest_snapshot_name =~ /^gjp_revertable_snapshot_([0-9]+)$/
+      if tag != nil
+        latest_count = if latest_tag(tag) =~ /^gjp_.*_([0-9]+)$/
           $1
         else
           0
         end
-        `git tag gjp_revertable_snapshot_#{$1.to_i + 1}`
+        `git tag gjp_#{tag}_#{latest_count.to_i + 1}`
       end
     end
 
-    # returns the last snapshot git tag name
-    def latest_snapshot_name
-      `git describe --abbrev=0 --tags --match=gjp_revertable_snapshot_*`.strip
+    # returns the last tag given in a gjp snapshot
+    def latest_tag(tag)
+      `git describe --abbrev=0 --tags --match=gjp_#{tag}_*`.strip
     end
 
-    # reverts dir contents as commit_count commits ago
-    def revert(dir)
-      `git rm -rf --ignore-unmatch #{dir}`
-      `git checkout -f #{latest_snapshot_name} -- #{dir}`
+    # 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 #{dir}`
+      `git clean -f -d #{path}`
     end
 
     # returns a symbol with the current status
@@ -233,11 +234,25 @@ module Gjp
       ".#{status.to_s}"
     end
 
-    # runs a block from the project directory
-    def from_directory
-      Dir.chdir(@full_path) do
+    # runs a block from the project directory or a subdirectory
+    def from_directory(subdirectory = "")
+      Dir.chdir(File.join(@full_path, subdirectory)) do
         yield
       end
     end
+
+    # helpers for ERB
+
+    def name
+      File.basename(@full_path)
+    end
+
+    def version
+      `git rev-parse --short #{latest_tag(:dry_run_finished)}`.strip
+    end
+
+    def get_binding
+      binding
+    end
   end
 end

data/lib/gjp/scaffolder.rb

@@ -0,0 +1,42 @@
+# encoding: UTF-8
+
+module Gjp
+  # creates and updates spec files
+  class Scaffolder
+    include Logger
+
+    def initialize(project)
+      @project = project
+    end
+
+    def scaffold_kit_spec
+      if @project.get_status != :gathering
+        return false
+      end
+
+      @project.from_directory do
+        spec_path = File.join("specs", "#{@project.name}-kit.spec")
+
+        TemplateManager.new.generate "kit.spec", @project.get_binding, "#{spec_path}.new_scaffold"
+
+        already_scaffolded = @project.latest_tag(:scaffold_kit_spec) != ""
+        already_existing = File.exist? spec_path
+
+        if already_scaffolded and already_existing
+          # 3-way merge
+          `git show #{@project.latest_tag(:scaffold_kit_spec)}:#{spec_path} > #{spec_path}.old_scaffold`
+          `git merge-file --ours #{spec_path} #{spec_path}.old_scaffold #{spec_path}.new_scaffold`
+          File.delete "#{spec_path}.new_scaffold"
+          File.delete "#{spec_path}.old_scaffold"
+        else
+          # just replace
+          File.rename "#{spec_path}.new_scaffold", spec_path
+        end
+
+        @project.take_snapshot "Kit spec scaffolded", :scaffold_kit_spec
+
+        true
+      end
+    end
+  end
+end

data/lib/gjp/template_manager.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+
+require "erb"
+
+module Gjp
+  # operates on files in template/
+  class TemplateManager
+    include Logger
+
+    attr_reader :template_path
+
+    def initialize
+      @template_path = File.join(File.dirname(__FILE__), "..", "template")
+    end
+
+    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)
+      erb = ERB.new File.read(File.join(template_path, template_name))
+      File.open(destination_path, "w") { |io| io.write erb.result(object_binding) }
+    end
+  end
+end

data/lib/gjp/version.rb

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

data/lib/gjp.rb

@@ -1,5 +1,6 @@
 require "gjp/version"
 require "gjp/logger"
+require "gjp/template_manager"
 require "gjp/project"
 require "gjp/pom"
 require "gjp/version_matcher"
@@ -11,5 +12,7 @@ require "gjp/source_address_getter"
 require "gjp/source_getter"
 require "gjp/parent_pom_getter"
 require "gjp/maven_runner"
+require "gjp/scaffolder"
+require "gjp/archiver"
 
 require "gjp/cli"

data/lib/template/archives/CONTENTS

@@ -0,0 +1,3 @@
+gjp will generate source archives for packages here.
+
+Those should not be edited by hand, rather you can edit which files get included by editing contents of the file_lists/ direcotry, and the files themselves from the kit and src/<package name> folders.

data/lib/template/kit.spec

@@ -0,0 +1,51 @@
+#
+# spec file for gjp kit for project "<%= name %>"
+#
+# Copyright (c) <%= Time.now.year %> <%= Etc.getlogin %>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+Name:           <%= name %>-kit
+Version:        <%= version %>
+Release:        1
+License:        Apache-2.0
+Summary:        Build-time dependencies for %{name}
+Url:            https://github.com/SilvioMoioli/gjp
+Group:          Develompent/Libraries/Java
+Source0:        %{name}.tar.xz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Provides:       gjp(kit)
+# no two kits should ever be installed at any given time
+Conflicts:      otherproviders(gjp(kit))
+
+%description
+This package has been automatically created by gjp in order to
+satisfy build time dependencies of some Java packages. It should
+not be used except for rebuilding those packages and it should never
+be installed on end users' systems.
+
+%prep
+%setup -q
+
+%build
+# nothing to do, gjp kits are precompiled by design
+
+%install
+install -d -m 0755 %{buildroot}%{_datadir}/gjp/%{name}/
+cp -a * %{buildroot}%{_datadir}/gjp/%{name}/
+
+%files
+%defattr(-,root,root)
+%{_datadir}/gjp/%{name}/
+
+%changelog

data/lib/template/specs/CONTENTS

@@ -0,0 +1,3 @@
+gjp will generate spec files for all packages here.
+
+You can edit them manually, if you wish, and also let gjp regenerate them later. If you do that, gjp will use three-way merge if possible (prompting in case any conflict arise).

data/spec/lib/archiver_spec.rb

@@ -0,0 +1,60 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gjp::Archiver 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)
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(@project_path)
+  end
+
+  let(:archiver) { Gjp::Archiver.new(@project) }
+
+  describe "#archive" do
+    it "archives a list of files" do
+      @project.from_directory do
+        File.open("test", "w") { |io| io.puts "test content" }
+        File.open("test_list", "w") { |io| io.puts "test" }
+
+        archiver.archive "test_list", "test.tar.xz"
+        `tar -Jtf test.tar.xz`.split.should include("test")
+      end
+    end
+  end
+
+  describe "#archive_kit" do
+    it "archives a kit package files" do
+      @project.from_directory do
+        File.open(File.join("kit","kit_test"), "w") { |io| io.puts "test content" }
+      end
+      @project.finish
+
+      archiver.archive_kit
+      @project.from_directory do
+        `tar -Jtf archives/test-project-kit.tar.xz`.split.should include("kit_test")
+      end
+    end
+  end
+
+  describe "#archive_src" do
+    it "archives a source package files" do
+      @project.from_directory do
+        Dir.mkdir(File.join("src", "a:b:c"))
+        File.open(File.join("src", "a:b:c", "src_test"), "w") { |io| io.puts "test content" }
+      end
+      @project.finish
+
+      archiver.archive_src "a:b:c"
+      @project.from_directory do
+        `tar -Jtf archives/test-project-a:b:c.tar.xz`.split.should include("src_test")
+      end
+    end
+  end
+end

data/spec/lib/maven_runner_spec.rb

@@ -10,19 +10,6 @@ describe Gjp::MavenRunner do
 
     Gjp::Project.init(@project_path)
     @project = Gjp::Project.new(@project_path)
-    @project.gather
-
-    # mock a 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
-
-    @project.finish
-
     @maven_runner = Gjp::MavenRunner.new(@project)
   end
 
@@ -31,26 +18,56 @@ describe Gjp::MavenRunner do
   end
 
   describe "#find_maven_executable"  do
-    it "looks for Maven in kit" 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
       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`"
     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
+    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
+    @project.gather
+    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
+
+    @project.finish
   end
 end

data/spec/lib/project_spec.rb

@@ -50,7 +50,7 @@ describe Gjp::Project do
       Dir.exists?(src_path).should be_true
 
       @project.from_directory do
-        @project.latest_snapshot_name.should eq "gjp_revertable_snapshot_1"
+        @project.latest_tag(:gathering_started).should eq "gjp_gathering_started_1"
         `git rev-list --all`.split("\n").length.should eq 2
       end
 
@@ -85,7 +85,7 @@ describe Gjp::Project do
          @project.take_snapshot "test", :revertable
 
         `git rev-list --all`.split("\n").length.should eq 3
-         @project.latest_snapshot_name.should eq "gjp_revertable_snapshot_2"
+         @project.latest_tag(:revertable).should eq "gjp_revertable_1"
       end
     end
   end

data/spec/lib/scaffolder_spec.rb

@@ -0,0 +1,94 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gjp::Scaffolder 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.dry_run
+    Dir.chdir(@project_path) do
+      test_file = File.join("kit", "test")
+      File.open(test_file, "w") { |io| io.puts "kit content test file" }
+    end
+    @project.gather
+
+    @scaffolder = Gjp::Scaffolder.new(@project)
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(@project_path)
+  end
+
+  describe "#scaffold_kit_spec" do
+    it "scaffolds the first version" do
+      @scaffolder.scaffold_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("Source0:        %{name}.tar.xz\n")
+      end
+    end
+    it "scaffolds a second version" do
+      @scaffolder.scaffold_kit_spec.should be_true
+      @project.dry_run
+      Dir.chdir(@project_path) do
+        test_file = File.join("kit", "test")
+        File.open(test_file, "w") { |io| io.puts "changed kit content test file" }
+
+        File.open(File.join("specs", "test-project-kit.spec"), "a") do |io|
+          io.write("nonconflicting line")
+        end
+      end
+      @project.gather
+
+      @scaffolder.scaffold_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("Source0:        %{name}.tar.xz\n")
+        spec_lines.should include("nonconflicting line\n")
+      end
+    end
+    it "scaffolds a conflicting version" do
+      @scaffolder.scaffold_kit_spec.should be_true
+      @project.dry_run
+      Dir.chdir(@project_path) do
+        test_file = File.join("kit", "test")
+        File.open(test_file, "w") { |io| io.puts "changed kit content test file" }
+
+        spec_path = File.join("specs", "test-project-kit.spec")
+        spec_contents = File.read spec_path
+
+        spec_contents.gsub! /^Version:.*$/, "CONFLICTING!"
+
+        File.open(spec_path, "w+") do |io|
+          io.write(spec_contents)
+        end
+      end
+      @project.gather
+
+      @scaffolder.scaffold_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)}`}")
+      end
+    end
+    it "returns error if the phase is incorrect" do
+      @project.dry_run
+      @scaffolder.scaffold_kit_spec.should be_false
+    end
+  end
+end

data/spec/lib/template_manager_spec.rb

@@ -0,0 +1,53 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gjp::TemplateManager do
+  let(:template_manager) { Gjp::TemplateManager.new }
+
+  describe "#template_path" do
+    it "returns the pathname where all templates are stored" do
+      relative_path = template_manager.template_path
+
+      File.expand_path(relative_path).should eq File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "template"))
+    end
+  end
+
+  describe "#copy" do
+    it "copies a file from template to another dir" do
+      destination = Tempfile.new("TemplateManager spec")
+      destination_path = destination.path
+      destination.unlink
+
+      template_manager.copy(File.join("src", "CONTENTS"), destination_path)
+
+      File.exist?(destination_path)
+    end
+  end
+
+  describe "#generate" do
+    it "compiles a file from a template and a value objects file" do
+      template_path = File.join(template_manager.template_path, "test.erb")
+      File.open(template_path, "w") { |io| io.puts "Hello <%= world_property %>" }
+
+      destination = Tempfile.new("TemplateManager spec")
+      destination_path = destination.path
+      destination.unlink
+
+      class WorldClass        
+        def world_property
+          "World!"
+        end
+
+        def get_binding
+         binding
+        end
+      end
+
+      template_manager.generate("test.erb", WorldClass.new.get_binding, destination_path)
+      File.unlink(template_path)
+
+      File.read(destination_path).should eq "Hello World!\n"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,6 +156,7 @@ files:
 - bin/gjp
 - gjp.gemspec
 - lib/gjp.rb
+- lib/gjp/archiver.rb
 - lib/gjp/cli.rb
 - lib/gjp/jar_table.rb
 - lib/gjp/limited_network_user.rb
@@ -166,13 +167,18 @@ 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/template_manager.rb
 - lib/gjp/version.rb
 - lib/gjp/version_matcher.rb
+- lib/template/archives/CONTENTS
 - lib/template/file_lists/CONTENTS
+- lib/template/kit.spec
 - lib/template/kit/CONTENTS
 - lib/template/kit/m2/settings.xml
+- lib/template/specs/CONTENTS
 - lib/template/src/CONTENTS
 - spec/data/ant-super-simple-code/build.xml
 - spec/data/ant-super-simple-code/build/HW.class
@@ -190,6 +196,7 @@ files:
 - spec/data/nailgun/pom.xml
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
+- spec/lib/archiver_spec.rb
 - spec/lib/jar_table_spec.rb
 - spec/lib/limited_network_user_spec_interactive.rb
 - spec/lib/maven_runner_spec.rb
@@ -198,8 +205,10 @@ 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/template_manager_spec.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/SilvioMoioli/gjp
@@ -243,6 +252,7 @@ test_files:
 - spec/data/nailgun/pom.xml
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
+- spec/lib/archiver_spec.rb
 - spec/lib/jar_table_spec.rb
 - spec/lib/limited_network_user_spec_interactive.rb
 - spec/lib/maven_runner_spec.rb
@@ -251,7 +261,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/template_manager_spec.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb