Merge pull request #1974 from NicholasBHubbard/fixup-some-comments

Minor comment cleanup

Author: jordansissel

lib/fpm/command.rb

@@ -673,7 +673,7 @@ def load_options(path)
         option.of(self).take(value)
       end
     end
-  end
+  end # def load_options
 
   # A simple flag validator
   #
@@ -757,4 +757,4 @@ def messages
 
     public(:initialize, :ok?, :messages)
   end # class Validator
-end # class FPM::Program
+end # class FPM::Command

lib/fpm/package.rb

@@ -226,7 +226,7 @@ def convert(klass)
   def converted_from(origin)
     # nothing to do by default. Subclasses may implement this.
     # See the RPM package class for an example.
-  end # def converted
+  end # def converted_from
 
   # Add a new source to this package.
   # The exact behavior depends on the kind of package being managed.
@@ -324,7 +324,7 @@ def files
 
   def template_dir
     File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "templates"))
-  end
+  end # def template_dir
 
   def template(path)
     template_path = File.join(template_dir, path)
@@ -437,7 +437,7 @@ def option(flag, param, help, options={}, &block)
 
       help = "(#{type} only) #{help}"
       @options << [flag, param, help, options, block]
-    end # def options
+    end # def option
 
     # Apply the options for this package on the clamp command
     #
@@ -510,7 +510,7 @@ def write_scripts
         File.chmod(0755, out)
       end
     end
-  end
+  end # def write_scripts
 
   # Get the contents of the script by a given name.
   #
@@ -547,7 +547,7 @@ def provides=(value)
     else
       @provides = value
     end
-  end
+  end # def provides=
 
   # General public API
   public(:type, :initialize, :convert, :input, :output, :to_s, :cleanup, :files,

lib/fpm/package/cpan.rb

@@ -46,7 +46,6 @@ def input(package)
         #"me know by filing an issue: " \
         #"https://github.com/jordansissel/fpm/issues"
     #end
-    #require "ftw" # for http access
     require "net/http"
     require "json"
 
@@ -299,7 +298,7 @@ def input(package)
         self.architecture = "native"
       end
     end
-  end
+  end # def input
 
   def unpack(tarball)
     directory = build_path("module")
@@ -308,7 +307,7 @@ def unpack(tarball)
              %q{--transform=s,[./]*[^/]*/,,} ]
     safesystem("tar", *args)
     return directory
-  end
+  end # def unpack
 
   def download(metadata, cpan_version=nil)
     distribution = metadata["distribution"]
@@ -383,7 +382,7 @@ def search(package)
     data = response.body
     metadata = JSON.parse(data)
     return metadata
-  end # def metadata
+  end # def search
 
   def cap_name(name)
     return "perl(" + name.gsub("-", "::") + ")"
@@ -411,7 +410,7 @@ def httpfetch(url)
       when Net::HTTPRedirection; return httpfetch(response["location"])
       else; response.error!
     end
-  end
+  end # def httpfetch
 
   def httppost(url, body)
     uri = URI.parse(url)
@@ -428,7 +427,7 @@ def httppost(url, body)
       when Net::HTTPRedirection; return httppost(response["location"])
       else; response.error!
     end
-  end
+  end # def httppost
 
   public(:input)
-end # class FPM::Package::NPM
+end # class FPM::Package::CPAN

lib/fpm/package/gem.rb

@@ -381,7 +381,7 @@ def detect_source_date_from_changelog(installdir)
       logger.debug("Gem %s did not have changelog with recognized name" % [name])
       # FIXME: check rubygems.org?
     end
-  end # detect_source_date_from_changelog
+  end # def detect_source_date_from_changelog
 
   public(:input, :output)
 end # class FPM::Package::Gem

lib/fpm/util.rb

@@ -38,7 +38,7 @@ def default_shell
     shell = ENV["SHELL"]
     return "/bin/sh" if shell.nil? || shell.empty?
     return shell
-  end
+  end # def default_shell
 
   ############################################################################
   # execmd([env,] cmd [,opts])
@@ -259,7 +259,7 @@ def ar_cmd
   def ar_cmd_deterministic?
     ar_cmd if not defined? @@ar_cmd_deterministic
     return @@ar_cmd_deterministic
-  end
+  end # def ar_cmd_deterministic?
 
   # Get the recommended 'tar' command for this platform.
   def tar_cmd
@@ -306,7 +306,7 @@ def tar_cmd
   def tar_cmd_supports_sort_names_and_set_mtime?
     tar_cmd if not defined? @@tar_cmd_deterministic
     return @@tar_cmd_deterministic
-  end
+  end # def tar_cmd_supports_sort_names_and_set_mtime?
 
   def copy_metadata(source, destination)
     source_stat = File::lstat(source)
@@ -452,7 +452,7 @@ def erbnew(template_code)
       # Ruby 3.1.0 and newer
       return ERB.new(template_code, trim_mode: "-")
     end
-  end
+  end # def erbnew
 end # module FPM::Util
 
 require 'fpm/util/tar_writer'