buildizer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTFhMmM1N2Y4NzhjOWNkMWRlMWFhMTlmOGQ5YzU0M2FkYTg3NDc0Yg==
+    YzFkODNmNmQzNzllNmRkZTY3ZGE2YTQ1Mzk1MjRiYmEyYTljY2UxZg==
   data.tar.gz: !binary |-
-    ZjQ5OTYxZGJiMWJkZGNiNjBjMzkwYjFiZTRkYzMxZWZiYmY5ODIwMw==
+    YThiNTliNTQ2MjRhZjY0OGZiZDE0ZjMzZDFmN2RiZGY0NTIxZjFiMw==
 SHA512:
   metadata.gz: !binary |-
-    MDZlNTZiNmFiOTBmZmFiYzczNWQ1NGI0MWVkODk4NDYwZjcwZmM1MDc5MDRk
-    ZjU1MmNiMDU3MTRiMTYzOTM0YmQxMDM2NjE0MjM5YjZjODRiYzRmMTA5NGY0
-    ZTg0ZDQ3MTFmMWVjNzYyNzY4ZjdlYzEzYzU4YjFiNWQ4MDU1YTI=
+    MDI5NzEzYWY2ZDZkNGFlZjRlMzEwMmFmYmVlM2RhOGE3MzEzMjc3ZjhmNjg3
+    YjFlNWY2MjBjMWZlZDI5OGYyNjNiZDRmOGNlNDdlNzQ3YjBlOGYzYTcxNzg1
+    YThiYTUzZDViOGJmOTgwMjM5Y2VmZmViNTVlZTFlOGM3NTQyMzM=
   data.tar.gz: !binary |-
-    MGExOGQ3ZjViMDVmZGE0MDg2ZjE2NjU2MTI3ZTcwNjFhM2U0MmM5YjFiZjNk
-    NDU2ZGNmNmVmMjcyNjczZjlhMTA0OTBmNDU5ZGZmYzQxNDg3YTdlZGY1YzI1
-    NzA4NmJiYWVhMDFlOWUyZmQ0MjUzNzgyMjEyMDQwZTFiMTQ1OGY=
+    OGQ0MDA2NmJlZDFiYjIxZDI2MDcwZTk3ZDMxZWUxYTM3MzYyYTZlMTI0OWVm
+    ZjI1MjAyYmM3YmRmZGE1YjNhMzJkMTg5MmI1NmNmYWE3ODk0NjY2NWQ0MTY2
+    Y2I2ZWY2Y2IwNDI4ZDBlYjNmN2RjMzBlYzY2NTY2YTc2NTVhMTQ=

data/Gemfile.lock

@@ -1,16 +1,16 @@
 GIT
   remote: https://github.com/flant/shellfold.git
-  revision: 4704e2ffe717268e1316b66db34e5f9a1aafabee
+  revision: bd500ed78320ead4d5fbf46470e3b34582ead26c
   specs:
-    shellfold (0.0.3)
+    shellfold (0.1.0)
       mixlib-shellout (>= 2.2.6, < 3.0)
 
 PATH
   remote: .
   specs:
-    buildizer (0.1.0)
+    buildizer (0.1.1)
       colorize (>= 0.6.0, < 1.0)
-      net_status (>= 0.0.1, < 1.0)
+      net_status (>= 0.1.0, < 1.0)
       overcommit (>= 0.33.0, < 1.0)
       package_cloud (>= 0.2, < 1.0)
       shellfold (>= 0.0.1, < 1.0)
@@ -26,16 +26,16 @@ GEM
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
-    colorize (0.6.0)
+    colorize (0.8.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
-    ethon (0.8.1)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.10)
+    ffi (1.9.14)
     gh (0.14.0)
       addressable
       backports
@@ -44,29 +44,31 @@ GEM
       net-http-persistent (>= 2.7)
       net-http-pipeline
     highline (1.6.20)
+    i18n (0.7.0)
     iniparse (1.4.2)
