fpm-fry 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d0c17ec38081829a127eb9388ed2a6fe5f10976
-  data.tar.gz: ef89b4472306f950a3f62a48a293d844006883d4
+  metadata.gz: a51e880dc026263476f0d4ee2dea2c80f6a9bc3e
+  data.tar.gz: fb3b23872e55a1ba82ee9cdcc686d2fb34048a04
 SHA512:
-  metadata.gz: d17bfa8b82c26885c29193d7147e132a25e2be465f88fa33b25f7b7e2a1135a8ca3ffdd461f931e7dc33517e680c82d3010508b8c81f9b90b30355ab6babefce
-  data.tar.gz: 2d7533f0c0a145a1f52828e6201d97c2a0d201538c2fc572b12da95ea005736d48cdd63a120f5d43606e9fe5d302cada8926eeffe37632ccf5b75e4320ffc5aa
+  metadata.gz: 711d10fd8ba12c8b9430bf6ed148292215f1e27c375566133eaeb9033e173f68db0d9712cfed1131a7036d6602d2e1a73b3718b13779f979257f03665c0fc614
+  data.tar.gz: d358c715e886459f2e213c0b99b271d173c813e9e456f5226bbdff641fce08edf75279352e1d0fc37fa2a30b42f3c04c66cfb72eb6c48c15bc79332a61d71fa0

data/lib/fpm/fry/command.rb

@@ -13,6 +13,9 @@ module FPM; module Fry
     option '--debug', :flag, 'Turns on debugging'
     option '--[no-]tls', :flag, 'Turns on tls ( default is false for schema unix, tcp and http and true for https )'
     option '--[no-]tlsverify', :flag, 'Turns off tls peer verification', default:true, environment_variable: 'DOCKER_TLS_VERIFY'
+    option ["-t", "--tmpdir"], "PATH", 'Write tmp data to PATH', default: '/tmp/fpm-fry', attribute_name: :dir do |s|
+      String(s)
+    end
 
     subcommand 'fpm', 'Works like fpm but with docker support', FPM::Command
 
@@ -22,7 +25,7 @@ module FPM; module Fry
 
     def initialize(invocation_path, ctx = {}, parent_attribute_values = {})
       super
-      @ui = ctx.fetch(:ui){ UI.new }
+      @ui = ctx.fetch(:ui){ UI.new(tmpdir: dir) }
       @client = ctx[:client]
     end
 

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

@@ -153,10 +153,14 @@ module FPM; module Fry
         case(update)
         when 'auto'
           Inspector.for_image(client, image) do |inspector|
-            inspector.read('/var/lib/apt/lists') do |file|
-              next if file.header.name == 'lists/'
-              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')
-              break
+            begin
+              inspector.read('/var/lib/apt/lists') do |file|
+                next if file.header.name == 'lists/'
+                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')
+                break
+              end
+            rescue FPM::Fry::Client::FileNotFound
+              logger.hint("/var/lib/apt/lists does not exists, so we will autoupdate")
             end
           end
           return true
@@ -304,15 +308,15 @@ module FPM; module Fry
 
     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 
+      # 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 
+      # 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 )

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 )

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Maxime Lagresle
 - Stefan Kaes
+- Sebastian Brandt
 - Hannes Georg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: FPM Fry