fpm-fry 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d58721a3f79317f65181422ff3a7e5d28ef823e
-  data.tar.gz: 85229c608182080d92b67b81c2e6d09f701d19ba
+  metadata.gz: 9052cdc66f349423b938cefae76a81ddf5504c65
+  data.tar.gz: 6084e244c0f01eb10f0c4ec2dbd6f18f1831ddd4
 SHA512:
-  metadata.gz: 5fc67b6dcbe5d6d8944028721665cbee9ae9bdb4f615c68812e012063e66c22ab278b943dc155d1e2ecc58e23021af133e8c0f29185db0ba0b5faa4f2dba5e5e
-  data.tar.gz: 03c12a7c8743715a8a33fff09c84e423ef67cbcd6a4a3a8659a6f7a1bd0b2e361797932117478950fb6ca6e5ac9af35049a4087c094a521b16a3e16a8d1fe22a
+  metadata.gz: 3667766c65cb233def8e06ae14029bea06ebae06f03a8f9b5a4c45ae9d851557dcef27a510c8a361d8099b8a50f1ebb632182598192c27ae5355f1c908611ec0
+  data.tar.gz: 81c95585118d529c4438b09aff3c96b3044b60a8b181d65bb6611635dc5fed9d672083796b13afb3fe6b4e38acdf81b1f9b54fbf3ade555b68237b12cc74d132

data/lib/fpm/fry/block_enumerator.rb

@@ -2,24 +2,31 @@ module FPM; module Fry
   class BlockEnumerator < Struct.new(:io, :blocksize)
     include Enumerable
 
+    # @param io [IO]
+    # @param blocksize [Numeric]
     def initialize(_, blocksize = 128)
       super
     end
 
+    # @return [Enumerator] unless called with a block
+    # @yield [chunk] One chunk from the io
+    # @yieldparam chunk [String]
     def each
       return to_enum unless block_given?
-      # Reading bigger chunks is far more efficient that eaching over the
+      # Reading bigger chunks is far more efficient than invoking #each on an IO.
       while chunk = io.read(blocksize)
         yield chunk
       end
+      return nil
     end
 
+    # @return [String] chunk or empty string at EOF
     def call
       while x = io.read(blocksize)
         next if x == ""
         return x
       end
       return ""
-    end
+   end
   end
 end ; end

data/lib/fpm/fry/channel.rb

@@ -19,5 +19,25 @@ module FPM; module Fry
 
     include Hint
 
+    # @private
+    def _log(message, data={})
+      case message
+      when Hash
+        data.merge!(message)
+      when Exception
+        # message is an exception
+        data[:message] = message.to_s
+        data[:exception] = message
+        data[:backtrace] = message.backtrace
+        if message.respond_to? :data
+          data = message.data.merge(data)
+        end
+      else
+        data = { :message => message }.merge(data)
+      end
+
+      publish(data)
+    end
+
   end
 end ; end

data/lib/fpm/fry/chroot.rb

