gjp 0.11.1 → 0.11.2

data/lib/gjp/source_address_getter.rb

@@ -7,18 +7,16 @@ require "open-uri"
 module Gjp
   # attempts to get java projects' scm addresses
   class SourceAddressGetter
-    def self.log
-      Gjp.logger
-    end
+    include Logger
 
     # returns the pom corresponding to a file or directory, if it can be found
-    def self.get_source_address(file)
+    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 self.get_source_address_from_pom(file)
+    def get_source_address_from_pom(file)
       pom = Pom.new(file)
       result = pom.connection_address
 
@@ -29,7 +27,7 @@ module Gjp
     end
     
     # returns an scm address looking for it on github
-    def self.get_source_address_from_github(file)
+    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))
@@ -41,7 +39,7 @@ module Gjp
     end
     
     # returns a Giuthub repo address based on the keyword
-    def self.github_search(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)

data/lib/gjp/source_getter.rb

@@ -5,12 +5,10 @@ require "rest_client"
 module Gjp
   # attempts to get java projects' sources from scm
   class SourceGetter
-    def self.log
-      Gjp.logger
-    end
+    include Logger
 
     # downloads a project's source into a specified directory
-    def self.get_source(address, pomfile, directory)
+    def get_source(address, pomfile, directory)
       log.info("downloading: #{address} in #{directory}, pomfile: #{pomfile}")
       
       dummy, prefix, scm_address = address.split(/^([^:]+):(.*)$/)
@@ -20,7 +18,7 @@ module Gjp
     end
 
     # checks code out from an scm
-    def self.get_source_from_scm(prefix, scm_address, pomfile, directory)
+    def get_source_from_scm(prefix, scm_address, pomfile, directory)
       pom = Pom.new(pomfile)
       dir = File.join(directory, "#{pom.group_id}:#{pom.artifact_id}:#{pom.version}")
   		begin
@@ -37,7 +35,7 @@ module Gjp
     end
 
     # checks code out of git
-  	def self.get_source_from_git(scm_address, dir, version)
+  	def get_source_from_git(scm_address, dir, version)
   		`git clone #{scm_address} #{dir}`
   		
   		Dir.chdir(dir) do
@@ -53,7 +51,7 @@ module Gjp
   	end
 
     # checks code out of svn
-  	def self.get_source_from_svn(scm_address, dir, version)
+  	def get_source_from_svn(scm_address, dir, version)
   		`svn checkout #{scm_address} #{dir}`
   		
   		Dir.chdir(dir) do
@@ -69,16 +67,18 @@ module Gjp
   	end
 
   	# return the (heuristically) most similar tag to the specified version
