fpm-fry 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6bc3a9f29acd7c147a4016c4906fd0a35c6481
-  data.tar.gz: afece6f8aea44147df5e357015115f9c74614071
+  metadata.gz: 2d0c17ec38081829a127eb9388ed2a6fe5f10976
+  data.tar.gz: ef89b4472306f950a3f62a48a293d844006883d4
 SHA512:
-  metadata.gz: 3fea3ee2114b957eca0789a06faab401d88ff9269bf95ffab42ce79f367716d4b962b964e44aa03ef58087c50c1df5c904195f1ac44cde705bc17c5c0a9d2e63
-  data.tar.gz: ccee1a75f08a186ff5a44e673d297ca41e2ce6faee2b4df57715542eafbf8640b605e0f7c619958f8b4a7967abd76b8192eadd6e72d5ffcecb07ab1ca27c9949
+  metadata.gz: d17bfa8b82c26885c29193d7147e132a25e2be465f88fa33b25f7b7e2a1135a8ca3ffdd461f931e7dc33517e680c82d3010508b8c81f9b90b30355ab6babefce
+  data.tar.gz: 2d7533f0c0a145a1f52828e6201d97c2a0d201538c2fc572b12da95ea005736d48cdd63a120f5d43606e9fe5d302cada8926eeffe37632ccf5b75e4320ffc5aa

data/lib/fpm/fry/build_output_parser.rb

@@ -10,12 +10,17 @@ module FPM; module Fry
     end
 
     def call(chunk, *_)
-      json = JSON.parse(chunk)
-      stream = json['stream']
-      if /\ASuccessfully built (\w+)\Z/.match(stream)
-        images << $1
+      # new docker for Mac results in data like this:
+      # "{'stream':' ---\\u003e 3bc51d6a4c46\\n'}\r\n{'stream':'Step 2 : WORKDIR /tmp/build\\n'}\r\n"
+      # this isn't valid JSON, of course, so we process each part individually
+      chunk.split("\r\n").each do |sub_chunk|
+        json = JSON.parse(sub_chunk)
+        stream = json['stream']
+        if /\ASuccessfully built (\w+)\Z/.match(stream)
+          images << $1
+        end
+        out << stream
       end
-      out << stream
     end
 
   end

data/lib/fpm/fry/client.rb

@@ -18,7 +18,7 @@ class FPM::Fry::Client
     include FPM::Fry::WithData
   end
 
-  # Raised when trying to read file that can't be read e.g. because it's a 
+  # Raised when trying to read file that can't be read e.g. because it's a
   # directory.
   class NotAFile < StandardError
     include FPM::Fry::WithData
@@ -84,12 +84,21 @@ class FPM::Fry::Client
 
   def read(name, resource)
     return to_enum(:read, name, resource) unless block_given?
-    res = agent.get(
-      path: url('containers',name,'archive'),
-      query: {'path' => resource},
-      headers: { 'Content-Type' => 'application/json' },
-      expects: [200,404,500]
-    )
+    res = if (server_version['ApiVersion'] < "1.20")
+            agent.post(
+              path: url('containers', name, 'copy'),
+              headers: { 'Content-Type' => 'application/json' },
+              body: JSON.generate({'Resource' => resource}),
+              expects: [200,404,500]
+            )
+          else
+            agent.get(
+              path: url('containers', name, 'archive'),
+              headers: { 'Content-Type' => 'application/json' },
+              query: {:path => resource},
+              expects: [200,404,500]
+            )
+          end
     if [404,500].include? res.status
       body_message = Hash[JSON.load(res.body).map{|k,v| ["docker.#{k}",v] }] rescue {'docker.message' => res.body}
       body_message['docker.container'] = name
@@ -99,7 +108,7 @@ class FPM::Fry::Client
       raise FileNotFound.new("file not found", {'path' => resource}.merge(body_message))
     end
     sio = StringIO.new(res.body)
-    tar = ::Gem::Package::TarReader.new( sio )
+    tar = FPM::Fry::Tar::Reader.new( sio )
     tar.each do |entry|
       yield entry
     end

data/lib/fpm/fry/command/cook.rb

@@ -122,6 +122,9 @@ module FPM; module Fry
             path: client.url("build?rm=1&dockerfile=#{DockerFile::NAME}&t=#{cachetag}"),
             request_block: BlockEnumerator.new(df.tar_io)
           )
+        else
+          # Hack to trigger hints/warnings even when the cache is valid.
+          DockerFile::Source.new(builder.variables.merge(image: image_id),cache).send(:file_map)
         end
 
         df = DockerFile::Build.new(cachetag, builder.variables.dup,builder.recipe, update: update?)
@@ -275,6 +278,7 @@ module FPM; module Fry
 
       out_map.each do |output, package|
         package.apply_output(output)
+        adjust_package_settings(output)
         adjust_config_files(output)
       end
 
@@ -291,6 +295,12 @@ module FPM; module Fry
 
     end
 
+    def adjust_package_settings( output )
+      # FPM ignores the file permissions on rpm packages.
+      output.attributes[:rpm_use_file_permissions?] = true
+      output.attributes[:rpm_user] = 'root'
+      output.attributes[:rpm_group] = 'root'
+    end
 
     def adjust_config_files( output )
       # FPM flags all files in /etc as config files but only for debian :/.

data/lib/fpm/fry/docker_file.rb

@@ -13,6 +13,11 @@ module FPM; module Fry
       def initialize(variables, cache = Source::Null::Cache)
         variables = variables.dup.freeze
         super(variables, cache)
+        if cache.respond_to? :logger
+          @logger = cache.logger
+        else
+          @logger = Cabin::Channel.get
+        end
       end
 
       def dockerfile
@@ -21,8 +26,8 @@ module FPM; module Fry
 
         df << "RUN mkdir /tmp/build"
 
-        cache.file_map.each do |from, to|
-          df << "ADD #{map_from(from)} #{map_to(to)}"
+        file_map.each do |from, to|
+          df << "COPY #{map_from(from)} #{map_to(to)}"
         end
 
         df << ""
@@ -47,6 +52,33 @@ module FPM; module Fry
         return sio
       end
 
+    private
+
+      attr :logger
+
+      def file_map
+        prefix = ""
+        to = ""
+        if cache.respond_to? :prefix
+          prefix = cache.prefix
+        end
+        if cache.respond_to? :to
+          to = cache.to || ""
+        end
+        fm = cache.file_map
+        if fm.nil?
+          return { prefix => to }
+        end
+        if fm.size == 1
+          key, value = fm.first
+          key = key.gsub(%r!\A\./|/\z!,'')
+          if ["",".","./"].include?(value) && key == prefix
+            logger.hint("You can remove the file_map: #{fm.inspect} option on source. The given value is the default")
+          end
+        end
+        return fm
+      end
+
       def map_to(dir)
         if ['','.'].include? dir
           return '/tmp/build'
@@ -78,17 +110,27 @@ module FPM; module Fry
       end
 
       def dockerfile
-        df = []
-        df << "FROM #{base}"
-        df << "WORKDIR /tmp/build"
+        df = {
+          source: [],
+          dependencies: [],
+          build: []
+        }
+        df[:source] << "FROM #{base}"
+        workdir = '/tmp/build'
+        # TODO: get this from cache, not from the source itself
+        if recipe.source.respond_to? :to
+          to = recipe.source.to || ""
+          workdir = File.expand_path(to, workdir)
+        end
+        df[:source] << "WORKDIR #{workdir}"
 
         # need to add external sources before running any command
         recipe.build_mounts.each do |source, target|
-          df << "ADD #{source} /tmp/build/#{target}"
+          df[:dependencies] << "COPY #{source} ./#{target}"
         end
 
-        recipe.apt_setup.each do |step|
-          df << "RUN #{step}"
+        recipe.before_dependencies_steps.each do |step|
+          df[:dependencies] << "RUN #{step.to_s}"
         end
 
         if build_dependencies.any?
@@ -98,22 +140,22 @@ module FPM; module Fry
             if options[:update]
               update = 'apt-get update && '
             end
-            df << "RUN #{update}apt-get install --yes #{Shellwords.join(build_dependencies)}"
+            df[:dependencies] << "RUN #{update}apt-get install --yes #{Shellwords.join(build_dependencies)}"
           when 'redhat'
-            df << "RUN yum -y install #{Shellwords.join(build_dependencies)}"
+            df[:dependencies] << "RUN yum -y install #{Shellwords.join(build_dependencies)}"
           else
             raise "Unknown flavour: #{variables[:flavour]}"
           end
         end
 
         recipe.before_build_steps.each do |step|
-          df << "RUN #{step.to_s}"
+          df[:build] << "RUN #{step.to_s}"
         end
 
-        df << "ADD .build.sh /tmp/build/"
-        df << "ENTRYPOINT /tmp/build/.build.sh"
-        df << ''
-        return df.join("\n")
+        df[:build] << "COPY .build.sh #{workdir}/"
+        df[:build] << "CMD #{workdir}/.build.sh"
+        recipe.apply_dockerfile_hooks(df)
+        return [*df[:source],*df[:dependencies],*df[:build],""].join("\n")
       end
 
       def build_sh

data/lib/fpm/fry/plugin/apt.rb

@@ -0,0 +1,52 @@
+require 'fpm/fry/plugin'
+module FPM::Fry::Plugin ; 
+
+  # Allows adding a debian repository.
+  #
+  # @note experimental
+  #
+  # @example in a recipe
+  #   plugin 'apt' do |apt|
+  #     apt.repository "https://repo.varnish-cache.org/#{distribution}", "trusty", "varnish-4.1"
+  #   end
+  #
+  class Apt
+
+  # Adds a debian repository
+  #
+  # @param [String] url
+  # @param [String] distribution
+  # @param [String,Array<String>] components
+  # @param [Hash] options
+  def repository(url, distribution, components, options = {} )
+    name = "#{url}-#{distribution}".gsub(/[^a-zA-Z0-9_\-]/,'-')
+    source = ['deb']
+    source << '[trusted=yes]'
+    source << url
+    source << distribution
+    source << Array(components).join(' ')
+    @builder.before_dependencies do
+      @builder.bash "echo '#{source.join(' ')}' >> /etc/apt/sources.list.d/#{name}.list && apt-get update -o Dir::Etc::sourcelist='sources.list.d/#{name}.list' -o Dir::Etc::sourceparts='-' -o APT::Get::List-Cleanup='0'"
+    end
+  end
+
+  def self.apply(builder, &block)
+    if builder.flavour != "debian"
+      builder.logger.info('skipped apt plugin')
+      return
+    end
+    dsl = self.new(builder)
+    if block.arity == 1
+      block.call(dsl)
+    else
+      dsl.instance_eval(&block)
+    end
+  end
+
+  private
+
+  def initialize(builder)
+    @builder = builder
+  end
+
+end ; end

data/lib/fpm/fry/plugin/env.rb

@@ -0,0 +1,45 @@
+require 'fpm/fry/plugin'
+# The env plugin sets global environment variables.
+# 
+# @example add something to PATH in a recipe
+#   plugin 'env', 'PATH' => '$PATH:/usr/local/go/bin'
+# 
+module FPM::Fry::Plugin::Env
+
+  # @api private
+  class AddEnv < Struct.new(:env)
+
+    def call(_, df)
+      df[:source] << format
+    end
+  private
+
+    def format
+      "ENV " + env.map{|k,v| "#{k}=#{escape(v)}" }.join(" ")
+    end
+
+    def escape(v)
+      v.gsub(/([ \n\\])/,'\\\\\\1')
+    end
+  end
+
+  def self.apply(builder, env)
+    unless env.kind_of? Hash
+      raise FPM::Fry::WithData(
+        ArgumentError.new("ENV must be a Hash, got #{env.inspect}"),
+        documentation: 'https://github.com/xing/fpm-fry/wiki/Plugin-env'
+      )
+    end
+    env.each do |k,v|
+      k = k.to_s if k.kind_of? Symbol
+      unless k.kind_of?(String) && k =~ /\A[A-Z][A-Z0-9_]*\z/
+        raise FPM::Fry::WithData(
+          ArgumentError.new("environment variable names must be strings consisiting of uppercase letters, numbers and underscores, got #{k.inspect}"),
+          documentation: 'https://github.com/xing/fpm-fry/wiki/Plugin-env'
+        )
+      end
+    end
+    builder.recipe.dockerfile_hooks << AddEnv.new(env.dup.freeze)
+  end
+
+end

data/lib/fpm/fry/plugin/init.rb

@@ -61,9 +61,9 @@ private
 
   def self.detect_sysv(inspector)
     features = {
-      chkconfig: inspector.exists?('/sbin/chkconfig'),
-      'update-rc.d': inspector.exists?('/usr/sbin/update-rc.d'),
-      'invoke-rc.d': inspector.exists?('/usr/sbin/invoke-rc.d')
+      :chkconfig => inspector.exists?('/sbin/chkconfig'),
+      :'update-rc.d' => inspector.exists?('/usr/sbin/update-rc.d'),
+      :'invoke-rc.d' => inspector.exists?('/usr/sbin/invoke-rc.d')
     }
     return System.new(:sysv,features)
   end

data/lib/fpm/fry/plugin/systemd.rb

@@ -0,0 +1,75 @@
+require 'fpm/fry/plugin'
+require 'fpm/fry/chroot'
+
+# Automatically adds the appropriate maintainer scripts for every systemd unit.
+#
+# @note experimental
+#
+# @example in a recipe
+#   plugin 'systemd' # no options required, just install your units in /lib/systemd/system
+module FPM::Fry::Plugin::Systemd
+
+  # @api private
+  VALID_UNITS = /\A[a-z_0-9\-]+@?\.(service|socket|timer)\z/
+
+  # @api private
+  INSTANTIATED_UNITS = /\A[a-z_0-9\-]+@\.(service|socket|timer)\z/
+
+  # @api private
+  class Callback < Struct.new(:script_helper)
+
+    def call(_, package)
+      chroot = FPM::Fry::Chroot.new(package.staging_path)
+      files = chroot.entries('lib/systemd/system') - ['.','..']
+      valid, invalid = files.partition{|file| VALID_UNITS =~ file }
+      if invalid.any?
+        package.logger.warning("Found #{invalid.size} files in systemd unit path that are no systemd units", files: invalid)
+      end
+      units = valid.grep_v(INSTANTIATED_UNITS)
+      return if units.none?
+      package.logger.info("Added #{units.size} systemd units", units: valid)
+      script_helper.after_install_or_upgrade install(units)
+      script_helper.before_remove_entirely before_remove(units)
+      script_helper.after_remove_entirely after_remove(units)
+    end
+
+  private
+     def install(units)
+<<BASH
+if systemctl is-system-running ; then
+  systemctl preset #{units.join(' ')}
+  if systemctl is-enabled #{units.join(' ')} ; then
+    systemctl daemon-reload
+    systemctl restart #{units.join(' ')}
+  fi
+fi
+BASH
+     end
+
+     def before_remove(units)
+<<BASH
+if systemctl is-system-running ; then
+  systemctl disable --now #{units.join(' ')}
+fi
+BASH
+     end
+
+     def after_remove(units)
+<<BASH
+if systemctl is-system-running ; then
+  systemctl daemon-reload
+  systemctl reset-failed #{units.join(' ')}
+fi
+BASH
+     end
+
+  end
+
+  def self.apply(builder)
+    return unless builder.plugin('init').systemd?
+    builder.plugin('script_helper') do |sh|
+      builder.output_hooks << Callback.new(sh)
+    end
+  end
+
+end

data/lib/fpm/fry/recipe/builder.rb

@@ -1,6 +1,8 @@
 require 'fpm/fry/recipe'
 require 'fpm/fry/recipe/error'
 require 'forwardable'
+require 'fpm/fry/channel'
+
 module FPM::Fry
   class Recipe
 
@@ -29,6 +31,8 @@ module FPM::Fry
         @inspector = options[:inspector]
       end
 
+      # Returns the package type ( e.g. "debian" or "redhat" ).
+      # @return [String]
       def flavour
         variables[:flavour]
       end
@@ -38,9 +42,13 @@ module FPM::Fry
       end
       alias platform distribution
 
-      def distribution_version
-        variables[:distribution_version]
+      # The release version of the distribution ( e.g. "12.04" or "6.0.7" )
+      # @return [String]
+      def release
+        variables[:release]
       end
+
+      alias distribution_version release
       alias platform_version distribution_version
 
       def codename
@@ -200,7 +208,7 @@ module FPM::Fry
         variables = variables.dup
         variables.freeze
         @recipe = recipe
-        @before_build = false
+        @steps = :steps
         register_default_source_types!
         super(variables, recipe.packages[0], options)
       end
@@ -231,7 +239,9 @@ module FPM::Fry
       end
 
       def apt_setup(cmd)
-        recipe.apt_setup << cmd
+        before_dependencies do
+          bash cmd
+        end
       end
 
       def run(*args)
@@ -250,7 +260,10 @@ module FPM::Fry
           code = Recipe::Step.new(name, code)
         end
         # Don't do this at home
-        if @before_build
+        case(@steps)
+        when :before_dependencies
+          recipe.before_dependencies_steps << code
+        when :before_build
           recipe.before_build_steps << code
         else
           recipe.steps << code
@@ -258,10 +271,17 @@ module FPM::Fry
       end
 
       def before_build
-        @before_build = true
+        steps, @steps = @steps, :before_build
+        yield
+      ensure
+        @steps = steps
+      end
+
+      def before_dependencies
+        steps, @steps = @steps, :before_dependencies
         yield
       ensure
-        @before_build = false
+        @steps = steps
       end
 
       def build_depends( name , options = {} )

data/lib/fpm/fry/recipe.rb

@@ -67,6 +67,7 @@ module FPM; module Fry
       # @return [FPM::Package] package
       # @api private
       def apply_output( package )
+        output_hooks.each{|h| h.call(self, package) }
         package.name = name
         package.version = version
         package.iteration = iteration
@@ -87,7 +88,6 @@ module FPM; module Fry
             end
           end
         end
-        output_hooks.each{|h| h.call(self, package) }
         return package
       end
 
@@ -134,7 +134,9 @@ module FPM; module Fry
     attr_accessor :source
 
     attr_accessor :build_mounts
-    attr_accessor :apt_setup
+
+    # @return [Array<#to_s>] steps that will be carried out before dependencies are installed
+    attr_accessor :before_dependencies_steps
 
     # @return [Array<#to_s>] steps that will be carried out before build
     attr_accessor :before_build_steps
@@ -151,16 +153,20 @@ module FPM; module Fry
     # @return [Array<#call>] hooks that will be called on the input package
     attr_accessor :input_hooks
 
+    # @return [Array<#call>] hooks that will be called when building the Dockerfile
+    attr_accessor :dockerfile_hooks
+
     def initialize
       @source = Source::Null
+      @before_dependencies_steps = []
       @before_build_steps = []
       @steps = []
       @packages = [PackageRecipe.new]
       @packages[0].files << '**'
       @build_depends = {}
       @input_hooks = []
+      @dockerfile_hooks = []
       @build_mounts = []
-      @apt_setup = []
     end
 
     # Calculates all dependencies of this recipe
@@ -187,6 +193,16 @@ module FPM; module Fry
       return package
     end
 
+    # Filters the dockerfile
+    # @api experimental
+    # @param [Hash] df
+    def apply_dockerfile_hooks( df )
+      dockerfile_hooks.each do |hook|
+        hook.call(self, df)
+      end
+      return nil
+    end
+
   end
 
 end ; end

data/lib/fpm/fry/source/archive.rb

@@ -6,6 +6,8 @@ require 'zlib'
 require 'fpm/fry/source'
 require 'fpm/fry/exec'
 require 'cabin'
+require 'cabin/channel'
+
 module FPM; module Fry ; module Source
   # Used to build from an archive.
   #
@@ -60,7 +62,7 @@ module FPM; module Fry ; module Source
     class Cache < Struct.new(:package,:tempdir)
       extend Forwardable
 
-      def_delegators :package, :url, :checksum, :checksum_algorithm, :logger, :file_map
+      def_delegators :package, :url, :checksum, :checksum_algorithm, :logger, :file_map, :to
 
       # @return [String] cachekey which is equal to the checksum
       def cachekey
@@ -155,6 +157,32 @@ module FPM; module Fry ; module Source
         Exec['tar','-xf',tempfile,'-C',dst, logger: logger]
       end
 
+      def prefix
+        update!
+        @prefix ||= prefix!
+      end
+
+      def prefix!
+        longest = nil
+        Exec.popen('tar','-tf',tempfile, logger: logger).each_line.map do |line|
+          line = line.chomp
+          parts = line.split('/')
+          parts.pop unless line[-1] == '/'
+          if longest.nil?
+            longest = parts
+          else
+            longest.each_with_index do | e, i |
+              if parts[i] != e
+                longest = longest[0...i]
+                break
+              end
+            end
+            break if longest.none?
+          end
+        end
+        return Array(longest).join('/')
+      end
+
     protected
       def ioclass
         File
@@ -181,6 +209,22 @@ module FPM; module Fry ; module Source
     class ZipCache < Cache
 
       def tar_io
+        unpack!
+        return Exec::popen('tar','-c','.', chdir: unpacked_tmpdir)
+      end
+
+      def copy_to(dst)
+        update!
+        Exec['unzip', tempfile, '-d', dst ]
+      end
+
+      def prefix
+        unpack!
+        Source::prefix(unpacked_tmpdir)
+      end
+    private
+
+      def unpack!
         if !::File.directory?( unpacked_tmpdir )
           workdir = unpacked_tmpdir + '.tmp'
           begin
@@ -192,14 +236,8 @@ module FPM; module Fry ; module Source
           copy_to( workdir )
           File.rename(workdir, unpacked_tmpdir)
         end
-        return Exec::popen('tar','-c','.', chdir: unpacked_tmpdir)
       end
 
-      def copy_to(dst)
-        update!
-        Exec['unzip', tempfile, '-d', dst ]
-      end
-    private
       def unpacked_tmpdir
         File.join(tempdir, cachekey)
       end
@@ -218,6 +256,10 @@ module FPM; module Fry ; module Source
         FileUtils.cp( tempfile, dst )
       end
 
+      def prefix
+        ""
+      end
+
     end
 
     CACHE_CLASSES = {
@@ -230,7 +272,7 @@ module FPM; module Fry ; module Source
       '.bundle' => PlainCache
     }
 
-    attr :file_map, :data, :url, :checksum, :checksum_algorithm, :logger
+    attr :file_map, :data, :url, :checksum, :checksum_algorithm, :logger, :to
 
     # @param [URI] url
     # @param [Hash] options
@@ -243,7 +285,8 @@ module FPM; module Fry ; module Source
       @logger = options.fetch(:logger){ Cabin::Channel.get }
       @checksum = options[:checksum]
       @checksum_algorithm = guess_checksum_algorithm(options[:checksum])
-      @file_map = options.fetch(:file_map){ {'' => ''} }
+      @file_map = options[:file_map]
+      @to = options[:to]
     end
 
     # Creates a cache.

data/lib/fpm/fry/source/dir.rb

@@ -2,6 +2,9 @@ require 'fpm/fry/source'
 require 'fpm/fry/exec'
 require 'fileutils'
 require 'digest'
+require 'cabin/channel'
+require 'fpm/fry/tar'
+
 module FPM; module Fry ; module Source
   class Dir
 
@@ -18,7 +21,7 @@ module FPM; module Fry ; module Source
     class Cache < Struct.new(:package, :dir)
       extend Forwardable
 
-      def_delegators :package, :url, :logger, :file_map
+      def_delegators :package, :url, :logger, :file_map, :to
 
       def tar_io
         Exec::popen('tar','-c','.', chdir: dir, logger: logger)
@@ -36,9 +39,13 @@ module FPM; module Fry ; module Source
         end
         return dig.hexdigest
       end
+
+      def prefix
+        Source::prefix(dir)
+      end
     end
 
-    attr :url, :logger, :file_map
+    attr :url, :logger, :file_map, :to
 
     def initialize( url, options = {} )
       @url = URI(url)
@@ -46,7 +53,8 @@ module FPM; module Fry ; module Source
         @url.path = File.expand_path(@url.path)
       end
       @logger = options.fetch(:logger){ Cabin::Channel.get }
-      @file_map = options.fetch(:file_map){ {'' => ''} }
+      @file_map = options[:file_map]
+      @to = options[:to]
     end
 
     def build_cache(_)

data/lib/fpm/fry/source/git.rb

@@ -43,7 +43,7 @@ module FPM; module Fry ; module Source
     class Cache < Struct.new(:package, :tempdir)
       extend Forwardable
 
-      def_delegators :package, :url, :rev, :logger, :file_map
+      def_delegators :package, :url, :rev, :logger, :file_map, :to
 
       def tar_io
         Exec::popen(package.git, "--git-dir=#{repodir}",'archive','--format=tar','FETCH_HEAD', logger: logger)
@@ -59,6 +59,11 @@ module FPM; module Fry ; module Source
       def cachekey
         Exec::exec(package.git, "--git-dir=#{repodir}",'rev-parse','FETCH_HEAD^{tree}', logger: logger).chomp
       end
+
+      def prefix
+        ""
+      end
+
     private
       def initialize(*_)
         super
@@ -90,12 +95,15 @@ module FPM; module Fry ; module Source
     # @return [String] the git rev to pull (default "HEAD")
     attr :rev
 
