gjp 0.26.0 → 0.27.0

data/README.md

@@ -113,7 +113,7 @@ The following command will generate the kit archive in `output/galaxy-kit/`:
 
     gjp generate-kit-archive
 
-Note that, in later runs, you can also use the `--incremental` option to create an additional "diff" tar.xz file instead of rebuilding it from scratch.
+Note that, in later runs, only an additional "diff" tar.xz file will be created to ease uploads. You can use the `--full` option to regenerate a single complete archive.
 
 The following command will generate the kit spec:
 

data/integration-tests/commons.sh

@@ -40,7 +40,7 @@ cd commons-fileupload-1.3-src/
 gjp mvn package -DskipTests
 gjp finish
 
-gjp generate-kit-archive -i
+gjp generate-kit-archive
 gjp generate-kit-spec
 gjp generate-package-script
 gjp generate-package-archive

data/lib/gjp/archiver.rb

@@ -10,7 +10,7 @@ module Gjp
     end
 
     # generates an archive for the kit package
-    def archive_kit(incremental)
+    def archive_kit(full)
       destination_dir = File.join(@project.full_path, "output", "#{@project.name}-kit")
       FileUtils.mkdir_p(destination_dir)
       destination_file_prefix = "#{@project.name}-kit"
@@ -18,12 +18,12 @@ module Gjp
 
       @project.take_snapshot "Kit archival started"
 
-      destination_file = if incremental
-        log.debug "doing incremental archive"
-        archive_incremental("kit", destination_dir, destination_file_prefix, destination_file_suffix, :archive_kit)
-      else
+      destination_file = if full
         remove_stale_incremental(destination_dir, destination_file_prefix, destination_file_suffix)
         archive_single("kit", File.join(destination_dir, destination_file_prefix + destination_file_suffix))
+      else
+        log.debug "doing incremental archive"
+        archive_incremental("kit", destination_dir, destination_file_prefix, destination_file_suffix, :archive_kit)
       end
 
       @project.take_snapshot "Kit archive generated", :archive_kit

data/lib/gjp/cli.rb

@@ -71,7 +71,9 @@ module Gjp
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          Gjp::KitRunner.new(project).mvn(@options)
+          ensure_dry_running(true, project) do
+            Gjp::KitRunner.new(project).mvn(@options)
+          end
         end
       end
     end
@@ -87,7 +89,9 @@ module Gjp
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          Gjp::KitRunner.new(project).ant(@options)
+          ensure_dry_running(true, project) do
+            Gjp::KitRunner.new(project).ant(@options)
+          end
         end
       end
     end
@@ -109,23 +113,27 @@ module Gjp
       end
     end
 
-    subcommand "generate-kit-spec", "Create or refresh a spec file for the kit" do
+    subcommand "generate-kit-archive", "Create or refresh the kit tarball" do
+      option ["-f", "--full"], :flag, "create a full archive (not incremental)"
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_kit_spec
-          print_generation_result(project, result_path, conflict_count)
+          ensure_dry_running(false, project) do
+            result_path = Gjp::Archiver.new(project).archive_kit(full?)
+            print_generation_result(project, result_path)
+          end
         end
       end
     end
 
-    subcommand "generate-kit-archive", "Create or refresh the kit tarball" do
-      option ["-i", "--incremental"], :flag, "create an archive with only the difference from the previous one"
+    subcommand "generate-kit-spec", "Create or refresh a spec file for the kit" do
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          result_path = Gjp::Archiver.new(project).archive_kit(incremental?)
-          print_generation_result(project, result_path)
+          ensure_dry_running(false, project) do
+            result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_kit_spec
+            print_generation_result(project, result_path, conflict_count)
+          end
         end
       end
     end
@@ -135,73 +143,85 @@ module Gjp
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          package_name = project.get_package_name(directory)
-          history_file = File.join(Dir.home, ".bash_history")
-          result_path, conflict_count = Gjp::ScriptGenerator.new(project, history_file).generate_build_script(package_name)
-          print_generation_result(project, result_path, conflict_count)
+          ensure_dry_running(false, project) do
+            package_name = project.get_package_name(directory)
+            history_file = File.join(Dir.home, ".bash_history")
+            result_path, conflict_count = Gjp::ScriptGenerator.new(project, history_file).generate_build_script(package_name)
+            print_generation_result(project, result_path, conflict_count)
+          end
         end
       end
     end
 
