gjp 0.36.0 → 0.37.0

data/lib/gjp/kit_runner.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
-require 'find'
-require 'pathname'
+require "find"
+require "pathname"
 
 module Gjp
   # runs programs from a gjp kit with gjp-specific options

data/lib/gjp/kit_spec_adapter.rb

@@ -21,7 +21,7 @@ module Gjp
         end
     end
 
-    def get_binding
+    def public_binding
       binding
     end
   end

data/lib/gjp/main.rb

@@ -0,0 +1,103 @@
+# encoding: UTF-8
+require "clamp"
+
+module Gjp
+  class MainCommand < Clamp::Command
+
+    subcommand(
+      "init",
+      "Inits a gjp project in the current directory",
+      Gjp::InitCommand
+    )
+
+    subcommand(
+      "dry-run",
+      "Starts a dry-run build",
+      Gjp::DryRunCommand
+    )
+
+    subcommand(
+      "mvn",
+      "Locates and runs Maven from any directory in kit/",
+      Gjp::MavenCommand
+    )
+
+    subcommand(
+      "ant",
+      "Locates and runs Ant from any directory in kit/",
+      Gjp::AntCommand
+    )
+
+    subcommand(
+      "finish",
+      "Ends the current dry-run",
+      Gjp::FinishCommand
+    )
+
+    subcommand(
+      "generate-kit-archive",
+      "Create or refresh the kit tarball",
+      Gjp::GenerateKitArchiveCommand
+    )
+
+    subcommand(
+      "generate-kit-spec",
+      "Create or refresh a spec file for the kit",
+      Gjp::GenerateKitSpecCommand
+    )
+
+    subcommand(
+      "generate-package-script",
+      "Create or refresh a build.sh file for a package",
+      Gjp::GeneratePackageScriptCommand
+    )
+
+    subcommand(
+      "generate-package-archive",
+      "Create or refresh a package tarball",
+      Gjp::GeneratePackageArchiveCommand
+    )
+
+    subcommand(
+      "generate-package-spec",
+      "Create or refresh a spec file for a package",
+      Gjp::GeneratePackageSpecCommand
+    )
+
+    subcommand(
+      "generate-all",
+      "Create or refresh specs, archives, scripts for a package and the kit",
+      Gjp::GenerateAllCommand
+    )
+
+    subcommand(
+      "move-jars-to-kit",
+      "Locates jars in src/ and moves them to kit/",
+      Gjp::MoveJarsToKitCommand
+    )
+
+    subcommand(
+      "download-maven-source-jars",
+      "Attempts to download Maven kit/ sources",
+      Gjp::DownloadMavenSourceJarsCommand
+    )
+
+    subcommand(
+      "get-pom",
+      "Retrieves a pom file",
+      Gjp::GetPomCommand
+    )
+
+    subcommand(
+      "get-source",
+      "Attempts to retrieve a project's sources",
+      Gjp::GetSourceCommand
+    )
+
+    subcommand(
+      "list-kit-missing-sources",
+      "Locates jars in kit/ that have no source files",
+      Gjp::ListKitMissingSourcesCommand
+    )
+  end
+end

data/lib/gjp/maven_runner.rb

@@ -38,7 +38,7 @@ module Gjp
         repo_path = File.join(prefix, "kit", "m2")
         config_path = File.join(prefix, "kit", "m2", "settings.xml")
 
-        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path} #{options.join(' ')}"
+        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path} #{options.join(" ")}"
       else
         raise ExecutableNotFoundError.new("mvn")
       end

data/lib/gjp/maven_website.rb

@@ -11,34 +11,36 @@ module Gjp
     # searching by a jar sha1 hash
     # see output format at http://search.maven.org/#api
     def search_by_sha1(sha1)
-      return search({:q => "1:\"#{sha1}\""})
+      return search(:q => "1:\"#{sha1}\"")
     end
 
     # returns a search result object from search.maven.com
     # searching by keyword (name)
     # see output format at http://search.maven.org/#api
     def search_by_name(name)