-  	def self.get_best_tag(tags, version)
-  		versions_to_tags =Hash[
+  	def get_best_tag(tags, version)
+      version_matcher = VersionMatcher.new
+
+  		versions_to_tags = Hash[
   			*tags.map do |tag|
-  				[VersionMatcher.split_version(tag)[1], tag]
+  				[version_matcher.split_version(tag)[1], tag]
   			end.flatten
   		]
   			
   	  log.info("found the following versions and tags: #{versions_to_tags}")
 
-  		best_version = VersionMatcher.best_match(version, versions_to_tags.keys)
+  		best_version = version_matcher.best_match(version, versions_to_tags.keys)
   		versions_to_tags[best_version]
   	end
   end

data/lib/gjp/version.rb

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

data/lib/gjp/version_matcher.rb

@@ -5,15 +5,13 @@ require "text"
 module Gjp
   # heuristically matches version strings
   class VersionMatcher 
-    def self.log
-      Gjp.logger
-    end
+    include Logger
 
   	# heuristically splits a full name into an artifact name and version string
     # assumes that version strings begin with a numeric character and are separated
     # by a ., -, _, ~ or space
     # returns a [name, version] pair
-  	def self.split_version(full_name)	
+  	def split_version(full_name)	
       matches = full_name.match(/(.*?)(?:[\.\-\_ ~,]?([0-9].*))?$/)
       if matches != nil and matches.length > 1
         [matches[1], matches[2]]
@@ -29,7 +27,7 @@ module Gjp
     #  - "comparison" is a subtraction if the chunk is an integer, a string distance measure otherwise
     #  - score weighs differently on chunk index (first chunks are most important)
     #  - lowest score wins
-    def self.best_match(my_version, their_versions)
+    def best_match(my_version, their_versions)
       log.debug("version comparison: #{my_version} vs #{their_versions.join(', ')}")
     
       my_chunks = my_version.split /[\.\-\_ ~,]/
@@ -77,7 +75,7 @@ module Gjp
     # for integers, the score is the difference between their values
     # for strings, the score is the Levenshtein distance
     # in any case score is normalized between 0 (identical) and 99 (very different/uncomparable)
-    def self.chunk_distance(my_chunk, their_chunk)
+    def chunk_distance(my_chunk, their_chunk)
       if my_chunk == nil
         my_chunk = "0"
       end

data/lib/template/file_lists/CONTENTS

@@ -0,0 +1,3 @@
+gjp will generate file lists for all packages here.
+
+You can edit them manually if you wish before package generation.

data/lib/template/kit/CONTENTS

@@ -0,0 +1,9 @@
+Any files you put here will be copied as is in the "kit" package.
+
+You should add all dependencies and build tools here, so that they are
+available at build time.
+
+gjp will recognise Maven, Ant and other popular build tool binaries in here.
+
+Some generally useful configuration files are also placed here (eg.
+m2/settings.xml for Maven builds.

data/lib/template/kit/m2/settings.xml

@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!--
+ | This is the configuration file for Maven. It can be specified at two levels:
+ |
+ |  1. User Level. This settings.xml file provides configuration for a single user,
+ |                 and is normally provided in ${user.home}/.m2/settings.xml.
+ |
+ |                 NOTE: This location can be overridden with the CLI option:
+ |
+ |                 -s /path/to/user/settings.xml
+ |
+ |  2. Global Level. This settings.xml file provides configuration for all Maven
+ |                 users on a machine (assuming they're all using the same Maven
+ |                 installation). It's normally provided in
+ |                 ${maven.home}/conf/settings.xml.
+ |
+ |                 NOTE: This location can be overridden with the CLI option:
+ |
+ |                 -gs /path/to/global/settings.xml
+ |
+ | The sections in this sample file are intended to give you a running start at
+ | getting the most out of your Maven installation. Where appropriate, the default
+ | values (values used when the setting is not specified) are provided.
+ |
+ |-->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <!-- localRepository
+   | The path to the local repository maven will use to store artifacts.
+   |
+   | Default: ~/.m2/repository
+  <localRepository>/path/to/local/repo</localRepository>
+  -->
+
+  <!-- interactiveMode
+   | This will determine whether maven prompts you when it needs input. If set to false,
+   | maven will use a sensible default value, perhaps based on some other setting, for
+   | the parameter in question.
+   |
+   | Default: true
+  <interactiveMode>true</interactiveMode>
+  -->
+
+  <!-- offline
+   | Determines whether maven should attempt to connect to the network when executing a build.
+   | This will have an effect on artifact downloads, artifact deployment, and others.
+   |
+   | Default: false
+  <offline>false</offline>
+  -->
+
+  <!-- pluginGroups
+   | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
+   | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
+   | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
+   |-->
+  <pluginGroups>
+    <!-- pluginGroup
+     | Specifies a further group identifier to use for plugin lookup.
+    <pluginGroup>com.your.plugins</pluginGroup>
+    -->
+  </pluginGroups>
+
+  <!-- proxies
+   | This is a list of proxies which can be used on this machine to connect to the network.
+   | Unless otherwise specified (by system property or command-line switch), the first proxy
+   | specification in this list marked as active will be used.
+   |-->
+  <proxies>
+    <!-- proxy
+     | Specification for one proxy, to be used in connecting to the network.
+     |
+    <proxy>
+      <id>optional</id>
+      <active>true</active>
+      <protocol>http</protocol>
+      <username>proxyuser</username>
+      <password>proxypass</password>
+      <host>proxy.host.net</host>
+      <port>80</port>
+      <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
+    </proxy>
+    -->
+  </proxies>
+
+  <!-- servers
+   | This is a list of authentication profiles, keyed by the server-id used within the system.
+   | Authentication profiles can be used whenever maven must make a connection to a remote server.
+   |-->
+  <servers>
+    <!-- server
+     | Specifies the authentication information to use when connecting to a particular server, identified by
+     | a unique name within the system (referred to by the 'id' attribute below).
+     |
+     | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+     |       used together.
+     |
+    <server>
+      <id>deploymentRepo</id>
+      <username>repouser</username>
+      <password>repopwd</password>
+    </server>
+    -->
+
+    <!-- Another sample, using keys to authenticate.
+    <server>
+      <id>siteServer</id>
+      <privateKey>/path/to/private/key</privateKey>
+      <passphrase>optional; leave empty if not used.</passphrase>
+    </server>
+    -->
+  </servers>
+
+  <!-- mirrors
+   | This is a list of mirrors to be used in downloading artifacts from remote repositories.
+   |
+   | It works like this: a POM may declare a repository to use in resolving certain artifacts.
+   | However, this repository may have problems with heavy traffic at times, so people have mirrored
+   | it to several places.
+   |
+   | That repository definition will have a unique id, so we can create a mirror reference for that
+   | repository, to be used as an alternate download site. The mirror site will be the preferred
+   | server for that repository.
+   |-->
+  <mirrors>
+    <!-- mirror
+     | Specifies a repository mirror site to use instead of a given repository. The repository that
+     | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
+     | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
+     |
+    <mirror>
+      <id>mirrorId</id>
+      <mirrorOf>repositoryId</mirrorOf>
+      <name>Human Readable Name for this Mirror.</name>
+      <url>http://my.repository.com/repo/path</url>
+    </mirror>
+     -->
+  </mirrors>
+
+  <!-- profiles
+   | This is a list of profiles which can be activated in a variety of ways, and which can modify
+   | the build process. Profiles provided in the settings.xml are intended to provide local machine-
+   | specific paths and repository locations which allow the build to work in the local environment.
+   |
+   | For example, if you have an integration testing plugin - like cactus - that needs to know where
+   | your Tomcat instance is installed, you can provide a variable here such that the variable is
+   | dereferenced during the build process to configure the cactus plugin.
+   |
+   | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
+   | section of this document (settings.xml) - will be discussed later. Another way essentially
+   | relies on the detection of a system property, either matching a particular value for the property,
+   | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+   | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
+   | Finally, the list of active profiles can be specified directly from the command line.
+   |
+   | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
+   |       repositories, plugin repositories, and free-form properties to be used as configuration
+   |       variables for plugins in the POM.
+   |
+   |-->
+  <profiles>
+    <!-- profile
+     | Specifies a set of introductions to the build process, to be activated using one or more of the
+     | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
+     | or the command line, profiles have to have an ID that is unique.
+     |
+     | An encouraged best practice for profile identification is to use a consistent naming convention
+     | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
+     | This will make it more intuitive to understand what the set of introduced profiles is attempting
+     | to accomplish, particularly when you only have a list of profile id's for debug.
+     |
+     | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
+    <profile>
+      <id>jdk-1.4</id>
+
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+
+      <repositories>
+        <repository>
+          <id>jdk14</id>
+          <name>Repository for JDK 1.4 builds</name>
+          <url>http://www.myhost.com/maven/jdk14</url>
+          <layout>default</layout>
+          <snapshotPolicy>always</snapshotPolicy>
+        </repository>
+      </repositories>
+    </profile>
+    -->
+
+    <!--
+     | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
+     | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
+     | might hypothetically look like:
+     |
+     | ...
+     | <plugin>
+     |   <groupId>org.myco.myplugins</groupId>
+     |   <artifactId>myplugin</artifactId>
+     |
+     |   <configuration>
+     |     <tomcatLocation>${tomcatPath}</tomcatLocation>
+     |   </configuration>
+     | </plugin>
+     | ...
+     |
+     | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
+     |       anything, you could just leave off the <value/> inside the activation-property.
+     |
+    <profile>
+      <id>env-dev</id>
+
+      <activation>
+        <property>
+          <name>target-env</name>
+          <value>dev</value>
+        </property>
+      </activation>
+
+      <properties>
+        <tomcatPath>/path/to/tomcat/instance</tomcatPath>
+      </properties>
+    </profile>
+    -->
+  </profiles>
+
+  <!-- activeProfiles
+   | List of profiles that are active for all builds.
+   |
+  <activeProfiles>
+    <activeProfile>alwaysActiveProfile</activeProfile>
+    <activeProfile>anotherAlwaysActiveProfile</activeProfile>
+  </activeProfiles>
+  -->
+</settings>

data/lib/template/src/CONTENTS

@@ -0,0 +1,13 @@
+For each package you want to create, you should create a subdirectory here
+named after the package Maven name "orgId:artifactId:version", eg.
+
+./commons-collections:commons-collections:3.2/
+
+In that directory, place all the source files "verbatim" (as checked out from
+the original source repository).
+
+You can create any other directory for your convenience here. In case of git-
+tracked projects, for example, you can clone the whole repository and copy the
+version you want to build in orgId_artifactId_version.
+
+Please note that .gitignore files are honored!

data/spec/lib/limited_network_user_spec_interactive.rb

@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 describe Gjp::LimitedNetworkUser do
-
   let(:user) { Gjp::LimitedNetworkUser.new("nonet_test") }
 
   before(:each)  do
@@ -16,20 +15,20 @@ describe Gjp::LimitedNetworkUser do
     end
   end
 
-  describe ".set_up" do
+  describe "#set_up" do
     it "set_ups a limited network user" do
       user.set_up?.should be_true
     end
   end
 
-  describe ".tear_down" do
+  describe "#tear_down" do
     it "tears down a limited network user" do
       user.tear_down
       user.set_up?.should be_false
     end
   end
 
-  describe ".set_up?" do
+  describe "#set_up?" do
     it "checks if a limited network user has been set up" do
       user.set_up?.should be_true