gpm 0.0.2 → 0.1.3

data/bin/correct_permissions

@@ -0,0 +1,4 @@
+chmod 0664 'templates/deb/control.tar.gz.dir/control.erb'
+chmod 0755 'templates/deb/control.tar.gz.dir/prerm.erb'
+chmod 0755 'templates/deb/control.tar.gz.dir/postinst.erb'
+chmod 0664 'templates/deb/data.tar.gz.dir/usr/share/doc/__name__/changelog.Debian.gz.erb'

data/lib/gpm/cli.rb

@@ -1,23 +1,31 @@
 require 'thor'
 require_relative 'packaging_task'
 class GpmCli < Thor
-
+  def self.supported_sources
+    ["gem","bundler"]
+  end
+  def self.supported_targets
+    ["deb"]
+  end
   # gpm package -s <source type> -t <target type> [options]
-  desc "package APP_DIRECTORY_OR_FILE", "package the given app"
-  method_option :source, :type => :string, :aliases => "-s"
-  method_option :target, :type => :string, :aliases => "-t"
-  method_option :workdir, :type => :string, :aliases => "-wd"
-  method_option :destination, :type => :string, :aliases => "-d"
+  desc "package APP_DIRECTORY_OR_FILE", "Packages the app given in a specified source format to a desired target format"
+  method_option :source, :type => :string, :aliases => "-s", :desc => "The input for creating the package (Currently supported: #{supported_sources.join(', ')})", :required => true
+  method_option :target, :type => :string, :aliases => "-t", :desc => "The desired output format for the package (Currently supported: #{supported_targets.join(', ')})", :required => true
+  method_option :workdir, :type => :string, :aliases => "-wd", :desc => "A directory in which temporary files can be placed"
+  method_option :destination, :type => :string, :aliases => "-d", :desc => "The destination path where the application shall be installed to", :required => true
+  method_option :owner, :type => :string, :aliases => "-o", :desc => "The owning user for the destination path", :default => "root"
+  method_option :group, :type => :string, :aliases => "-g", :desc => "The owning group for the destination path", :default => "root"
+  method_option :buildnumber, :type => :string, :aliases => "-b", :desc => "The build number that is appended to the version", :required => false
 
   def package(file_or_directory)
-    raise "Only gem or bundler source at the moment" unless ["gem","bundler"].include? options.source
-    raise "Only deb target at the moment" unless options.target == "deb"
+    raise "Only gem or bundler source at the moment" unless self.class.supported_sources.include? options.source
+    raise "Only deb target at the moment" unless self.class.supported_targets.include? options.target
     package_options = {}
-    {:workdir => :work_dir , :destination => :destination}.each do |in_field, out_field|
+    {:workdir => :work_dir , :destination => :destination, :owner => :owner, :group => :group, :buildnumber => :build_number}.each do |in_field, out_field|
       package_options[out_field] = options[in_field] if options[in_field]
     end
 
     PackagingTask.create(file_or_directory, options.source, options.target, package_options).run
   end
 
-end
+end

data/lib/gpm/file_path_and_permissions.rb

@@ -1,19 +1,24 @@
-class FilePathAndPermissions < Delegator
-  attr_reader :permissions
-  def initialize(path, permissions = "0444")
-    @path = path
+require 'delegate'
+class FilePathAndPermissions < SimpleDelegator
+  attr_reader :permissions, :path
+  def initialize(path, permissions = 0444)
+    @path = path.to_s
+    super(@path)
     @permissions = permissions
   end
 
-  def to_s
-    @path
+  def eql?(other)
+    return @path == other if other.is_a? String
+    return @path == other.path if other.is_a? FilePathAndPermissions
+    super
   end
 
-  def __getobj__
-    @path
+  def inspect
+    vars = instance_variables.collect { |v| v.to_s << "=#{instance_variable_get(v).inspect}"}.join(", ")
+    "#<#{self.class}:#{vars}>"
   end
 
-  def __setobj__(path)
-    @path = path
+  def hash
+    @path.hash
   end
-end
+end

data/lib/gpm/io_helpers.rb

