fpm-fry 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d10781e6b5740b80f68e6a7130acd844c2b1d5c
-  data.tar.gz: 5dc23f36f547bd2359b433424ae8ef091dd2cf53
+  metadata.gz: 9d58721a3f79317f65181422ff3a7e5d28ef823e
+  data.tar.gz: 85229c608182080d92b67b81c2e6d09f701d19ba
 SHA512:
-  metadata.gz: ba95b38a5652f87439105db3c7430505695e5429ef90fdfadcb1b6f517556259c8add886a2c0b0cca72e0d7c7683a4584883d3e1263266ad5f4e162fa911b9f0
-  data.tar.gz: 9ded152eb45fbab21bdef04a651bee26689f0dd8a45a10d096ece7fe5cbc646f727fbc082e353f49bd62b6a303887d6ab86b6bb0e245625667d0529779f39f3e
+  metadata.gz: 5fc67b6dcbe5d6d8944028721665cbee9ae9bdb4f615c68812e012063e66c22ab278b943dc155d1e2ecc58e23021af133e8c0f29185db0ba0b5faa4f2dba5e5e
+  data.tar.gz: 03c12a7c8743715a8a33fff09c84e423ef67cbcd6a4a3a8659a6f7a1bd0b2e361797932117478950fb6ca6e5ac9af35049a4087c094a521b16a3e16a8d1fe22a

data/lib/cabin/nice_output.rb

@@ -6,14 +6,16 @@ class Cabin::NiceOutput
     :red => "\e[1;31m",
     :green => "\e[1;32m",
     :yellow => "\e[0;33m",
-    :white => "\e[0;37m"
+    :white => "\e[0;37m",
+    :blue => "\e[1;34m"
   }
 
   DIM_CODEMAP = {
     red:   "\e[0;31m",
     green: "\e[0;32m",
     white: "\e[1;30m",
-    yellow: "\e[33m"
+    yellow: "\e[33m",
+    blue: "\e[0;34m"
   }
 
   LEVELMAP = {
@@ -21,6 +23,7 @@ class Cabin::NiceOutput
     :error => :red,
     :warn => :yellow,
     :info => :green,
+    :hint => :blue,
     :debug => :white,
   }
 
@@ -43,6 +46,9 @@ class Cabin::NiceOutput
     bold = data.delete(:bold) ? :bold : nil
 
     backtrace = data.delete(:backtrace)
+    if !backtrace && data[:exception].respond_to?(:backtrace)
+      backtrace = data[:exception].backtrace
+    end
 
     # Make 'error' and other log levels have color
     if color.nil?
@@ -52,6 +58,9 @@ class Cabin::NiceOutput
     message = [event[:level] ? '====> ' : '      ',event[:message]]
     message.unshift(CODEMAP[color.to_sym]) if !color.nil?
     message << DIM_CODEMAP[color] if !color.nil?
+    if documentation = data.delete(:documentation)
+      message << "\n\tRead more on this topic here: #{documentation}"
+    end
     if data.any?
       message << "\n" <<  pp(data)
     end

data/lib/fpm/fry/channel.rb

@@ -0,0 +1,23 @@
+require 'cabin/channel'
+module FPM; module Fry
+  class Channel < Cabin::Channel
+
+    module Hint
+      def hint( message, data = {} )
+        return unless hint?
+        log(message, data.merge(level: :hint))
+      end
+
+      def hint?
+        !defined?(@hint) || @hint
+      end
+
+      def hint=( bool )
+        @hint = !!bool
+      end
+    end
+
+    include Hint
+
+  end
+end ; end

data/lib/fpm/fry/client.rb

@@ -9,30 +9,6 @@ module FPM; module Fry; end ; end
 
 class FPM::Fry::Client
 
