gjp 0.14.1 → 0.15.7

data/README.md

@@ -16,17 +16,19 @@ Easiest install is via RubyGems:
 
 Main workflow subcommands:
 * `gjp init` inits a new gjp project in the current directory, generating minimal directories and files;
-* `gjp gather` starts a new gathering phase, to add files to the packages you want to create. You should place source files in src/<orgId:artifactId:version>, and binary dependency files in kit/;
-* `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 gather` starts a gathering phase, to add source and kit files. You should place source files in src/<package name> and binary dependency files in kit/;
+* `gjp dry-run` starts a dry-run phase, to attempt a build. Any change to src/ will be reverted after you call `gjp finish`;
+* `gjp mvn` during a dry run, 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 status` prints the current phase;
 * `gjp finish` ends the current phase;
-* `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. Use during dry runs;
-superuser privileges;
-* `gjp generate-kit-spec` creates or refreshes a spec file for the kit package. Use when you are finished gathering and dry-running;
-* `gjp generate-kit-archive` creates or refreshes an archive file for the kit package. Use when you are finished gathering and dry-running;
-* `gjp generate-source-archive NAME` creates or refreshes an archive file for source package NAME. Use when you are finished gathering and dry-running;
+* `gjp generate-kit-spec` creates or refreshes a spec file for the kit. Use after `gjp finish`;
+* `gjp generate-kit-archive` creates or refreshes an archive file for the kit. Use after `gjp finish`;
+* `gjp generate-package-spec NAME POM` creates or refreshes a spec file for the package in src/<NAME>. Use after `gjp finish`;
+* `gjp generate-package-archive NAME` creates or refreshes an archive file for package in src/<NAME>. Use after `gjp finish`;
 
 Optional workflow subcommands:
 * `gjp set-up-nonet-user` sets up a user named `nonet` without Internet access you can use for networkless dry runs. Requires `iptables` and 
+superuser privileges;
 * `gjp tear-down-nonet-user` removes a user previously created by gjp;
 
 Other available tools:

data/lib/gjp.rb

@@ -12,6 +12,7 @@ require "gjp/source_address_getter"
 require "gjp/source_getter"
 require "gjp/parent_pom_getter"
 require "gjp/maven_runner"
+require "gjp/package_spec_adapter"
 require "gjp/scaffolder"
 require "gjp/archiver"
 

data/lib/gjp/archiver.rb

@@ -27,12 +27,12 @@ module Gjp
 
     # generates an archive for a project's source package based on
     # its file list
-    def archive_src(name)
+    def archive_package(name)
       list_file = File.join(@project.full_path, "file_lists/#{name}_input")
       if not File.exist? list_file
         return nil
       end
-      destination_file = File.join(@project.full_path, "archives/#{@project.name}-#{name}.tar.xz")
+      destination_file = File.join(@project.full_path, "archives/#{name}.tar.xz")
 
       @project.from_directory File.join("src", name) do
         archive list_file, destination_file

data/lib/gjp/cli.rb

@@ -40,30 +40,30 @@ module Gjp
       def execute
         Gjp::Project.init(".")
         puts "Project inited, now gathering."
-        puts "Any file added to kit/ will be added to the kit package."
-        puts "Any file added to src/<orgId_artifactId_version> will be added to the corresponding package."
-        puts "Note that .gitignore files are honored!"
-        puts "When you are ready to test a dry-run build, use \"gjp dry-run\"."
+        explain_gathering
       end
     end
 
-    subcommand "gather", "Starts a gathering phase, add source and kit files to project" do
+    subcommand "gather", "Starts a gathering phase, to add source and kit files" do
       def execute
         if Gjp::Project.new(".").gather
           puts "Now gathering."
-          puts "Any file added to kit/ will be added to the kit package."
-          puts "Any file added to src/<orgId_artifactId_version> will be added to the corresponding package."
-          puts "Note that .gitignore files are honored!"
-          puts "When you are ready to test a dry-run build, use \"gjp dry-run\"."
+          explain_gathering
         end
       end
     end
 
-    subcommand "dry-run", "Starts a dry-run phase, attempt build to add dependencies to kit." do
+    def explain_gathering
+      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
+
+    subcommand "dry-run", "Starts a dry-run phase, to attempt a 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 package."
+          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 a Maven from the kit, use \"gjp mvn\"."
@@ -73,7 +73,7 @@ module Gjp
       end
     end
 
-    subcommand "mvn", "Runs Maven from the kit" do
+    subcommand "mvn", "Locates and runs Maven from any directory in kit/" do
       parameter "[MAVEN OPTIONS] ...", "mvn options", :attribute_name => "dummy"
 
       # override parsing in order to pipe everything to mvn
@@ -84,7 +84,9 @@ module Gjp
       def execute
         begin
           project = Gjp::Project.new(".")
-          Gjp::MavenRunner.new(project).mvn(@maven_options)
+          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, gather it"
         end
@@ -97,7 +99,7 @@ module Gjp
       end
     end
 
-    subcommand "finish", "Finishes the current phase" do
+    subcommand "finish", "Ends the current phase" do
       def execute
         result = Gjp::Project.new(".").finish        
         if result == :gathering
@@ -109,15 +111,15 @@ module Gjp
       end
     end
 
-    subcommand "generate-kit-spec", "Scaffolds or refreshes a spec file for the kit package" do
+    subcommand "generate-kit-spec", "Scaffolds or refreshes a spec file for the kit" do
       def execute
         project = Gjp::Project.new(".")
-        result_path = Gjp::Scaffolder.new(project).scaffold_kit_spec
+        result_path = Gjp::Scaffolder.new(project).generate_kit_spec
         puts "#{result_path} generated"
       end
     end
 
-    subcommand "generate-kit-archive", "Archives contents of the kit package in a tarball" do
+    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
@@ -131,15 +133,31 @@ module Gjp
       end
     end
 
-    subcommand "generate-src-archive", "Archives contents of one src package in a tarball" do
-      parameter "NAME", "name of a package in src/"
+    subcommand "generate-package-spec", "Scaffolds 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\"."
+        end
+      end
+    end
+
+    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_src name
+        result_path = Gjp::Archiver.new(project).archive_package name
         if result_path != nil
           puts "#{result_path} generated"
         else
-          "The file_list/#{name}_input file was not found. Ensure you already added content to " +
+          "The file_list/#{name}_input file was not found. Ensure you have already added content to " +
           "src/#{name} during a gathering phase, and ensure you ended that phase with \"gjp finish\"."
         end
       end

data/lib/gjp/maven_runner.rb

@@ -54,7 +54,12 @@ module Gjp
       if maven_commandline == nil
         raise MavenNotFoundException
       end
-      Process.wait(Process.spawn("#{maven_commandline} #{options.join(' ')}"))
+
+      full_commandline = "#{maven_commandline} #{options.join(' ')}"
+      log.debug full_commandline
+
+      Process.wait(Process.spawn(full_commandline))
+      full_commandline
     end
   end
 

data/lib/gjp/package_spec_adapter.rb

@@ -0,0 +1,47 @@
+  # encoding: UTF-8
+
+module Gjp
+  # encapsulates details of a package needed by the spec file
+  # retrieving them from other objects
+  class PackageSpecAdapter
+    attr_reader :name
+    attr_reader :version
+    attr_reader :license
+    attr_reader :summary
+    attr_reader :url
+    attr_reader :project_name
+    attr_reader :group_id
+    attr_reader :artifact_id
+    attr_reader :version
+    attr_reader :runtime_dependency_ids
+    attr_reader :description
+    attr_reader :outputs
+
+    def initialize(project, package_name, pom, filter)
+      @name = package_name
+      @version = pom.version
+      @license = pom.license_name
+      clean_description = pom.description.gsub(/[\s]+/, ' ').strip
+      @summary = clean_description[0..60].gsub(/\s\w+$/, '...')
+      @url = pom.url
+      @project_name = project.name
+      @group_id = pom.group_id
+      @artifact_id = pom.artifact_id
+      @version = pom.version
+      @runtime_dependency_ids = pom.runtime_dependency_ids
+      @description = clean_description
+
+      output_list = File.join(project.full_path, "file_lists", "#{@name}_output")
+      @outputs = File.open(output_list).readlines.map do |line|
+        line.strip
+      end.select do |line|
+        File.fnmatch? filter, File.basename(line.strip)
+      end
+    end
+
+    def get_binding
+      binding
+    end
+  end
+end
+

data/lib/gjp/pom.rb

@@ -30,6 +30,24 @@ module Gjp
       @doc.xpath("project/version/text()").to_s
     end
 
+    def description
+      @doc.xpath("project/description/text()").to_s
+    end
+
+    def url
+      @doc.xpath("project/url/text()").to_s
+    end
+
+    def license_name
+      @doc.xpath("project/licenses/license/name/text()").to_s
+    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]
+      end
+    end
+
     def parent_group_id
       @doc.xpath("project/parent/groupId/text()").to_s
     end

data/lib/gjp/project.rb

@@ -77,7 +77,7 @@ module Gjp
 
     # starts a dry running phase: files added to the kit will
     # be added to packages, while sources will be reset at the
-    # end
+    # current state when finished
     def dry_run
       from_directory do
         status = get_status
@@ -130,11 +130,11 @@ module Gjp
 
     # 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/
+    # package (subdirectory) 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}", tag)
+        if File.directory?(File.join(Dir.getwd, "src", entry)) and entry != "." and entry != ".."
+          update_changed_file_list(File.join("src", entry), "#{entry}_#{list_name.to_s}", tag)
         end
       end
     end
@@ -143,7 +143,7 @@ module Gjp
     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)
+        File.readlines(list_file).map { |line| line.strip }
       else
         []
       end
