fpm-fry 0.2.2 → 0.3.0

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

@@ -1,4 +1,5 @@
 require 'fpm/fry/source'
+require 'fpm/fry/exec'
 require 'fileutils'
 require 'digest'
 module FPM; module Fry ; module Source
@@ -20,11 +21,7 @@ module FPM; module Fry ; module Source
       def_delegators :package, :url, :logger, :file_map
 
       def tar_io
-        cmd = ['tar','-c','.']
-        logger.debug("Running tar",cmd: cmd, dir: dir)
-        ::Dir.chdir(dir) do
-          return IO.popen(cmd)
-        end
+        Exec::popen('tar','-c','.', chdir: dir, logger: logger)
       end
 
       def copy_to(dst)

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

@@ -1,16 +1,41 @@
 require 'fileutils'
 require 'forwardable'
-require 'open3'
+require 'fpm/fry/exec'
 require 'fpm/fry/source'
 module FPM; module Fry ; module Source
+  # Used to build directly from git.
+  #
+  # @example in a recipe
+  #     source 'https://github.com/ggreer/the_silver_searcher.git'
+  # 
+  # It automatically recognizes the following url patterns:
+  #
+  #   - git://…
+  #   - git+…://…
+  #   - user@host:….git
+  #   - https://….git
+  #   - https://git.…
+  #
   class Git
 
-    REGEX = %r!\A(?:git:|\S+@\S+:\S+\.git\z|https?:.*\.git\z|ssh:.*\.git\z)!
+    REGEX = %r!\A(?:git:|\S+@\S+:\S+\.git\z|https?:(?://git\.|.*\.git\z)|ssh:.*\.git\z|git\+[a-z0-9]+:)!
 
+    # @return [:git]
     def self.name
       :git
     end
 
+    # Guesses if this url is a git url.
+    #
+    # @example not a git url
+    #   FPM::Fry::Source::Git.guess( "bzr://something" ) #=> nil
+    #
+    # @example a git url
+    #   FPM::Fry::Source::Git.guess( "git://something" ) #=> 4
+    #
+    # @param [URI,String] url
+    # @return [nil] when this uri doesn't match
+    # @return [Numeric] number of characters that were used
     def self.guess( url )
       Source::guess_regex(REGEX, url)
     end
@@ -20,63 +45,63 @@ module FPM; module Fry ; module Source
 
       def_delegators :package, :url, :rev, :logger, :file_map
 
-      def update
-        begin
-          if !File.exists? repodir
-            if (ecode = git('init', '--bare')) != 0
-              raise CacheFailed.new("Initializing git repository failed", exit_code: ecode)
-            end
-          end
-          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
-          raise "Cannot find git binary. Is it installed?"
-        end
-      end
-
       def tar_io
-        cmd = [package.git, "--git-dir=#{repodir}",'archive','--format=tar','FETCH_HEAD']
-        logger.debug("Running git",cmd: cmd)
-        IO.popen(cmd)
+        Exec::popen(package.git, "--git-dir=#{repodir}",'archive','--format=tar','FETCH_HEAD', logger: logger)
       end
 
       def copy_to(dst)
-        cmd = [package.git, "--git-dir=#{repodir}", "--work-tree=#{dst}",'checkout','FETCH_HEAD','--','*']
-        logger.debug("Running git",cmd: cmd)
-        system(*cmd, chdir: dst)
+        Exec[
+          package.git, "--git-dir=#{repodir}", "--work-tree=#{dst}",'checkout','FETCH_HEAD','--','*',
+          chdir: dst, logger: logger
+        ]
       end
 
       def cachekey
-        cmd = [package.git, "--git-dir=#{repodir}",'rev-parse','FETCH_HEAD^{tree}']
-        logger.debug("Running git",cmd: cmd)
-        return IO.popen(cmd).read.chomp
+        Exec::exec(package.git, "--git-dir=#{repodir}",'rev-parse','FETCH_HEAD^{tree}', logger: logger).chomp
       end
     private
-      def repodir
-        File.join(tempdir,File.basename(url.path))
+      def initialize(*_)
+        super
+        update
       end
 
-      def git(*args)
-        cmd = [package.git, "--git-dir=#{repodir}",*args]
-        logger.debug("Running git",cmd: cmd.join(' '))
-        Open3.popen3(*cmd) do |sin, out, err, thr|
-          sin.close
-          out.each_line do |line|
-            logger.debug(line.chomp)
-          end
-          err.each_line do |line|
-            logger.debug(line.chomp)
+      def update
+        begin
+          if !File.exists? repodir
+            Exec::exec(package.git, "--git-dir=#{repodir}",'init', '--bare', description: "initializing git repository", logger: logger)
           end
-          return thr.value.exitstatus
+          Exec::exec(package.git, "--git-dir=#{repodir}",'fetch','--depth=1', url.to_s, rev, description: 'fetching from remote', logger: logger)
+          return self
+        rescue => e
+          raise CacheFailed.new(e, url: url.to_s, rev: rev)
         end
       end
-
+      def repodir
+        File.join(tempdir,File.basename(url.path))
+      end
     end
 
-    attr :logger, :git, :rev, :file_map, :url
+    # @return [Cabin::Channel] logger
+    attr :logger
+
+    # @return [String] the git binary (default: "git")
+    attr :git
+
+    # @return [String] the git rev to pull (default "HEAD")
+    attr :rev
+
+    # @return [Hash<String,String>] the file map for generating a docker file
+    attr :file_map
+
+    # @return [URI] the uri to pull from
+    attr :url
 
+    # @param [URI] url the url to pull from
+    # @param [Hash] options
+    # @option options [Cabin::Channel] :logger (cabin default channel)
+    # @option options [String] :branch git branch to pull
+    # @option options [String] :tag git tag to pull
+    # @option options [Hash<String,String>] :file_map ({""=>""}) the file map to create the docker file from
     def initialize( url, options = {} )
       url = url.sub(/\A(\S+@\S+):(\S+\.git)\z/,'ssh://\1/\2')
       @url = URI(url)
@@ -86,8 +111,10 @@ module FPM; module Fry ; module Source
       @git = options[:git] || 'git'
     end
 
+    # @param [String] tempdir
+    # @return [Cache]
     def build_cache(tempdir)
-      Cache.new(self, tempdir).update
+      Cache.new(self, tempdir)
     end
 
   end

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
@@ -40,8 +41,11 @@ module FPM; module Fry ; module Source
             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)
           end
@@ -52,12 +56,7 @@ module FPM; module Fry ; module Source
 
       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 +75,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 +97,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)

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

@@ -3,8 +3,12 @@ require 'fpm/package'
 
 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 +22,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 +57,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 +94,7 @@ private
   CREATED = 1
   DELETED = 2
 
+  # @api private
   class Node < Struct.new(:children, :kind)
 
     def initialize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Hannes Georg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -70,8 +70,9 @@ 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/config.rb
@@ -87,9 +88,9 @@ files:
 - 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

data/lib/fpm/fry/os_db.rb

@@ -1,36 +0,0 @@
-module FPM; module Fry
-
-  # Structure is
-  #
-  # <distribution> => {
-  #   codenames: {
-  #     <codename> => <version>
-  #   },
-  #   flavour: <flavour>
-  # }
-  OsDb = {
-    'centos' => {
-      codenames: {},
-      flavour: 'redhat'
-    },
-
-    'debian' => {
-      codenames: {
-        'lenny'   => '5',
-        'squeeze' => '6',
-        'wheezy'  => '7'
-      },
-      flavour: 'debian'
-    },
-
-    'ubuntu' => {
-      codenames: {
-        'precise' => '12.04',
-        'trusty'  => '14.04',
-        'xenial'  => '16.04'
-      },
-      flavour: 'debian'
-    }
-  }
-
-end ; end