@@ -0,0 +1,119 @@
+require 'fpm/fry/with_data'
+module FPM ; module Fry
+  # Helper class for filesystem operations inside staging directory.
+  # Resolves all symlinks relativ to a given base directory.
+  class Chroot
+
+    attr :base
+
+    # @param [String] base filesystem base
+    def initialize(base)
+      raise ArgumentError, "Base #{base.inspect} is not a directory" unless File.directory? base
+      @base = base
+    end
+
+    # Returns all directory entries like Dir.entries.
+    # @param [String] path
+    # @result [Array<String>] entries
+    def entries(path)
+      dir = rebase(path)
+      return Dir.entries(dir)
+    rescue => ex
+      raise Fry::WithData(ex, path: path)
+    end
+
+    # Opens a file like File.open.
+    # @param [String] path
+    # @see (File.open)
+    def open(path,*args,&block)
+      file = rebase(path)
+      return File.open(file,*args,&block)
+    rescue => ex
+      raise Fry::WithData(ex, path: path)
+    end
+
+    # Yields all entries recursively like Find.find.
+    # @param [String] path
+    # @yields entry
+    # @yieldparam [String] entry
+    def find(path, &block)
+      if stat(path).directory?
+        catch(:prune) do
+          block.call(path)
+          entries(path).each do | e |
+            next if e == "."
+            next if e == ".."
+            ep = File.join(path,e)
+            find(ep, &block)
+          end
+        end
+      else
+        block.call(path)
+      end
+      return nil
+    end
+
+    # Stats a file without following the last symlink like File.lstat.
+    # @param [String] file
+    # @return [File::Stat] stat
+    # @see (File.lstat)
+    def lstat(file)
+      File.lstat(rebase(file, FOLLOW_ALL_BUT_LAST))
+    end
+
+    # Stats a file like File.stat.
+    # @param [String] file
+    # @return [File::Stat] stat
+    # @see (File.stat)
+    def stat(file)
+      File.stat(rebase(file))
+    end
+
+   private
+
+    FOLLOW = lambda do |base, current, rest|
+      path = [base, *current].join('/')
+      if File.symlink?(path)
+        File.readlink(path)
+      else
+        nil
+      end
+    end
+
+    FOLLOW_ALL_BUT_LAST = lambda do |base, current, rest|
+      if rest.any?
+        FOLLOW.call(base, current, rest)
+      else
+        nil
+      end
+    end
+
+    def rebase(path, symlink_strategy = FOLLOW)
+      segs = path.split('/')
+      current = []
+      while segs.any?
+        seg = segs.shift
+        case seg
+        when '', '.' then next
+        when '..' then
+          # We don't check if anything was actually removed.
+          # This is consistent with File/Dir behavior.
+          current.pop
+        else
+          current << seg
+          rl = symlink_strategy.call(base, current, segs)
+          if rl
+            if rl.start_with? '/'
+              current = []
+            else
+              current.pop
+            end
+            segs.unshift *rl.split('/')
+          end
+        end
+      end
+      return [base,*current].join('/')
+    end
+
+  end
+end ; end

data/lib/fpm/fry/docker_file.rb

@@ -90,31 +90,25 @@ module FPM; module Fry
         df << "FROM #{base}"
         df << "WORKDIR /tmp/build"
 
-        deps = (recipe.build_depends.merge recipe.depends)\
-          .select{|_,v| v.fetch(:install,true) }\
-          .map do |k,v|
-            i = v.fetch(:install,true)
-            if i == true then
-              k
-            else
-              i
-            end
-          end.sort
-        if deps.any?
+        if build_dependencies.any?
           case(variables[:flavour])
           when 'debian'
             update = ''
             if options[:update]
               update = 'apt-get update && '
             end
-            df << "RUN #{update}apt-get install --yes #{Shellwords.join(deps)}"
+            df << "RUN #{update}apt-get install --yes #{Shellwords.join(build_dependencies)}"
           when 'redhat'
-            df << "RUN yum -y install #{Shellwords.join(deps)}"
+            df << "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}"
+        end
+
         df << "ADD .build.sh /tmp/build/"
         df << "ENTRYPOINT /tmp/build/.build.sh"
         df << ''
@@ -147,6 +141,27 @@ module FPM; module Fry
         sio.rewind
         return sio
       end
+
+    private
+      def build_dependencies
+        return @build_dependencies if @build_dependencies
+        deps = []
+        (recipe.build_depends.merge recipe.depends).each do |k,v|
+          install = v.fetch(:install,true)
+          next unless install
+          case( install )
+          when true
+            deps << simplify_build_dependency(k)
+          when String
+            deps << simplify_build_dependency(install)
+          end
+        end
+        @build_dependencies = deps.sort
+      end
+
+      def simplify_build_dependency( dep )
+        dep.split('|').first.strip
+      end
     end
 
   end

data/lib/fpm/fry/joined_io.rb

@@ -1,13 +1,18 @@
 module FPM; module Fry
+  # Joins together multiple IOs
   class JoinedIO
     include Enumerable
 
+    # @param [IO] ios
     def initialize(*ios)
       @ios = ios
       @pos = 0
       @readbytes = 0
     end
 