-    json (1.8.3)
+    json (2.0.2)
     json_pure (1.8.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mixlib-shellout (2.2.6)
-    multi_json (1.11.2)
+    mixlib-shellout (2.2.7)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    net_status (0.0.2)
-    overcommit (0.33.0)
+    net_status (0.1.3)
+      i18n (~> 0.7)
+    overcommit (0.36.0)
       childprocess (~> 0.5.8)
       iniparse (~> 1.4)
-    package_cloud (0.2.29)
-      colorize (= 0.6.0)
+    package_cloud (0.2.36)
       highline (= 1.6.20)
       json_pure (= 1.8.1)
+      rainbow (= 2.1.0)
       rest-client (~> 1.6.7)
       thor (~> 0.18)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -76,22 +78,23 @@ GEM
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
+    rainbow (2.1.0)
     rake (10.5.0)
     rest-client (1.6.9)
       mime-types (~> 1.16)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     slop (3.6.0)
     thor (0.19.1)
     travis (1.8.2)
@@ -119,3 +122,6 @@ DEPENDENCIES
   rspec (~> 3.4, >= 3.4.0)
   shellfold!
   travis (~> 1.8, >= 1.8.2)
+
+BUNDLED WITH
+   1.13.1

data/buildizer.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables = ["buildizer"]
 
-  spec.required_ruby_version = ">= 2.2.1"
+  spec.required_ruby_version = ">= 2.1.0"
 
   spec.add_dependency "thor", ">= 0.19.1", "< 1.0"
-  spec.add_dependency "net_status", ">= 0.0.1", "< 1.0"
+  spec.add_dependency "net_status", ">= 0.1.0", "< 1.0"
   spec.add_dependency "shellfold", ">= 0.0.1", "< 1.0"
   spec.add_dependency "package_cloud", ">= 0.2", "< 1.0"
   spec.add_dependency "overcommit", ">= 0.33.0", "< 1.0"

data/lib/buildizer.rb

@@ -20,6 +20,7 @@ require 'buildizer/cli/option_mod'
 require 'buildizer/cli/base'
 require 'buildizer/cli/main'
 require 'buildizer/buildizer'
+require 'buildizer/image'
 require 'buildizer/target'
 require 'buildizer/target/package_name_mod'
 require 'buildizer/target/base'
@@ -31,15 +32,15 @@ require 'buildizer/builder/base'
 require 'buildizer/builder/fpm'
 require 'buildizer/builder/native'
 require 'buildizer/builder/patch'
-require 'buildizer/image'
-require 'buildizer/image/base'
-require 'buildizer/image/centos'
-require 'buildizer/image/centos6'
-require 'buildizer/image/centos7'
-require 'buildizer/image/ubuntu'
-require 'buildizer/image/ubuntu1204'
-require 'buildizer/image/ubuntu1404'
-require 'buildizer/image/ubuntu1604'
+require 'buildizer/os'
+require 'buildizer/os/base'
+require 'buildizer/os/centos'
+require 'buildizer/os/centos6'
+require 'buildizer/os/centos7'
+require 'buildizer/os/ubuntu'
+require 'buildizer/os/ubuntu1204'
+require 'buildizer/os/ubuntu1404'
+require 'buildizer/os/ubuntu1604'
 require 'buildizer/core_ext/string'
 require 'buildizer/core_ext/hash'
 require 'buildizer/core_ext/true_class'

data/lib/buildizer/builder/base.rb

@@ -28,13 +28,13 @@ module Buildizer
       def new_target(target_name)
         os_name, os_version, target_tag = target_name.split('/', 3)
 
-        image = docker.new_image(os_name, os_version)
+        os = docker.new_os(os_name, os_version)
 
         params = initial_target_params
         buildizer.buildizer_conf.each do |match_key, match_params|
           match_os_name, match_os_version, match_target_tag = match_key.to_s.split('/', 3)
-          if image.os_name.match_glob?(match_os_name) and
-            ( match_os_version.nil? or image.os_version.match_glob?(match_os_version) ) and
+          if os.name.match_glob?(match_os_name) and
+            ( match_os_version.nil? or os.version.match_glob?(match_os_version) ) and
               ( match_target_tag.nil? or (not target_tag.nil? and
                                           target_tag.match_glob?(match_target_tag)) )
             params = merge_params(into: params, params: match_params)
@@ -43,24 +43,37 @@ module Buildizer
 
         check_params! params
 
-        target_klass.new(self, image, name: target_name, **params).tap do |target|
-          image.target = target
+        target_klass.new(self, os, name: target_name, **params)
+      end
+
+      def target_names
+        @target_names ||= begin
+          targets = Array(buildizer.buildizer_conf['target'])
+          restrict_targets = ENV['BUILDIZER_TARGET']
+          restrict_targets = restrict_targets.split(',').map(&:strip) if restrict_targets
+          targets = targets & restrict_targets if restrict_targets
+          targets
         end
       end
 
       def targets
-        @targets ||= buildizer.targets.map {|target_name| new_target(target_name)}
+        @targets ||= target_names.map {|name| new_target(name)}
       end
 
       def initial_target_params
         {}.tap do |params|
-          params[:package_name] = buildizer.package_name
-          params[:package_version] = buildizer.package_version
+          params[:package_name] = buildizer.buildizer_conf['package_name']
+          params[:package_version] = buildizer.buildizer_conf['package_version']
           params[:package_cloud] = buildizer.package_cloud
-          params[:prepare] = buildizer.prepare
-          params[:build_dep] = buildizer.build_dep
-          params[:before_build] = buildizer.before_build
-          params[:maintainer] = buildizer.maintainer
+          params[:prepare] = Array(buildizer.buildizer_conf['prepare'])
+          params[:build_dep] = Array(buildizer.buildizer_conf['build_dep']).to_set
+          params[:before_build] = Array(buildizer.buildizer_conf['before_build'])
+          params[:maintainer] = buildizer.buildizer_conf['maintainer']
+
+          params[:test_options] = Hash(buildizer.buildizer_conf['test_options'])
+          params[:test_env] = buildizer.buildizer_conf['test_env'].to_h
+          params[:before_test] = Array(buildizer.buildizer_conf['before_test'])
+          params[:test] = Array(buildizer.buildizer_conf['test'])
         end
       end
 
@@ -80,6 +93,11 @@ module Buildizer
           res[:build_dep] = into[:build_dep] | Array(params['build_dep']).to_set
           res[:before_build] = into[:before_build] + Array(params['before_build'])
           res[:maintainer] = params['maintainer'] || into[:maintainer]
+
+          res[:test_options] = into[:test_options].merge params['test_options'].to_h
+          res[:test_env] = into[:test_env].merge(params['test_env'].to_h)
+          res[:before_test] = into[:before_test] + Array(params['before_test'])
+          res[:test] = into[:test] + Array(params['test'])
         end
       end
 
@@ -109,20 +127,20 @@ module Buildizer
 
       def prepare
         docker.with_cache do
-          buildizer.before_prepare
-                   .each {|cmd| buildizer.command! cmd, desc: "Before prepare command: #{cmd}"}
+          Array(buildizer.buildizer_conf['before_prepare'])
+            .each {|cmd| buildizer.command! cmd, desc: "Before prepare command: #{cmd}"}
 
-          targets.each {|target| prepare_target_image(target)}
+          targets.each {|target| prepare_target_build_image(target)}
 
-          buildizer.after_prepare
-                   .each {|cmd| buildizer.command! cmd, desc: "After prepare command: #{cmd}"}
+          Array(buildizer.buildizer_conf['after_prepare'])
+            .each {|cmd| buildizer.command! cmd, desc: "After prepare command: #{cmd}"}
         end # with_cache
       end
 
-      def prepare_target_image(target)
-        target.prepare.each {|cmd| target.image.instruction(:RUN, "bash -lec \"#{cmd}\"")}
-        target.image.build_dep(Array(build_dep(target)).to_set + target.build_dep)
-        docker.build_image! target
+      def prepare_target_build_image(target)
+        target.prepare.each {|cmd| target.build_image.instruction(:RUN, "bash -lec \"#{cmd}\"")}
+        target.os.build_dep(target.build_image, Array(build_dep(target)).to_set + target.build_dep)
+        docker.make_build_image target
       end
 
       def build
@@ -148,8 +166,98 @@ module Buildizer
           *Array(build_instructions(target)),
         ]
 