-    subcommand "generate-package-spec", "Create or refresh a spec file for a package" do
-      option ["-f", "--filter"], "FILTER", "filter files to be installed by this spec", :default => "*.jar"
+    subcommand "generate-package-archive", "Create or refresh a package tarball" do
       parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", :default => "."
-      parameter "[POM]", "a pom file path", :default => "pom.xml"
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          package_name = project.get_package_name(directory)
-          result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_package_spec package_name, pom, filter
-          print_generation_result(project, result_path, conflict_count)
+          ensure_dry_running(false, project) do
+            package_name = project.get_package_name(directory)
+            result_path = Gjp::Archiver.new(project).archive_package package_name
+            print_generation_result(project, result_path)
+          end
         end
       end
     end
 
-    subcommand "generate-package-archive", "Create or refresh a package tarball" do
+    subcommand "generate-package-spec", "Create or refresh a spec file for a package" do
+      option ["-f", "--filter"], "FILTER", "filter files to be installed by this spec", :default => "*.jar"
       parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", :default => "."
+      parameter "[POM]", "a pom file path", :default => "pom.xml"
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          package_name = project.get_package_name(directory)
-          result_path = Gjp::Archiver.new(project).archive_package package_name
-          print_generation_result(project, result_path)
+          ensure_dry_running(false, project) do
+            package_name = project.get_package_name(directory)
+            result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_package_spec package_name, pom, filter
+            print_generation_result(project, result_path, conflict_count)
+          end
         end
       end
     end
 
     subcommand "generate-all", "Create or refresh specs, archives, scripts for a package and the kit" do
       option ["-f", "--filter"], "FILTER", "filter files to be installed by this package spec", :default => "*.jar"
-      option ["-i", "--incremental"], :flag, "create a kit archive with only the difference from the previous one", :default => true
+      option ["-f", "--full"], :flag, "create a full archive (not incremental)"
       parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", :default => "."
       parameter "[POM]", "a package pom file path", :default => "pom.xml"
       def execute
         checking_exceptions do
           project = Gjp::Project.new(".")
-          package_name = project.get_package_name(directory)
+          ensure_dry_running(false, project) do
+            package_name = project.get_package_name(directory)
 
-          result_path = Gjp::Archiver.new(project).archive_kit(incremental?)
-          print_generation_result(project, result_path)
+            result_path = Gjp::Archiver.new(project).archive_kit(full?)
+            print_generation_result(project, result_path)
 
-          result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_kit_spec
-          print_generation_result(project, result_path, conflict_count)
+            result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_kit_spec
+            print_generation_result(project, result_path, conflict_count)
 
-          history_file = File.join(Dir.home, ".bash_history")
-          result_path, conflict_count = Gjp::ScriptGenerator.new(project, history_file).generate_build_script(package_name)
-          print_generation_result(project, result_path, conflict_count)
+            history_file = File.join(Dir.home, ".bash_history")
+            result_path, conflict_count = Gjp::ScriptGenerator.new(project, history_file).generate_build_script(package_name)
+            print_generation_result(project, result_path, conflict_count)
 
-          result_path = Gjp::Archiver.new(project).archive_package package_name
-          print_generation_result(project, result_path)
+            result_path = Gjp::Archiver.new(project).archive_package package_name
+            print_generation_result(project, result_path)
 
-          result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_package_spec package_name, pom, filter
-          print_generation_result(project, result_path, conflict_count)
+            result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_package_spec package_name, pom, filter
+            print_generation_result(project, result_path, conflict_count)
+          end
         end
       end
     end
 
     subcommand "purge-jars", "Locates jars in src/ and moves them to kit/" do
       def execute
-        Gjp::Project.new(".").purge_jars.each do |original, final|
-          puts "Replaced #{original} with symlink pointing to to #{final}"
+        project = Gjp::Project.new(".")
+
+        ensure_dry_running(false, project) do
+          project.purge_jars.each do |original, final|
+            puts "Replaced #{original} with symlink pointing to to #{final}"
+          end
         end
       end
     end