+    # Reads length bytes or all if length is nil.
+    # @param [Numeric, nil] length
+    # @return [String] resulting bytes
     def read( len = nil )
       buf = []
       if len.nil?
@@ -35,27 +40,37 @@ module FPM; module Fry
       end
     end
 
-    def readpartial( len )
+    # Reads up to length bytes.
+    # @param [Numeric] length
+    # @return [String] chunk
+    # @return [nil] at eof
+    def readpartial( length )
       while (io = @ios[@pos])
-        r = io.read( len )
+        r = io.read( length )
         if r.nil?
           @pos = @pos + 1
           next
         else
+          if io.eof?
+            @pos = @pos + 1
+          end
           return r
         end
       end
       return nil
     end
 
+    # @return [Numeric] number bytes read
     def pos
       @readbytes
     end
 
+    # @return [true,false] 
     def eof?
       @pos == @ios.size
     end
 
+    # Closes all IOs.
     def close
       @ios.each(&:close)
     end

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

@@ -1,4 +1,5 @@
 require 'fpm/fry/plugin'
+require 'fpm/fry/chroot'
 module FPM::Fry::Plugin::Config
 
   # @api private
@@ -15,6 +16,7 @@ module FPM::Fry::Plugin::Config
   class Callback < Struct.new(:files)
 
     def call(_, package)
+      chroot = FPM::Fry::Chroot.new(package.staging_path)
       prefix_length = package.staging_path.size + 1
       candidates = []
       # Sorting is important so that more specific rules override more generic 
@@ -23,10 +25,31 @@ module FPM::Fry::Plugin::Config
       keys.each do | key |
         if files[key]
           # Inclusion rule. Crawl file system for candidates
-          Find.find( File.expand_path(key, package.staging_path) ) do | path |
-            next unless File.file? path
-            name = path[prefix_length..-1]
-            candidates << name
+          begin
+            lstat = chroot.lstat( key )
+            if lstat.symlink?
+              package.logger.warn("Config file is a symlink",
+                                   path: key,
+                                   plugin: 'config',
+                                   documentation: 'https://github.com/xing/fpm-fry/wiki/Plugin-config#config-path-not-foun://github.com/xing/fpm-fry/wiki/Plugin-config#config-file-is-a-symlink')
+              next
+            end
+            chroot.find( key ) do | path |
+              lstat = chroot.lstat(path)
+              if lstat.symlink?
+                package.logger.debug("Ignoring symlink",
+                                     path: path,
+                                     plugin: 'config')
+                throw :prune
+              elsif lstat.file?
+                candidates << path
+              end
+            end
+          rescue Errno::ENOENT
+            package.logger.warn("Config path not found",
+                                path: key,
+                                plugin: 'config',
+                                documentation: 'https://github.com/xing/fpm-fry/wiki/Plugin-config#config-path-not-found')
           end
         else
           # Exclusion rule. Remove matching candidates

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

@@ -1,10 +1,18 @@
+require 'stringio'
 require 'fpm/fry/plugin'
 require 'fileutils'
+# A plugin to edit the final build results.
+# @example Add a file
+#   plugin 'edit_staging' do
+#     add_file '/a_file'
+#   end
 module FPM::Fry::Plugin::EditStaging
 
+  # @api private
   class AddFile < Struct.new(:path, :io, :options)
     def call(_ , package)
       file = package.staging_path(path)
+      package.logger.debug("Writing file directly to staging", target: file, content: io.inspect)
       FileUtils.mkdir_p(File.dirname(file))
       File.open(file,'w') do | f |
         IO.copy_stream(io, f)
@@ -16,16 +24,28 @@ module FPM::Fry::Plugin::EditStaging
     end
   end
 
+  # @api private
   class LnS < Struct.new(:src, :dest)
     def call(_ , package)
       file = package.staging_path(dest)
+      package.logger.debug("Linking file directly in staging", target: file, to: src)
       FileUtils.mkdir_p(File.dirname(file))
       File.symlink(src, file)
     end
   end
 
   class DSL < Struct.new(:builder)
-    def add_file(path, io, options = {})
+
+    # @param [String] path
+    # @param [IO, String] content
+    def add_file(path, content, options = {})
+      if content.kind_of?(IO) || content.kind_of?(StringIO)
+        io = content
+      elsif content.kind_of? String
+        io = StringIO.new(content)
+      else
+        raise ArgumentError.new("File content must be a String or IO, got #{content.inspect}")
+      end
       options = options.dup
       options[:chmod] = convert_chmod(options[:chmod]) if options[:chmod]
       options.freeze
@@ -51,6 +71,9 @@ module FPM::Fry::Plugin::EditStaging
 
   end
 
+  # @yield [dsl]
+  # @yieldparam [DSL] dsl
+  # @return [DSL]
   def self.apply(builder, &block)
     d = DSL.new(builder)
     if !block

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

@@ -92,9 +92,17 @@ module FPM::Fry::Plugin ; module Service
           sh.after_install_or_upgrade(<<BASH)
 if status #{Shellwords.shellescape name} 2>/dev/null | grep -q ' start/'; then
   # It has to be stop+start because upstart doesn't pickup changes with restart.
-  stop #{Shellwords.shellescape name}
+  if which invoke-rc.d >/dev/null 2>&1; then
+    invoke-rc.d #{Shellwords.shellescape name} stop
+  else
+    stop #{Shellwords.shellescape name}
+  fi
+fi
+if which invoke-rc.d >/dev/null 2>&1; then
+  invoke-rc.d #{Shellwords.shellescape name} start
+else
+  start #{Shellwords.shellescape name}
 fi
-start #{Shellwords.shellescape name}
 BASH
           sh.before_remove_entirely(<<BASH)
 if status #{Shellwords.shellescape name} 2>/dev/null | grep -q ' start/'; then
@@ -104,7 +112,6 @@ BASH
         end
         builder.plugin('config', FPM::Fry::Plugin::Config::IMPLICIT => true) do |co|
           co.include "etc/init/#{name}.conf"
-          co.include "etc/init.d/#{name}"
         end
       when 'sysv' then
         edit.add_file "/etc/init.d/#{name}",StringIO.new( env.render('sysv.erb') ), chmod: '750'

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

@@ -1,4 +1,5 @@
 require 'fpm/fry/recipe'
+require 'fpm/fry/recipe/error'
 require 'forwardable'
 module FPM::Fry
   class Recipe
@@ -52,11 +53,21 @@ module FPM::Fry
 
       def depends( name , options = {} )
         name, options = parse_package(name, options)
+        if package_recipe.depends.key? name
+          raise Error.new("duplicate dependency",package: name)
+        elsif package_recipe.conflicts.key? name
+          raise Error.new("depending package is already a conflicting package",package: name)
+        end
         package_recipe.depends[name] = options
       end
 
       def conflicts( name , options = {} )
         name, options = parse_package(name, options)
+        if package_recipe.conflicts.key? name
+          raise Error.new("duplicate conflict",package: name)
+        elsif package_recipe.depends.key? name
+          raise Error.new("conflicting package is already a dependency",package: name)
+        end
         package_recipe.conflicts[name] = options
       end
 
@@ -176,7 +187,9 @@ module FPM::Fry
         end
         variables.freeze
         @recipe = recipe
-        super(variables, recipe.packages[0], options = {})
+        @before_build = false
+        register_default_source_types!
+        super(variables, recipe.packages[0], options)
       end
 
       def load_file( file )
@@ -213,12 +226,23 @@ module FPM::Fry
 
       def bash( name = nil, code )
         if name
-          recipe.steps << Recipe::Step.new(name, code)
+          code = Recipe::Step.new(name, code)
+        end
+        # Don't do this at home
+        if @before_build
+          recipe.before_build_steps << code
         else
-          recipe.steps << code.to_s
+          recipe.steps << code
         end
       end
 
+      def before_build
+        @before_build = true
+        yield
+      ensure
+        @before_build = false
+      end
+
       def build_depends( name , options = {} )
         name, options = parse_package(name, options)
         recipe.build_depends[name] = options