-        docker.run_in_image!(target: target, cmd: cmd,
-                             desc: "Run build in docker image '#{target.image.name}'")
+        docker.run_in_image! image: target.build_image,
+                             cmd: cmd,
+                             desc: "Run build in docker image '#{target.build_image.name}'"
+      end
+
+      def test
+        failures = targets
+          .map {|target| [target, Array(test_target(target))]}
+          .reduce([]) {|res, (target, results)|
+            res.push *results.map {|res|
+              {target: target,
+               result: res}
+            }
+          }
+          .select {|test| test[:result].net_status_error?}
+
+        if failures.any?
+          puts
+          puts "Buildizer test FAILED:"
+          failures.each do |failure|
+            puts "* #{failure[:target].name} env=#{failure[:result][:data][:env]}"
+            puts failure[:result][:message]
+            puts
+          end
+
+          raise Error, message: "test failed"
+        end
+      end
+
+      def test_target(target)
+        unless target.test.any? or buildizer.options[:shell]
+          buildizer.warn "No tests found for target '#{target.name}' (use directive 'test')"
+          return
+        end
+
+        target
+          .test_env
+          .map {|env| test_target_env(target, env)}
+      end
+
+      def install_test_package_instructions(target)
+        target.os.install_test_package_instructions(target)
+      end
+
+      def prepare_test_container_instructions(target)
+        target.os.prepare_test_container_instructions(target)
+      end
+
+      def test_target_env(target, env)
+        container_name = SecureRandom.uuid
+        docker_opts = (target.test_options['docker'] || {}).zymbolize_keys
+
+        docker.with_container(
+          name: container_name,
+          image: target.test_image,
+          env: env.merge(TERM: ENV['TERM']),
+          docker_opts: docker_opts,
+          desc: "Run test container '#{container_name}' " +
+                "target='#{target.name}' env=#{env}"
+        ) do |container|
+          before_test_cmd = [*Array(prepare_package_source_instructions(target)),
+                             *Array(prepare_test_container_instructions(target)),
+                             *Array(install_test_package_instructions(target)),
+                             "cd #{docker.container_package_path}",
+                             *target.before_test]
+
+          docker.run_in_container! container: container,
+                                   cmd: before_test_cmd,
+                                   docker_opts: {tty: true},
+                                   desc: "Run before_test stage in test container '#{container}'"
+
+          ret = {data: {env: env}}
+
+          if buildizer.options[:shell]
+            docker.shell_in_container container: container
+          else
+            test_cmd = ["cd #{docker.container_package_path}", *target.test]
+
+            res = docker.run_in_container container: container,
+                                          cmd: test_cmd,
+                                          cmd_opts: {live_log: true, log_failure: false},
+                                          docker_opts: {tty: true},
+                                          desc: "Run test stage in test container '#{container}'"
+
+            unless res.status.success?
+              ret[:error] = :error
+              ret[:message] = res.stdout + res.stderr
+            end
+          end
+
+          ret
+        end # with_container
       end
 
       def deploy