-  class LogInstrumentor < Struct.new(:logger)
-
-    def instrument(event, data = {})
-      if block_given?
-        logger.debug('Requesting HTTP', filtered(data))
-        r = yield
-        return r
-      else
-        logger.debug('Getting HTTP response', filtered(data))
-      end
-    end
-
-    def filtered(data)
-      filtered = {}
-      filtered[:path] = data[:path] if data[:path]
-      filtered[:verb] = data[:method] if data[:method]
-      filtered[:status] = data[:status] if data[:status]
-      filtered[:body] = data[:body][0..500] if data[:body]
-      filtered[:headers] = data[:headers] 
-      return filtered
-    end
-
-  end
-
   class FileNotFound < StandardError
   end
 
@@ -141,7 +117,6 @@ class FPM::Fry::Client
   def agent_for( uri, tls )
     proto, address = uri.split('://',2)
     options = {
-      instrumentor: LogInstrumentor.new(logger),
       read_timeout: 10000
     }.merge( tls )
     case(proto)

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

@@ -18,10 +18,6 @@ module FPM; module Fry
     parameter 'image', 'Docker image to build from'
     parameter '[recipe]', 'Recipe file to cook', default: 'recipe.rb'
 
-    attr :ui
-    extend Forwardable
-    def_delegators :ui, :out, :err, :logger, :tmpdir
-
     def initialize(invocation_path, ctx = {}, parent_attribute_values = {})
       @tls = nil
       require 'digest'
@@ -35,10 +31,6 @@ module FPM; module Fry
       require 'fpm/fry/block_enumerator'
       require 'fpm/fry/build_output_parser'
       super
-      @ui = ctx.fetch(:ui){ UI.new }
-      if debug?
-        ui.logger.level = :debug
-      end
     end
 
     def detector
@@ -53,12 +45,8 @@ module FPM; module Fry
     end
 
     def detector=(d)
-      begin
-        unless d.detect!
-          raise "Unable to detect distribution from given image"
-        end
-      rescue Excon::Errors::NotFound
-        raise "Image not found"
+      unless d.detect!
+        raise "Unable to detect distribution from given image"
       end
       @detector = d
     end
@@ -70,7 +58,7 @@ module FPM; module Fry
 
     def output_class
       @output_class ||= begin
-        logger.info("Autodetecting package type",flavour: flavour)
+        logger.debug("Autodetecting package type",flavour: flavour)
         case(flavour)
         when 'debian'
           require 'fpm/package/deb'
@@ -92,7 +80,7 @@ module FPM; module Fry
           distribution_version: detector.version,
           flavour: flavour
         }
-        logger.info("Loading recipe",variables: vars, recipe: recipe)
+        logger.debug("Loading recipe",variables: vars, recipe: recipe)
         b = Recipe::Builder.new(vars, Recipe.new, logger: ui.logger)
         b.load_file( recipe )
         b
@@ -150,7 +138,7 @@ module FPM; module Fry
               'Content-Type'=>'application/tar'
             },
             expects: [200],
-            path: client.url("build?rm=1&t=#{cachetag}"),
+            path: client.url("build?rm=1&dockerfile=#{DockerFile::NAME}&t=#{cachetag}"),
             request_block: BlockEnumerator.new(df.tar_io)
           )
         end
@@ -162,12 +150,12 @@ module FPM; module Fry
             'Content-Type'=>'application/tar'
           },
           expects: [200],
-          path: client.url('build?rm=1'),
+          path: client.url("build?rm=1&dockerfile=#{DockerFile::NAME}"),
           request_block: BlockEnumerator.new(df.tar_io),
           response_block: parser
         )
         if parser.images.none?
-          raise "Unable to detect build image"
+          raise "Didn't find a build image in the stream. This usually means that the build script failed."
         end
         image = parser.images.last
         logger.debug("Detected build image", image: image)
@@ -191,13 +179,12 @@ module FPM; module Fry
           begin
             client.read( container, '/var/lib/apt/lists') do |file|
               next if file.header.name == 'lists/'