@@ -0,0 +1,26 @@
+require_relative 'file_path_and_permissions'
+def write_file_contents(file_contents)
+  file_contents.each do |file_name, content|
+    FileUtils.mkdir_p(File.dirname(file_name))
+    File.open(file_name,"w") do |file|
+      file.print content
+    end
+    File.chmod(file_name.permissions, file_name.to_s) if file_name.is_a? FilePathAndPermissions
+  end
+end
+
+def write_file_contents_in_directory(file_contents,directory)
+  FileUtils.mkdir_p directory
+  Dir.chdir(directory) do
+    write_file_contents(file_contents)
+  end
+end
+def read_file_contents(files,base_directory)
+  file_contents = {}
+  files.each do |f|
+    path = File.join(base_directory,f)
+    permissions = File.lstat(path).mode % 4096
+    file_contents[FilePathAndPermissions.new(f,permissions)] = File.read(path) if File.file?(path)
+  end
+  file_contents
+end

data/lib/gpm/packaging_task.rb

@@ -1,14 +1,23 @@
 class PackagingTask
-  def self.create(file_or_directory, source_name, target_name, options = {})
-    options[:work_dir] ||= Dir.mktmpdir
+
+  def self.class_for_source(source_name)
     require_relative "source"
     require_relative "source/#{source_name}"
-    source_class = Kernel.const_get("Source").const_get(source_name.capitalize)
-    source = source_class.create(file_or_directory)
+    Kernel.const_get("Source").const_get(source_name.capitalize)
+  end
 
+  def self.class_for_target(target_name)
     require_relative "target"
     require_relative "target/#{target_name}"
-    target_class = Kernel.const_get("Target").const_get(target_name.capitalize)
+    Kernel.const_get("Target").const_get(target_name.capitalize)
+  end
+
+  def self.create(file_or_directory, source_name, target_name, options = {})
+    options[:work_dir] ||= Dir.mktmpdir
+    source_class = class_for_source(source_name)
+    source = source_class.create(file_or_directory, options)
+
+    target_class = class_for_target(target_name)
     target = target_class.new(options[:work_dir], options)
     new(source,target)
   end
@@ -22,4 +31,4 @@ class PackagingTask
     @target.create_package(@source)
   end
 
-end
+end

data/lib/gpm/source.rb