-    # @return [Hash<String,String>] the file map for generating a docker file
+    # @return [Hash<String,String>,nil] the file map for generating a docker file
     attr :file_map
 
     # @return [URI] the uri to pull from
     attr :url
 
+    # @return [String,nil]
+    attr :to
+
     # @param [URI] url the url to pull from
     # @param [Hash] options
     # @option options [Cabin::Channel] :logger (cabin default channel)
@@ -107,8 +115,9 @@ module FPM; module Fry ; module Source
       @url = URI(url)
       @logger = options.fetch(:logger){ Cabin::Channel.get }
       @rev = options[:branch] || options[:tag] || options[:rev] || 'HEAD'
-      @file_map = options.fetch(:file_map){ {'' => ''} }
+      @file_map = options[:file_map]
       @git = options[:git] || 'git'
+      @to = options[:to]
     end
 
     # @param [String] tempdir

data/lib/fpm/fry/source/patched.rb

@@ -8,6 +8,7 @@ module FPM; module Fry ; module Source
       extend Forwardable
 
       def_delegators :package, :logger, :file_map
+      def_delegators :inner, :prefix, :to
 
       attr :inner
 
@@ -18,39 +19,64 @@ module FPM; module Fry ; module Source
       end
 
       def update!
-        @updated ||= begin
-          if !File.directory?(unpacked_tmpdir)
-            workdir = unpacked_tmpdir + '.tmp'
+        return if @updated
+        if !File.directory?(unpacked_tmpdir)
+          workdir = unpacked_tmpdir + '.tmp'
+          begin
+            FileUtils.mkdir(workdir)
+          rescue Errno::EEXIST
+            FileUtils.rm_rf(workdir)
+            FileUtils.mkdir(workdir)
+          end
+          if inner.respond_to? :copy_to
+            inner.copy_to(workdir)
+          else
+            ex = Tar::Extractor.new(logger: logger)
+            tio = inner.tar_io
             begin
-              FileUtils.mkdir(workdir)
-            rescue Errno::EEXIST
-              FileUtils.rm_rf(workdir)
-              FileUtils.mkdir(workdir)
+              ex.extract(workdir, FPM::Fry::Tar::Reader.new(tio), chown: false)
+            ensure
+              tio.close
             end
-            if inner.respond_to? :copy_to
-              inner.copy_to(workdir)
-            else
-              ex = Tar::Extractor.new(logger: logger)
-              tio = inner.tar_io
-              begin
-                ex.extract(workdir, ::Gem::Package::TarReader.new(tio), chown: false)
-              ensure
-                tio.close
+          end
+          base = workdir
+          if inner.respond_to? :prefix
+            base = File.expand_path(inner.prefix, base)
+          end
+          package.patches.each do |patch|
+            cmd = ['patch','-p1','-i',patch[:file]]
+            chdir = base
+            if patch.key? :chdir
+              given_chdir = File.expand_path(patch[:chdir],workdir)
+              if given_chdir != chdir
+                chdir = given_chdir
+              else
+                logger.hint("You can remove the chdir: #{patch[:chdir].inspect} option for #{patch[:file]}. The given value is the default.", documentation: 'https://github.com/xing/fpm-fry/wiki/Source-patching#chdir' )
               end
             end
-            package.patches.each do |patch|
-              cmd = ['patch','-p1','-i',patch[:file]]
-              chdir = File.expand_path(patch.fetch(:chdir,'.'),workdir)
-              begin
-                Fry::Exec[*cmd, chdir: chdir, logger: logger]
-              rescue Exec::Failed => e
-                raise CacheFailed.new(e, patch: patch[:file])
+            begin
+              Fry::Exec[*cmd, chdir: chdir, logger: logger]
+            rescue Exec::Failed => e
+              raise CacheFailed.new(e, patch: patch[:file])
+            end
+          end
+          File.rename(workdir, unpacked_tmpdir)
+        else
+          #
+          base = unpacked_tmpdir
+          if inner.respond_to? :prefix
+            base = File.expand_path(inner.prefix, base)
+          end
+          package.patches.each do |patch|
+            if patch.key? :chdir
+              given_chdir = File.expand_path(patch[:chdir],unpacked_tmpdir)
+              if given_chdir == base
+                logger.hint("You can remove the chdir: #{patch[:chdir].inspect} option for #{patch[:file]}. The given value is the default.", documentation: 'https://github.com/xing/fpm-fry/wiki/Source-patching#chdir' )
               end
             end
-            File.rename(workdir, unpacked_tmpdir)
           end
-          true
         end
+        @updated = true
       end
       private :update!
 
@@ -119,4 +145,3 @@ module FPM; module Fry ; module Source
   end
 
 end ; end ; end
-

data/lib/fpm/fry/source.rb

@@ -26,6 +26,11 @@ module FPM; module Fry ; module Source
       def self.cachekey
         return '0' * 32
       end
+
+      # @return [String] common path prefix of all files that should be stripped
+      def self.prefix
+        return ""
+      end
     end
 
     # @see FPM::Fry::Source::Null::Cache
@@ -45,5 +50,27 @@ module FPM; module Fry ; module Source
       end
     end
 
+    # @api private
+    # @param dir [String] directory
+    # @return [String] prefix
+    def prefix(dir)
+      e = ::Dir.entries(dir)
+      if e.size != 3
+        return ""
+      end
+      other = (e - ['.','..']).first
+      path = File.join(dir, other)
+      if File.directory?( path )
+        pf = prefix(path)
+        if pf == ""
+          return other
+        else
+          return File.join(other, pf)
+        end
+      else
+        return ""
+      end
+    end
+
   end
 end ; end ; end

data/lib/fpm/fry/tar.rb

@@ -1,7 +1,70 @@
+require "rubygems/package"
+require 'fpm/fry/channel'
+
 module FPM; module Fry; end ; end
 
 class FPM::Fry::Tar
 
+  class Reader
+    include Enumerable
+
+    def initialize(io)
+      @reader = Gem::Package::TarReader.new(io)
+    end
+
+    def each
+      return to_enum(:each) unless block_given?
+
+      last_pax_header = nil
+      @reader.each do |entry|
+        if entry.header.typeflag == 'x'
+          last_pax_header = extract_pax_header(entry.read)
+        else
+          if last_pax_header && (path = last_pax_header["path"])
+            entry.header.instance_variable_set :@name, path
+            last_pax_header = nil
+          end
+          yield entry
+        end
+      end
+    end
+
+    def map
+      return to_enum(:map) unless block_given?
+
+      res = []
+      each do |entry|
+        res << yield(entry)
+      end
+      res
+    end
+
+    private
+
+    def extract_pax_header(string)
+      res = {}
+      s = StringIO.new(string)
+      while !s.eof?
+        total_len = 0
+        prefix_len = 0
+        # read number prefix and following blank
+        while (c = s.getc) && (c =~ /\d/)
+          total_len = 10 * total_len + c.to_i
+          prefix_len += 1
+        end
+        field = s.read(total_len - prefix_len - 2)
+        if field =~ /\A([^=]+)=(.+)\z/
+          res[$1] = $2
+        else
+          raise "malformed pax header: #{field}"
+        end
+        s.read(1) # read trailing newline
+      end
+      res
+    end
+
+  end
+
   class Extractor
 
     def initialize( options = {} )

data/lib/fpm/package/docker.rb

@@ -1,5 +1,6 @@
 require 'fpm'
 require 'fpm/package'
+require 'fpm/fry/channel'
 
 require 'fpm/fry/client'
 

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
+- Maxime Lagresle
+- Stefan Kaes
 - Hannes Georg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -52,8 +54,84 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: deep-fried package builder
-email: hannes.georg@xing.com
+email: maxime.lagresle@xing.com
 executables:
 - fpm-fry
 extensions: []
@@ -75,14 +153,17 @@ files:
 - lib/fpm/fry/joined_io.rb
 - lib/fpm/fry/plugin.rb
 - lib/fpm/fry/plugin/alternatives.rb
+- lib/fpm/fry/plugin/apt.rb
 - lib/fpm/fry/plugin/config.rb
 - lib/fpm/fry/plugin/edit_staging.rb
+- lib/fpm/fry/plugin/env.rb
 - lib/fpm/fry/plugin/exclude.rb
 - lib/fpm/fry/plugin/init.rb
 - lib/fpm/fry/plugin/platforms.rb
 - lib/fpm/fry/plugin/same_version.rb
 - lib/fpm/fry/plugin/script_helper.rb
 - lib/fpm/fry/plugin/service.rb
+- lib/fpm/fry/plugin/systemd.rb
 - lib/fpm/fry/plugin/user.rb
 - lib/fpm/fry/recipe.rb
 - lib/fpm/fry/recipe/builder.rb