-              logger.info("/var/lib/apt/lists is not empty, no update is required ( force update with --apt-update=always )")
-              return false
+              logger.hint("/var/lib/apt/lists is not empty, you could try to speed up builds with --update=never", documentation: 'https://github.com/xing/fpm-fry/wiki/The-update-parameter')
+              return true
             end
           ensure
             client.delete(path: client.url('containers',container))
           end
-          logger.info("/var/lib/apt/lists is empty, update is required ( disable update with --apt-update=never )")
           return true
         when 'always'
           return true
@@ -250,7 +237,7 @@ module FPM; module Fry
         )
         json = JSON.parse(res.body)
         if json["StatusCode"] != 0
-          raise "Build failed"
+          raise "Build failed with exit code #{json["StatusCode"]}"
         end
         return yield container
       ensure
@@ -283,6 +270,12 @@ module FPM; module Fry
 
       output.output(tmp_package_file)
 
+      if output.config_files.any?
+        logger.debug("Found config files for #{output.name}", files: output.config_files)
+      else
+        logger.debug("No config files for #{output.name}")
+      end
+
       begin
         FileUtils.rm_rf package_file
       rescue Errno::ENOENT
@@ -311,6 +304,7 @@ module FPM; module Fry
 
       out_map.each do |output, package|
         package.apply_output(output)
+        adjust_config_files(output)
       end
 
       out_map.each do |output, _|
@@ -327,6 +321,39 @@ module FPM; module Fry
     end
 
 
+    def adjust_config_files( output )
+      # FPM flags all files in /etc as config files but only for debian :/.
+      # Actually this behavior makes sense to me for all packages because it's 
+      # the thing I usually want. By setting this attribute at least the 
+      # misleading warning goes away.
+      output.attributes[:deb_no_default_config_files?] = true
+      output.attributes[:deb_auto_config_files?] = false
+
+      return if output.attributes[:fry_config_explicitly_used]
+
+      # Now that we have disabled this for debian we have to reenable if it for 
+      # all.
+      etc = File.expand_path('etc', output.staging_path)
+      if File.exists?( etc )
+        # Config plugin wasn't used. Add everything under /etc
+        prefix_length = output.staging_path.size + 1
+        added = []
+        Find.find(etc) do | path |
+          next unless File.file? path
+          name = path[prefix_length..-1]
+          if !output.config_files.include? name
+            added << name
+            output.config_files << name
+          end
+        end
+        if added.any?
+          logger.hint( "#{output.name} contains some config files in /etc. They were automatically added. You can customize this using the \"config\" plugin.",
+                      documentation: "https://github.com/xing/fpm-fry/wiki/Plugin-config",
+                      files: added)
+        end
+      end
+    end
+
   public
 
     def execute
@@ -355,7 +382,7 @@ module FPM; module Fry
 
       return 0
     rescue Recipe::NotFound => e
-      logger.error("Recipe not found", recipe: recipe, exeception: e)
+      logger.error("Recipe not found", recipe: recipe, exception: e)
       return 1
     rescue => e
       logger.error(e)

data/lib/fpm/fry/command.rb

@@ -16,13 +16,29 @@ module FPM; module Fry
 
     subcommand 'fpm', 'Works like fpm but with docker support', FPM::Command
 
+    attr :ui
+    extend Forwardable
+    def_delegators :ui, :out, :err, :logger, :tmpdir
+
+    def initialize(invocation_path, ctx = {}, parent_attribute_values = {})
+      super
+      @ui = ctx.fetch(:ui){ UI.new }
+    end
+
+    def parse(attrs)
+      super
+      if debug?
+        ui.logger.level = :debug
+      end
+    end
+
     def client
       @client ||= begin
         client = FPM::Fry::Client.new(
           logger: logger,
           tls: tls?, tlsverify: tlsverify?
         )
-        logger.info("Docker connected",client.server_version)
+        logger.debug("Docker connected",client.server_version)
         client
       end
     end
