buildizer 0.0.6 → 0.0.7

data/lib/buildizer/refine.rb

@@ -4,8 +4,14 @@ module Buildizer
       def underscore
         self.gsub(/(.)([A-Z])/,'\1_\2').downcase
       end
+
+      def match_glob?(glob)
+        File.fnmatch? glob, self, File::FNM_EXTGLOB
+      end
+
+      def on?
+        ['1', 'true', 'yes'].include? self.downcase
+      end
     end
   end # Refine
-
-  using Refine
 end # Buildizer

data/lib/buildizer/target/base.rb

@@ -11,10 +11,12 @@ module Buildizer
       attr_reader :prepare
       attr_reader :build_dep
       attr_reader :before_build
+      attr_reader :maintainer
 
       def initialize(builder, image,
-                     name:, package_name:, package_version:, package_cloud:,
-                     prepare: [], build_dep: [], before_build: [])
+                     name:, package_name:, package_version:, package_cloud: [],
+                     prepare: [], build_dep: [], before_build: [],
+                     maintainer: nil, &blk)
         @builder = builder
         @image = image
 
@@ -25,14 +27,84 @@ module Buildizer
         @prepare = prepare
         @build_dep = build_dep
         @before_build = before_build
+        @maintainer = maintainer
+
+        yield if block_given?
+
+        image_work_path.mkpath
+        image_build_path.mkpath
+        image_extra_path.mkpath
+      end
+
+      def image_work_path
+        raise
+      end
+
+      def container_package_name
+        raise
+      end
+
+      def package_version_tag_param_name
+        raise
+      end
+
+      def maintainer_email
+        match = maintainer.match(/<(.*)>/) if maintainer
+        match[1] if match
+      end
+
+      def package_version
+        @package_version.nil? ? nil : @package_version.to_s
+      end
+
+      def base_package_name
+        package_name.split('-').first
+      end
+
+      def docker_image_repository
+        "#{builder.packager.docker_image || "buildizer/#{package_name}"}"
+      end
+
+      def docker_image_tag
+        name.gsub('/', '__')
       end
 
       def docker_image
-        "#{builder.packager.docker_image || "buildizer/#{package_name}"}:#{name}"
+        "#{docker_image_repository}:#{docker_image_tag}"
+      end
+
+      def package_cloud
+        @package_cloud.map do |desc|
+          desc.merge(package_path: _package_cloud_path(desc[:repo]))
+        end
+      end
+
+      def _package_cloud_path(repo)
+        "#{repo}/#{image.os_package_cloud_name}/#{image.os_package_cloud_version}"
+      end
+
+      def image_build_path
+        image_work_path.join('build')
+      end
+
+      def image_extra_path
+        image_work_path.join('extra')
+      end
+
+      def package_version_tag
+        send(package_version_tag_param_name)
+      end
+
+      def container_package_archive_name
+        "#{container_package_name}.tar.gz"
+      end
+
+      def container_package_path
+        Pathname.new('/').join(container_package_name)
       end
 
-      def package_cloud_path
-        "#{package_cloud}/#{image.os_package_cloud_name}/#{image.os_package_cloud_version}"
+      def container_package_archive_path
+        Pathname.new('/').join(container_package_archive_name)
       end
     end # Base
   end # Target

data/lib/buildizer/target/fpm.rb

@@ -1,16 +1,63 @@
 module Buildizer
   module Target
     class Fpm < Base
+      include PackageNameMod
+
       attr_reader :fpm_script
       attr_reader :fpm_config_files
       attr_reader :fpm_files
+      attr_reader :fpm_conflicts
+      attr_reader :fpm_replaces
+      attr_reader :fpm_provides
+      attr_reader :fpm_depends
+      attr_reader :fpm_description
+      attr_reader :fpm_url
+
+      def initialize(builder, image,
+                     fpm_script: [], fpm_config_files: {}, fpm_files: {},
+                     fpm_conflicts: [], fpm_replaces: {}, fpm_provides: [],
+                     fpm_depends: [], fpm_description: nil, fpm_url: nil, **kwargs, &blk)
+        super(builder, image, **kwargs) do
+          @fpm_script = fpm_script
+          @fpm_config_files = fpm_config_files
+          @fpm_files = fpm_files
+          @fpm_conflicts = fpm_conflicts
+          @fpm_replaces = fpm_replaces
+          @fpm_provides = fpm_provides
+          @fpm_depends = fpm_depends
+          @fpm_description = fpm_description
+          @fpm_url = fpm_url
+
+          yield if block_given?
+        end
+      end
+
+      def image_work_path
+        builder.work_path.join('fpm').join(package_name).join(package_version).join(name)
+      end
 
-      def initialize(builder, image, fpm_script: [], fpm_config_files: {}, fpm_files: {}, **kwargs)
-        super(builder, image, **kwargs)
+      def package_version_tag_param_name
+        :package_version
+      end
+
+      def fpm_config_files_expand
+        _expand_files_directive fpm_config_files
+      end
+
+      def fpm_files_expand
+        _expand_files_directive fpm_files
+      end
 
-        @fpm_script = fpm_script
-        @fpm_config_files = fpm_config_files
-        @fpm_files = fpm_files
+      def _expand_files_directive(files)
+        files.reduce({}) do |res, (dst, src)|
+          if src.is_a? Array
+            res.merge src.map {|src_file| [File.join(dst, src_file), src_file]}.to_h
+          elsif src.nil?
+            res.merge dst => File.basename(dst)
+          else
+            res.merge dst => src
+          end
+        end
       end
     end # Fpm
   end # Target

data/lib/buildizer/target/native.rb

@@ -1,6 +1,15 @@
 module Buildizer
   module Target
     class Native < Base
+      include PackageNameMod
+
+      def image_work_path
+        builder.work_path.join('native').join(package_name).join(package_version).join(name)
+      end
+
+      def package_version_tag_param_name
+        :package_version
+      end
     end # Native
   end # Target
 end # Buildizer

data/lib/buildizer/target/package_name_mod.rb

@@ -0,0 +1,17 @@
+module Buildizer
+  module Target
+    module PackageNameMod
+      def package_upstream_version
+        package_version.split('-')[0]
+      end
+
+      def package_release
+        package_version.split('-')[1]
+      end
+
+      def container_package_name
+        "#{package_name}-#{package_upstream_version}"
+      end
+    end # PackageNameMod
+  end # Target
+end # Buildizer

data/lib/buildizer/target/patch.rb

@@ -0,0 +1,33 @@
+module Buildizer
+  module Target
+    class Patch < Base
+      attr_reader :patch
+      attr_reader :patch_version
+
+      def initialize(builder, image, patch: [], patch_version: nil, **kwargs, &blk)
+        super(builder, image, **kwargs) do
+          @patch = patch
+          @patch_version = patch_version
+
+          yield if block_given?
+        end
+      end
+
+      def patch_version
+        @patch_version.nil? ? nil : @patch_version.to_s
+      end
+
+      def image_work_path
+        builder.work_path.join('patch').join(package_name).join(patch_version).join(name)
+      end
+
+      def container_package_name
+        "#{package_name}-#{patch_version}"
+      end
+
+      def package_version_tag_param_name
+        :patch_version
+      end
+    end # Patch
+  end # Target
+end # Buildizer

data/lib/buildizer/version.rb

@@ -1,3 +1,3 @@
 module Buildizer
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildizer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - flant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -223,6 +223,7 @@ files:
 - lib/buildizer/builder/base.rb
 - lib/buildizer/builder/fpm.rb
 - lib/buildizer/builder/native.rb
+- lib/buildizer/builder/patch.rb
 - lib/buildizer/cli.rb
 - lib/buildizer/docker.rb
 - lib/buildizer/error.rb
@@ -234,12 +235,15 @@ files:
 - lib/buildizer/image/ubuntu.rb
 - lib/buildizer/image/ubuntu1204.rb
 - lib/buildizer/image/ubuntu1404.rb
+- lib/buildizer/image/ubuntu1604.rb
 - lib/buildizer/packager.rb
 - lib/buildizer/refine.rb
 - lib/buildizer/target.rb
 - lib/buildizer/target/base.rb
 - lib/buildizer/target/fpm.rb
 - lib/buildizer/target/native.rb
+- lib/buildizer/target/package_name_mod.rb
+- lib/buildizer/target/patch.rb
 - lib/buildizer/version.rb
 homepage: https://github.com/flant/buildizer
 licenses: