gjp 0.37.0 → 0.38.0

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
+ClassLength:
+  Max: 200
+
 LineLength:
   Max: 120
 

data/.rubocop_todo.yml

@@ -5,29 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-ClassVars:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-ColonMethodCall:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-CommentIndentation:
-  Enabled: false
-
-# Offense count: 1
-CyclomaticComplexity:
-  Max: 8
-
-# Offense count: 6
-# Cop supports --auto-correct.
-DeprecatedClassMethods:
-  Enabled: false
-
 # Offense count: 8
 Documentation:
   Enabled: false
@@ -36,20 +13,10 @@ Documentation:
 DoubleNegation:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-EmptyLines:
-  Enabled: false
-
 # Offense count: 1
 EmptyLinesAroundAccessModifier:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-EmptyLinesAroundBody:
-  Enabled: false
-
 # Offense count: 2
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Encoding:
@@ -70,37 +37,11 @@ FormatString:
 GuardClause:
   Enabled: false
 
-# Offense count: 27
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
-HashSyntax:
-  EnforcedStyle: hash_rockets
-
 # Offense count: 7
 # Configuration parameters: MaxLineLength.
 IfUnlessModifier:
   Enabled: false
 
-# Offense count: 3
-# Cop supports --auto-correct.
-IndentationConsistency:
-  Enabled: false
-
-# Offense count: 15
-# Cop supports --auto-correct.
-IndentationWidth:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-LineEndConcatenation:
-  Enabled: false
-
-# Offense count: 4
-# Cop supports --auto-correct.
-MethodCallParentheses:
-  Enabled: false
-
 # Offense count: 28
 # Configuration parameters: CountComments.
 MethodLength:
@@ -115,22 +56,6 @@ MultilineBlockChain:
 Next:
   Enabled: false
 
-# Offense count: 8
-# Cop supports --auto-correct.
-NilComparison:
-  Enabled: false
-
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: IncludeSemanticChanges.
-NonNilCheck:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-PerlBackrefs:
-  Enabled: false
-
 # Offense count: 3
 # Configuration parameters: NamePrefixBlacklist.
 PredicateName:
@@ -141,17 +66,6 @@ PredicateName:
 RaiseArgs:
   EnforcedStyle: compact
 
-# Offense count: 2
-# Cop supports --auto-correct.
-RedundantBegin:
-  Enabled: false
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-RedundantReturn:
-  Enabled: false
-
 # Offense count: 1
 # Configuration parameters: MaxSlashes.
 RegexpLiteral:
@@ -167,34 +81,6 @@ ShadowingOuterLocalVariable:
 SignalException:
   Enabled: false
 
-# Offense count: 11
-# Cop supports --auto-correct.
-SpaceAfterComma:
-  Enabled: false
-
-# Offense count: 8
-# Cop supports --auto-correct.
-SpaceAroundOperators:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-SpaceBeforeBlockBraces:
-  Enabled: false
-
-# Offense count: 13
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-SpaceInsideBlockBraces:
-  Enabled: false
-
-# Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
-SpaceInsideHashLiteralBraces:
-  Enabled: false
-
 # Offense count: 4
 # Cop supports --auto-correct.
 SpecialGlobalVars:
@@ -204,22 +90,6 @@ SpecialGlobalVars:
 Tab:
   Enabled: false
 
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-TrailingBlankLines:
-  Enabled: false
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-TrailingComma:
-  Enabled: false
-
-# Offense count: 45
-# Cop supports --auto-correct.
-TrailingWhitespace:
-  Enabled: false
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, Whitelist.

data/Rakefile

@@ -3,5 +3,5 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
 
-task :default => :test
-task :test => :spec
+task default: :test
+task test: :spec

data/gjp.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  
+
   s.add_runtime_dependency "clamp"
   s.add_runtime_dependency "rubyzip", ">= 1.0"
   s.add_runtime_dependency "rest-client"

data/integration-tests/commons.sh

@@ -22,7 +22,7 @@ unzip apache-maven-*.zip
 rm apache-maven-*.zip
 cd ..
 
-gjp dry-run
+gjp dry-run --very-very-verbose
 cd src/commons-collections/commons-collections-3.2.1-src/
 gjp mvn package -DskipTests
 gjp finish

data/lib/gjp.rb

@@ -23,20 +23,20 @@ require "gjp/kit_checker"
 require "gjp/commands/base"
 
 require "gjp/commands/ant"
-require "gjp/commands/download-maven-source-jars"
-require "gjp/commands/dry-run"
+require "gjp/commands/download_maven_source_jars"
+require "gjp/commands/dry_run"
 require "gjp/commands/finish"
-require "gjp/commands/generate-all"
-require "gjp/commands/generate-kit-archive"
-require "gjp/commands/generate-kit-spec"
-require "gjp/commands/generate-package-archive"
-require "gjp/commands/generate-package-script"
-require "gjp/commands/generate-package-spec"
-require "gjp/commands/get-pom"
-require "gjp/commands/get-source"
+require "gjp/commands/generate_all"
+require "gjp/commands/generate_kit_archive"
+require "gjp/commands/generate_kit_spec"
+require "gjp/commands/generate_package_archive"
+require "gjp/commands/generate_package_script"
+require "gjp/commands/generate_package_spec"
+require "gjp/commands/get_pom"
+require "gjp/commands/get_source"
 require "gjp/commands/init"
-require "gjp/commands/list-kit-missing-sources"
-require "gjp/commands/move-jars-to-kit"
+require "gjp/commands/list_kit_missing_sources"
+require "gjp/commands/move_jars_to_kit"
 require "gjp/commands/mvn"
 
 require "gjp/main"

data/lib/gjp/ant_runner.rb

@@ -3,7 +3,7 @@
 module Gjp
   # runs Ant with gjp-specific options
   class AntRunner < KitRunner
-    include Logger
+    include Logging
 
     # runs ant in a subprocess
     def ant(options)
@@ -15,7 +15,7 @@ module Gjp
     def get_ant_commandline(prefix)
       executable = find_executable("ant")
 
-      if executable != nil
+      if !executable.nil?
         ant_path = File.join(prefix, executable)
 
         "#{ant_path}"

data/lib/gjp/archiver.rb

@@ -3,7 +3,7 @@
 module Gjp
   # generates file archives that accompany spec files
   class Archiver
-    include Logger
+    include Logging
 
     def initialize(project)
       @project = project
@@ -18,16 +18,18 @@ module Gjp
 
       @project.take_snapshot "Kit archival started"
 
-      destination_file = if full
-        remove_stale_incremental(destination_dir, file_prefix, file_suffix)
-        archive_single("kit", File.join(destination_dir, file_prefix + file_suffix))
-      else
-        log.debug "doing incremental archive"
-        archive_incremental("kit", destination_dir, file_prefix, file_suffix, :archive_kit)
-      end
+      destination_file = (
+        if full
+          remove_stale_incremental(destination_dir, file_prefix, file_suffix)
+          archive_single("kit", File.join(destination_dir, file_prefix + file_suffix))
+        else
+          log.debug "doing incremental archive"
+          archive_incremental("kit", destination_dir, file_prefix, file_suffix, :archive_kit)
+        end
+      )
 
       @project.take_snapshot "Kit archive generated", :archive_kit
-      
+
       destination_file
     end
 
@@ -66,7 +68,7 @@ module Gjp
 
           log.debug "files that changed since then: #{@project.git.changed_files_since(tag)}"
           list = @project.git.changed_files_since(tag).select do |file|
-            File.expand_path(file) =~ /^#{File.expand_path(source_directory)}\//            
+            File.expand_path(file) =~ /^#{File.expand_path(source_directory)}\//
           end.map do |file|
             Pathname.new(file).relative_path_from Pathname.new(source_directory)
           end
@@ -82,7 +84,7 @@ module Gjp
     # removes any stale incremental files
     def remove_stale_incremental(destination_dir, file_prefix, file_suffix)
       Dir.entries(destination_dir)
-        .select { |f| f =~ /^#{file_prefix}_([0-9]+)#{file_suffix}$/}
+        .select { |f| f =~ /^#{file_prefix}_([0-9]+)#{file_suffix}$/ }
         .each do |f|
         log.debug "removing stale incremental archive #{f}"
         File.delete(File.join(destination_dir, f))

data/lib/gjp/commands/ant.rb

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

data/lib/gjp/commands/base.rb

@@ -3,10 +3,9 @@ require "clamp"
 require "gjp/logger"
 
 module Gjp
-  
   # implements common options and utility methods
   class BaseCommand < Clamp::Command
-    include Logger
+    include Logging
 
     # Options available to all gjp commands
     option ["-v", "--verbose"], :flag, "verbose output"
@@ -17,11 +16,11 @@ module Gjp
     def very_very_verbose=(flag)
       configure_log_level(verbose?, very_verbose?, flag)
     end
-    
+
     def very_verbose=(flag)
       configure_log_level(verbose?, flag, very_very_verbose?)
     end
-    
+
     def verbose=(flag)
       configure_log_level(flag, very_verbose?, very_very_verbose?)
     end
@@ -62,33 +61,33 @@ module Gjp
 
     # generates a version of path relative to the current directory
     def format_path(path, project)
-      full_path = if Pathname.new(path).relative?
-        File.join(project.full_path, path)
-      else
-        path
-      end
+      full_path = (
+        if Pathname.new(path).relative?
+          File.join(project.full_path, path)
+        else
+          path
+        end
+      )
       Pathname.new(full_path).relative_path_from(Pathname.new(Dir.pwd))
     end
 
     # handles most fatal exceptions
     def checking_exceptions
-      begin
-        yield
-      rescue Errno::EACCES => e
-        $stderr.puts e
-      rescue Errno::ENOENT => e
-        $stderr.puts e
-      rescue Errno::EEXIST => e
-        $stderr.puts e
-      rescue NoProjectDirectoryError => e
-        $stderr.puts "#{e.directory} is not a gjp project directory, see gjp init"
-      rescue NoPackageDirectoryError => e
-        $stderr.puts "#{e.directory} is not a gjp package directory, see README"
-      rescue GitAlreadyInitedError => e
-        $stderr.puts "This directory is already a gjp project"
-      rescue ExecutableNotFoundError => e
-        $stderr.puts "Executable #{e.executable} not found in kit/ or any of its subdirectories"
-      end
+      yield
+    rescue Errno::EACCES => e
+      $stderr.puts e
+    rescue Errno::ENOENT => e
+      $stderr.puts e
+    rescue Errno::EEXIST => e
+      $stderr.puts e
+    rescue NoProjectDirectoryError => e
+      $stderr.puts "#{e.directory} is not a gjp project directory, see gjp init"
+    rescue NoPackageDirectoryError => e
+      $stderr.puts "#{e.directory} is not a gjp package directory, see README"
+    rescue GitAlreadyInitedError => e
+      $stderr.puts "This directory is already a gjp project"
+    rescue ExecutableNotFoundError => e
+      $stderr.puts "Executable #{e.executable} not found in kit/ or any of its subdirectories"
     end
   end
 end

data/lib/gjp/commands/finish.rb

@@ -2,7 +2,6 @@
 
 module Gjp
   class FinishCommand < Gjp::BaseCommand
-
     option ["-a", "--abort"], :flag, "build abort, restore files as before dry-run"
 
     def execute

data/lib/gjp/commands/{generate-all.rb → generate_all.rb}

@@ -2,11 +2,10 @@
 
 module Gjp
   class GenerateAllCommand < Gjp::BaseCommand
-
-    option ["-f", "--filter"], "FILTER", "filter files to be installed by this package spec", :default => "*.jar"
+    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"
+    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