@@ -1,9 +1,12 @@
+require 'pathname'
+require_relative 'file_path_and_permissions'
+
 module Source
   class Base
     DEFAULTS = {
       # Default version is 1.0 in case nobody told us a specific version.
       :version => "1.0",
-      :iteration => nil,
+      :build_number => nil,
       :epoch => nil,
       # If architecture is nil, the target package should provide a default.
       # Special 'architecture' values include "all" (aka rpm's noarch, debian's all)
@@ -46,10 +49,10 @@ module Source
         end
       end
     end
-  end
-  class FilesProvider
-    def files
-      file_contents.keys
+
+    def contains_file?(file_name)
+      file_name = FilePathAndPermissions.new(file_name) unless file_name.kind_of? FilePathAndPermissions
+      file_contents.include? file_name
     end
   end
-end
+end

data/lib/gpm/source/bundler.rb

@@ -1,55 +1,26 @@
 require_relative 'gem'
-require 'bundler'
-
-
-class Source::Bundler < Source::Gem
-
-  class FilesFromBundlerDirectoryProvider < Source::Gem::FilesFromGemDirectoryProvider
-
-    attr_reader :gemfile,:gemspec
-    def initialize(gemfile,gemspec)
-      super(File.dirname(gemfile),Source::Gem.read_metadata(gemspec).files)
-      @gemfile = gemfile
-      @gemspec = gemspec
+require_relative 'files_providers/files_from_bundler_directory_provider'
+module Source
+  class Bundler < Source::Gem
+    def self.create(gemfile, options = {})
+      directory = File.absolute_path(File.dirname(gemfile))
+      gemspec = Dir[File.join(directory,'*.gemspec')].first
+      metadata = read_metadata(gemspec)
+  
+      bundler_provider = FilesFromBundlerDirectoryProvider.new(File.expand_path(gemfile), gemspec)
+      package_path = File.join(directory, '_package_')
+      package_scripts_provider = Source::FilesFromDirectoryProvider.new(package_path, directory)
+      new(metadata, Source::CompositeFilesProvider.new(bundler_provider, package_scripts_provider), options)
     end
-    def file_contents
-      backup_fields = ["PATH","GEM_PATH"]
-      bundled_files = []
-      directory = File.dirname(@gemfile)
-      old_env = ENV.to_hash
-      Dir.chdir(directory) do
-        Bundler.with_clean_env do
-          old_env.each {|k,_| ENV.delete k}
-          ENV["BUNDLE_GEMFILE"] = @gemfile
-          ENV["PWD"] = directory
-          backup_fields.each {|f| ENV[f] = old_env[f]}
-          FileUtils.rm_rf('.bundle')
-          ["bundle install","bundle install --deployment --verbose"].each do |c| # --standalone
-            puts c,`#{c}`
-          end
-        end
-        bundled_files = Dir["vendor/bundle/**/*"]
-      end
-      old_env.each {|k,v| ENV[k] = v}
-      super_contents = super.merge(read_file_contents(bundled_files+[File.basename(gemfile),File.basename(gemspec),'Gemfile.lock'], directory))
-      super_contents
+  
+    def initialize(*args)
+      super
+    end
+    def architecture
+      "native"
+    end
+    def dependencies
+      ["libc6", "ruby"]
     end
   end
-
-  def self.create(gemfile)
-    gemspec = Dir[File.join(File.dirname(gemfile),'*.gemspec')].first
-    metadata = read_metadata(gemspec)
-
-    new(metadata,FilesFromBundlerDirectoryProvider.new(File.expand_path(gemfile), gemspec))
-  end
-
-  def initialize(*args)
-    super
-  end
-  def architecture
-    "native"
-  end
-  def dependencies
-    ["libc6"]
-  end
-end
+end

data/lib/gpm/source/files_providers/composite_files_provider.rb

@@ -0,0 +1,23 @@
+module Source
+  class CompositeFilesProvider
+    def initialize(*file_providers)
+      @file_providers = file_providers
+    end
+
+    def files
+      @file_providers.inject([]) do |merged, file_provider|
+        files = file_provider.files
+        raise "duplicate filename found in different file providers" unless (merged & files).empty?
+        merged + files
+      end
+    end
+
+    def file_contents
+      @file_providers.inject({}) do |merged, file_provider|
+        contents = file_provider.file_contents
+        raise "duplicate filename found in different file providers: #{(merged.keys & contents.keys)}" unless (merged.keys & contents.keys).empty?
+        merged.merge contents
+      end
+    end
+  end
+end

data/lib/gpm/source/files_providers/files_from_bundler_directory_provider.rb

@@ -0,0 +1,36 @@
+require_relative 'files_from_directory_provider'
+require_relative 'composite_files_provider'
+require_relative 'files_from_gem_directory_provider'
+require_relative 'vendored_gems_installer'
+require_relative '../gem'
+require 'bundler'
+
+module Source
+  class FilesFromBundlerDirectoryProvider < FilesFromGemDirectoryProvider
+    attr_reader :gemfile,:gemspec
+    def initialize(gemfile,gemspec,vendored_gems_installer = nil)
+      raise "Must give me a Gemfile, not #{gemfile.inspect}" unless File.basename(gemfile)=="Gemfile"
+      metadata = Source::Gem.read_metadata(gemspec)
+      super(File.dirname(gemfile),metadata.files)
+      @gemfile = gemfile
+      @gemspec = gemspec
+      @vendored_gems_installer = vendored_gems_installer || Source::VendoredGemsInstaller.new(gemfile)
+    end
+
+    def bundled_files
+      files = nil
+      Dir.chdir(File.dirname(@gemfile)) do
+        files = Dir["vendor/bundle/**/*"]
+      end
+      files
+    end
+
+    def file_contents
+      @vendored_gems_installer.install!
+      super_contents = super.merge(read_file_contents(bundled_files+[File.basename(gemfile),File.basename(gemspec),'Gemfile.lock','.bundle/config'], directory))
+      super_contents
+    end
+
+
+  end
+end

data/lib/gpm/source/files_providers/files_from_directory_provider.rb

@@ -0,0 +1,16 @@
+require_relative 'files_provider'
+
+module Source
+  class FilesFromDirectoryProvider < FilesProvider
+    def initialize(directory=".", base_directory=nil)
+      @directory = directory
+      @base_directory = base_directory || directory
+    end
+
+    def file_contents
+      base_path = Pathname.new(@base_directory)
+      files = Dir[File.join(@directory, '**', '*')].collect {|file| Pathname.new(file).relative_path_from(base_path).to_s }
+      read_file_contents(files, @base_directory)
+    end
+  end
+end

data/lib/gpm/source/files_providers/files_from_gem_directory_provider.rb

@@ -0,0 +1,13 @@
+require_relative 'files_provider'
+module Source
+  class FilesFromGemDirectoryProvider < FilesProvider
+    attr_reader :directory
+    def initialize(directory,files)
+      @directory = directory
+      @files = files
+    end
+    def file_contents
+      read_file_contents @files, @directory
+    end
+  end
+end

data/lib/gpm/source/files_providers/files_provider.rb

@@ -0,0 +1,10 @@
+module Source
+  class FilesProvider
+    def files
+      file_contents.keys
+    end
+    def file_contents
+      {}
+    end
+  end
+end

data/lib/gpm/source/files_providers/overrides_permissions.rb

@@ -0,0 +1,37 @@
+require_relative '../../file_path_and_permissions'
+
+#This module is intended as a mixin, you still need to implement
+# the respective methods, i.e.
+# base_provider and permission_overrides
+module OverridesPermissions
+  def file_contents
+    #Beware: Deep magic here.
+    result = base_provider.file_contents.map do |file_with_permissions,content|
+      _,override = permission_overrides.map do |condition,permission|
+        # Find the length of the longest match for the current regexp.
+        longest = file_with_permissions.scan(condition).map do |match|
+          match = match.join if match.kind_of? Array
+          match.length
+        end.max
+        # return the length of the longest match and the associated permission
+        # or nil if there was no match
+        [longest,permission] if longest
+      end.compact.max_by(&:first) #Get the Array with the greatest length in the first component.
+      file_with_permissions = FilePathAndPermissions.new(file_with_permissions,override) if override
+      [file_with_permissions,content]
+    end
+    Hash[*result.flatten]
+  end
+
+  def files
+    file_contents.keys
+  end
+
+  private
+  def base_provider
+    raise "Not implemented here. Override this method in the class that includes this module."
+  end
+  def permission_overrides
+    raise "Not implemented here. Override this method in the class that includes this module."
+  end
+end

data/lib/gpm/source/files_providers/vendored_gems_installer.rb

@@ -0,0 +1,36 @@
+require_relative 'files_provider'
+
+module Source
+  class VendoredGemsInstaller
+    attr_reader :gemfile
+    def initialize(gemfile)
+      @gemfile = gemfile
+      @installed = false
+    end
+    def directory
+      File.dirname(@gemfile)
+    end
+    def install!
+      return if @installed
+      backup_fields = ["PATH","GEM_PATH"]
+      bundled_files = []
+
+      old_env = ENV.to_hash
+      Dir.chdir(directory) do
+        ::Bundler.with_clean_env do
+          old_env.each {|k,_| ENV.delete k}
+          ENV["BUNDLE_GEMFILE"] = gemfile
+          ENV["PWD"] = directory
+          backup_fields.each {|f| ENV[f] = old_env[f]}
+          FileUtils.rm_rf('.bundle')
+          ["bundle install","bundle install --deployment --verbose"].each do |c| # --standalone
+            command_result = `#{c}`
+            raise "#{c.inspect} failed:\n#{command_result}" unless $?.success?
+          end
+        end
+      end
+      old_env.each {|k,v| ENV[k] = v}
+      @installed = true
+    end
+  end
+end

data/lib/gpm/source/gem.rb

@@ -1,9 +1,11 @@
 require_relative '../source'
+require_relative 'files_providers/files_from_gem_directory_provider'
 require "rubygems/package"
 require "rubygems"
 require 'zlib'
 
-class Source::Gem < Source::Base
+module Source
+class Gem < Base
   class FilesFromGemProvider < Source::FilesProvider
     def initialize(contents)
       @gem_file_contents = contents
@@ -17,7 +19,7 @@ class Source::Gem < Source::Base
       contents
     end
     def tar_files(io)
-      tar_reader = Gem::Package::TarReader.new(io)
+      tar_reader = ::Gem::Package::TarReader.new(io)
       tar_files = {}
       tar_reader.each do |entry|
         tar_files[entry.full_name] = entry.read
@@ -27,24 +29,6 @@ class Source::Gem < Source::Base
     end
   end
 
-  class FilesFromGemDirectoryProvider < Source::FilesProvider
-    attr_reader :directory
-    def initialize(directory,files)
-      @directory = directory
-      @files = files
-    end
-    def file_contents
-      read_file_contents @files, @directory
-    end
-    def read_file_contents(files,base_directory)
-      file_contents = {}
-      files.each do |f|
-        path = File.join(base_directory,f)
-        file_contents[f] = File.read(path) if File.file?(path)
-      end
-      file_contents
-    end
-  end
 
   def self.read_metadata(gem_file)
     metadata = nil
@@ -58,13 +42,16 @@ class Source::Gem < Source::Base
           end
         end
       elsif gem_file.end_with?('.gemspec')
-        metadata = Gem::Specification.load(gem_file)
+        metadata = ::Gem::Specification.load(gem_file)
+      else
+        raise "Unknown file type of #{gem_file}. Need a .gem or .gemspec file"
       end
     end
+    raise "Could not read metadata for #{gem_file.inspect}" unless metadata
     metadata
   end
 
-  def self.create(gem_file)
+  def self.create(gem_file, options = {})
     metadata = self.read_metadata(gem_file)
 
     files_provider = nil
@@ -77,13 +64,14 @@ class Source::Gem < Source::Base
         files_provider = FilesFromGemDirectoryProvider.new(File.expand_path(File.dirname(gem_file)), metadata.files+[File.basename(gem_file)])
       end
     end
-    new(metadata, files_provider)
+    new(metadata, files_provider, options)
   end
 
   attr_reader :metadata, :files_provider
-  def initialize(metadata, files_provider = nil)
+  def initialize(metadata, files_provider = nil, options = {})
     @metadata = metadata
     @files_provider = files_provider
+    @options = options
   end
 
   %w(description license summary version email).each do |method|
@@ -91,6 +79,12 @@ class Source::Gem < Source::Base
       metadata.send(method)
     end
   end
+
+  %w(owner group destination build_number).each do |method|
+    define_method method do
+      @options[method.to_sym]
+    end
+  end
   {:maintainer => :author, :url => :homepage}.each do |out_field, in_field|
     define_method out_field do
       metadata.send(in_field)
@@ -132,12 +126,13 @@ class Source::Gem < Source::Base
         dependencies << "#{name(dep)} #{req}"
       end
     end
-    dependencies
+    return dependencies + ["libc6", "ruby"]
   end
   def file_contents
-    @files_provider.nil? ? {} : @files_provider.file_contents
+    files_provider.nil? ? {} : files_provider.file_contents
   end
   def files
-    @files_provider.files
+    files_provider.files
   end
+end
 end

data/lib/gpm/target.rb

@@ -7,6 +7,7 @@ require_relative 'file_path_and_permissions'
 
 require_relative 'target/generate_from_templates'
 require_relative 'target/zip_directories'
+require_relative 'io_helpers'
 module Target
   class Base
     PHASES = [:file_creation, :packaging]
@@ -19,6 +20,9 @@ module Target
     def self.steps_for_phase(phase)
       self.send(field_name_for_steps(phase))
     end
+    def self.add_step_for_phase(phase, block, description = nil)
+      steps_for_phase(phase) << [block, description]
+    end
     class_inheritable_array *phase_steps_names
     phase_steps_names.each {|p| self.send("#{p}=".to_sym,[])}
 
@@ -28,6 +32,7 @@ module Target
     def initialize(work_dir, options = {})
       @work_dir = work_dir
       @logger = ::Logger.new(STDERR)
+      @logger.level = ::Logger::INFO
       @options = options
     end
 
@@ -43,30 +48,16 @@ module Target
       @origin_dir = Dir.getwd
       FileUtils.mkdir_p package_dir
       ::Dir.chdir(package_dir) do
-        self.class.phase_steps_names.each do |steps|
-          self.class.send(steps).each do |step|
+        self.class.phase_steps_names.each do |phase_name|
+          steps_for_phase = self.class.send(phase_name)
+          steps_for_phase.each do |step, description|
+            @logger.info description if description
             instance_exec source, &step
           end
         end
       end
     end
 
-    def write_file_contents(file_contents)
-      file_contents.each do |file_name, content|
-        FileUtils.mkdir_p(File.dirname(file_name))
-        File.open(file_name,"w") do |file|
-          file.print content
-        end
-        File.chmod(file_name.permissions, file_name.to_s) if file_name.is_a? FilePathAndPermissions
-      end
-    end
-
-    def write_file_contents_in_directory(file_contents,directory)
-      FileUtils.mkdir_p directory
-      Dir.chdir(directory) do
-        write_file_contents(file_contents)
-      end
-    end
 
     def tar_directory(directory, options = {})
         FileUtils.mkdir_p(directory)
@@ -80,9 +71,9 @@ module Target
     end
 
     def exec(*args)
-      puts args.join(" ")
+      @logger.debug args.join(" ")
       success = system(*args)
-      puts "#{args.join(" ")} did not complete successfully!" unless success
+      @logger.error "#{args.join(" ")} did not complete successfully!" unless success
     end
   end
 end

data/lib/gpm/target/deb.rb

@@ -1,23 +1,47 @@
 require_relative '../target'
+require_relative '../source'
+require_relative '../source/files_providers/overrides_permissions'
 require 'erb'
 require 'delegate'
 require_relative 'step_plugin'
 
 class Target::Deb < Target::Base
   include StepPlugin
-  class DebianSourceWrapper < Delegator
-    def initialize(source)
-      super
-      @delegate_sd_obj = source || raise("nil source")
-      @logger = ::Logger.new(STDERR)
+  POST_INST_FILES = /^_package_\/postinst.*$/
+  PRE_RM_FILES = /^_package_\/prerm.*$/
+  SCRIPT_PERMISSIONS = 0750
+
+  def self.architecture(architecture=nil)
+    if architecture.nil? or architecture == "native"
+      # Default architecture should be 'native' which we'll need
+      # to ask the system about.
+      arch = %x{dpkg --print-architecture}.chomp
+      if $?.exitstatus != 0
+        arch = %x{uname -m}.chomp
+        @logger.warn("Can't find 'dpkg' tool (need it to get default " \
+                     "architecture!). Please specificy --architecture " \
+                     "specifically. (Defaulting now to #{arch})")
+      end
+      arch
+    elsif architecture == "x86_64"
+      # Debian calls x86_64 "amd64"
+      "amd64"
+    else
+      architecture
     end
+  end
 
-    def __getobj__
-      @delegate_sd_obj          # return object we are delegating to, required
+  class DebianSourceWrapper < SimpleDelegator
+    include OverridesPermissions
+    alias :base_provider :__getobj__
+    def initialize(source)
+      raise("nil source") unless source
+      super(source)
+      @logger = ::Logger.new(STDERR)
     end
 
-    def __setobj__(source)
-      @delegate_sd_obj = source    # change delegation object, a feature we're providing
+    def permission_overrides
+      { Regexp.union(POST_INST_FILES, PRE_RM_FILES) => SCRIPT_PERMISSIONS }
     end
 
     def name
@@ -33,7 +57,7 @@ class Target::Deb < Target::Base
       end
 
       if name.include?("_")
-        @logger.info("Package name '#{name}' includes underscores, converting" \
+        @logger.debug("Package name '#{name}' includes underscores, converting" \
                      " to dashes")
         name = name.gsub(/[_]/, "-")
       end
@@ -41,31 +65,14 @@ class Target::Deb < Target::Base
       return name
     end
     def architecture
-      architecture = __getobj__.architecture
-      if architecture.nil? or architecture == "native"
-        # Default architecture should be 'native' which we'll need
-        # to ask the system about.
-        arch = %x{dpkg --print-architecture}.chomp
-        if $?.exitstatus != 0
-          arch = %x{uname -m}.chomp
-          @logger.warn("Can't find 'dpkg' tool (need it to get default " \
-                       "architecture!). Please specificy --architecture " \
-                       "specifically. (Defaulting now to #{arch})")
-        end
-        arch
-      elsif architecture == "x86_64"
-        # Debian calls x86_64 "amd64"
-        "amd64"
-      else
-        architecture
-      end
+      Target::Deb.architecture(__getobj__.architecture)
     end # def architecture
 
     def default_output
       name_and_version = "#{name}_#{version}"
       architecture_and_type = "#{architecture}.#{type}"
-      if iteration
-        "#{name_and_version}-#{iteration}_#{architecture_and_type}"
+      if build_number
+        "#{name_and_version}-b#{build_number}_#{architecture_and_type}"
       else
         "#{name_and_version}_#{architecture_and_type}"
       end
@@ -95,8 +102,8 @@ class Target::Deb < Target::Base
         nextversion[l-1] = 0
         nextversion = nextversion.join(".")
         return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
-      # ignore iterations for = dependencies if flag specified
-      elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/)) && self.settings[:ignore_iteration]
+      # ignore build_numbers for = dependencies if flag specified
+      elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/)) && self.settings[:ignore_build_numbers]
         name, version = m[1..2]
         nextversion = version.split('.').collect { |v| v.to_i }
         nextversion[-1] += 1
