fpm-fry 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9052cdc66f349423b938cefae76a81ddf5504c65
-  data.tar.gz: 6084e244c0f01eb10f0c4ec2dbd6f18f1831ddd4
+  metadata.gz: 30f03302993885946a899feba8c6f6a63f9cc46a
+  data.tar.gz: 6cf9d78c60aca34c1c8feab1b58ddd9234fe28b9
 SHA512:
-  metadata.gz: 3667766c65cb233def8e06ae14029bea06ebae06f03a8f9b5a4c45ae9d851557dcef27a510c8a361d8099b8a50f1ebb632182598192c27ae5355f1c908611ec0
-  data.tar.gz: 81c95585118d529c4438b09aff3c96b3044b60a8b181d65bb6611635dc5fed9d672083796b13afb3fe6b4e38acdf81b1f9b54fbf3ade555b68237b12cc74d132
+  metadata.gz: d832baed68a8f809a009bcdb7d8addb4847393475f1bc4ae12d5a562210ddbc3506f1e6e310d4798b68197b75a649152ea05449ce2ef18ad4e34f321094efb9d
+  data.tar.gz: ca77a79b3aad02271b8dd9cf4e9c31d556c7125065ea7b1df0917d3677a433b64b8a32a7bd90e3a527a5f7016533dcd766393472cf5c30cb8b4d99e16fb6107f

data/bin/fpm-fry

@@ -2,6 +2,7 @@
 
 require "rubygems"
 $: << File.expand_path(File.join( "..", "lib"),File.dirname(__FILE__))
+require "json"
 require "fpm"
 require "fpm/command"
 require "fpm/package/docker"

data/lib/cabin/nice_output.rb

@@ -35,6 +35,14 @@ class Cabin::NiceOutput
 
   def <<(event)
     data = event.clone
+    if data[:exception].respond_to? :data
+      ed = data[:exception].data
+      if ed.kind_of? Hash
+        data = ed.merge( data )
+      else
+        data[:exception_data] = ed.inspect
+      end
+    end
     data.delete(:line)
     data.delete(:file)
     level = data.delete(:level) || :normal

data/lib/fpm/fry/client.rb

@@ -70,12 +70,11 @@ class FPM::Fry::Client
 
   def read(name, resource)
     return to_enum(:read, name, resource) unless block_given?
-    body = JSON.generate({'Resource' => resource})
-    res = agent.post(
-      path: url('containers',name,'copy'),
+    res = agent.get(
+      path: url('containers',name,'archive'),
+      query: URI.encode_www_form('path' => resource),
       headers: { 'Content-Type' => 'application/json' },
-      body: body,
-      expects: [200,500]
+      expects: [200,404,500]
     )
     if res.status == 500
       raise FileNotFound, "File #{resource.inspect} not found: #{res.body}"

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

@@ -237,7 +237,7 @@ module FPM; module Fry
         )
         json = JSON.parse(res.body)
         if json["StatusCode"] != 0
-          raise "Build failed with exit code #{json["StatusCode"]}"
+          raise Fry::WithData("Build failed", exit_code: json["StatusCode"])
         end
         return yield container
       ensure

data/lib/fpm/fry/docker_file.rb

@@ -90,6 +90,15 @@ module FPM; module Fry
         df << "FROM #{base}"
         df << "WORKDIR /tmp/build"
 
+        # need to add external sources before running any command
+        recipe.build_mounts.each do |source, target|
+          df << "ADD #{source} /tmp/build/#{target}"
+        end
+
+        recipe.apt_setup.each do |step|
+          df << "RUN #{step}"
+        end
+
         if build_dependencies.any?
           case(variables[:flavour])
           when 'debian'
@@ -137,6 +146,11 @@ module FPM; module Fry
         tar.add_file(NAME,'0777') do |io|
           io.write(dockerfile)
         end
+        recipe.build_mounts.each do |source, _|
+          tar.add_file(source,'0777') do |io|
+            io.write(File.read(source))
+          end
+        end
         #tar.close
         sio.rewind
         return sio

data/lib/fpm/fry/os_db.rb

@@ -26,7 +26,8 @@ module FPM; module Fry
     'ubuntu' => {
       codenames: {
         'precise' => '12.04',
-        'trusty'  => '14.04'
+        'trusty'  => '14.04',
+        'xenial'  => '16.04'
       },
       flavour: 'debian'
     }

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

@@ -94,7 +94,8 @@ module FPM::Fry::Plugin::ScriptHelper
 
   class AfterRemove < Script
 
-    def initialize
+    def initialize(*_)
+      super
       @remove = []
       @upgrade = []
     end

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

@@ -129,7 +129,20 @@ BASH
           co.include "etc/init.d/#{name}"
         end
       when 'systemd' then
+        edit.add_file "/lib/systemd/system/#{name}.service", StringIO.new( env.render('systemd.erb') ), chmod: '644'
+        builder.plugin('script_helper') do |sh|
+          sh.after_install_or_upgrade(<<BASH)
+systemctl preset #{Shellwords.shellescape name}.service
+if systemctl is-enabled --quiet #{Shellwords.shellescape name}.service ; then
+  systemctl --system daemon-reload
+  systemctl try-reload-or-restart #{Shellwords.shellescape name}.service
+fi
+BASH
+          sh.before_remove_entirely(<<BASH)
+systemctl disable --now #{Shellwords.shellescape name}.service
+BASH
 
+        end
       end
     end
 

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

@@ -213,6 +213,14 @@ module FPM::Fry
         recipe.source = source
       end
 
+      def add(source, target)
+        recipe.build_mounts << [source, target]
+      end
+
+      def apt_setup(cmd)
+        recipe.apt_setup << cmd
+      end
+
       def run(*args)
         if args.first.kind_of? Hash
           options = args.shift

data/lib/fpm/fry/recipe.rb

@@ -125,6 +125,8 @@ module FPM; module Fry
     end
 
     attr_accessor :source,
+      :build_mounts,
+      :apt_setup,
       :before_build_steps,
       :steps,
       :packages,
@@ -139,6 +141,8 @@ module FPM; module Fry
       @packages[0].files << '**'
       @build_depends = {}
       @input_hooks = []
+      @build_mounts = []
+      @apt_setup = []
     end
 
     def depends

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

@@ -23,12 +23,12 @@ module FPM; module Fry ; module Source
       def update
         begin
           if !File.exists? repodir
-            if git('init', '--bare') != 0
-              raise "Initializing git repository failed"
+            if (ecode = git('init', '--bare')) != 0
+              raise CacheFailed.new("Initializing git repository failed", exit_code: ecode)
             end
           end
-          if git('fetch','--depth=1', url.to_s, rev) != 0
-            raise "Failed to fetch from remote #{url.to_s} ( #{rev} )"
+          if (ecode = git('fetch','--depth=1', url.to_s, rev)) != 0
+            raise CacheFailed.new("Failed to fetch from remote", exit_code: ecode, url: url.to_s, rev: rev)
           end
           return self
         rescue Errno::ENOENT
@@ -69,7 +69,7 @@ module FPM; module Fry ; module Source
           err.each_line do |line|
             logger.debug(line.chomp)
           end
-          return thr.value
+          return thr.value.exitstatus
         end
       end
 

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

@@ -4,6 +4,7 @@ require 'net/http'
 require 'forwardable'
 require 'zlib'
 require 'fpm/fry/source'
+require 'cabin'
 module FPM; module Fry ; module Source
   class Package
 
@@ -29,6 +30,12 @@ module FPM; module Fry ; module Source
 
       def_delegators :package, :url, :checksum, :checksum_algorithm, :agent, :logger, :file_map
 
+      def cachekey
+        @observed_checksum || checksum
+      end
+
+    private
+
       def initialize(*_)
         super
         if !checksum
@@ -52,7 +59,9 @@ module FPM; module Fry ; module Source
         end
         d = checksum_algorithm.new
         f = nil
-        fetch_url(url) do |resp|
+        actual_url = url.to_s
+        fetch_url(url) do | last_url, resp|
+          actual_url = last_url.to_s
           begin
             f = File.new(tempfile,'w')
             resp.read_body do | chunk |
@@ -67,10 +76,10 @@ module FPM; module Fry ; module Source
         end
 
         @observed_checksum = d.hexdigest
-        logger.debug("got checksum", checksum: @observed_checksum)
+        logger.debug("Got checksum", checksum: @observed_checksum, url: actual_url)
         if checksum
           if d.hexdigest != checksum
-            raise CacheFailed.new("Checksum failed",given: d.hexdigest, expected: checksum)
+            raise CacheFailed.new("Checksum failed",given: d.hexdigest, expected: checksum, url: actual_url)
           end
         else
           return true
@@ -88,9 +97,9 @@ module FPM; module Fry ; module Source
             logger.debug("Following redirect", url: url.to_s , location: resp['location'])
             return fetch_url( resp['location'], redirs - 1, &block)
           when Net::HTTPSuccess
-            return block.call(resp)
+            return block.call( url, resp)
           else