@@ -39,14 +55,6 @@ module FPM; module Fry
       extend Forwardable
       def_delegators :ui, :logger
 
-      def initialize(*_)
-        super
-        @ui = UI.new()
-        if debug?
-          ui.logger.level = :debug
-        end
-      end
-
       def execute
         require 'fpm/fry/os_db'
         require 'fpm/fry/detector'

data/lib/fpm/fry/detector.rb

@@ -73,6 +73,10 @@ module FPM; module Fry
     end
 
     class Image < Struct.new(:client,:image,:factory)
+
+      class ImageNotFound < StandardError
+      end
+
       attr :distribution
       attr :version
 
@@ -82,11 +86,15 @@ module FPM; module Fry
 
       def detect!
         body = JSON.generate({"Image" => image, "Cmd" => "exit 0"})
-        res = client.post( path: client.url('containers','create'),
-                           headers: {'Content-Type' => 'application/json'},
-                           body: body,
-                           expects: [201]
-                         )
+        begin
+          res = client.post( path: client.url('containers','create'),
+                             headers: {'Content-Type' => 'application/json'},
+                             body: body,
+                             expects: [201]
+                           )
+        rescue Excon::Errors::NotFound
+          raise ImageNotFound, "Image #{image.inspect} not found. Did you do a `docker pull #{image}` before?"
+        end
         body = JSON.parse(res.body)
         container = body.fetch('Id')
         begin

data/lib/fpm/fry/docker_file.rb

@@ -7,6 +7,8 @@ require 'fpm/fry/joined_io'
 module FPM; module Fry
   class DockerFile < Struct.new(:variables,:cache,:recipe)
 
+    NAME = 'Dockerfile.fpm-fry'
+
     class Source < Struct.new(:variables, :cache)
 
       def initialize(variables, cache = Source::Null::Cache)
@@ -42,7 +44,7 @@ module FPM; module Fry
       def self_tar_io
         sio = StringIO.new
         tar = Gem::Package::TarWriter.new(sio)
-        tar.add_file('Dockerfile','0777') do |io|
+        tar.add_file(NAME,'0777') do |io|
           io.write(dockerfile)
         end
         #tar.close
@@ -122,8 +124,10 @@ module FPM; module Fry
       def build_sh
         df = ['#!/bin/bash']
         df << 'set -e'
-        recipe.steps.each do |k,v|
-          df << "echo -e '\\e[1;32m====> #{Shellwords.escape k}\\e[0m'"
+        recipe.steps.each do |v|
+          if v.respond_to? :name
+            df << "echo -e '\\e[1;32m====> #{Shellwords.escape v.name}\\e[0m'"
+          end
           df << v.to_s
         end
         df << ''
@@ -136,7 +140,7 @@ module FPM; module Fry
         tar.add_file('.build.sh','0777') do |io|
           io.write(build_sh)
         end
-        tar.add_file('Dockerfile','0777') do |io|
+        tar.add_file(NAME,'0777') do |io|
           io.write(dockerfile)
         end
         #tar.close

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