@@ -115,10 +122,11 @@ class Target::Deb < Target::Base
     Dir["**/*.so"]
   end
 
-  in_phase(:file_creation) { exec("strip --strip-unneeded #{all_binaries.join(' ')}") unless all_binaries.empty? }
-  in_phase(:file_creation) { exec("chrpath --delete #{all_binaries.join(' ')}") unless all_binaries.empty? }
-  in_phase(:packaging) {|source| exec("ar -qc ../#{source.default_output} debian-binary control.tar.gz data.tar.gz") }
-  in_phase(:packaging) {|source| FileUtils.cp("../#{source.default_output}",@origin_dir) }
+  in_phase(:file_creation, "Stripping links from binaries...") { exec("strip --strip-unneeded #{all_binaries.join(' ')}") unless all_binaries.empty? }
+  in_phase(:file_creation, "Removing absolute paths from binaries...") { exec("chrpath --delete #{all_binaries.join(' ')}") unless all_binaries.empty? }
+  in_phase(:file_creation, "Making files unwriteable by group and others...") { exec("chmod -R go-w *") }
+  in_phase(:packaging, "Packaging metafiles and files into .deb package...") {|source| exec("ar -qc ../#{source.default_output} debian-binary control.tar.gz data.tar.gz") }
+  in_phase(:packaging, "Copying .deb package to output directory...") {|source| FileUtils.cp("../#{source.default_output}",@origin_dir) }
 
   def create_package(source)
     super(DebianSourceWrapper.new(source))