@@ -184,7 +292,7 @@ module Buildizer
       end
 
       def deploy_target(target)
-        cmd = Dir[target.image_build_path.join("*.#{target.image.fpm_output_type}")]
+        cmd = Dir[target.image_build_path.join("*.#{target.os.fpm_output_type}")]
                 .map {|p| Pathname.new(p)}.map {|package_path|
                   package = package_path.basename
                   target.package_cloud.map do |desc|

data/lib/buildizer/builder/fpm.rb

@@ -84,12 +84,12 @@ module Buildizer
         ["fpm -s dir",
          "--force",
          "-p #{docker.container_build_path}",
-         "-t #{target.image.fpm_output_type}",
+         "-t #{target.os.fpm_output_type}",
          "-n #{target.package_name}",
          "--version=#{version}",
          "--iteration=#{release}",
          *fpm_script.values.map {|desc| "#{desc[:fpm_option]}=#{desc[:container_file]}"},
-         *Array(target.image.fpm_extra_params),
+         *Array(target.os.fpm_extra_params),
          (target.maintainer ? "--maintainer=\"#{target.maintainer}\"" : nil),
          (target.fpm_description ? "--description=\"#{target.fpm_description}\"" : nil),
          (target.fpm_url ? "--url=\"#{target.fpm_url}\"" : nil),

data/lib/buildizer/builder/native.rb

@@ -15,7 +15,7 @@ module Buildizer
       end
 
       def build_instructions(target)
-        target.image.native_build_instructions(self, target)
+        target.os.native_build_instructions(target)
       end
     end # Native
   end # Builder

data/lib/buildizer/builder/patch.rb

@@ -29,11 +29,11 @@ module Buildizer
       end
 
       def build_instructions(target)
-        target.image.patch_build_instructions(self, target)
+        target.os.patch_build_instructions(target)
       end
 
       def build_dep(target)
-        target.image.patch_build_dep(self, target)
+        target.os.patch_build_dep(target)
       end
     end # Patch
   end # Builder

data/lib/buildizer/buildizer.rb

@@ -48,19 +48,27 @@ module Buildizer
       end
     end
 
-    def prepare!
+    def prepare
       builder.prepare
     end
 
-    def build!
+    def build
       builder.build
     end
 
-    def deploy!
+    def test
+      raise(
+        Error, message: "cannot run test shell in non interactive mode"
+      ) if options[:shell] and not interactive?
+
+      builder.test
+    end
+
+    def deploy
       builder.deploy
     end
 
-    def verify!
+    def verify
       builder.verify
     end