@@ -0,0 +1,90 @@
+require 'fpm/fry/plugin'
+module FPM::Fry::Plugin::Config
+
+  # @api private
+  IMPLICIT = Module.new
+
+  # @api private
+  MARK_EXPLICIT = Module.new do
+    def self.call(_, package)
+      package.attributes[:fry_config_explicitly_used] = true
+    end
+  end
+
+  # @api private
+  class Callback < Struct.new(:files)
+
+    def call(_, package)
+      prefix_length = package.staging_path.size + 1
+      candidates = []
+      # Sorting is important so that more specific rules override more generic 
+      # rules.
+      keys = files.keys.sort_by(&:size)
+      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
+          end
+        else
+          # Exclusion rule. Remove matching candidates
+          keydir = key + "/"
+          candidates.reject!{ |can| 
+            can.start_with?(keydir) || can == key
+          }
+        end
+      end
+      package.config_files |= candidates
+    end
+
+  end
+
+  class DSL < Struct.new(:builder, :options, :callback)
+
+    def initialize( builder, options )
+      callback = builder.output_hooks.find{|h| h.kind_of? Callback }
+      if !callback
+        callback = Callback.new({'etc' => true})
+        builder.output_hooks << callback
+      end
+      # This looks kind of dirty. The callback tells the cook comamnd that the 
+      # user has explictly used the config plugin. This way the cook command 
+      # can hint the user to use this plugin if config files were automatically 
+      # added.
+      if !options[IMPLICIT]
+        builder.output_hooks << MARK_EXPLICIT
+      end
+      super( builder, options, callback )
+    end
+
+    def include( path )
+      if path[0] == "/"
+        path = path[1..-1]
+      end
+      callback.files[path] = true
+    end
+
+    def exclude( path )
+      if path[0] == "/"
+        path = path[1..-1]
+      end
+      callback.files[path] = false
+    end
+
+  end
+
+  def self.apply( builder, options = {}, &block )
+    dsl = DSL.new(builder, options)
+    if block
+      if block.arity == 1
+        yield dsl
+      else
+        dsl.instance_eval(&block)
+      end
+    end
+    dsl
+  end
+
+end

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

@@ -0,0 +1,19 @@
+module FPM::Fry::Plugin::SameVersion
+
+  # Generates a special constraint that ignores iterations.
+  # This is especially pointful in multi-package recipes.
+  # @example
+  #   name 'mainpackage'
+  #   version '0.2.3'
+  #   package 'subpackage'
+  #     plugin 'same_version'
+  #     depends 'mainpackage', same_version
+  #   end
+  #
+  def same_version
+    *head, last = version.split('.')
+    last = last.to_i + 1
+    return ">= #{version}, << #{head.join '.'}.#{last}"
+  end
+
+end

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

@@ -1,29 +1,39 @@
 require 'fpm/fry/plugin'
 require 'fpm/fry/plugin/init'
 require 'fpm/fry/plugin/edit_staging'
+require 'fpm/fry/plugin/config'
 require 'erb'
 require 'shellwords'
 module FPM::Fry::Plugin ; module Service
 
-  class Environment < Struct.new(:name,:command, :description)
+  class Environment < Struct.new(:name,:command, :description, :limits, :user, :group, :chdir)
 
     def render(file)
       _erbout = ""
       erb = ERB.new(
-        IO.read(File.join(File.dirname(__FILE__),'..','templates',file))
+        IO.read(File.join(File.dirname(__FILE__),'..','templates',file)),
+        0, "-"
       )
-      eval(erb.src)
+      eval(erb.src,nil,File.join(File.dirname(__FILE__),'..','templates',file))
       return _erbout
     end
 
   end
 
+  LIMITS = %w(core cpu data fsize memlock msgqueue nice nofile nproc rss rtprio sigpending stack)
+
   class DSL
 
+    attr :limits
+
     def initialize(*_)
       super
       @name = nil
       @command = []
+      @limits = {}
+      @user = nil
+      @group = nil
+      @chdir = nil
     end
 
     def name( n = nil )
@@ -33,6 +43,34 @@ module FPM::Fry::Plugin ; module Service
       return @name
     end
 
+    def group( n = nil )
+      if n
+        @group = n
+      end
+      return @group
+    end
+
+    def user( n = nil )
+      if n
+        @user = n
+      end
+      return @user
+    end
+
+    def limit( name, soft, hard = soft )
+      unless LIMITS.include? name
+        raise ArgumentError, "Unknown limit #{name.inspect}. Known limits are: #{LIMITS.inspect}"
+      end
+      @limits[name] = [soft,hard]
+    end
+
+    def chdir( dir = nil )
+      if dir
+        @chdir = dir
+      end
+      @chdir
+    end
+
     def command( *args )
       if args.any?
         @command = args
