gjp 0.29.0 → 0.30.0

data/spec/lib/maven_runner_spec.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+require 'lib/kit_runner_spec'
+
+describe Gjp::MavenRunner do
+  it_behaves_like Gjp::KitRunner
+  include Gjp::Mockers
+
+  before(:each) do
+    create_mock_project
+    @kit_runner = Gjp::MavenRunner.new(@project)
+  end
+
+  after(:each) do
+    delete_mock_project
+  end
+
+  describe "#get_maven_commandline"  do
+    it "returns commandline options for running maven" do
+      executable_path = create_mock_executable("mvn")
+
+      @project.from_directory do
+        commandline = @kit_runner.get_maven_commandline(".")
+        commandline.should eq "./#{executable_path} -Dmaven.repo.local=./kit/m2 -s./kit/m2/settings.xml"
+      end
+    end
+    it "doesn't return commandline options if Maven is not available" do
+      expect { @kit_runner.get_maven_commandline(".") }.to raise_error(Gjp::ExecutableNotFoundError)
+    end
+  end
+
+  describe "#mvn"  do
+    it "runs maven" do
+      create_mock_executable("mvn")
+      @project.from_directory do
+        @kit_runner.mvn(["extra-option"])
+        File.read("test_out").strip.should match /extra-option$/
+      end
+    end
+    it "doesn't run Maven if it is not available" do
+      @project.from_directory do
+        expect { @kit_runner.mvn([]) }.to raise_error(Gjp::ExecutableNotFoundError)
+      end
+    end
+  end
+
+  describe "#get_source_jar"  do
+    it "runs maven to get a source jar" do
+      create_mock_executable("mvn")
+      @project.from_directory do
+        @kit_runner.get_source_jar("test_group", "test_artifact_id", "test_version")
+        File.read("test_out").strip.should match /dependency:get -Dartifact=test_group:test_artifact_id:test_version:jar:sources -Dtransitive=false$/
+      end
+    end
+  end
+
+  describe "#get_effective_pom"  do
+    it "runs maven to get an effective pom" do
+      create_mock_executable("mvn")
+      @project.from_directory do
+        @kit_runner.get_effective_pom("test.pom").should eq "test.pom.effective"
+        File.read("test_out").strip.should match /help:effective-pom -ftest.pom -Doutput=test.pom.effective$/
+      end
+    end
+  end
+end

data/spec/lib/pom_getter_spec.rb

@@ -11,6 +11,8 @@ describe Gjp::PomGetter do
       jar_path = File.join(dir_path, "commons-logging-1.1.1.jar")
       path, status = pom_getter.get_pom(jar_path)
       status.should eq :found_in_jar
+      File.exist?(path).should be_true
+      FileUtils.rm(path)
     end
 
     it "gets the pom from sha1" do
@@ -18,6 +20,8 @@ describe Gjp::PomGetter do
       jar_path = File.join(dir_path, "antlr-2.7.2.jar")
       path, status = pom_getter.get_pom(jar_path)
       status.should eq :found_via_sha1
+      File.exist?(path).should be_true
+      FileUtils.rm(path)
     end
     
     it "gets the pom from a heuristic" do
@@ -25,6 +29,8 @@ describe Gjp::PomGetter do
       jar_path = File.join(dir_path, "nailgun-0.7.1.jar")
       path, status = pom_getter.get_pom(jar_path)
       status.should eq :found_via_heuristic
+      File.exist?(path).should be_true
+      FileUtils.rm(path)
     end         
   end
 end

data/spec/lib/pom_spec.rb

@@ -5,16 +5,6 @@ require 'spec_helper'
 describe Gjp::Pom do
   let(:pom) { Gjp::Pom.new(File.join("spec", "data", "commons-logging", "pom.xml")) }
 
-  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"
@@ -27,6 +17,12 @@ describe Gjp::Pom do
     end
   end
 
+  describe "#name" do
+    it "reads artifact name" do
+      pom.name.should eq "Commons Logging"
+    end
+  end
+
   describe "#version" do
     it "reads the version" do
       pom.version.should eq "1.1.1"
@@ -57,21 +53,15 @@ describe Gjp::Pom do
     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
-  end
-
-  describe "#parent_artifact_id" do
-    it "reads the parent's artifact id" do
-      pom.parent_artifact_id.should eq "commons-parent"
+  describe "#scm_connection" do
+    it "reads the SCM connection address" do
+      pom.scm_connection.should eq "scm:svn:http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
     end
   end
 
-  describe "#parent_version" do
-    it "reads the parent's version" do
-      pom.parent_version.should eq "5"
+  describe "#scm_url" do
+    it "reads the SCM connection url" do
+      pom.scm_url.should eq "http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
     end
   end
 end

data/spec/lib/source_getter_spec.rb

@@ -4,19 +4,20 @@ require "spec_helper"
 require "fileutils"
 
 describe Gjp::SourceGetter do
+  include Gjp::Mockers
   let(:source_getter) { Gjp::SourceGetter.new }
 
-  describe "#get_maven_source_jars" do
-    before(:each) do
-      @project_path = File.join("spec", "data", "test-project")
-      Dir.mkdir(@project_path)
+  before(:each) do
+    create_mock_project
+  end
 
-      Gjp::Project.init(@project_path)
-      @project = Gjp::Project.new(@project_path)
-    end
+  after(:each) do
+    delete_mock_project
+  end
 
+  describe "#get_maven_source_jars" do
     it "gets sources for jars in the Maven repo through Maven itself" do
-      mock_executable("mvn", @project_path)
+      create_mock_executable("mvn")
 
       @project.from_directory(File.join("kit", "m2")) do
         jar_dir_path = File.join("net", "test", "artifact", "1.0")
@@ -31,40 +32,6 @@ describe Gjp::SourceGetter do
         failures.should eq []
       end
     end
-
-    after(:each) do
-      FileUtils.rm_rf(@project_path)
-    end
-  end
-
-  describe "#get_source_from_git" do
-    it "gets the sources from a git repo" do
-      dir_path = File.join("spec", "data", "nailgun")
-      pom_path = File.join(dir_path, "pom.xml")
-      repo_path = File.join(dir_path, "com.martiansoftware:nailgun-all:0.9.1")
-      file_path = File.join(repo_path, "README.md")
-
-      FileUtils.rm_rf(repo_path)
-
-      source_getter.get_source("git:git@github.com:martylamb/nailgun.git", pom_path, dir_path)
-
-      File.open(file_path).readline.should eq "nailgun\n"
-    end
-  end
-  
-	describe "#get_source_from_svn" do
-    it "gets the sources from an svn repo" do  
-      dir_path = File.join("spec", "data", "struts-apps")
-      pom_path = File.join(dir_path, "pom.xml")
-      repo_path = File.join(dir_path, "org.apache.struts:struts2-apps:")
-      file_path = File.join(repo_path, "showcase", "README.txt")
-
-      FileUtils.rm_rf(repo_path)
-
-      source_getter.get_source("svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_14/apps", pom_path, dir_path)
-
-      File.open(file_path).readline.should eq "README.txt - showcase\n"
-    end
   end
 end
 

data/spec/spec_helper.rb

@@ -5,16 +5,33 @@ require "gjp/logger"
 
 Gjp::Logger.log.level = ::Logger::DEBUG
 
-# creates an executable in kit that will print its parameters
-# in a test_out file for checking. Returns mocked executable
-# full path
-def mock_executable(executable_name, project_path)
-  Dir.chdir(project_path) do
-    bin_dir = File.join("kit", executable_name, "bin")
-    FileUtils.mkdir_p(bin_dir)
-    executable_path = File.join(bin_dir, executable_name)
-    File.open(executable_path, "w") { |io| io.puts "echo $0 $*>test_out" }
-    File.chmod(0777, executable_path)
-    executable_path
+# custom mock methods
+module Gjp::Mockers
+  # creates a minimal gjp project
+  def create_mock_project
+    @project_path = File.join("spec", "data", "test-project")
+    Dir.mkdir(@project_path)
+
+    Gjp::Project.init(@project_path)
+    @project = Gjp::Project.new(@project_path)
+  end
+
+  # deletes the mock project and all contents
+  def delete_mock_project
+    FileUtils.rm_rf(@project_path)
+  end
+
+  # creates an executable in kit that will print its parameters
+  # in a test_out file for checking. Returns mocked executable
+  # full path
+  def create_mock_executable(executable_name)
+    Dir.chdir(@project_path) do
+      bin_dir = File.join("kit", executable_name, "bin")
+      FileUtils.mkdir_p(bin_dir)
+      executable_path = File.join(bin_dir, executable_name)
+      File.open(executable_path, "w") { |io| io.puts "echo $0 $*>test_out" }
+      File.chmod(0777, executable_path)
+      executable_path
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -157,6 +157,7 @@ files:
 - gjp.gemspec
 - integration-tests/commons.sh
 - lib/gjp.rb
+- lib/gjp/ant_runner.rb
 - lib/gjp/archiver.rb
 - lib/gjp/cli.rb
 - lib/gjp/git.rb
@@ -164,14 +165,13 @@ files:
 - lib/gjp/kit_spec_adapter.rb
 - lib/gjp/limited_network_user.rb
 - 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
 - lib/gjp/project.rb
 - lib/gjp/script_generator.rb
-- lib/gjp/source_address_getter.rb
 - lib/gjp/source_getter.rb
 - lib/gjp/spec_generator.rb
 - lib/gjp/template_manager.rb
@@ -201,17 +201,17 @@ files:
 - spec/data/nailgun/pom.xml
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
+- spec/lib/ant_runner_spec.rb
 - spec/lib/archiver_spec.rb
 - spec/lib/git_spec.rb
 - spec/lib/kit_runner_spec.rb
 - spec/lib/limited_network_user_spec_interactive.rb
+- spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
-- spec/lib/parent_pom_getter_spec.rb
 - spec/lib/pom_getter_spec.rb
 - spec/lib/pom_spec.rb
 - spec/lib/project_spec.rb
 - spec/lib/script_generator_spec.rb
-- spec/lib/source_address_getter_spec.rb
 - spec/lib/source_getter_spec.rb
 - spec/lib/spec_generator_spec.rb
 - spec/lib/template_manager_spec.rb
@@ -259,17 +259,17 @@ test_files:
 - spec/data/nailgun/pom.xml
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
+- spec/lib/ant_runner_spec.rb
 - spec/lib/archiver_spec.rb
 - spec/lib/git_spec.rb
 - spec/lib/kit_runner_spec.rb
 - spec/lib/limited_network_user_spec_interactive.rb
+- spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
-- spec/lib/parent_pom_getter_spec.rb
 - spec/lib/pom_getter_spec.rb
 - spec/lib/pom_spec.rb
 - spec/lib/project_spec.rb
 - spec/lib/script_generator_spec.rb
-- spec/lib/source_address_getter_spec.rb
 - spec/lib/source_getter_spec.rb
 - spec/lib/spec_generator_spec.rb
 - spec/lib/template_manager_spec.rb

data/lib/gjp/parent_pom_getter.rb

@@ -1,22 +0,0 @@
-# encoding: UTF-8
-
-require "pathname"
-
-module Gjp
-  # attempts to get a pom's parent pom
-  class ParentPomGetter
-    include Logger
-
-    # returns the pom's parent, if any
-    def get_parent_pom(filename)
-      begin
-        pom = Pom.new(filename)
-        site = MavenWebsite.new
-
-        site.download_pom(pom.parent_group_id, pom.parent_artifact_id, pom.parent_version)
-      rescue RestClient::ResourceNotFound
-        $stderr.puts "Could not find a parent for this pom!" 
-      end
-    end
-  end
-end

data/lib/gjp/source_address_getter.rb

@@ -1,51 +0,0 @@
-# encoding: UTF-8
-
-require "rest_client"
-require "json"
-require "open-uri"
-
-module Gjp
-  # attempts to get java projects' scm addresses
-  class SourceAddressGetter
-    include Logger
-
-    # returns the pom corresponding to a file or directory, if it can be found
-    def get_source_address(file)
-      log.info("looking for source address for: #{file}")
-      (get_source_address_from_pom(file) or get_source_address_from_github(file))
-    end
-
-    # returns an scm address in a pom file
-    def get_source_address_from_pom(file)
-      pom = Pom.new(file)
-      result = pom.connection_address
-
-      if result != nil
-        log.info("address found in pom")
-        result
-      end
-    end
-    
-    # returns an scm address looking for it on github
-    def get_source_address_from_github(file)
-      pom = Pom.new(file)
-
-      result = (github_search(pom.artifact_id) or github_search(pom.artifact_id.split("-").first) or github_search(pom.group_id))
-      
-      if result != nil
-        log.info("address found on Github: #{result}")
-        result
-      end
-    end
-    
-    # returns a Giuthub repo address based on the keyword
-    def github_search(keyword)
-      if keyword != "" and keyword != nil
-        response = RestClient.get "https://api.github.com/legacy/repos/search/" + CGI::escape(keyword), :user_agent => "gjp/" + Gjp::VERSION, :language => "java", :sort => "forks"
-        json = JSON.parse(response.to_s)
-      
-        (json["repositories"].map {|repository| "git:" + repository["url"]}).first
-      end
-    end
-  end
-end

data/spec/lib/parent_pom_getter_spec.rb

@@ -1,16 +0,0 @@
-# encoding: UTF-8
-
-require 'spec_helper'
-
-describe Gjp::ParentPomGetter do
-  let(:parent_pom_getter) { Gjp::ParentPomGetter.new }
-
-  describe "#get_parent_pom" do
-    it "gets the the parent of a pom" do
-      dir_path = File.join("spec", "data", "commons-logging")
-      pom_path = File.join(dir_path, "pom.xml")
-      parent_pom_path = File.join(dir_path, "parent_pom.xml")
-      parent_pom_getter.get_parent_pom(pom_path).should eq(File.read(parent_pom_path))
-    end
-  end
-end

data/spec/lib/source_address_getter_spec.rb

@@ -1,20 +0,0 @@
-# encoding: UTF-8
-
-require 'spec_helper'
-
-describe Gjp::SourceAddressGetter do
-  let(:source_address_getter) { Gjp::SourceAddressGetter.new }
-
-  describe "#get_source_address" do
-    it "gets the source address from a pom file" do
-      pom_path = File.join("spec", "data", "commons-logging", "pom.xml")
-      source_address_getter.get_source_address(pom_path).should eq "svn:http://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1"
-    end
-    
-    it "gets the source address from Github" do
-      pom_path = File.join("spec", "data", "antlr", "pom.xml")
-      source_address_getter.get_source_address(pom_path).should eq "git:https://github.com/antlr/antlr4"
-    end
-  end
-end
-