-      return search({:q => name})
+      return search(:q => name)
     end
 
     # returns a search result object from search.maven.com
     # searching by Maven's group id and artifact id
     # see output format at http://search.maven.org/#api
     def search_by_group_id_and_artifact_id(group_id, artifact_id)
-      return search({:q => "g:\"#{group_id}\" AND a:\"#{artifact_id}\"", :core => "gav"})
+      return search(:q => "g:\"#{group_id}\" AND a:\"#{artifact_id}\"", :core => "gav")
     end
 
     # returns a search result object from search.maven.com
     # searching by Maven's id (group id, artifact id and version)
     # see output format at http://search.maven.org/#api
     def search_by_maven_id(group_id, artifact_id, version)
-      return search({:q => "g:\"#{group_id}\" AND a:\"#{artifact_id}\" AND v:\"#{version}\""})
+      return search(:q => "g:\"#{group_id}\" AND a:\"#{artifact_id}\" AND v:\"#{version}\"")
     end
 
     # returns a search result object from search.maven.com
     # see input and output format at http://search.maven.org/#api
     def search(params)
-        response = RestClient.get "http://search.maven.org/solrsearch/select", {:params => params.merge({"rows" => "100", "wt" => "json"})}
+        response = RestClient.get("http://search.maven.org/solrsearch/select",
+                                  :params => params.merge("rows" => "100", "wt" => "json")
+        )
         json = JSON.parse(response.to_s)
         return json["response"]["docs"]
     end
@@ -53,7 +55,7 @@ module Gjp
     def download_pom(group_id, artifact_id, version)
       path = "#{group_id.gsub(".", "/")}/#{artifact_id}/#{version}/#{artifact_id}-#{version}.pom"
       log.debug("downloading #{path}...")
-      return (RestClient.get "http://search.maven.org/remotecontent", {:params => {:filepath => path}}).to_s
+      return (RestClient.get "http://search.maven.org/remotecontent", :params => {:filepath => path}).to_s
     end
   end
 end

data/lib/gjp/package_spec_adapter.rb

@@ -41,7 +41,7 @@ module Gjp
       end
     end
 
-    def get_binding
+    def public_binding
       binding
     end
 

data/lib/gjp/pom.rb

@@ -40,7 +40,9 @@ module Gjp
     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|
+      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, element.xpath("artifactId").text, element.xpath("version").text]
       end
     end

data/lib/gjp/pom_getter.rb

@@ -16,7 +16,7 @@ module Gjp
     # saves a jar poms in <jar_filename>.pom
     # returns filename and status if found, else nil
     def get_pom(filename)
-      content, status = (get_pom_from_jar(filename) or get_pom_from_sha1(filename) or get_pom_from_heuristic(filename))
+      content, status = (get_pom_from_jar(filename) || get_pom_from_sha1(filename) || get_pom_from_heuristic(filename))
       if content
         pom_filename = filename.sub(/(\.jar)?$/, ".pom")
         File.open(pom_filename, "w") { |io| io.write(content) }
@@ -52,7 +52,9 @@ module Gjp
           results = site.search_by_sha1(sha1).select {|result| result["ec"].include?(".pom")}
           result = results.first    
           if result != nil
-            log.info("pom.xml for #{file} found on search.maven.org for sha1 #{sha1} (#{result["g"]}:#{result["a"]}:#{result["v"]})")
+            log.info("pom.xml for #{file} found on search.maven.org for sha1 #{sha1}\
+              (#{result["g"]}:#{result["a"]}:#{result["v"]})"
+            )
             group_id, artifact_id, version = site.get_maven_id_from result
             return site.download_pom(group_id, artifact_id, version), :found_via_sha1
           end
@@ -80,11 +82,17 @@ module Gjp
           results = site.search_by_group_id_and_artifact_id(group_id, artifact_id)
           log.debug("All versions: #{results}")
           their_versions = results.map {|doc| doc["v"]}
