gjp 0.36.0 → 0.37.0

data/lib/gjp/commands/download-maven-source-jars.rb

@@ -0,0 +1,28 @@
+# encoding: UTF-8
+
+module Gjp
+  class DownloadMavenSourceJarsCommand < Gjp::BaseCommand
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        source_getter = Gjp::SourceGetter.new
+
+        ensure_dry_running(false, project) do
+          puts "Getting sources from Maven..."
+          succeeded, failed = source_getter.get_maven_source_jars(project)
+
+          puts "\n**SUMMARY**\n"
+          puts "Sources found for:"
+          succeeded.each do |path|
+            puts " #{format_path(path, project)}"
+          end
+
+          puts "\nSources not found for:"
+          failed.each do |path|
+            puts " #{format_path(path, project)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gjp/commands/dry-run.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+
+module Gjp
+  class DryRunCommand < Gjp::BaseCommand
+    def execute
+      checking_exceptions do
+        if Gjp::Project.new(".").dry_run
+          puts "Now dry-running, please start your build."
+          puts "To run a Maven installation from the kit, use \"gjp mvn\"."
+          puts "If the build succeedes end this dry run with \"gjp finish\"."
+          puts "If the build does not succeed use \"gjp finish --abort\" to restore files."
+        end
+      end
+    end
+  end
+end

data/lib/gjp/commands/finish.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+module Gjp
+  class FinishCommand < Gjp::BaseCommand
+
+    option ["-a", "--abort"], :flag, "build abort, restore files as before dry-run"
+
+    def execute
+      checking_exceptions do
+        if Gjp::Project.new(".").finish(abort?)
+          if abort?
+            puts "Project reverted as before dry-run."
+          else
+            puts "Dry-run finished."
+          end
+        else
+          puts "No dry-run is in progress."
+        end
+      end
+    end
+  end
+end

data/lib/gjp/commands/generate-all.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+
+module Gjp
+  class GenerateAllCommand < Gjp::BaseCommand
+
+    option ["-f", "--filter"], "FILTER", "filter files to be installed by this package spec", :default => "*.jar"
+    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(".")
+        ensure_dry_running(false, project) do
+          package_name = project.get_package_name(directory)
+
+          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)
+
+          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
+  end
+end

data/lib/gjp/commands/generate-kit-archive.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+
+module Gjp
+  class GenerateKitArchiveCommand < Gjp::BaseCommand
+
+    option ["-f", "--full"], :flag, "create a full archive (not incremental)"
+
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        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
+end

data/lib/gjp/commands/generate-kit-spec.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+
+module Gjp
+  class GenerateKitSpecCommand < Gjp::BaseCommand
+
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        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
+end

data/lib/gjp/commands/generate-package-archive.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+module Gjp
+  class GeneratePackageArchiveCommand < Gjp::BaseCommand
+
+    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", :default => "."
+
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        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
+end

data/lib/gjp/commands/generate-package-script.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+module Gjp
+  class GeneratePackageScriptCommand < Gjp::BaseCommand
+
+    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", :default => "."
+
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        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
+end

data/lib/gjp/commands/generate-package-spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+module Gjp
+  class GeneratePackageSpecCommand < Gjp::BaseCommand
+
+    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(".")
+        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
+end

data/lib/gjp/commands/get-pom.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+
+module Gjp
+  class GetPomCommand < Gjp::BaseCommand
+
+    parameter "NAME", "a jar file name or a `name-version` string (heuristic)"
+
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        pom_getter = Gjp::PomGetter.new
+
+        path, status = pom_getter.get_pom(name)
+        if path
+          text_status = if status == :found_in_jar
+            "was inside the jar"
+          elsif status == :found_via_sha1
+            "found by sha1 search from search.maven.org"
+          elsif status == :found_via_heuristic
+            "found by heuristic search from search.maven.org"
+          end
+
+          puts "#{format_path(path, project)} written, #{text_status}"
+        else
+          puts "#{name}'s pom not found. Try:"
+          puts "http://google.com/#q=#{URI::encode(pom_getter.cleanup_name(name) + " pom")}"
+        end
+      end
+    end
+  end
+end

data/lib/gjp/commands/get-source.rb

@@ -0,0 +1,35 @@
+# encoding: UTF-8
+
+module Gjp
+  class GetSourceCommand < Gjp::BaseCommand
+
+    parameter "POM", "a pom file path or URI"
+
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        source_getter = Gjp::SourceGetter.new
+
+        puts "Attempting to find source through Maven..."
+        if source_getter.get_maven_source_jar(project, pom)
+          puts "Source jar found and added to Maven repository."
+        else
+          effective_pom_path = Gjp::MavenRunner.new(project).get_effective_pom(pom)
+          puts "Source jar not found in Maven. Try looking here:"
+          pom = Gjp::Pom.new(effective_pom_path)
+          if pom.url && !pom.url.empty?
+            puts "Website: #{pom.url}"
+          end
+          if pom.scm_connection && !pom.scm_connection.empty?
+            puts "SCM connection: #{pom.scm_connection}"
+          end
+          if pom.scm_url && !pom.scm_url.empty?
+            puts "SCM connection: #{pom.scm_url}"
+          end
+          puts "The effective POM: #{effective_pom_path}"
+          puts "Google: http://google.com/#q=#{URI::encode(pom.name + " sources")}"
+        end
+      end
+    end
+  end
+end