@@ -276,6 +296,18 @@ module Gjp
 
     private
 
+    def ensure_dry_running(state, project)
+      if project.is_dry_running == state
+        yield
+      else
+        if state == true
+          puts "Please start a dry-run first, use \"gjp dry-run\""
+        else
+          puts "Please finish or abort this dry-run first, use \"gjp finish\" or \"gjp finish --abort\""
+        end
+      end
+    end
+
     # outputs output of a file generation
     def print_generation_result(project, result_path, conflict_count = 0)
       puts "#{format_path(result_path, project)} generated"
@@ -306,7 +338,7 @@ module Gjp
         $stderr.puts e
       rescue NoProjectDirectoryError => e
         $stderr.puts "#{e.directory} not a gjp project directory, see gjp init"
-      rescue NoPackageDirectoryException => e
+      rescue NoPackageDirectoryError => e
         $stderr.puts "#{e.directory} is not a gjp package directory, see README"
       rescue GitAlreadyInitedError => e
         $stderr.puts "This directory is already a gjp project"

data/lib/gjp/script_generator.rb

@@ -30,6 +30,8 @@ module Gjp
         relevant_lines.map do |line|
           if line =~ /gjp +mvn/
             line.gsub(/gjp +mvn/, "#{@kit_runner.get_maven_commandline("$PROJECT_PREFIX")}")
+          elsif line =~ /gjp +ant/
+            line.gsub(/gjp +ant/, "#{@kit_runner.get_ant_commandline("$PROJECT_PREFIX")}")
           else
             line
           end
@@ -37,8 +39,15 @@ module Gjp
 
         new_content = script_lines.join("\n") + "\n"
 
-        result_path = File.join("src", name, "build.sh")
+        script_name = "build.sh"
+        result_path = File.join("src", name, script_name)
         conflict_count = @project.merge_new_content(new_content, result_path, "Build script generated", "generate_#{name}_build_script")
+
+        destination_dir = File.join("output", name)
+        FileUtils.mkdir_p(destination_dir)
+        destination_script_path =  File.join(destination_dir, script_name)        
+        FileUtils.symlink(File.expand_path(result_path), destination_script_path, :force => true)
+
         [result_path, conflict_count]
       end
     end

data/lib/gjp/version.rb

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

data/lib/template/package.spec

@@ -23,6 +23,7 @@ Summary:        <%= summary %>
 Url:            <%= url %>
 Group:          Development/Libraries/Java
 Source0:        %{name}.tar.xz
+Source1:        build.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  xz
 BuildRequires:  java-devel
@@ -41,6 +42,7 @@ Requires:       mvn(<%= dependency_id[0] %>:<%= dependency_id[1] %>) <% if depen
 
 %prep
 %setup -q -c -n src/<%= name %>
+cp -f %{SOURCE1} .
 ln -sf %{_datadir}/gjp/<%= project_name %>-kit ../../kit
 
 %build

data/spec/lib/archiver_spec.rb

@@ -60,7 +60,7 @@ describe Gjp::Archiver do
       end
       @project.finish(false)
 
-      archiver.archive_kit(false)
+      archiver.archive_kit(true)
       @project.from_directory do
         `tar -Jtf output/test-project-kit/test-project-kit.tar.xz`.split.should include("kit_test")
       end
@@ -71,7 +71,7 @@ describe Gjp::Archiver do
       end
       @project.finish(false)
 
-      archiver.archive_kit(true)
+      archiver.archive_kit(false)
       @project.from_directory do
         `tar -Jtf output/test-project-kit/test-project-kit.tar.xz`.split.should include("kit_test")
       end
@@ -80,7 +80,7 @@ describe Gjp::Archiver do
         File.open(File.join("kit","kit_test2"), "w") { |io| io.puts "test content" }
       end
 
-      archiver.archive_kit(true)
+      archiver.archive_kit(false)
       @project.from_directory do
         files = `tar -Jtf output/test-project-kit/test-project-kit_0001.tar.xz`.split
         files.should include("kit_test2")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
   prerelease: 
 platform: ruby
 authors: