fpm 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 1865c3f86f85b91177908b4ab565d14586795cb8
-  data.tar.gz: 0fbd72a7c8db1b4eb11104990182f248233e2252
-SHA512:
-  metadata.gz: 3b988637a79243d70644a911e65143784129de29278a3581b31f777a433570fde9fbb125ae12f7ff15c81ba043917a67dac0c98a383e50ed49676457ff48d23c
-  data.tar.gz: 350fbd84054b7685815b527ff6cb51dcbd8ab8d4331f84f0deb0450f40ac6c12a7e06c8cf6df8caa2e8980512daf0439bbca5f3cd200ed04f1f368443effc088
+--- 
+SHA1: 
+  metadata.gz: 94e2acc2a51dca9658374538128343b060301a57
+  data.tar.gz: ae3771e347496bd609cfa118c602d59a9277daf5
+SHA512: 
+  metadata.gz: 21ce60f7679ae634fdf4a55214b93476bc0d14d41fe1806b4f25133dfa6b4035dc4acf1d4c9d3eaa420a3960a2daedf11e6dd16499dcd04be09d13718432d4ef
+  data.tar.gz: dab536c4438a4db9f1920a8be8903b62060ac0b7a9c1b075eeedda225364bb79ea7f55d942163167262995b0d749c9f8859caf8997656fe6378046d761894535

data/CHANGELIST

@@ -1,3 +1,25 @@
+1.3.0 (????)
+  - Fixed a bunch of Ruby 1.8.7-related bugs. (Jordan Sissel)
+  - cpan: Fix bug in author handling (#744, Leon Weidauer)
+  - cpan: Better removal of perllocal.pod (#763, #443, #510, Mathias Lafeldt)
+  - rpm: Use lstat calls instead of stat, so we don't follow symlinks (#765, Shrijeet Paliwal)
+  - rpm and deb: Now supports script actions on upgrades. This adds two new flags:
+    --before-upgrade and --after-upgrade. (#772, #661; Daniel Haskin)
+  - rpm: Package triggers are now supported. New flags: --rpm-trigger-before-install,
+    --rpm-trigger-after-install, --rpm-trigger-before-uninstall, 
+    --rpm-trigger-after-target-uninstall. (#626, Maxime Caumartin)
+  - rpm: Add --rpm-init flag; similar to --deb-init. (Josh Dolitsky)
+  - sh: Skip installation if already installed for the given version. If forced,
+    the old installation is renamed. (#776, Chris Gerber)
+  - deb: Allow Vendor field to be omitted now by specifying `--vendor ""` (#778, Nate Brown)
+  - general: Add --log=level flag for setting log level. Levels are error, warn, info, debug. (Jordan SIssel)
+  - cpan: Check for Build.PL first before Makefile.PL (#787, Daniel Jay Haskin)
+  - dir: Don't follow symlinks when copying files (#658, Jordan Sissel)
+  - deb: Automatically provide a 'changes' file in debs because lintian
+    complains if they are missing. (#784, Jordan Sissel)
+  - deb: Fix and warn for package names that have spaces (#779, Grantlyk)
+  - npm: Automatically set the prefix to `npm prefix -g` (#758, Brady Wetherington and Jordan Sissel)
+
 1.2.0 (July 25, 2014)
   - rpm: Add --rpm-verifyscript for adding a custom rpm verify script to
     your package. (Remi Hakim)

data/CONTRIBUTORS

@@ -19,6 +19,7 @@ Oliver Hookins (github: ohookins)
 llasram
 sbuss
 Brett Gailey (github: dnbert)
+Daniel Haskin (github: djhaskin987)
 
 If you have contributed (bug reports, feature requests, help in IRC, blog
 posts, code, etc) and aren't listed here, please let me know if you wish to be

data/lib/fpm/command.rb

@@ -58,6 +58,16 @@ class FPM::Command < Clamp::Command
   option ["-f", "--force"], :flag, "Force output even if it will overwrite an " \
     "existing file", :default => false
   option ["-n", "--name"], "NAME", "The name to give to the package"
+
+  loglevels = %w(error warn info debug)
+  option "--log", "LEVEL", "Set the log level. Values: #{loglevels.join(", ")}.",
+    :attribute_name => :log_level do |val|
+    val.downcase.tap do |v|
+      if !loglevels.include?(v)
+        raise FPM::Package::InvalidArgument, "Invalid log level, #{v.inspect}. Must be one of: #{loglevels.join(", ")}"
+      end
+    end
+  end # --log
   option "--verbose", :flag, "Enable verbose output"
   option "--debug", :flag, "Enable debug output"
   option "--debug-workspace", :flag, "Keep any file workspaces around for " \
@@ -85,11 +95,11 @@ class FPM::Command < Clamp::Command
   option "--no-depends", :flag, "Do not list any dependencies in this package",
     :default => false
 
-  option "--no-auto-depends", :flag, "Do not list any dependencies in this" \
+  option "--no-auto-depends", :flag, "Do not list any dependencies in this " \
     "package automatically", :default => false
 
   option "--provides", "PROVIDES",
-    "What this package provides (usually a name). This flag can be "\
+    "What this package provides (usually a name). This flag can be " \
     "specified multiple times.", :multivalued => true,
     :attribute_name => :provides
   option "--conflicts", "CONFLICTS",
@@ -97,7 +107,7 @@ class FPM::Command < Clamp::Command
     "specified multiple times.", :multivalued => true,
     :attribute_name => :conflicts
   option "--replaces", "REPLACES",
-    "Other packages/versions this package replaces. This flag can be "\
+    "Other packages/versions this package replaces. This flag can be " \
     "specified multiple times.", :multivalued => true,
     :attribute_name => :replaces
 
@@ -142,42 +152,59 @@ class FPM::Command < Clamp::Command
     "files and dirs to use as input."
 
   option "--post-install", "FILE",
-    "(DEPRECATED, use --after-install) a script to be run after " \
+    "(DEPRECATED, use --after-install) A script to be run after " \
     "package installation" do |val|
     @after_install = File.expand_path(val) # Get the full path to the script
   end # --post-install (DEPRECATED)
   option "--pre-install", "FILE",
-    "(DEPRECATED, use --before-install) a script to be run before " \
+    "(DEPRECATED, use --before-install) A script to be run before " \
     "package installation" do |val|
     @before_install = File.expand_path(val) # Get the full path to the script
   end # --pre-install (DEPRECATED)
   option "--post-uninstall", "FILE",
-      "(DEPRECATED, use --after-remove) a script to be run after " \
+      "(DEPRECATED, use --after-remove) A script to be run after " \
       "package removal" do |val|
     @after_remove = File.expand_path(val) # Get the full path to the script
   end # --post-uninstall (DEPRECATED)
   option "--pre-uninstall", "FILE",
-    "(DEPRECATED, use --before-remove) a script to be run before " \
+    "(DEPRECATED, use --before-remove) A script to be run before " \
     "package removal"  do |val|
     @before_remove = File.expand_path(val) # Get the full path to the script
   end # --pre-uninstall (DEPRECATED)
 
   option "--after-install", "FILE",
-    "a script to be run after package installation" do |val|
+    "A script to be run after package installation" do |val|
     File.expand_path(val) # Get the full path to the script
   end # --after-install
   option "--before-install", "FILE",
-    "a script to be run before package installation" do |val|
+    "A script to be run before package installation" do |val|
     File.expand_path(val) # Get the full path to the script
-  end # --pre-install
+  end # --before-install
   option "--after-remove", "FILE",
-    "a script to be run after package removal" do |val|
+    "A script to be run after package removal" do |val|
     File.expand_path(val) # Get the full path to the script
   end # --after-remove
   option "--before-remove", "FILE",
-    "a script to be run before package removal" do |val|
+    "A script to be run before package removal" do |val|
     File.expand_path(val) # Get the full path to the script
   end # --before-remove
+  option "--after-upgrade", "FILE",
+    "A script to be run after package upgrade. If not specified,\n" \
+        "--before-install, --after-install, --before-remove, and \n" \
+        "--after-remove wil behave in a backwards-compatible manner\n" \
+        "(they will not be upgrade-case aware).\n" \
+        "Currently only supports deb and rpm packages." do |val|
+    File.expand_path(val) # Get the full path to the script
+  end # --after-upgrade
+  option "--before-upgrade", "FILE",
+    "A script to be run before package upgrade. If not specified,\n" \
+        "--before-install, --after-install, --before-remove, and \n" \
+        "--after-remove wil behave in a backwards-compatible manner\n" \
+        "(they will not be upgrade-case aware).\n" \
+        "Currently only supports deb and rpm packages." do |val|
+    File.expand_path(val) # Get the full path to the script
+  end # --before-upgrade
+
   option "--template-scripts", :flag,
     "Allow scripts to be templated. This lets you use ERB to template your " \
     "packaging scripts (for --after-install, etc). For example, you can do " \
@@ -227,10 +254,16 @@ class FPM::Command < Clamp::Command
       return 0
     end
 
-    @logger.level = :warn
+    logger.level = :warn
+    logger.level = :info if verbose? # --verbose
+    logger.level = :debug if debug? # --debug
+    if log_level
+      logger.level = log_level.to_sym
+    end
+
 
     if (stray_flags = args.grep(/^-/); stray_flags.any?)
-      @logger.warn("All flags should be before the first argument " \
+      logger.warn("All flags should be before the first argument " \
                    "(stray flags found: #{stray_flags}")
     end
 
@@ -239,28 +272,25 @@ class FPM::Command < Clamp::Command
     # fpm would assume you meant to add '.' to the end of the commandline.
     # Let's hack that. https://github.com/jordansissel/fpm/issues/187
     if input_type == "dir" and args.empty? and !chdir.nil?
-      @logger.info("No args, but -s dir and -C are given, assuming '.' as input") 
+      logger.info("No args, but -s dir and -C are given, assuming '.' as input") 
       args << "."
     end
 
-    @logger.info("Setting workdir", :workdir => workdir)
+    logger.info("Setting workdir", :workdir => workdir)
     ENV["TMP"] = workdir
 
     validator = Validator.new(self)
     if !validator.ok?
       validator.messages.each do |message|
-        @logger.warn(message)
+        logger.warn(message)
       end
 
-      @logger.fatal("Fix the above problems, and you'll be rolling packages in no time!")
+      logger.fatal("Fix the above problems, and you'll be rolling packages in no time!")
       return 1
     end
     input_class = FPM::Package.types[input_type]
     output_class = FPM::Package.types[output_type]
 
-    @logger.level = :info if verbose? # --verbose
-    @logger.level = :debug if debug? # --debug
-
     input = input_class.new
 
     # Merge in package settings. 
@@ -290,7 +320,7 @@ class FPM::Command < Clamp::Command
         input.attributes["#{attr}_given?".to_sym] = flag_given
         attr = "#{attr}?" if !respond_to?(attr) # handle boolean :flag cases
         input.attributes[attr.to_sym] = send(attr) if respond_to?(attr)
-        @logger.debug("Setting attribute", attr.to_sym => send(attr))
+        logger.debug("Setting attribute", attr.to_sym => send(attr))
       end
     end
 
@@ -305,7 +335,7 @@ class FPM::Command < Clamp::Command
     # If --inputs was specified, read it as a file.
     if !inputs.nil?
       if !File.exists?(inputs)
-        @logger.fatal("File given for --inputs does not exist (#{inputs})")
+        logger.fatal("File given for --inputs does not exist (#{inputs})")
         return 1
       end
 
@@ -326,7 +356,7 @@ class FPM::Command < Clamp::Command
       # if the package's attribute is currently nil *or* the flag setting for this
       # attribute is non-default, use the value.
       if object.send(attribute).nil? || send(attribute) != send("default_#{attribute}")
-        @logger.info("Setting from flags: #{attribute}=#{send(attribute)}")
+        logger.info("Setting from flags: #{attribute}=#{send(attribute)}")
         object.send("#{attribute}=", send(attribute))
       end
     end
@@ -369,7 +399,7 @@ class FPM::Command < Clamp::Command
       next if path.nil?
 
       if !File.exists?(path)
-        @logger.error("No such file (for #{scriptname.to_s}): #{path.inspect}")
+        logger.error("No such file (for #{scriptname.to_s}): #{path.inspect}")
         script_errors << path
       end
 
@@ -381,6 +411,8 @@ class FPM::Command < Clamp::Command
     setscript.call(:after_install)
     setscript.call(:before_remove)
     setscript.call(:after_remove)
+    setscript.call(:before_upgrade)
+    setscript.call(:after_upgrade)
 
     # Bail if any setscript calls had errors. We don't need to log
     # anything because we've already logged the error(s) above.
@@ -388,7 +420,7 @@ class FPM::Command < Clamp::Command
 
     # Validate the package
     if input.name.nil? or input.name.empty?
-      @logger.fatal("No name given for this package (set name with, " \
+      logger.fatal("No name given for this package (set name with, " \
                     "for example, '-n packagename')")
       return 1
     end
@@ -417,26 +449,23 @@ class FPM::Command < Clamp::Command
     begin
       output.output(package_file)
     rescue FPM::Package::FileAlreadyExists => e
-      @logger.fatal(e.message)
+      logger.fatal(e.message)
       return 1
     rescue FPM::Package::ParentDirectoryMissing => e
-      @logger.fatal(e.message)
+      logger.fatal(e.message)
       return 1
     end
 
-    @logger.log("Created package", :path => package_file)
+    logger.log("Created package", :path => package_file)
     return 0
   rescue FPM::Util::ExecutableNotFound => e
-    @logger.error("Need executable '#{e}' to convert #{input_type} to #{output_type}")
+    logger.error("Need executable '#{e}' to convert #{input_type} to #{output_type}")
     return 1
   rescue FPM::InvalidPackageConfiguration => e
-    @logger.error("Invalid package configuration: #{e}")
-    return 1
-  rescue FPM::Package::InvalidArgument => e
-    @logger.error("Invalid package argument: #{e}")
+    logger.error("Invalid package configuration: #{e}")
     return 1
   rescue FPM::Util::ProcessFailed => e
-    @logger.error("Process failed: #{e}")
+    logger.error("Process failed: #{e}")
     return 1
   ensure
     if debug_workspace?
@@ -446,7 +475,7 @@ class FPM::Command < Clamp::Command
         [:staging_path, :build_path].each do |pathtype|
           path = plugin.send(pathtype)
           next unless Dir.open(path).to_a.size > 2
-          @logger.log("plugin directory", :plugin => plugin.type, :pathtype => pathtype, :path => path)
+          logger.log("plugin directory", :plugin => plugin.type, :pathtype => pathtype, :path => path)
         end
       end
     else
@@ -456,8 +485,7 @@ class FPM::Command < Clamp::Command
   end # def execute
 
   def run(*args)
-    @logger = Cabin::Channel.get
-    @logger.subscribe(STDOUT)
+    logger.subscribe(STDOUT)
 
     # fpm initialization files, note the order of the following array is
     # important, try .fpm in users home directory first and then the current
@@ -467,7 +495,7 @@ class FPM::Command < Clamp::Command
 
     rc_files.each do |rc_file|
       if File.readable? rc_file
-        @logger.warn("Loading flags from rc file #{rc_file}")
+        logger.warn("Loading flags from rc file #{rc_file}")
         File.readlines(rc_file).each do |line|
           # reverse becasue 'unshift' pushes onto the left side of the array.
           Shellwords.shellsplit(line).reverse.each do |arg|
@@ -480,6 +508,9 @@ class FPM::Command < Clamp::Command
     end
 
     super(*args)
+  rescue FPM::Package::InvalidArgument => e
+    logger.error("Invalid package argument: #{e}")
+    return 1
   end # def run
 
   # A simple flag validator

data/lib/fpm/package.rb

@@ -116,8 +116,6 @@ class FPM::Package
   private
 
   def initialize
-    @logger = Cabin::Channel.get
-
     # Attributes for this specific package 
     @attributes = {}
 
@@ -189,7 +187,7 @@ class FPM::Package
 
   # Convert this package to a new package type
   def convert(klass)
-    @logger.info("Converting #{self.type} to #{klass.type}")
+    logger.info("Converting #{self.type} to #{klass.type}")
 
     exclude
 
@@ -204,7 +202,7 @@ class FPM::Package
       :@directories, :@staging_path, :@attrs
     ]
     ivars.each do |ivar|
-      #@logger.debug("Copying ivar", :ivar => ivar, :value => instance_variable_get(ivar),
+      #logger.debug("Copying ivar", :ivar => ivar, :value => instance_variable_get(ivar),
                     #:from => self.type, :to => pkg.type)
       pkg.instance_variable_set(ivar, instance_variable_get(ivar))
     end
@@ -272,20 +270,20 @@ class FPM::Package
 
   # Clean up any temporary storage used by this class.
   def cleanup
-    cleanup_staging unless @logger.level == :debug
-    cleanup_build unless @logger.level == :debug
+    cleanup_staging unless logger.level == :debug
+    cleanup_build unless logger.level == :debug
   end # def cleanup
 
   def cleanup_staging
     if File.directory?(staging_path)
-      @logger.debug("Cleaning up staging path", :path => staging_path)
+      logger.debug("Cleaning up staging path", :path => staging_path)
       FileUtils.rm_r(staging_path) 
     end
   end # def cleanup_staging
 
   def cleanup_build
     if File.directory?(build_path)
-      @logger.debug("Cleaning up build path", :path => build_path)
+      logger.debug("Cleaning up build path", :path => build_path)
       FileUtils.rm_r(build_path) 
     end
   end # def cleanup_build
@@ -327,7 +325,7 @@ class FPM::Package
   def template(path)
     template_path = File.join(template_dir, path)
     template_code = File.read(template_path)
-    @logger.info("Reading template", :path => template_path)
+    logger.info("Reading template", :path => template_path)
     erb = ERB.new(template_code, nil, "-")
     erb.filename = template_path
     return erb
@@ -348,7 +346,7 @@ class FPM::Package
 
   def edit_file(path)
     editor = ENV['FPM_EDITOR'] || ENV['EDITOR'] || 'vi'
-    @logger.info("Launching editor", :file => path)
+    logger.info("Launching editor", :file => path)
     command = "#{editor} #{Shellwords.escape(path)}"
     system("#{editor} #{Shellwords.escape(path)}")
     if !$?.success?
@@ -377,10 +375,10 @@ class FPM::Package
       match_path = path.sub("#{installdir.chomp('/')}/", '')
 
       attributes[:excludes].each do |wildcard|
-        @logger.debug("Checking path against wildcard", :path => match_path, :wildcard => wildcard)
+        logger.debug("Checking path against wildcard", :path => match_path, :wildcard => wildcard)
 
         if File.fnmatch(wildcard, match_path)
-          @logger.info("Removing excluded path", :path => match_path, :matches => wildcard)
+          logger.info("Removing excluded path", :path => match_path, :matches => wildcard)
           FileUtils.remove_entry_secure(path)
           Find.prune
           break
@@ -500,7 +498,7 @@ class FPM::Package
     end
     if File.file?(output_path)
       if attributes[:force?]
-        @logger.warn("Force flag given. Overwriting package at #{output_path}")
+        logger.warn("Force flag given. Overwriting package at #{output_path}")
         File.delete(output_path)
       else
         raise FileAlreadyExists.new(output_path)

data/lib/fpm/package/cpan.rb

@@ -73,17 +73,23 @@ class FPM::Package::CPAN < FPM::Package
     end
 
     unless metadata["distribution"].nil?
-      @logger.info("Setting package name from 'distribution'",
+      logger.info("Setting package name from 'distribution'",
                    :distribution => metadata["distribution"])
       self.name = fix_name(metadata["distribution"])
     else
-      @logger.info("Setting package name from 'name'",
+      logger.info("Setting package name from 'name'",
                    :name => metadata["name"])
       self.name = fix_name(metadata["name"])
     end
 
-    # Not all things have 'author' listed.
-    self.vendor = metadata["author"].join(", ") unless metadata["author"].nil?
+    # author is not always set or it may be a string instead of an array
+    self.vendor = case metadata["author"]
+      when String; metadata["author"]
+      when Array; metadata["author"].join(", ")
+      else
+        raise FPM::InvalidPackageConfiguration, "Unexpected CPAN 'author' field type: #{metadata["author"].class}. This is a bug."
+    end if metadata.include?("author")
+
     self.url = metadata["resources"]["homepage"] rescue "unknown"
 
     # TODO(sissel): figure out if this perl module compiles anything
@@ -92,7 +98,7 @@ class FPM::Package::CPAN < FPM::Package
 
     # Install any build/configure dependencies with cpanm.
     # We'll install to a temporary directory.
-    @logger.info("Installing any build or configure dependencies")
+    logger.info("Installing any build or configure dependencies")
 
     cpanm_flags = ["-L", build_path("cpan"), moduledir]
     cpanm_flags += ["-n"] if attributes[:cpan_test?]
@@ -144,36 +150,13 @@ class FPM::Package::CPAN < FPM::Package
       # build/configure requirements.
       # META.yml calls it 'configure_requires' and 'build_requires'
       # META.json calls it prereqs/build and prereqs/configure
- 
+
       prefix = attributes[:prefix] || "/usr/local"
       # TODO(sissel): Set default INSTALL path?
 
       # Try Makefile.PL, Build.PL
       #
-      if File.exists?("Makefile.PL")
-        if attributes[:cpan_perl_lib_path]
-          perl_lib_path = attributes[:cpan_perl_lib_path]
-          safesystem(attributes[:cpan_perl_bin],
-                     "-Mlocal::lib=#{build_path("cpan")}",
-                     "Makefile.PL", "PREFIX=#{prefix}", "LIB=#{perl_lib_path}",
-                     # Empty install_base to avoid local::lib being used.
-                     "INSTALL_BASE=")
-        else 
-          safesystem(attributes[:cpan_perl_bin],
-                     "-Mlocal::lib=#{build_path("cpan")}",
-                     "Makefile.PL", "PREFIX=#{prefix}",
-                     # Empty install_base to avoid local::lib being used.
-                     "INSTALL_BASE=")
-        end
-        if attributes[:cpan_test?]
-          make = [ "env", "PERL5LIB=#{build_path("cpan/lib/perl5")}", "make" ]
-        else
-          make = [ "make" ]
-        end
-        safesystem(*make)
-        safesystem(*(make + ["test"])) if attributes[:cpan_test?]
-        safesystem(*(make + ["DESTDIR=#{staging_path}", "install"]))
-      elsif File.exists?("Build.PL")
+      if File.exists?("Build.PL")
         # Module::Build is in use here; different actions required.
         safesystem(attributes[:cpan_perl_bin],
                    "-Mlocal::lib=#{build_path("cpan")}",
@@ -197,6 +180,31 @@ class FPM::Package::CPAN < FPM::Package
                      # Empty install_base to avoid local::lib being used.
                      "--install_base", "")
         end
+      elsif File.exists?("Makefile.PL")
+        if attributes[:cpan_perl_lib_path]
+          perl_lib_path = attributes[:cpan_perl_lib_path]
+          safesystem(attributes[:cpan_perl_bin],
+                     "-Mlocal::lib=#{build_path("cpan")}",
+                     "Makefile.PL", "PREFIX=#{prefix}", "LIB=#{perl_lib_path}",
+                     # Empty install_base to avoid local::lib being used.
+                     "INSTALL_BASE=")
+        else
+          safesystem(attributes[:cpan_perl_bin],
+                     "-Mlocal::lib=#{build_path("cpan")}",
+                     "Makefile.PL", "PREFIX=#{prefix}",
+                     # Empty install_base to avoid local::lib being used.
+                     "INSTALL_BASE=")
+        end
+        if attributes[:cpan_test?]
+          make = [ "env", "PERL5LIB=#{build_path("cpan/lib/perl5")}", "make" ]
+        else
+          make = [ "make" ]
+        end
+        safesystem(*make)
+        safesystem(*(make + ["test"])) if attributes[:cpan_test?]
+        safesystem(*(make + ["DESTDIR=#{staging_path}", "install"]))
+
+
       else
         raise FPM::InvalidPackageConfiguration, 
           "I don't know how to build #{name}. No Makefile.PL nor " \
@@ -207,8 +215,9 @@ class FPM::Package::CPAN < FPM::Package
       # across packages.
       # https://github.com/jordansissel/fpm/issues/443
       # https://github.com/jordansissel/fpm/issues/510
-      ::Dir.glob(File.join(staging_path, prefix, "**/perllocal.pod")).each do |path|
-        @logger.debug("Removing useless file.",
+      glob_prefix = attributes[:cpan_perl_lib_path] || prefix
+      ::Dir.glob(File.join(staging_path, glob_prefix, "**/perllocal.pod")).each do |path|
+        logger.debug("Removing useless file.",
                       :path => path.gsub(staging_path, ""))
         File.unlink(path)
       end
@@ -223,7 +232,7 @@ class FPM::Package::CPAN < FPM::Package
     # native if found; otherwise keep the 'all' default.
     Find.find(staging_path) do |path|
       if path =~ /\.so$/  
-        @logger.info("Found shared library, setting architecture=native",
+        logger.info("Found shared library, setting architecture=native",
                      :path => path)
         self.architecture = "native" 
       end
@@ -243,7 +252,7 @@ class FPM::Package::CPAN < FPM::Package
     distribution = metadata["distribution"]
     author = metadata["author"]
 
-    @logger.info("Downloading perl module",
+    logger.info("Downloading perl module",
                  :distribution => distribution,
                  :version => cpan_version)
 
@@ -262,7 +271,7 @@ class FPM::Package::CPAN < FPM::Package
     begin
       release_response = httpfetch(metacpan_release_url)
     rescue Net::HTTPServerException => e
-      @logger.error("metacpan release query failed.", :error => e.message,
+      logger.error("metacpan release query failed.", :error => e.message,
                     :module => package, :url => metacpan_release_url)
       raise FPM::InvalidPackageConfiguration, "metacpan release query failed"
     end
@@ -279,14 +288,14 @@ class FPM::Package::CPAN < FPM::Package
 
     #url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
     url = "#{url_base}/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{archive}"
-    @logger.debug("Fetching perl module", :url => url)
+    logger.debug("Fetching perl module", :url => url)
     
     begin
       response = httpfetch(url)
     rescue Net::HTTPServerException => e
-      #@logger.error("Download failed", :error => response.status_line,
+      #logger.error("Download failed", :error => response.status_line,
                     #:url => url)
-      @logger.error("Download failed", :error => e, :url => url)
+      logger.error("Download failed", :error => e, :url => url)
       raise FPM::InvalidPackageConfiguration, "metacpan query failed"
     end
 
@@ -298,14 +307,14 @@ class FPM::Package::CPAN < FPM::Package
   end # def download
 
   def search(package)
-    @logger.info("Asking metacpan about a module", :module => package)
+    logger.info("Asking metacpan about a module", :module => package)
     metacpan_url = "http://api.metacpan.org/v0/module/" + package
     begin
       response = httpfetch(metacpan_url)
     rescue Net::HTTPServerException => e
-      #@logger.error("metacpan query failed.", :error => response.status_line,
+      #logger.error("metacpan query failed.", :error => response.status_line,
                     #:module => package, :url => metacpan_url)
-      @logger.error("metacpan query failed.", :error => e.message,
+      logger.error("metacpan query failed.", :error => e.message,
                     :module => package, :url => metacpan_url)
       raise FPM::InvalidPackageConfiguration, "metacpan query failed"
     end