fpm-fry 0.2.2 → 0.4.6

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

@@ -1,4 +1,5 @@
 require 'fpm/fry/tar'
+require 'fpm/fry/exec'
 require 'digest'
 module FPM; module Fry ; module Source
   class Patched
@@ -7,6 +8,7 @@ module FPM; module Fry ; module Source
       extend Forwardable
 
       def_delegators :package, :logger, :file_map
+      def_delegators :inner, :prefix, :to
 
       attr :inner
 
@@ -17,47 +19,70 @@ 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)
-              logger.debug("Running patch",cmd: cmd, dir: chdir )
-              system(*cmd, chdir: chdir, out: :close)
+            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!
 
       def tar_io
         update!
-        cmd = ['tar','-c','.']
-        logger.debug("Running tar",cmd: cmd, dir: unpacked_tmpdir)
-        # IO.popen( ..., chdir: ... ) doesn't work on older ruby
-        ::Dir.chdir(unpacked_tmpdir) do
-          return IO.popen(cmd)
-        end
+        return Exec::popen('tar','-c','.',chdir: unpacked_tmpdir, logger: logger)
       end
 
       def cachekey
@@ -76,11 +101,11 @@ module FPM; module Fry ; module Source
 
     end
 
-    attr :inner, :patches
+    attr :inner, :logger, :patches
 
     extend Forwardable
 
-    def_delegators :inner, :logger, :file_map
+    def_delegators :inner, :file_map
 
     def initialize( inner , options = {})
       @inner = inner
@@ -98,6 +123,11 @@ module FPM; module Fry ; module Source
         end
         options
       end
+      if @inner.respond_to? :logger
+        @logger = @inner.logger
+      else
+        @logger = Cabin::Channel.get
+      end
     end
 
     def build_cache(tmpdir)
@@ -115,4 +145,3 @@ module FPM; module Fry ; module Source
   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/fry/templates/debian/after_remove.erb

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 case "$1" in
-  remove)
+  remove|purge)
   <%= remove.join("\n") %>
   ;;
   upgrade)

data/lib/fpm/fry/templates/debian/before_remove.erb

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 case "$1" in
-  remove)
+  remove|purge)
   <%= remove.join("\n") %>
   ;;
   upgrade)

data/lib/fpm/fry/ui.rb

@@ -3,7 +3,7 @@ require 'fpm/fry/channel'
 module FPM; module Fry
   class UI < Struct.new(:out, :err, :logger, :tmpdir)
 
-    def initialize( out = STDOUT, err = STDERR, logger = nil , tmpdir = '/tmp/fpm-fry' )
+    def initialize( out: STDOUT, err: STDERR, logger: nil , tmpdir: '/tmp/fpm-fry' )
       logger ||= Channel.new.tap{|chan| chan.subscribe(Cabin::NiceOutput.new(out)) }
       FileUtils.mkdir_p( tmpdir )
       super( out, err, logger, tmpdir )

data/lib/fpm/fry/with_data.rb

@@ -16,4 +16,38 @@ module FPM ; module Fry
     return ex
   end
 
+  # Adds a data method to an exception. This overrides initialize so it may 
+  # not work everywhere.
+  module WithData
+
+    # @return [Hash] debugging/logging data
+    attr :data
+
+    # @overload initialize(data = {})
+    #   @param data [Hash]
+    #
+    # @overload initialize(cause, data = {})
+    #   If cause responds to #data the data will be merged.
+    #   @param cause [Exception]
+    #   @param data [Hash]
+    #
+    # @overload initialize(message, data = {})
+    #   @param message [String]
+    #   @param data [Hash]
+    #
+    def initialize(e=self.class.name, data = {})
+      if e.kind_of? Exception
+        if e.respond_to? :data
+          @data = e.data.merge(data)
+        else
+          @data = data.dup.freeze
+        end
+        super(e.message)
+      else
+        @data = data.dup.freeze
+        super(e.to_s)
+      end
+    end
+  end
+
 end ; end

data/lib/fpm/package/docker.rb

@@ -1,10 +1,15 @@
 require 'fpm'
 require 'fpm/package'
+require 'fpm/fry/channel'
 
 require 'fpm/fry/client'
 
+# An {FPM::Package} that loads files from a docker container diff.
 class FPM::Package::Docker < FPM::Package
 
+  # @param [Hash] options
+  # @option options [Cabin::Channel] :logger Logger
+  # @option options [FPM::Fry::Client] :client Docker client
   def initialize( options = {} )
     super()
     if options[:logger]
@@ -18,10 +23,19 @@ class FPM::Package::Docker < FPM::Package
     end
   end
 
+  # Loads all files from a docker container with the given name to the staging 
+  # path.
+  #
+  # @param [String] name docker container name
   def input(name)
     split( name, '**' => staging_path)
   end
 
+  # Loads all files from a docker container into multiple paths defined by map 
+  # param.
+  #
+  # @param [String] name docker container name
+  # @param [Hash<String,String>] map 
   def split( name, map )
     changes = changes(name)
     changes.remove_modified_leaves! do | kind, ml |
@@ -44,6 +58,7 @@ class FPM::Package::Docker < FPM::Package
     directories.each do |chg|
       client.copy(name, chg, fmap ,chown: false)
     end
+    return nil
   end
 
 private
@@ -80,6 +95,7 @@ private
   CREATED = 1
   DELETED = 2
 
+  # @api private
   class Node < Struct.new(:children, :kind)
 
     def initialize

metadata

@@ -1,14 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.6
 platform: ruby
 authors:
+- Maxime Lagresle
+- Stefan Kaes
+- Sebastian Brandt
 - Hannes Georg
+- Julian Tabel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -16,14 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.71.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.71.0
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +43,83 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
+        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.0
+    - - "~>"
+      - !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.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.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: '1.8'
+        version: '0'
 description: deep-fried package builder
-email: hannes.georg@xing.com
+email: maxime.lagresle@xing.com
 executables:
 - fpm-fry
 extensions: []
@@ -70,26 +136,30 @@ files:
 - lib/fpm/fry/command/cook.rb
 - lib/fpm/fry/detector.rb
 - lib/fpm/fry/docker_file.rb
+- lib/fpm/fry/exec.rb
+- lib/fpm/fry/inspector.rb
 - lib/fpm/fry/joined_io.rb
-- lib/fpm/fry/os_db.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
 - lib/fpm/fry/recipe/error.rb
 - lib/fpm/fry/source.rb
+- lib/fpm/fry/source/archive.rb
 - lib/fpm/fry/source/dir.rb
 - lib/fpm/fry/source/git.rb
-- lib/fpm/fry/source/package.rb
 - lib/fpm/fry/source/patched.rb
 - lib/fpm/fry/stream_parser.rb
 - lib/fpm/fry/tar.rb
@@ -126,8 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: FPM Fry