@@ -240,19 +264,25 @@ module FPM::Fry
     protected
 
       def source_types
-        @source_types  ||= {
-          git:  Source::Git,
-          http: Source::Package,
-          tar:  Source::Package,
-          dir:  Source::Dir
-        }
+        @source_types  ||= {}
       end
 
-      def register_source_type( name, klass )
+      def register_source_type( klass )
         if !klass.respond_to? :new
           raise ArgumentError.new("Expected something that responds to :new, got #{klass.inspect}")
         end
-        source_types[name] = klass
+        source_types[klass.name] = klass
+        if klass.respond_to? :aliases
+          klass.aliases.each do |al|
+            source_types[al] = klass
+          end
+        end
+      end
+
+      def register_default_source_types!
+        register_source_type Source::Git
+        register_source_type Source::Package
+        register_source_type Source::Dir
       end
 
       NEG_INF = (-1.0/0.0)
@@ -267,10 +297,10 @@ module FPM::Fry
           .sort_by{|score,_| score.nil? ? NEG_INF : score }
         score, klasses = scores.last
         if score == nil
-          raise ArgumentError.new("No source provide found for #{url}.\nMaybe try explicitly setting the type using :with parameter. Valid options are: #{source_types.keys.join(', ')}")
+          raise Error.new("No source provider found for #{url}.\nMaybe try explicitly setting the type using :with parameter. Valid options are: #{source_types.keys.join(', ')}")
         end
         if klasses.size != 1
-          raise ArgumentError.new("Multiple possible source providers found for #{url}: #{klasses.join(', ')}.\nMaybe try explicitly setting the type using :with parameter. Valid options are: #{source_types.keys.join(', ')}")
+          raise Error.new("Multiple possible source providers found for #{url}: #{klasses.join(', ')}.\nMaybe try explicitly setting the type using :with parameter. Valid options are: #{source_types.keys.join(', ')}")
         end
         return klasses.first
       end

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

@@ -0,0 +1,15 @@
+require 'fpm/fry/recipe'
+module FPM::Fry
+  class Recipe
+    class Error < StandardError
+
+      attr :data
+
+      def initialize(msg=nil, data={})
+        super(msg)
+        @data = data
+      end
+
+    end
+  end
+end

data/lib/fpm/fry/recipe.rb

@@ -18,6 +18,9 @@ module FPM; module Fry
       end
     end
 
+    class DuplicateDependency < ArgumentError
+    end
+
     class PackageRecipe
       attr_accessor :name,
         :iteration,
@@ -121,10 +124,16 @@ module FPM; module Fry
       end
     end
 
-    attr_accessor :source, :steps, :packages, :build_depends, :input_hooks
+    attr_accessor :source,
+      :before_build_steps,
+      :steps,
+      :packages,
+      :build_depends,
+      :input_hooks
 
     def initialize
       @source = Source::Null
+      @before_build_steps = []
       @steps = []
       @packages = [PackageRecipe.new]
       @packages[0].files << '**'

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

@@ -6,6 +6,10 @@ module FPM; module Fry ; module Source
 
     REGEX = %r!\A(?:file:|/|\.)!
 
+    def self.name
+      :dir
+    end
+
     def self.guess( url )
       Source::guess_regex(REGEX, url)
     end

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

@@ -7,6 +7,10 @@ module FPM; module Fry ; module Source
 
     REGEX = %r!\A(?:git:|\S+@\S+:\S+\.git\z|https?:.*\.git\z|ssh:.*\.git\z)!
 
+    def self.name
+      :git
+    end
+
     def self.guess( url )
       Source::guess_regex(REGEX, url)
     end

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

@@ -9,6 +9,14 @@ module FPM; module Fry ; module Source
 
     REGEX = %r!\Ahttps?:!
 
+    def self.name
+      :package
+    end
+
+    def self.aliases
+      [:http]
+    end
+
     def self.guess( url )
       Source::guess_regex(REGEX, url)
     end
@@ -158,11 +166,32 @@ module FPM; module Fry ; module Source
       end
     end
 
