gjp 0.25.0 → 0.26.0

data/README.md

@@ -132,6 +132,20 @@ You can also edit the specs file manually if you want. When you later regenerate
 
 OBS users: note that the output/ directory created by gjp can be submitted or used as OBS project. Feel free to replace it with a symlink pointing at your home OBS project, or use symlinks from your OBS project to its contents.
 
+#### Quicker workflow
+
+`gjp` also has a `generate-all` subcommand that will generate everything in one step. Thus, for Maven-based projects, the minimal workflow is:
+
+    cd src
+    mkdir <package_name>
+    cd <package_name>
+    wget <sources>
+    ...
+    gjp dry-run
+    gjp mvn package
+    gjp finish
+    gjp generate-all
+
 #### Ant packages
 
 Building Ant packages is not really different from Maven ones, as `gjp ant` will operate exactly like `gjp mvn`.

data/integration-tests/commons.sh

@@ -25,11 +25,7 @@ cd src/commons-collections/commons-collections-3.2.1-src/
 gjp mvn package -DskipTests
 gjp finish
 
-gjp generate-kit-archive
-gjp generate-kit-spec
-gjp generate-package-script
-gjp generate-package-archive
-gjp generate-package-spec
+gjp generate-all
 cd ../../..
 
 cd src

data/lib/gjp/cli.rb

@@ -114,10 +114,7 @@ module Gjp
         checking_exceptions do
           project = Gjp::Project.new(".")
           result_path, conflict_count = Gjp::SpecGenerator.new(project).generate_kit_spec
-          puts "#{format_path(result_path, project)} generated"
-          if conflict_count > 0
-            puts "Warning: #{conflict_count} unresolved conflicts"
-          end
+          print_generation_result(project, result_path, conflict_count)
         end
       end
     end
@@ -128,7 +125,7 @@ module Gjp
         checking_exceptions do
           project = Gjp::Project.new(".")
           result_path = Gjp::Archiver.new(project).archive_kit(incremental?)
-          puts "#{format_path(result_path, project)} generated"
+          print_generation_result(project, result_path)
         end
       end
     end
@@ -141,10 +138,7 @@ module Gjp
           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)
-          puts "#{format_path(result_path, project)} generated"
-          if conflict_count > 0
-            puts "Warning: #{conflict_count} unresolved conflicts"
-          end
+          print_generation_result(project, result_path, conflict_count)
         end
       end
     end
@@ -158,10 +152,7 @@ module Gjp
           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
-          puts "#{format_path(result_path, project)} generated"
-          if conflict_count > 0
-            puts "Warning: #{conflict_count} unresolved conflicts"
-          end
+          print_generation_result(project, result_path, conflict_count)
         end
       end
     end
@@ -173,7 +164,36 @@ module Gjp
           project = Gjp::Project.new(".")
           package_name = project.get_package_name(directory)
           result_path = Gjp::Archiver.new(project).archive_package package_name
-          puts "#{format_path(result_path, project)} generated"
+          print_generation_result(project, result_path)
+        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
+      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)
+
+          result_path = Gjp::Archiver.new(project).archive_kit(incremental?)
+          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)
+
+          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, conflict_count = Gjp::SpecGenerator.new(project).generate_package_spec package_name, pom, filter
+          print_generation_result(project, result_path, conflict_count)
         end
       end
     end
@@ -254,6 +274,16 @@ module Gjp
       end    
     end
 
+    private
+
+    # outputs output of a file generation
+    def print_generation_result(project, result_path, conflict_count = 0)
+      puts "#{format_path(result_path, project)} generated"
+      if conflict_count > 0
+        puts "Warning: #{conflict_count} unresolved conflicts"
+      end
+    end
+
     # generates a version of path relative to the current directory
     def format_path(path, project)
       full_path = if Pathname.new(path).relative?

data/lib/gjp/version.rb

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

metadata

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