data/lib/gpm/target/generate_from_templates.rb

@@ -2,7 +2,7 @@ require_relative 'step_plugin'
 require_relative '../file_path_and_permissions'
 module GenerateFromTemplates
   include StepPlugin
-  in_phase(:file_creation) { |source| write_files_to_package_dir(source) }
+  in_phase(:file_creation, "Expanding templates...") { |source| write_files_to_package_dir(source) }
 
   def template_paths
     @template_paths ||= Dir["#{template_dir}/**/*.erb"]

data/lib/gpm/target/step_plugin.rb

@@ -1,19 +1,20 @@
 module StepPlugin
   def self.included(base)
     if base.is_a? Class
-      def base.in_phase(phase, &block)
-        self.steps_for_phase(phase) << block
+      def base.in_phase(phase, description=nil, &block)
+        self.add_step_for_phase(phase,block,description)
       end
     elsif base.is_a? Module
-      def base.in_phase(phase, &block)
+      def base.in_phase(phase, description=nil, &block)
         @phase_blocks||= {}
         @phase_blocks[phase] ||= []
-        @phase_blocks[phase] << block
+        @phase_blocks[phase] << [block, description]
       end
       def base.included(clazz)
         @phase_blocks.each do |phase, blocks|
-          blocks.each do |block|
-            clazz.steps_for_phase(phase) << block
+          blocks.each do |block_and_description|
+            block, description = block_and_description
+            clazz.add_step_for_phase(phase,block,description)
           end
         end
       end

data/lib/gpm/target/zip_directories.rb

@@ -1,7 +1,7 @@
 require_relative 'step_plugin'
 module ZipDirectories
   include StepPlugin
-  in_phase(:packaging) do
+  in_phase(:packaging, "Zipping directories...") do
     Dir["*.tar.gz.dir"].each do |tar_gz_dir|
       tar_directory(tar_gz_dir, :group=>"root",:owner=>"root")
     end

data/templates/deb/control.tar.gz.dir/control.erb

@@ -1,5 +1,5 @@
 Package: <%= name %>
-Version: <%= "#{epoch}:" if epoch %><%= version %><%= iteration && '-'+iteration.to_s %>
+Version: <%= "#{epoch}:" if epoch %><%= version %><%= build_number && '-b'+build_number.to_s %>
 Architecture: <%= architecture %>
 Maintainer: <%= maintainer or "<unknown>" %><%= " <#{email}>".gsub(" <>","") %>
 <% if !dependencies.empty? -%>

data/templates/deb/control.tar.gz.dir/postinst.erb

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+chown <%= owner %>:<%= group %> -R <%= destination %>
+<% file_contents.keys.select { |file| file =~ Target::Deb::POST_INST_FILES }.sort.each do |file| %><%= File.join(destination, file) %> $*
+<% end %>

data/templates/deb/control.tar.gz.dir/prerm.erb

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+<% file_contents.keys.select { |file| file =~ Target::Deb::PRE_RM_FILES }.sort.each do |file| %><%= File.join(destination, file) %> $*
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &78034030 !ruby/object:Gem::Requirement
+  requirement: &75731240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78034030
+  version_requirements: *75731240
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &78033470 !ruby/object:Gem::Requirement
+  requirement: &75730810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *78033470
+  version_requirements: *75730810
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &78033080 !ruby/object:Gem::Requirement
+  requirement: &75730540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78033080
+  version_requirements: *75730540
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &78032450 !ruby/object:Gem::Requirement
+  requirement: &75730250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78032450
+  version_requirements: *75730250
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &78031940 !ruby/object:Gem::Requirement
+  requirement: &75729940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *78031940
+  version_requirements: *75729940
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &78025220 !ruby/object:Gem::Requirement
+  requirement: &75729620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,32 +76,32 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *78025220
+  version_requirements: *75729620
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &78024410 !ruby/object:Gem::Requirement
+  requirement: &75729360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *78024410
+  version_requirements: *75729360
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &78023540 !ruby/object:Gem::Requirement
+  requirement: &75729110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.3
   type: :development
   prerelease: false
-  version_requirements: *78023540
+  version_requirements: *75729110
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &78022860 !ruby/object:Gem::Requirement
+  requirement: &75728810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,18 +109,40 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *78022860
+  version_requirements: *75728810
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &78022250 !ruby/object:Gem::Requirement
+  requirement: &75728460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *78022250
+  version_requirements: *75728460
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &75728070 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :development
+  prerelease: false
+  version_requirements: *75728070
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &75727760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :development
+  prerelease: false
+  version_requirements: *75727760
 description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
   solaris packages and more. Win at package management without wasting pointless hours
   debugging bad rpm specs!