+    class PlainCache < Cache
+
+      def tar_io
+        update!
+        cmd = ['tar','-c',::File.basename(tempfile)]
+        dir = File.dirname(tempfile)
+        logger.debug("Running tar",cmd: cmd, dir: dir)
+        ::Dir.chdir(dir) do
+          return IO.popen(cmd)
+        end
+      end
+
+      def copy_to(dst)
+        update!
+        FileUtils.cp( tempfile, dst )
+      end
+
+    end
+
     CACHE_CLASSES = {
       '.tar' => TarCache,
       '.tar.gz' => TarGzCache,
       '.tgz' => TarGzCache,
-      '.zip' => ZipCache
+      '.zip' => ZipCache,
+      '.bin' => PlainCache,
+      '.bundle' => PlainCache
     }
 
     attr :file_map, :data, :url, :extension, :checksum, :checksum_algorithm, :agent, :logger

data/lib/fpm/fry/with_data.rb

@@ -0,0 +1,8 @@
+module FPM ; module Fry
+
+  def self.WithData(ex, data)
+    ex.define_singleton_method(:data){ data }
+    return ex
+  end
+
+end ; end

data/lib/fpm/package/docker.rb

@@ -24,8 +24,12 @@ class FPM::Package::Docker < FPM::Package
 
   def split( name, map )
     changes = changes(name)
-    changes.remove_modified_leaves! do | ml |
-      @logger.warn("Found a modified file. You can only create new files in a package",name: ml)
+    changes.remove_modified_leaves! do | kind, ml |
+      if kind == DELETED
+        @logger.warn("Found a deleted file. You can only create new files in a package",name: ml)
+      else
+        @logger.warn("Found a modified file. You can only create new files in a package",name: ml)
+      end
     end
     fmap = {}
     changes.leaves.each do | change |
@@ -72,6 +76,10 @@ private
     return false
   end
 
+  MODIFIED = 0
+  CREATED = 1
+  DELETED = 2
+
   class Node < Struct.new(:children, :kind)
 
     def initialize
@@ -105,8 +113,8 @@ private
     def modified_leaves( prefix = '/', &block )
       return to_enum(:modified_leaves, prefix) unless block
       if leaf?
-        if kind != 1
-          yield prefix
+        if kind != CREATED
+          yield kind, prefix
         end
       else
         children.each do |name, cld|
@@ -119,15 +127,15 @@ private
       to_remove = {}
       children.each do |name, cld|
         removed_children = cld.remove_modified_leaves!(File.join(prefix,name), &block)
-        if cld.leaf? and cld.kind != 1
-          to_remove[name] = removed_children
+        if cld.leaf? and cld.kind != CREATED
+          to_remove[name] = [cld.kind, removed_children]
         end
       end
       if to_remove.any?
-        to_remove.each do |name, removed_children|
+        to_remove.each do |name, (kind, removed_children)|
           children.delete(name)
           if !removed_children
-            yield File.join(prefix,name)
+            yield kind, File.join(prefix,name)
           end
         end
         return true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hannes Georg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: packages docker changes with fpm
+description: deep-fried package builder
 email: hannes.georg@xing.com
 executables:
 - fpm-fry
@@ -50,6 +50,7 @@ files:
 - lib/fpm/fry/block_enumerator.rb
 - lib/fpm/fry/build_output_parser.rb
 - lib/fpm/fry/channel.rb
+- lib/fpm/fry/chroot.rb
 - lib/fpm/fry/client.rb
 - lib/fpm/fry/command.rb
 - lib/fpm/fry/command/cook.rb
@@ -70,6 +71,7 @@ files:
 - 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/dir.rb
 - lib/fpm/fry/source/git.rb
@@ -86,6 +88,7 @@ files:
 - lib/fpm/fry/templates/sysv.erb
 - lib/fpm/fry/templates/upstart.erb
 - lib/fpm/fry/ui.rb
+- lib/fpm/fry/with_data.rb
 - lib/fpm/package/docker.rb
 homepage: https://github.com/xing/fpm-fry
 licenses:
@@ -107,9 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: FPM Fry
 test_files: []
-has_rdoc: