gjp 0.37.0 → 0.38.0

data/lib/gjp/commands/{generate-kit-archive.rb → generate_kit_archive.rb}

@@ -2,7 +2,6 @@
 
 module Gjp
   class GenerateKitArchiveCommand < Gjp::BaseCommand
-
     option ["-f", "--full"], :flag, "create a full archive (not incremental)"
 
     def execute

data/lib/gjp/commands/{generate-kit-spec.rb → generate_kit_spec.rb}

@@ -2,7 +2,6 @@
 
 module Gjp
   class GenerateKitSpecCommand < Gjp::BaseCommand
-
     def execute
       checking_exceptions do
         project = Gjp::Project.new(".")

data/lib/gjp/commands/{generate-package-archive.rb → generate_package_archive.rb}

@@ -2,8 +2,7 @@
 
 module Gjp
   class GeneratePackageArchiveCommand < Gjp::BaseCommand
-
-    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", :default => "."
+    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", default: "."
 
     def execute
       checking_exceptions do

data/lib/gjp/commands/{generate-package-script.rb → generate_package_script.rb}

@@ -2,8 +2,7 @@
 
 module Gjp
   class GeneratePackageScriptCommand < Gjp::BaseCommand
-
-    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", :default => "."
+    parameter "[DIRECTORY]", "path to a package directory (src/<package name>)", default: "."
 
     def execute
       checking_exceptions do

data/lib/gjp/commands/{generate-package-spec.rb → generate_package_spec.rb}

@@ -2,10 +2,9 @@
 
 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"
+    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

data/lib/gjp/commands/{get-pom.rb → get_pom.rb}

@@ -2,7 +2,6 @@
 
 module Gjp
   class GetPomCommand < Gjp::BaseCommand
-
     parameter "NAME", "a jar file name or a `name-version` string (heuristic)"
 
     def execute
@@ -12,18 +11,20 @@ module Gjp
 
         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
+          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")}"
+          puts "http://google.com/#q=#{URI.encode(pom_getter.cleanup_name(name) + " pom")}"
         end
       end
     end

data/lib/gjp/commands/{get-source.rb → get_source.rb}

@@ -2,7 +2,6 @@
 
 module Gjp
   class GetSourceCommand < Gjp::BaseCommand
-
     parameter "POM", "a pom file path or URI"
 
     def execute
@@ -17,17 +16,17 @@ module Gjp
           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?
+          unless pom.url.empty?
             puts "Website: #{pom.url}"
           end
-          if pom.scm_connection && !pom.scm_connection.empty?
+          unless pom.scm_connection.empty?
             puts "SCM connection: #{pom.scm_connection}"
           end
-          if pom.scm_url && !pom.scm_url.empty?
+          unless 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")}"
+          puts "Google: http://google.com/#q=#{URI.encode(pom.name + " sources")}"
         end
       end
     end

data/lib/gjp/commands/init.rb

@@ -2,7 +2,6 @@
 
 module Gjp
   class InitCommand < Gjp::BaseCommand
-
     def execute
       checking_exceptions do
         Gjp::Project.init(".")

data/lib/gjp/commands/{list-kit-missing-sources.rb → list_kit_missing_sources.rb}

@@ -2,7 +2,6 @@
 
 module Gjp
   class ListKitMissingSourcesCommand < Gjp::BaseCommand
-
     def execute
       checking_exceptions do
         project = Gjp::Project.new(".")
@@ -11,7 +10,7 @@ module Gjp
         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())
+            percentage = "%.2f" % (100.0 * archive[:unsourced_class_names].length / archive[:class_names].length)
             puts "#{format_path(archive[:archive], project)} (~#{percentage}% missing)"
           end
         end

data/lib/gjp/commands/{move-jars-to-kit.rb → move_jars_to_kit.rb}

@@ -2,7 +2,6 @@
 
 module Gjp
   class MoveJarsToKitCommand < Gjp::BaseCommand