-          best_matched_version = if my_version != nil then version_matcher.best_match(my_version, their_versions) else their_versions.max end
+          best_matched_version = if my_version != nil
+            version_matcher.best_match(my_version, their_versions)
+          else
+            their_versions.max
+          end
           best_matched_result = (results.select{|result| result["v"] == best_matched_version}).first
             
           group_id, artifact_id, version = site.get_maven_id_from(best_matched_result)
-          log.warn("pom.xml for #{filename} found on search.maven.org with heuristic search (#{group_id}:#{artifact_id}:#{version})")
+          log.warn("pom.xml for #{filename} found on search.maven.org with heuristic search\
+            (#{group_id}:#{artifact_id}:#{version})"
+          )
             
           return site.download_pom(group_id, artifact_id, version), :found_via_heuristic
         end

data/lib/gjp/project.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'find'
+require "find"
 
 module Gjp
   # encapsulates a Gjp project directory
@@ -49,7 +49,9 @@ module Gjp
         dir_path = Pathname.new(File.expand_path(dir)).relative_path_from(Pathname.new(@full_path))
         components = dir_path.to_s.split(File::SEPARATOR)
 
-        if components.count >= 2 && components.first == "src" && Dir.exist?(File.join(@full_path, components[0], components[1]))
+        if components.count >= 2 &&
+          components.first == "src" &&
+          Dir.exist?(File.join(@full_path, components[0], components[1]))
           components[1]
         else
           raise NoPackageDirectoryError

data/lib/gjp/script_generator.rb

@@ -42,7 +42,8 @@ module Gjp
 
         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")
+        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)

data/lib/gjp/spec_generator.rb

@@ -17,7 +17,7 @@ module Gjp
         FileUtils.mkdir_p(output_dir)
 
         adapter = Gjp::KitSpecAdapter.new(@project)
-        conflict_count = generate_merging("kit.spec", adapter.get_binding, spec_path, :generate_kit_spec)
+        conflict_count = generate_merging("kit.spec", adapter.public_binding, spec_path, :generate_kit_spec)
 
         symlink_to_output(spec_path, output_dir)
 
@@ -34,7 +34,7 @@ module Gjp
         FileUtils.mkdir_p(output_dir)
 
         adapter = Gjp::PackageSpecAdapter.new(@project, name, pom, filter)
-        conflict_count = generate_merging("package.spec", adapter.get_binding, spec_path, "generate_#{name}_spec")
+        conflict_count = generate_merging("package.spec", adapter.public_binding, spec_path, "generate_#{name}_spec")
 
         symlink_to_output(spec_path, output_dir)
 

data/lib/gjp/version.rb

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

data/lib/gjp/version_matcher.rb

@@ -28,13 +28,13 @@ module Gjp
     #  - score weighs differently on chunk index (first chunks are most important)
     #  - lowest score wins
     def best_match(my_version, their_versions)
-      log.debug("version comparison: #{my_version} vs #{their_versions.join(', ')}")
+      log.debug("version comparison: #{my_version} vs #{their_versions.join(", ")}")
     