@@ -45,7 +83,7 @@ module FPM::Fry::Plugin ; module Service
       name = self.name || builder.name || raise
       init = Init.detect_init(builder.variables)
       edit = builder.plugin('edit_staging')
-      env = Environment.new(name, command, "")
+      env = Environment.new(name, command, "", @limits, @user, @group, @chdir)
       case(init)
       when 'upstart' then
         edit.add_file "/etc/init/#{name}.conf",StringIO.new( env.render('upstart.erb') )
@@ -64,6 +102,10 @@ if status #{Shellwords.shellescape name} 2>/dev/null | grep -q ' start/'; then
 fi
 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'
         builder.plugin('script_helper') do |sh|
@@ -76,6 +118,9 @@ BASH
 update-rc.d -f #{Shellwords.shellescape name} remove
 BASH
         end
+        builder.plugin('config', FPM::Fry::Plugin::Config::IMPLICIT => true) do |co|
+          co.include "etc/init.d/#{name}"
+        end
       when 'systemd' then
 
       end

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

@@ -0,0 +1,21 @@
+require 'fpm/fry/plugin'
+module FPM::Fry::Plugin ; module User
+
+  def self.apply(builder, name, options = {}, &block)
+    cmd = ["adduser", "--system"]
+    case options[:group]
+    when String
+      cmd << '--ingroup' << options[:group]
+    when true
+      cmd << '--group'
+    when nil
+    else
+      raise ArgumentError, ":group must be a String or true, got #{options[:group].inspect}"
+    end
+    cmd << name
+    builder.plugin('script_helper') do |sh|
+      sh.after_install_or_upgrade(Shellwords.shelljoin(cmd))
+    end
+  end
+
+end ; end

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

@@ -86,6 +86,9 @@ module FPM::Fry
         if mod.respond_to? :apply
           mod.apply(self, *args, &block)
         else
+          if args.any? or block_given?
+            raise ArgumentError, "Simple plugins can't accept additional arguments and blocks."
+          end
           extend(mod)
         end
       end
@@ -131,14 +134,16 @@ module FPM::Fry
 
       def parse_package( name, options = {} )
         if options.kind_of? String
-          options = {version: options}
+          options = {constraints: options}
         end
-        case(v = options[:version])
+        case(v = options[:constraints])
         when String
-          if v =~ /\A(<=|<<|>=|>>|<>|=|>|<)(\s*)/
-            options[:version] = ' ' + $1 + ' ' + $'
-          else
-            options[:version] = ' = ' + v
+          options[:constraints] = v.split(',').map do |c|
+            if c =~ /\A\s*(<=|<<|>=|>>|<>|=|>|<)(\s*)/
+              $1 + ' ' + $'
+            else
+              '= ' + c
+            end
           end
         end
         return name, options
@@ -202,8 +207,16 @@ module FPM::Fry
           options = {}
         end
         command = args.shift
-        name = options.fetch(:name){ [command,*args].select{|c| c[0] != '-' }.join('-') }
-        recipe.steps[name] = Shellwords.join([command, *args])
+        name = options.fetch(:name){ [command,*args].select{|c| c[0] != '-' }.join(' ') }
+        bash( name, Shellwords.join([command, *args]) )
+      end
+
+      def bash( name = nil, code )
+        if name
+          recipe.steps << Recipe::Step.new(name, code)
+        else
+          recipe.steps << code.to_s
+        end
       end
 
       def build_depends( name , options = {} )

data/lib/fpm/fry/recipe.rb

@@ -12,6 +12,12 @@ module FPM; module Fry
 
   class Recipe
 
+    class Step < Struct.new(:name, :value)
+      def to_s
+        value.to_s
+      end
+    end
+
     class PackageRecipe
       attr_accessor :name,
         :iteration,
@@ -62,7 +68,14 @@ module FPM; module Fry
         end
         [:dependencies, :conflicts, :replaces, :provides].each do |sym|
           send(sym).each do |name, options|
-            package.send(sym) << "#{name}#{options[:version]}"
+            constr = Array(options[:constraints])
+            if constr.any?
+              constr.each do | c |
+                package.send(sym) << "#{name} #{c}"
+              end
+            else
+              package.send(sym) << name
+            end
           end
         end
         output_hooks.each{|h| h.call(self, package) }
@@ -112,7 +125,7 @@ module FPM; module Fry
 
     def initialize
       @source = Source::Null
-      @steps = {}
+      @steps = []
       @packages = [PackageRecipe.new]
       @packages[0].files << '**'
       @build_depends = {}

data/lib/fpm/fry/templates/sysv.erb

@@ -1,4 +1,21 @@
 #!/bin/sh
+<%
+startopts = ['']
+if user
+  if group
+    startopts << '-c' << Shellwords.escape(user + ':' + group)
+  else
+    startopts <<  '-c' << Shellwords.escape(user)
+  end
+else
+  if group
+    startopts << '-g' << Shellwords.escape(group)
+  end
+end
+if chdir
+  startopts << '-d' << Shellwords.escape(chdir)
+end
+-%>
 ### BEGIN INIT INFO
 # Provides:          <%= name %>
 # Required-Start:    $remote_fs $syslog
@@ -42,7 +59,7 @@ do_start()
     #   2 if daemon could not be started
     start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
         || return 1
-    start-stop-daemon --start --quiet --pidfile $PIDFILE --background --exec $DAEMON -- \
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --background<%= startopts.join(" ") %> --exec $DAEMON -- \
         $DAEMON_ARGS \
         || return 2
     # Add code here, if necessary, that waits for the process to be ready

data/lib/fpm/fry/templates/upstart.erb

@@ -7,6 +7,15 @@ env NAME=<%= name.inspect %>
 env DAEMON=<%= command[0].inspect %>
 env DAEMON_ARGS=<%= Shellwords.shelljoin(command[1..-1]).inspect %>
 
+<% if user %>setuid <%= user.inspect %>
+<% end -%>
+<% if group %>setgid <%= group.inspect %>
+<% end -%>
+<% if chdir %>chdir <%= chdir.inspect %>
+<% end -%>
+<% limits.each do | name, (soft, hard) | -%>
+limit <%= name %> <%= soft %> <%= hard %>
+<% end -%>
 respawn
 
 script

data/lib/fpm/fry/ui.rb

@@ -1,9 +1,10 @@
 require 'cabin/nice_output'
+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' )
-      logger ||= Cabin::Channel.new.tap{|chan| chan.subscribe(Cabin::NiceOutput.new(out)) }
+      logger ||= Channel.new.tap{|chan| chan.subscribe(Cabin::NiceOutput.new(out)) }
       FileUtils.mkdir_p( tmpdir )
       super( out, err, logger, tmpdir )
     end

data/lib/fpm/package/docker.rb

@@ -25,7 +25,7 @@ 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",file: ml)
+      @logger.warn("Found a modified file. You can only create new files in a package",name: ml)
     end
     fmap = {}
     changes.leaves.each do | change |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Hannes Georg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -49,6 +49,7 @@ files:
 - lib/cabin/nice_output.rb
 - lib/fpm/fry/block_enumerator.rb
 - lib/fpm/fry/build_output_parser.rb
+- lib/fpm/fry/channel.rb
 - lib/fpm/fry/client.rb
 - lib/fpm/fry/command.rb
 - lib/fpm/fry/command/cook.rb
@@ -58,12 +59,15 @@ files:
 - lib/fpm/fry/os_db.rb
 - lib/fpm/fry/plugin.rb
 - lib/fpm/fry/plugin/alternatives.rb
+- lib/fpm/fry/plugin/config.rb
 - lib/fpm/fry/plugin/edit_staging.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/user.rb
 - lib/fpm/fry/recipe.rb
 - lib/fpm/fry/recipe/builder.rb
 - lib/fpm/fry/source.rb
@@ -103,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: FPM Fry