@@ -151,10 +151,10 @@ module Gjp
       new_tracked_files = (
         `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]  }
+        .map { |file|file[directory.length + 1, file.length] }
         .concat(tracked_files)
-        .sort
         .uniq
+        .sort
       )
 
       log.debug("writing file list for #{directory}: #{new_tracked_files.to_s}")
@@ -171,7 +171,7 @@ module Gjp
     def take_snapshot(message, tag = nil)
       log.debug "committing with message: #{message}"
 
-      `git rm -r --cached .`
+      `git rm -r --cached --ignore-unmatch .`
       `git add .`
       `git commit -m "#{message}"`
 

data/lib/gjp/scaffolder.rb

@@ -9,30 +9,52 @@ module Gjp
       @project = project
     end
 
-    def scaffold_kit_spec
-      @project.from_directory do
-        spec_path = File.join("specs", "#{@project.name}-kit.spec")
+    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
+    end
+
+    def generate_package_spec(name, pom, filter)
+      spec_path = File.join("specs", "#{name}.spec")
+
+      list_file = File.join(@project.full_path, "file_lists/#{name}_output")
+      if not File.exist? list_file
+        return nil
+      end
+
+      adapter = Gjp::PackageSpecAdapter.new(@project, name, Gjp::Pom.new(pom), filter)
 
-        TemplateManager.new.generate "kit.spec", @project.get_binding, "#{spec_path}.new_scaffold"
+      generate_merging "package.spec", adapter.get_binding, spec_path, "scaffold_#{name}_spec"
 
-        already_scaffolded = @project.latest_tag(:scaffold_kit_spec) != ""
-        already_existing = File.exist? spec_path
+      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)
+      @project.from_directory do
+        TemplateManager.new.generate template, binding, "#{result_path}.new_scaffold"
+
+        already_scaffolded = @project.latest_tag(tag) != ""
+        already_existing = File.exist? result_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"
+          `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"
         else
           # just replace
-          File.rename "#{spec_path}.new_scaffold", spec_path
+          File.rename "#{result_path}.new_scaffold", result_path
         end
 
-        @project.take_snapshot "Kit spec scaffolded", :scaffold_kit_spec
-
-        spec_path
+        @project.take_snapshot "Kit spec scaffolded", tag
       end
     end
+
   end
 end

data/lib/gjp/template_manager.rb

@@ -18,7 +18,7 @@ module Gjp
     end
 
     def generate(template_name, object_binding, destination_path)
-      erb = ERB.new File.read(File.join(template_path, template_name))
+      erb = ERB.new File.read(File.join(template_path, template_name)), nil, "<>"
       File.open(destination_path, "w") { |io| io.write erb.result(object_binding) }
     end
   end

data/lib/gjp/version.rb

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

data/lib/template/kit.spec

@@ -44,10 +44,12 @@ 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
 %{_datadir}/gjp/%{name}/
 

data/lib/template/kit/README.SUSE

@@ -0,0 +1,4 @@
+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.

data/lib/template/package.spec

@@ -0,0 +1,54 @@
+#
+# spec file for "<%= 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 %>
+Version:        <%= version %>
+Release:        1
+License:        <%= license %>
+Summary:        <%= summary %>
+Url:            <%= url %>
+Group:          Development/Libraries/Java
+Source0:        %{name}.tar.xz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  <%= project_name %>-kit
+BuildArch:      noarch
+Provides:       mvn(<%= group_id %>:<%= artifact_id %>) == <%= version %>
+<% runtime_dependency_ids.each do |dependency_id| %>
+Requires:       mvn(<%= dependency_id[0] %>:<%= dependency_id[1] %>) <% if dependency_id[3] != nil %>==<%= dependency_id[3] %><% end %>
+<% end %>
+
+%description
+<%= description %>
+
+%prep
+%setup -q -c
+
+%build
+./build.sh
+
+%install
+<% outputs.each do |output| %>
+cp -a <%= output %> %{buildroot}%{_javadir}/<%= File.basename(output) %>
+<% end %>
+
+%files
+%defattr(-,root,root)
+<% outputs.each do |output| %>
+cp -a <%= output %> %{buildroot}%{_javadir}/<%= File.basename(output) %>
+<% end %>
+
+%changelog

data/spec/lib/archiver_spec.rb

@@ -43,17 +43,17 @@ describe Gjp::Archiver do
     end
   end
 
-  describe "#archive_src" do
-    it "archives a source package files" do
+  describe "#archive_package" do
+    it "archives a 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"
+      archiver.archive_package "a:b:c"
       @project.from_directory do
-        `tar -Jtf archives/test-project-a:b:c.tar.xz`.split.should include("src_test")
+        `tar -Jtf archives/a:b:c.tar.xz`.split.should include("src_test")
       end
     end
   end

data/spec/lib/pom_spec.rb

@@ -3,55 +3,75 @@
 require 'spec_helper'
 
 describe Gjp::Pom do
-  [ File.join("spec", "data", "commons-logging", "pom.xml"),
-    'http://search.maven.org/remotecontent?filepath=commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom'].each do |loc|
+  let(:pom) { Gjp::Pom.new(File.join("spec", "data", "commons-logging", "pom.xml")) }
 
-    let(:pom) { Gjp::Pom.new(loc) }
+  describe "#connection_address" do
+    it "reads the SCM connection address" do
+      pom.connection_address.should eq "svn:http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
+    end
+
+    it "reads the SCM connection address from a remote repository" do
+      pom.connection_address.should eq "svn:http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
+    end
+  end
+
+  describe "#group_id" do
+    it "reads the group id" do
+      pom.group_id.should eq "commons-logging"
+    end
+  end
+
+  describe "#artifact_id" do
+    it "reads the artifact id" do
+      pom.artifact_id.should eq "commons-logging"
+    end
+  end
 
-    describe "#connection_address" do
-      it "reads the SCM connection address" do
-        pom.connection_address.should eq "svn:http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
-      end
+  describe "#version" do
+    it "reads the version" do
+      pom.version.should eq "1.1.1"
+    end
+  end
 
-      it "reads the SCM connection address from a remote repository" do
-        pom.connection_address.should eq "svn:http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
-      end
+  describe "#description" do
+    it "reads the description" do
+      pom.description.should eq "Commons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems."
     end
+  end
 
-    describe "#group_id" do
-      it "reads the group id" do
-        pom.group_id.should eq "commons-logging"
-      end
+  describe "#url" do
+    it "reads the url" do
+      pom.url.should eq "http://commons.apache.org/logging"
     end
+  end
 
-    describe "#artifact_id" do
-      it "reads the artifact id" do
-        pom.artifact_id.should eq "commons-logging"
-      end
+  describe "#license_name" do
+    it "reads the license name" do
+      pom.license_name.should eq ""
     end
+  end
 
-    describe "#version" do
-      it "reads the version" do
-        pom.version.should eq "1.1.1"
-      end
+  describe "#runtime_dependency_ids" do
+    it "reads the dependency maven ids" do
+      pom.runtime_dependency_ids.should eq []
     end
+  end
 
-    describe "#parent_group_id" do
-      it "reads the parent's group id" do
-        pom.parent_group_id.should eq "org.apache.commons"
-      end
+  describe "#parent_group_id" do
+    it "reads the parent's group id" do
+      pom.parent_group_id.should eq "org.apache.commons"
     end
+  end
 
-    describe "#parent_artifact_id" do
-      it "reads the parent's artifact id" do
-        pom.parent_artifact_id.should eq "commons-parent"
-      end
+  describe "#parent_artifact_id" do
+    it "reads the parent's artifact id" do
+      pom.parent_artifact_id.should eq "commons-parent"
     end
+  end
 
-    describe "#parent_version" do
-      it "reads the parent's version" do
-        pom.parent_version.should eq "5"
-      end
+  describe "#parent_version" do
+    it "reads the parent's version" do
+      pom.parent_version.should eq "5"
     end
   end
 end

data/spec/lib/project_spec.rb

@@ -111,8 +111,8 @@ describe Gjp::Project do
   describe "#finish" do
     it "ends the current gathering phase" do
       @project.from_directory do
-        Dir.mkdir("src/a:b:c")
-        `touch src/a\:b\:c/test`
+        Dir.mkdir("src/abc")
+        `touch src/abc/test`
         `touch kit/test`
       end
 
@@ -121,16 +121,16 @@ describe Gjp::Project do
 
       @project.from_directory do
         `git rev-list --all`.split("\n").length.should eq 4
-        `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should include("src/a:b:c/test")
-        File.readlines(File.join("file_lists", "a:b:c_input")).should include("test\n")
+        `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should include("src/abc/test")
+        File.readlines(File.join("file_lists", "abc_input")).should include("test\n")
         File.readlines(File.join("file_lists","kit")).should include("test\n")
       end
     end
 
     it "ends the current dry-run phase" do
       @project.from_directory do
-        Dir.mkdir("src/a:b:c")
-        `echo A > src/a\:b\:c/test`
+        Dir.mkdir("src/abc")
+        `echo A > src/abc/test`
       end
 
       @project.finish.should eq :gathering
@@ -138,8 +138,8 @@ describe Gjp::Project do
       @project.dry_run.should be_true
 
       @project.from_directory do
-        `echo B > src/a\:b\:c/test`
-        `touch src/a\:b\:c/test2`
+        `echo B > src/abc/test`
+        `touch src/abc/test2`
         `touch kit/test`
       end
 
@@ -148,12 +148,12 @@ describe Gjp::Project do
 
       @project.from_directory do
         `git rev-list --all`.split("\n").length.should eq 9
-        File.read("src/a:b:c/test").should eq "A\n"
-        File.readlines(File.join("file_lists", "a:b:c_output")).should include("test2\n")
-        File.readlines(File.join("file_lists", "a:b:c_input")).should_not include("test2\n")
+        File.read("src/abc/test").should eq "A\n"
+        File.readlines(File.join("file_lists", "abc_output")).should include("test2\n")
+        File.readlines(File.join("file_lists", "abc_input")).should_not include("test2\n")
 
-        `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should_not include("src/a:b:c/test2")
-        File.exists?("src/a:b:c/test2").should be_false
+        `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should_not include("src/abc/test2")
+        File.exists?("src/abc/test2").should be_false
         File.readlines(File.join("file_lists", "kit")).should include("test\n")
       end
     end

data/spec/lib/scaffolder_spec.rb

@@ -24,9 +24,9 @@ describe Gjp::Scaffolder do
     FileUtils.rm_rf(@project_path)
   end
 
-  describe "#scaffold_kit_spec" do
+  describe "#generate_kit_spec" do
     it "scaffolds the first version" do
-      @scaffolder.scaffold_kit_spec.should be_true
+      @scaffolder.generate_kit_spec.should be_true
 
       @project.from_directory do
         spec_lines = File.readlines(File.join("specs", "test-project-kit.spec"))
@@ -36,7 +36,7 @@ describe Gjp::Scaffolder do
       end
     end
     it "scaffolds a second version" do
-      @scaffolder.scaffold_kit_spec.should be_true
+      @scaffolder.generate_kit_spec.should be_true
       @project.dry_run
       Dir.chdir(@project_path) do
         test_file = File.join("kit", "test")
@@ -48,7 +48,7 @@ describe Gjp::Scaffolder do
       end
       @project.gather
 
-      @scaffolder.scaffold_kit_spec.should be_true
+      @scaffolder.generate_kit_spec.should be_true
 
       @project.from_directory do
         spec_lines = File.readlines(File.join("specs", "test-project-kit.spec"))
@@ -59,7 +59,7 @@ describe Gjp::Scaffolder do
       end
     end
     it "scaffolds a conflicting version" do
-      @scaffolder.scaffold_kit_spec.should be_true
+      @scaffolder.generate_kit_spec.should be_true
       @project.dry_run
       Dir.chdir(@project_path) do
         test_file = File.join("kit", "test")
@@ -76,7 +76,7 @@ describe Gjp::Scaffolder do
       end
       @project.gather
 
-      @scaffolder.scaffold_kit_spec.should be_true
+      @scaffolder.generate_kit_spec.should be_true
 
       @project.from_directory do
         spec_lines = File.readlines(File.join("specs", "test-project-kit.spec"))
@@ -86,9 +86,41 @@ describe Gjp::Scaffolder do
         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
+
+  describe "#generate_package_spec" do
+    it "scaffolds the first version" do
+
+      @project.from_directory do
+        FileUtils.mkdir_p File.join("src", "test", "out")
+        (1..5).each do |i|
+          `touch src/test/test#{i}.java`
+        end
+        @project.dry_run
+
+        (1..5).each do |i|
+          `touch src/test/test#{i}.class`
+        end
+
+        (1..5).each do |i|
+          `touch src/test/out/test#{i}.jar`
+        end
+
+        @project.finish
+      end
+
+      @scaffolder.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"))
+        spec_lines.should include("Name:           test\n")
+        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("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
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -163,6 +163,7 @@ files:
 - lib/gjp/logger.rb
 - lib/gjp/maven_runner.rb
 - lib/gjp/maven_website.rb
+- lib/gjp/package_spec_adapter.rb
 - lib/gjp/parent_pom_getter.rb
 - lib/gjp/pom.rb
 - lib/gjp/pom_getter.rb
@@ -177,7 +178,9 @@ 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
 - lib/template/src/CONTENTS
 - spec/data/ant-super-simple-code/build.xml