-      my_chunks = my_version.split /[\.\-\_ ~,]/
+      my_chunks = my_version.split(/[\.\-\_ ~,]/)
       their_chunks_hash = Hash[
         their_versions.map do |their_version|
           their_chunks_for_version = if their_version != nil
-            their_version.split /[\.\-\_ ~,]/
+            their_version.split(/[\.\-\_ ~,]/)
           else
             []
           end

data/lib/template/kit.spec

@@ -52,6 +52,7 @@ be installed on end users' systems.
 # nothing to do, gjp kits are precompiled by design
 
 %install
+export NO_BRP_CHECK_BYTECODE_VERSION=true
 install -d -m 0755 %{buildroot}%{_datadir}/gjp/%{name}/
 cp -a * %{buildroot}%{_datadir}/gjp/%{name}/
 %fdupes -s %{buildroot}%{_datadir}/gjp/%{name}/

data/lib/template/package.spec

@@ -50,6 +50,7 @@ cd ../../
 sh src/<%= name %>/build.sh
 
 %install
+export NO_BRP_CHECK_BYTECODE_VERSION=true
 mkdir -p %{buildroot}%{_javadir}
 <% outputs.each do |output| %>
 cp -a <%= output %> %{buildroot}%{_javadir}/<%= File.basename(output) %>

data/spec/lib/ant_runner_spec.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
-require 'spec_helper'
-require 'lib/kit_runner_spec'
+require "spec_helper"
+require "lib/kit_runner_spec"
 
 describe Gjp::AntRunner do
   it_behaves_like Gjp::KitRunner
@@ -34,7 +34,7 @@ describe Gjp::AntRunner do
       executable_path = create_mock_executable("ant")
       @project.from_directory do
         @kit_runner.ant(["extra-option"])
-        File.read("test_out").strip.should match /extra-option$/
+        File.read("test_out").strip.should match(/extra-option$/)
       end
     end
     it "doesn't run Ant if it is not available" do

data/spec/lib/archiver_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Gjp::Archiver do
   before(:each) do

data/spec/lib/git_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Gjp::Git do
   before(:each) do
@@ -17,9 +17,31 @@ describe Gjp::Git do
 
   describe "#init"  do
     it "complains if a double initialization is attempted" do
-      expect {
+      expect do
         @git.init
-      }.to raise_error(Gjp::GitAlreadyInitedError)
+      end.to raise_error(Gjp::GitAlreadyInitedError)
+    end
+  end
+
+  describe "#commit_whole_directory" do
+    it "commits all contents of a directory to git for later use" do
+      Dir.chdir(@git_path) do
+        File.open("file1", "w") do |file|
+          file.write "test"
+        end
+
+        # check that gitignore files are moved correctly
+        File.open(".gitignore", "w") do |file|
+          file.write "file1o"
+        end
+
+        @git.commit_whole_directory("test", "test")
+
+        files = `git ls-tree --name-only -r HEAD`.split("\n")
+
+        files.should include("file1")
+        files.should include(".gitignore_disabled_by_gjp")
+      end
     end
   end
 

data/spec/lib/kit_checker_spec.rb

@@ -39,7 +39,7 @@ describe Gjp::KitChecker do
     end
   end
 
-  describe "#get_source_classes"  do
+  describe "#source_class_names"  do
     it "distills source class names in kit" do
       all_files = [
         ["path/to/ClassOne.java", nil],
@@ -48,7 +48,7 @@ describe Gjp::KitChecker do
         ["path/to/CompiledClass.class", "yet_another.jar"],
       ]
 
-      class_names = @kit_checker.get_source_class_names(all_files)
+      class_names = @kit_checker.source_class_names(all_files)
 
       class_names.should include "path.to.ClassOne"
       class_names.should include "path.to.ClassTwo"
@@ -57,7 +57,7 @@ describe Gjp::KitChecker do
     end
   end
 
-  describe "#get_compiled_classes"  do
+  describe "#compiled_classes"  do
     it "distills source class names in kit" do
       all_files = [
         ["path/to/ClassOne.class", nil],
@@ -66,7 +66,7 @@ describe Gjp::KitChecker do
         ["path/to/SourceClass.java", "yet_another.jar"],
       ]
 
-      classes = @kit_checker.get_compiled_classes(all_files)
+      classes = @kit_checker.compiled_classes(all_files)
 
       classes[nil].should include "path.to.ClassOne"
       classes["path/to/archive.jar"].should include "path.to.ClassTwo"
@@ -75,7 +75,7 @@ describe Gjp::KitChecker do
     end
   end
 
-  describe "#get_unsourced" do
+  describe "#unsourced_archives" do
     it "returns a list of jars wich source files are missing" do
       @project.from_directory("kit") do
         FileUtils.mkdir_p("package1")
@@ -106,7 +106,7 @@ describe Gjp::KitChecker do
         end
       end
 
-      unsourced = @kit_checker.get_unsourced
+      unsourced = @kit_checker.unsourced_archives
       unsourced.length().should eq 1
 
       unsourced.first[:archive].should be_nil