@@ -131,21 +153,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/gpm/cli.rb
+- lib/gpm/source/files_providers/composite_files_provider.rb
+- lib/gpm/source/files_providers/files_from_gem_directory_provider.rb
+- lib/gpm/source/files_providers/overrides_permissions.rb
+- lib/gpm/source/files_providers/vendored_gems_installer.rb
+- lib/gpm/source/files_providers/files_from_bundler_directory_provider.rb
+- lib/gpm/source/files_providers/files_from_directory_provider.rb
+- lib/gpm/source/files_providers/files_provider.rb
 - lib/gpm/source/bundler.rb
 - lib/gpm/source/gem.rb
 - lib/gpm/packaging_task.rb
 - lib/gpm/file_path_and_permissions.rb
 - lib/gpm/target.rb
 - lib/gpm/source.rb
+- lib/gpm/io_helpers.rb
 - lib/gpm/target/generate_from_templates.rb
 - lib/gpm/target/deb.rb
 - lib/gpm/target/zip_directories.rb
 - lib/gpm/target/step_plugin.rb
+- bin/correct_permissions
 - bin/gpm
 - templates/deb/data.tar.gz.dir/usr/share/doc/__name__/copyright.erb
-- templates/deb/data.tar.gz.dir/usr/share/doc/__name__/changelog.gz.erb
+- templates/deb/data.tar.gz.dir/usr/share/doc/__name__/changelog.Debian.gz.erb
 - templates/deb/control.tar.gz.dir/md5sums.erb
+- templates/deb/control.tar.gz.dir/postinst.erb
 - templates/deb/control.tar.gz.dir/control.erb
+- templates/deb/control.tar.gz.dir/prerm.erb
 - templates/deb/debian-binary.erb
 homepage: https://github.com/crealytics/gpm
 licenses: []