data/lib/gjp/commands/init.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+module Gjp
+  class InitCommand < Gjp::BaseCommand
+
+    def execute
+      checking_exceptions do
+        Gjp::Project.init(".")
+        puts "Project inited."
+        puts "Add sources to src/<package name>, binary dependencies to kit/."
+        puts "When you are ready to test a build, use \"gjp dry-run\"."
+      end
+    end
+  end
+end

data/lib/gjp/commands/list-kit-missing-sources.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+module Gjp
+  class ListKitMissingSourcesCommand < Gjp::BaseCommand
+
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        kit_checker = Gjp::KitChecker.new(project)
+
+        ensure_dry_running(false, project) do
+          puts "Some source files were not found in these archives:"
+          kit_checker.unsourced_archives.each do |archive|
+            percentage = "%.2f" % (100.0 * archive[:unsourced_class_names].length()/archive[:class_names].length())
+            puts "#{format_path(archive[:archive], project)} (~#{percentage}% missing)"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gjp/commands/move-jars-to-kit.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+
+module Gjp
+  class MoveJarsToKitCommand < Gjp::BaseCommand
+
+    def execute
+      checking_exceptions do
+        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
+  end
+end

data/lib/gjp/commands/mvn.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+module Gjp
+  class MavenCommand < Gjp::BaseCommand
+
+    parameter "[MAVEN OPTIONS] ...", "mvn options", :attribute_name => "dummy"
+
+    # override parsing in order to pipe everything to mvn
+    def parse(args)
+      @options = args
+    end
+
+    def execute
+      checking_exceptions do
+        project = Gjp::Project.new(".")
+        ensure_dry_running(true, project) do
+          Gjp::MavenRunner.new(project).mvn(@options)
+        end
+      end
+    end
+  end
+end

data/lib/gjp/git.rb

@@ -39,7 +39,8 @@ module Gjp
         else
           "HEAD"
         end
-        `git diff-tree --no-commit-id --name-only -r #{prefixed_start_tag} #{prefixed_end_tag} -- #{directory}`.split("\n")
+        `git diff-tree --no-commit-id --name-only -r #{prefixed_start_tag} #{prefixed_end_tag} -- #{directory}`
+          .split("\n")
       end
     end
 
@@ -50,6 +51,14 @@ module Gjp
       Dir.chdir(@directory) do
         log.debug "committing with message: #{message}"
 
+        # rename all .gitignore files by default as
+        # they prevent snapshotting
+        Find.find(".") do |file|
+          if file =~ /\.gitignore$/
+            FileUtils.mv(file, "#{file}_disabled_by_gjp")
+          end
+        end
+
         `git rm -r --cached --ignore-unmatch .`
         `git add .`
         `git commit -m "#{message}"`
@@ -68,12 +77,12 @@ module Gjp
     def get_tag_maximum_suffix(prefix)
       Dir.chdir(@directory) do
         `git tag`.split.map do |tag|
-          if tag =~ /^gjp_#{prefix}_([0-9]+)$/
-            $1.to_i
-          else
-            0
-          end
-         end.max or 0
+           if tag =~ /^gjp_#{prefix}_([0-9]+)$/
+             $1.to_i
+           else
+             0
+           end
+        end.max || 0
       end
     end
 
@@ -103,7 +112,8 @@ module Gjp
         log.debug "calling git show gjp_#{tag}:#{path} > #{path}.old_version, output follows"
         `git show gjp_#{tag}:#{path} > #{path}.old_version`
         log.debug "calling git merge-file #{path} #{path}.old_version #{new_path}, output follows"
-        `git merge-file #{path} #{path}.old_version #{new_path} -L "newly generated" -L "previously generated" -L "user edited"`
+        `git merge-file #{path} #{path}.old_version #{new_path} \
+          -L "newly generated" -L "previously generated" -L "user edited"`
         conflict_count = $?.exitstatus
         File.delete "#{path}.old_version"
         return conflict_count

data/lib/gjp/kit_checker.rb

@@ -23,7 +23,7 @@ module Gjp
         end
 
         archived_file_paths = plain_file_paths.select do |path, archive|
-          path. =~ /\.(zip)|([jwe]ar)$/
+          path. =~ (/\.(zip)|([jwe]ar)$/)
         end.map do |path, archive|
           result = []
           Zip::File.foreach(path) do |entry|
@@ -40,7 +40,7 @@ module Gjp
 
     # returns a list of class names for which
     # we have source files in kit/
-    def get_source_class_names(paths)
+    def source_class_names(paths)
       source_paths = paths.select do |path, archive|
         path =~ /\.java$/
       end
@@ -63,7 +63,7 @@ module Gjp
 
     # returns a list of class names for which
     # we have binary files in kit/
-    def get_compiled_classes(paths)
+    def compiled_classes(paths)
       result = {}
       compiled_paths = paths.select do |path, archive|
         path =~ /\.class$/
@@ -81,10 +81,10 @@ module Gjp
 
     # returns a hash that associates archive names and
     # the unsourced classes within them
-    def get_unsourced
+    def unsourced_archives
       paths = kit_file_paths
-      source_class_names = get_source_class_names(paths)
-      archive_paths_to_class_names = get_compiled_classes(paths)
+      source_class_names = source_class_names(paths)
+      archive_paths_to_class_names = compiled_classes(paths)
 
       result = archive_paths_to_class_names.map do |archive, class_names|
         unsourced_class_names = class_names.select do |class_name|