-            raise CacheFailed.new('Unable to fetch file',url: url.to_s, http_code: resp.code, http_message: resp.message)
+            raise CacheFailed.new('Unable to fetch file',url: url.to_s, http_code: resp.code.to_i, http_message: resp.message)
           end
         end
       end
@@ -99,10 +108,6 @@ module FPM; module Fry ; module Source
         File.join(tempdir,File.basename(url.path))
       end
 
-      def cachekey
-        @observed_checksum || checksum
-      end
-
     end
 
     class TarCache < Cache
@@ -133,6 +138,17 @@ module FPM; module Fry ; module Source
       end
     end
 
+    class TarBz2Cache < TarCache
+
+      def tar_io
+        update!
+        cmd = ['bzcat',tempfile]
+        logger.debug("Running bzcat",cmd: cmd)
+        return IO.popen(cmd)
+      end
+
+    end
+
     class ZipCache < Cache
 
       def tar_io
@@ -189,6 +205,7 @@ module FPM; module Fry ; module Source
       '.tar' => TarCache,
       '.tar.gz' => TarGzCache,
       '.tgz' => TarGzCache,
+      '.tar.bz2' => TarBz2Cache,
       '.zip' => ZipCache,
       '.bin' => PlainCache,
       '.bundle' => PlainCache

data/lib/fpm/fry/source.rb

@@ -2,14 +2,14 @@ module FPM; module Fry ; module Source
 
   class CacheFailed < StandardError
 
-    attr :options
+    attr :data
 
-    def initialize(e, opts = {})
+    def initialize(e, data = {})
       if e.kind_of? Exception
-        @options = {reason: e}.merge opts
+        @data = {reason: e}.merge data
         super(e.message)
       else
-        @options = opts.dup
+        @data = data.dup
         super(e.to_s)
       end
     end

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

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+case "$1" in
+  remove)
+  <%= remove.join("\n") %>
+  ;;
+  upgrade)
+  <%= upgrade.join("\n") %>
+  ;;
+  *)
+  exit 1
+  ;;
+esac

data/lib/fpm/fry/templates/redhat/after_remove.erb

@@ -0,0 +1,6 @@
+#!/bin/bash
+if [[ $1 -eq 0 ]] ; then
+  <%= remove.join("\n") %>
+elif [[ $1 -ge 1 ]] ; then
+  <%= upgrade.join("\n") %>
+fi

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

@@ -0,0 +1,19 @@
+[Unit]
+Description=<%= description %>
+
+[Service]
+Type=simple
+ExecStart=<%= Shellwords.shelljoin(command) %>
+Restart=on-failure
+<% if user %>User=<%= user %>
+<% end -%>
+<% if group %>Group=<%= group %>
+<% end -%>
+<% if chdir %>WorkingDirectory=<%= chdir %>
+<% end -%>
+<% limits.each do | name, (soft, hard) | -%>
+Limit<%= name.upcase %>=<%= soft %>:<%= hard %>
+<% end -%>
+
+[Install]
+WantedBy=multi-user.target

data/lib/fpm/fry/with_data.rb

@@ -1,6 +1,17 @@
 module FPM ; module Fry
 
+  # Annotates an arbitrary exception with logable data.
+  # 
+  # @example
+  #   raise FPM::Fry::WithData("Something went wrong", key: "value")
+  # @param [String,Exception] ex
+  # @param [Hash] data
+  # @return [Exception] annotated exception
+  #
   def self.WithData(ex, data)
+    if ex.kind_of? String
+      ex = StandardError.new(ex)
+    end
     ex.define_singleton_method(:data){ data }
     return ex
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Hannes Georg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: deep-fried package builder
 email: hannes.georg@xing.com
 executables:
@@ -80,11 +94,14 @@ files:
 - lib/fpm/fry/stream_parser.rb
 - lib/fpm/fry/tar.rb
 - lib/fpm/fry/templates/debian/after_install.erb
+- lib/fpm/fry/templates/debian/after_remove.erb
 - lib/fpm/fry/templates/debian/before_install.erb
 - lib/fpm/fry/templates/debian/before_remove.erb
 - lib/fpm/fry/templates/redhat/after_install.erb
+- lib/fpm/fry/templates/redhat/after_remove.erb
 - lib/fpm/fry/templates/redhat/before_install.erb
 - lib/fpm/fry/templates/redhat/before_remove.erb
+- lib/fpm/fry/templates/systemd.erb
 - lib/fpm/fry/templates/sysv.erb
 - lib/fpm/fry/templates/upstart.erb
 - lib/fpm/fry/ui.rb