-
     def execute
       checking_exceptions do
         project = Gjp::Project.new(".")

data/lib/gjp/commands/mvn.rb

@@ -2,8 +2,7 @@
 
 module Gjp
   class MavenCommand < Gjp::BaseCommand
-
-    parameter "[MAVEN OPTIONS] ...", "mvn options", :attribute_name => "dummy"
+    parameter "[MAVEN OPTIONS] ...", "mvn options", attribute_name: "dummy"
 
     # override parsing in order to pipe everything to mvn
     def parse(args)

data/lib/gjp/git.rb

@@ -4,7 +4,7 @@ module Gjp
   # facade to git, currently implemented with calls to the git command
   # prefixes all tags with "gjp_"
   class Git
-    include Logger
+    include Logging
 
     # inits a new git manager object pointing to the specified
     # directory
@@ -15,7 +15,7 @@ module Gjp
     # inits a repo
     def init
       Dir.chdir(@directory) do
-        if Dir.exists?(".git") == false
+        if Dir.exist?(".git") == false
           `git init`
         else
           raise GitAlreadyInitedError
@@ -34,11 +34,13 @@ module Gjp
     def changed_files_between(start_tag, end_tag, directory)
       Dir.chdir(@directory) do
         prefixed_start_tag = "gjp_#{start_tag}"
-        prefixed_end_tag = if end_tag
-          "gjp_#{end_tag}"
-        else
-          "HEAD"
-        end
+        prefixed_end_tag = (
+          if end_tag
+            "gjp_#{end_tag}"
+          else
+            "HEAD"
+          end
+        )
         `git diff-tree --no-commit-id --name-only -r #{prefixed_start_tag} #{prefixed_end_tag} -- #{directory}`
           .split("\n")
       end
@@ -63,8 +65,8 @@ module Gjp
         `git add .`
         `git commit -m "#{message}"`
 
-        if tag != nil
-          if tag_message != nil
+        unless tag.nil?
+          if !tag_message.nil?
             `git tag gjp_#{tag} -m "#{tag_message}"`
           else
             `git tag gjp_#{tag}`
@@ -77,11 +79,11 @@ 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
+          if tag =~ /^gjp_#{prefix}_([0-9]+)$/
+            Regexp.last_match[1].to_i
+          else
+            0
+          end
         end.max || 0
       end
     end

data/lib/gjp/kit_checker.rb

@@ -6,9 +6,9 @@ require "zip"
 module Gjp
   # checks kits for errors
   class KitChecker
-    include Logger
+    include Logging
 
-    def initialize(project)      
+    def initialize(project)
       @project = project
     end
 
@@ -45,14 +45,14 @@ module Gjp
         path =~ /\.java$/
       end
 
-      # heuristically add all possible package names, walking 
+      # heuristically add all possible package names, walking
       # back the directory tree all the way back to root.
       # This could add non-existent names, but allows not looking
       # in the file at all
       class_names = source_paths.map do |path, archive|
         class_name = path_to_class(path)
         parts = class_name.split(".")
-        last_index = parts.length() -1
+        last_index = parts.length - 1
         (0..last_index).map do |i|
           parts[i..last_index].join(".")
         end
@@ -69,7 +69,7 @@ module Gjp
         path =~ /\.class$/
       end.each do |path, archive|
         class_name = path_to_class(path)
-        if result[archive] == nil
+        if result[archive].nil?
           result[archive] = [class_name]
         else
           result[archive] << class_name
@@ -90,7 +90,7 @@ module Gjp
         unsourced_class_names = class_names.select do |class_name|
           source_class_names.include?(class_name) == false
         end
-        {:archive => archive, :class_names => class_names, :unsourced_class_names => unsourced_class_names}
+        { archive: archive, class_names: class_names, unsourced_class_names: unsourced_class_names }
       end.select do |archive|
         archive[:unsourced_class_names].any?
       end

data/lib/gjp/kit_runner.rb

@@ -6,9 +6,9 @@ require "pathname"
 module Gjp
   # runs programs from a gjp kit with gjp-specific options
   class KitRunner
-    include Logger
+    include Logging
 
-    def initialize(project)      
+    def initialize(project)
       @project = project
     end
 

data/lib/gjp/kit_spec_adapter.rb

@@ -1,4 +1,4 @@
-  # encoding: UTF-8
+# encoding: UTF-8
 
 module Gjp
   # encapsulates details of a kit needed by the spec file
@@ -26,4 +26,3 @@ module Gjp
     end
   end
 end
-

data/lib/gjp/logger.rb

@@ -1,27 +1,30 @@
 # encoding: UTF-8
 
+require "singleton"
+require "forwardable"
 require "logger"
 
 module Gjp
-  module Logger
-    @@logger = nil
+  class Logger
+    include Singleton
+    extend Forwardable
 
-    # returns a logger instance
-    def self.log
-      if @@logger == nil
-        @@logger = ::Logger.new(STDERR)
-        @@logger.datetime_format = "%Y-%m-%d %H:%M "
-        @@logger.level = ::Logger::ERROR
-        @@logger.formatter = proc do |severity, datetime, progname, msg|
-          "#{severity.chars.first}: #{msg}\n"
-        end
+    def_delegators :@logger, :debug, :info, :warn, :error, :fatal, :level=
+
+    def initialize
+      @logger = ::Logger.new(STDERR)
+      @logger.datetime_format = "%Y-%m-%d %H:%M "
+      @logger.level = ::Logger::ERROR
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        "#{severity.chars.first}: #{msg}\n"
       end
-      @@logger
     end
+  end
 
+  module Logging
     # convenience instance method
     def log
-      Gjp::Logger.log
+      Gjp::Logger.instance
     end
   end
 end

data/lib/gjp/main.rb

@@ -3,7 +3,6 @@ require "clamp"
 
 module Gjp
   class MainCommand < Clamp::Command
-
     subcommand(
       "init",
       "Inits a gjp project in the current directory",

data/lib/gjp/maven_runner.rb

@@ -3,7 +3,7 @@
 module Gjp
   # runs Maven with gjp-specific options
   class MavenRunner < KitRunner
-    include Logger
+    include Logging
 
     # runs Maven in a subprocess
     def mvn(options)
@@ -33,7 +33,7 @@ module Gjp
     def get_maven_commandline(prefix, options)
       executable = find_executable("mvn")
 
-      if executable != nil
+      if !executable.nil?
         mvn_path = File.join(prefix, executable)
         repo_path = File.join(prefix, "kit", "m2")
         config_path = File.join(prefix, "kit", "m2", "settings.xml")

data/lib/gjp/maven_website.rb

@@ -4,58 +4,58 @@ require "text"
 
 module Gjp
   # Facade to search.maven.org
-  class MavenWebsite 
-    include Logger
+  class MavenWebsite
+    include Logging
 
     # returns a search result object from search.maven.com
     # 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}\"")
+      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)
+      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")
+      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}\"")
+      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")
-        )
-        json = JSON.parse(response.to_s)
-        return json["response"]["docs"]
+      response = RestClient.get("http://search.maven.org/solrsearch/select",
+                                params: params.merge("rows" => "100", "wt" => "json")
+      )
+      json = JSON.parse(response.to_s)
+      json["response"]["docs"]
     end
 
     # returns a Maven's triple (artifactId, groupId, version)
     # from a result object
     def get_maven_id_from(result)
-      return result["g"], result["a"], result["v"]
+      [result["g"], result["a"], result["v"]]
     end
-    
+
     # downloads a POM from a search.maven.com search result
     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
+      (RestClient.get "http://search.maven.org/remotecontent", params: { filepath: path }).to_s
     end
   end
 end