buildizer 0.1.0 → 0.1.1

data/lib/buildizer/os.rb

@@ -0,0 +1,4 @@
+module Buildizer
+  module Os
+  end # Os
+end # Buildizer

data/lib/buildizer/os/base.rb

@@ -0,0 +1,69 @@
+module Buildizer
+  module Os
+    class Base
+      attr_reader :docker
+
+      def initialize(docker, **kwargs)
+        @docker = docker
+      end
+
+      def base_image_name
+        "buildizer/#{base_vendor_image_name}"
+      end
+
+      def base_vendor_image_name
+        "#{name}:#{version}"
+      end
+
+      def name
+        raise
+      end
+
+      def package_cloud_os_name
+        name
+      end
+
+      def package_cloud_os_version
+        version
+      end
+
+      def version
+        raise
+      end
+
+      def fpm_output_type
+        raise
+      end
+
+      def fpm_extra_params
+      end
+
+      def build_dep(image, build_dep)
+        raise
+      end
+
+      def patch_build_dep(target)
+        target_package_spec(target)
+      end
+
+      def native_build_instructions(target)
+        raise
+      end
+
+      def patch_build_instructions(target)
+        raise
+      end
+
+      def target_package_spec(target)
+        raise
+      end
+
+      def install_test_package_instructions(target)
+        raise
+      end
+
+      def prepare_test_container_instructions(target)
+      end
+    end # Base
+  end # Os
+end # Buildizer

data/lib/buildizer/{image → os}/centos.rb

@@ -1,23 +1,23 @@
 module Buildizer
-  module Image
+  module Os
     class Centos < Base
-      attr_reader :os_version
+      attr_reader :version
 
-      def initialize(docker, os_version, **kwargs)
-        @os_version = os_version
+      def initialize(docker, version, **kwargs)
+        @version = version
         super(docker, **kwargs)
       end
 
-      def os_name
+      def name
         'centos'
       end
 
-      def os_package_cloud_name
+      def package_cloud_os_name
         'el'
       end
 
-      def os_package_cloud_version
-        os_version.match(/\d+$/).to_s.to_i
+      def package_cloud_os_version
+        version.match(/\d+$/).to_s.to_i
       end
 
       def fpm_output_type
@@ -30,11 +30,19 @@ module Buildizer
         end
       end
 
-      def build_dep(build_dep)
-        instruction :RUN, "yum-builddep -y #{build_dep.to_a.join(' ')}" if build_dep.any?
+      def install_test_package_instructions(target)
+        "yum localinstall -y #{target.builder.docker.container_build_path.join('*.rpm')}"
       end
 
-      def add_repo(id:, name:, baseurl: nil, enabled: 1, gpgcheck: nil, gpgkey: nil, exclude: nil, includepkgs: nil, mirrorlist: nil)
+      def prepare_test_container_instructions(target)
+        "yum install -y git"
+      end
+
+      def build_dep(image, build_dep)
+        image.instruction :RUN, "yum-builddep -y #{build_dep.to_a.join(' ')}" if build_dep.any?
+      end
+
+      def add_repo(image, id:, name:, baseurl: nil, enabled: 1, gpgcheck: nil, gpgkey: nil, exclude: nil, includepkgs: nil, mirrorlist: nil)
         repo = "[#{id}]\
 \\nname=#{name}\
 \\nenabled=#{enabled}\
@@ -45,32 +53,32 @@ module Buildizer
 #{exclude ? "\\nexclude=#{exclude}" : nil}\
 #{includepkgs ? "\\nincludepkgs=#{includepkgs}" : nil}"
 
-        instruction :RUN, "bash -lec \"echo -e '#{repo}' >> /etc/yum.repos.d/CentOS-Extra-Buildizer.repo\""
+        image.instruction :RUN, "bash -lec \"echo -e '#{repo}' >> /etc/yum.repos.d/CentOS-Extra-Buildizer.repo\""
       end
 
       def target_spec_name(target)
         "#{target.base_package_name}.spec"
       end
 
-      def rpmdev_setuptree_instructions(builder, target)
+      def rpmdev_setuptree_instructions(target)
         "rpmdev-setuptree"
       end
 
-      def build_rpm_instructions(builder, target)
+      def build_rpm_instructions(target)
         ["cd ~/rpmbuild/SPECS/",
          "rpmbuild -bb #{target_spec_name(target)}",
          ["find ~/rpmbuild/RPMS -name '*.rpm' ",
-          "-exec mv {} #{builder.docker.container_build_path} \\;"].join]
+          "-exec mv {} #{target.builder.docker.container_build_path} \\;"].join]
       end
 
-      def native_build_instructions(builder, target)
-        [*Array(rpmdev_setuptree_instructions(builder, target)),
-         "cp #{builder.docker.container_package_archive_path} ~/rpmbuild/SOURCES/",
-         "cp #{builder.docker.container_package_path.join(target_spec_name(target))} ~/rpmbuild/SPECS/",
-         *Array(build_rpm_instructions(builder, target))]
+      def native_build_instructions(target)
+        [*Array(rpmdev_setuptree_instructions(target)),
+         "cp #{target.builder.docker.container_package_archive_path} ~/rpmbuild/SOURCES/",
+         "cp #{target.builder.docker.container_package_path.join(target_spec_name(target))} ~/rpmbuild/SPECS/",
+         *Array(build_rpm_instructions(target))]
       end
 
-      def patch_build_instructions(builder, target)
+      def patch_build_instructions(target)
         rpmchange_cmd = "rpmchange %{cmd} --specfile ~/rpmbuild/SPECS/#{target_spec_name(target)} %{args}"
         get_release_cmd = rpmchange_cmd % {cmd: :tag, args: "--name release"}
         set_release_cmd = rpmchange_cmd % {cmd: :tag, args: "--name release --value %{value}"}
@@ -79,7 +87,7 @@ module Buildizer
           args: "--append --name \"%{name}\" --email \"%{email}\" --message \"%{message}\""
         }
 
-        [*Array(rpmdev_setuptree_instructions(builder, target)),
+        [*Array(rpmdev_setuptree_instructions(target)),
          "yumdownloader --source #{target_package_spec(target)}",
          "rpm -i *.rpm",
          "gem install rpmchange",
@@ -92,12 +100,12 @@ module Buildizer
          changelog_cmd % {name: target.maintainer,
                           email: target.maintainer_email,
                           message: 'Patch by buildizer'},
-         *Array(build_rpm_instructions(builder, target))]
+         *Array(build_rpm_instructions(target))]
       end
 
       def target_package_spec(target)
         [target.package_name, target.package_version].compact.join('-')
       end
     end # Centos
-  end # Image
+  end # Os
 end # Buildizer

data/lib/buildizer/{image → os}/centos6.rb

@@ -1,9 +1,9 @@
 module Buildizer
-  module Image
+  module Os
     class Centos6 < Centos
       def initialize(docker, **kwargs)
         super(docker, 'centos6', **kwargs)
       end
     end # Centos6
-  end # Image
+  end # Os
 end # Buildizer

data/lib/buildizer/{image → os}/centos7.rb

@@ -1,9 +1,9 @@
 module Buildizer
-  module Image
+  module Os
     class Centos7 < Centos
       def initialize(docker, **kwargs)
         super(docker, 'centos7', **kwargs)
       end
     end # Centos7
-  end # Image
+  end # Os
 end # Buildizer

data/lib/buildizer/{image → os}/ubuntu.rb

@@ -1,27 +1,27 @@
 module Buildizer
-  module Image
+  module Os
     class Ubuntu < Base
-      attr_reader :os_version
+      attr_reader :version
 
-      def initialize(docker, os_version, **kwargs)
-        @os_version = os_version
+      def initialize(docker, version, **kwargs)
+        @version = version
         super(docker, **kwargs)
       end
 
-      def os_name
+      def name
         'ubuntu'
       end
 
-      def os_codename
+      def codename
         raise
       end
 
-      def os_package_cloud_version
-        os_codename
+      def package_cloud_os_version
+        codename
       end
 
-      def build_dep(build_dep)
-        instruction :RUN, "apt-get build-dep -y #{build_dep.to_a.join(' ')}" if build_dep.any?
+      def build_dep(image, build_dep)
+        image.instruction :RUN, "apt-get build-dep -y #{build_dep.to_a.join(' ')}" if build_dep.any?
       end
 
       def fpm_output_type
@@ -35,36 +35,46 @@ module Buildizer
         end
       end
 
-      def build_deb_instructions(builder, target)
-        ["DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -us -uc -j#{builder.build_jobs}",
-         "cp ../*.deb #{builder.docker.container_build_path}"]
+      def install_test_package_instructions(target)
+        "(dpkg -i #{target.builder.docker.container_build_path.join('*.deb')} || true)" +
+          " && apt-get install -yf"
       end
 
-      def native_build_instructions(builder, target)
+      def prepare_test_container_instructions(target)
+        ["apt-get update",
+         "apt-get install -y git"]
+      end
+
+      def build_deb_instructions(target)
+        ["DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -us -uc -j#{target.builder.build_jobs}",
+         "cp ../*.deb #{target.builder.docker.container_build_path}"]
+      end
+
+      def native_build_instructions(target)
         source_archive_name = "#{target.package_name}_#{target.package_upstream_version}.orig.tar.gz"
 
         [["ln -fs #{target.container_package_archive_path} ",
           "#{target.container_package_path.dirname.join(source_archive_name)}"].join,
          "cd #{target.container_package_path}",
-         *Array(build_deb_instructions(builder, target))]
+         *Array(build_deb_instructions(target))]
       end
 
-      def patch_build_instructions(builder, target)
+      def patch_build_instructions(target)
         ["apt-get source #{target_package_spec(target)}",
          'cd $(ls *.orig.tar* | ruby -ne "puts \$_.split(\\".orig.tar\\").first.gsub(\\"_\\", \\"-\\")")',
          ["DEBFULLNAME=\"#{target.maintainer}\" DEBEMAIL=\"#{target.maintainer_email}\" ",
           "debchange --newversion ",
           "$(dpkg-parsechangelog | grep \"Version:\" | cut -d\" \" -f2-)buildizer#{target.patch_version} ",
-          "--distribution #{os_codename} \"Patch by buildizer\""].join,
+          "--distribution #{codename} \"Patch by buildizer\""].join,
          *target.patch.map {|patch| "cp ../#{patch} debian/patches/"},
          *target.patch.map {|patch| "sed -i \"/#{Regexp.escape(patch)}/d\" debian/patches/series"},
          *target.patch.map {|patch| "echo #{patch} >> debian/patches/series"},
-         *Array(build_deb_instructions(builder, target))]
+         *Array(build_deb_instructions(target))]
       end
 
       def target_package_spec(target)
         [target.package_name, target.package_version].compact.join('=')
       end
     end # Ubuntu
-  end # Image
+  end # Os
 end # Buildizer

data/lib/buildizer/{image → os}/ubuntu1204.rb

@@ -1,13 +1,13 @@
 module Buildizer
-  module Image
+  module Os
     class Ubuntu1204 < Ubuntu
       def initialize(docker, **kwargs)
         super(docker, '12.04', **kwargs)
       end
 
-      def os_codename
+      def codename
         'precise'
       end
     end # Ubuntu1204
-  end # Image
+  end # Os
 end # Buildizer

data/lib/buildizer/{image → os}/ubuntu1404.rb

@@ -1,13 +1,13 @@
 module Buildizer
-  module Image
+  module Os
     class Ubuntu1404 < Ubuntu
       def initialize(docker, **kwargs)
         super(docker, '14.04', **kwargs)
       end
 
-      def os_codename
+      def codename
         'trusty'
       end
     end # Ubuntu1404
-  end # Image
+  end # Os
 end # Buildizer

data/lib/buildizer/{image → os}/ubuntu1604.rb

@@ -1,13 +1,13 @@
 module Buildizer
-  module Image
+  module Os
     class Ubuntu1604 < Ubuntu
       def initialize(docker, **kwargs)
         super(docker, '16.04', **kwargs)
       end
 
-      def os_codename
+      def codename
         'xenial'
       end
     end # Ubuntu1604
-  end # Image
+  end # Os
 end # Buildizer

data/lib/buildizer/target/base.rb

@@ -2,34 +2,51 @@ module Buildizer
   module Target
     class Base
       attr_reader :builder
-      attr_reader :image
-
-      attr_reader :name
-      attr_reader :package_name
-      attr_reader :package_version
-      attr_reader :package_cloud
-      attr_reader :prepare
-      attr_reader :build_dep
-      attr_reader :before_build
-      attr_reader :maintainer
-
-      def initialize(builder, image,
+      attr_reader :os
+
+      attr_reader :params
+
+      attr_reader :build_image
+      attr_reader :cache_image
+      attr_reader :test_image
+
+      def initialize(builder, os,
                      name:, package_name:, package_version:, package_cloud: [],
-                     prepare: [], build_dep: [], before_build: [],
-                     maintainer: nil, &blk)
+                     prepare: [], build_dep: [], before_build: [], maintainer: nil,
+                     test_options: {}, test_env: {}, test_image: nil, before_test: [], test: [],
+                     &blk)
         @builder = builder
-        @image = image
-
-        @name = name
-        @package_name = package_name
-        @package_version = package_version
-        @package_cloud = package_cloud
-        @prepare = prepare
-        @build_dep = build_dep
-        @before_build = before_build
-        @maintainer = maintainer
+        @os = os
+        @params = {}
+
+        params[:name] = name
+        params[:package_name] = package_name
+        params[:package_version] = package_version
+        params[:package_cloud] = package_cloud
+        params[:prepare] = prepare
+        params[:build_dep] = build_dep
+        params[:before_build] = before_build
+        params[:maintainer] = maintainer
+        params[:test_options] = test_options
+        params[:test_env] = test_env
+        params[:test_image] = test_image
+        params[:before_test] = before_test
+        params[:test] = test
 
         yield if block_given?
+
+        @build_image = ::Buildizer::Image.new(build_image_name, self, from: os.base_image_name)
+        @cache_image = ::Buildizer::Image.new(cache_image_name, self) if cache_image_name
+        @test_image = ::Buildizer::Image.new(test_image_name, self)
+      end
+
+      def method_missing(name, *args, &blk)
+        param_name = name.to_sym
+        if params.key? param_name
+          params[param_name]
+        else
+          super
+        end
       end
 
       def image_work_path
@@ -45,42 +62,42 @@ module Buildizer
       end
 
       def maintainer_email
-        match = maintainer.match(/<(.*)>/) if maintainer
+        match = params[:maintainer].match(/<(.*)>/) if params[:maintainer]
         match[1] if match
       end
 
       def package_version
-        @package_version.nil? ? nil : @package_version.to_s
+        params[:package_version].nil? ? nil : params[:package_version].to_s
       end
 
       def base_package_name
-        package_name.split('-').first
+        params[:package_name].split('-').first
       end
 
-      def docker_image_repository
-        package_name
+      def build_image_tag
+        params[:name].gsub('/', '__')
       end
 
-      def docker_image_tag
-        name.gsub('/', '__')
+      def build_image_name
+        "#{params[:package_name]}:#{build_image_tag}"
       end
 
-      def docker_image
-        "#{docker_image_repository}:#{docker_image_tag}"
+      def cache_image_name
+        "#{os.docker.cache[:repo]}:#{build_image_tag}" if os.docker.cache
       end
 
-      def docker_cache_image
-        "#{image.docker.cache[:repo]}:#{docker_image_tag}" if image.docker.cache
+      def test_image_name
+        params[:test_image] || os.base_vendor_image_name
       end
 
       def package_cloud
-        @package_cloud.map do |desc|
+        params[: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}"
+        "#{repo}/#{os.package_cloud_os_name}/#{os.package_cloud_os_version}"
       end
 
       def image_build_path
@@ -106,6 +123,17 @@ module Buildizer
       def container_package_archive_path
         Pathname.new('/').join(container_package_archive_name)
       end
+
+      def test_env
+        params[:test_env]
+          .map {|var, values| Array(values).uniq.map {|value| {var => value}}}
+          .reduce {|res, vars| res.product vars}
+          .to_a
+          .map {|vars|
+            vars = [vars] unless vars.is_a? Array
+            vars.reduce(&:merge)
+          }
+      end
     end # Base
   end # Target
 end # Buildizer