buildizer 0.0.9 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmMwYWNlZTljM2Y1ZTk0ZTQ5MTc0N2Q4ODc1NjE5NzY3Y2ViNTY1ZA==
+    NTFhMmM1N2Y4NzhjOWNkMWRlMWFhMTlmOGQ5YzU0M2FkYTg3NDc0Yg==
   data.tar.gz: !binary |-
-    MzNiNzUzODE5MTg4YzUzZDlkZDc2MGE1NWNhZWY3YThhYjk2MWZmOQ==
+    ZjQ5OTYxZGJiMWJkZGNiNjBjMzkwYjFiZTRkYzMxZWZiYmY5ODIwMw==
 SHA512:
   metadata.gz: !binary |-
-    NmUzYjBjNzdkZTk0NjY2OGI2MmQwN2UwNjg3YzFjZWY4MWE1NGNjNGUwZjcw
-    MTI3MmQxMDdlZjljMzNmYjQxODk4YWEwYTFjZDc0NjRiYTdiMGNiYzk3Y2Jj
-    NjQwNzdhOTE2MWVhNTkyM2QwYzM4YWM0YjcyZjVkNTlmYmY5OWM=
+    MDZlNTZiNmFiOTBmZmFiYzczNWQ1NGI0MWVkODk4NDYwZjcwZmM1MDc5MDRk
+    ZjU1MmNiMDU3MTRiMTYzOTM0YmQxMDM2NjE0MjM5YjZjODRiYzRmMTA5NGY0
+    ZTg0ZDQ3MTFmMWVjNzYyNzY4ZjdlYzEzYzU4YjFiNWQ4MDU1YTI=
   data.tar.gz: !binary |-
-    NjFlNDA4NzE4ZDJkYTc4NWMzZWIwY2IyZGJkYjZiZGRjZTRiMmUzNTlhOTk0
-    MzI1MTliMmJlOTk3OTgzNWQ0ZWZhN2ZhYWFhNzEzYTc3MzM5YjA5ZTY5ZWM5
-    NGY4ZGNlYzYzNjc4OTMxZDE0MWEwZTg5ZGQzN2E3ZDNmZjYxZTU=
+    MGExOGQ3ZjViMDVmZGE0MDg2ZjE2NjU2MTI3ZTcwNjFhM2U0MmM5YjFiZjNk
+    NDU2ZGNmNmVmMjcyNjczZjlhMTA0OTBmNDU5ZGZmYzQxNDg3YTdlZGY1YzI1
+    NzA4NmJiYWVhMDFlOWUyZmQ0MjUzNzgyMjEyMDQwZTFiMTQ1OGY=

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/flant/shellfold.git
-  revision: 4db6a6a953412f2973fb6a814a0517cd04b0658c
+  revision: 4704e2ffe717268e1316b66db34e5f9a1aafabee
   specs:
     shellfold (0.0.3)
       mixlib-shellout (>= 2.2.6, < 3.0)
@@ -8,7 +8,8 @@ GIT
 PATH
   remote: .
   specs:
-    buildizer (0.0.9)
+    buildizer (0.1.0)
+      colorize (>= 0.6.0, < 1.0)
       net_status (>= 0.0.1, < 1.0)
       overcommit (>= 0.33.0, < 1.0)
       package_cloud (>= 0.2, < 1.0)
@@ -118,6 +119,3 @@ DEPENDENCIES
   rspec (~> 3.4, >= 3.4.0)
   shellfold!
   travis (~> 1.8, >= 1.8.2)
-
-BUNDLED WITH
-   1.11.2

data/bin/buildizer

@@ -7,6 +7,6 @@ require 'buildizer'
 begin
   Buildizer::Cli::Main.start
 rescue Buildizer::Error => e
-  $stderr.puts [e.net_status[:error], e.net_status[:message]].compact.join(': ')
+  $stderr.puts e.net_status.net_status_message
   exit 1
 end

data/buildizer.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   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"
+  spec.add_dependency "colorize", ">= 0.6.0", "< 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/buildizer/builder/base.rb

@@ -1,19 +1,14 @@
 module Buildizer
   module Builder
     class Base
-      using Refine
-
-      attr_reader :packager
+      attr_reader :buildizer
       attr_reader :work_path
       attr_reader :docker
 
-      def initialize(packager)
-        @packager = packager
-
-        @work_path = packager.work_path.join('builder').expand_path
-        work_path.mkpath
-
-        @docker = Docker.new(self, cache: packager.docker_cache)
+      def initialize(buildizer)
+        @buildizer = buildizer
+        @work_path = buildizer.work_path.join('builder').expand_path
+        @docker = Docker.new(self, cache: buildizer.docker_cache)
       end
 
       def build_type
@@ -36,7 +31,7 @@ module Buildizer
         image = docker.new_image(os_name, os_version)
 
         params = initial_target_params
-        packager.buildizer_conf.each do |match_key, match_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
@@ -54,18 +49,18 @@ module Buildizer
       end
 
       def targets
-        @targets ||= packager.targets.map {|target_name| new_target(target_name)}
+        @targets ||= buildizer.targets.map {|target_name| new_target(target_name)}
       end
 
       def initial_target_params
         {}.tap do |params|
-          params[:package_name] = packager.package_name
-          params[:package_version] = packager.package_version
-          params[:package_cloud] = packager.package_cloud
-          params[:prepare] = packager.prepare
-          params[:build_dep] = packager.build_dep
-          params[:before_build] = packager.before_build
-          params[:maintainer] = packager.maintainer
+          params[:package_name] = buildizer.package_name
+          params[:package_version] = buildizer.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
         end
       end
 
@@ -114,13 +109,13 @@ module Buildizer
 
       def prepare
         docker.with_cache do
-          packager.before_prepare
-                  .each {|cmd| packager.command! cmd, desc: "Before prepare command: #{cmd}"}
+          buildizer.before_prepare
+                   .each {|cmd| buildizer.command! cmd, desc: "Before prepare command: #{cmd}"}
 
           targets.each {|target| prepare_target_image(target)}
 
-          packager.after_prepare
-                  .each {|cmd| packager.command! cmd, desc: "After prepare command: #{cmd}"}
+          buildizer.after_prepare
+                   .each {|cmd| buildizer.command! cmd, desc: "After prepare command: #{cmd}"}
         end # with_cache
       end
 
@@ -158,27 +153,27 @@ module Buildizer
       end
 
       def deploy
-        if packager.package_version_tag_required_for_deploy? and
-           not packager.package_version_tag
+        if buildizer.package_version_tag_required_for_deploy? and
+           not buildizer.package_version_tag
           puts "package_version_tag (env TRAVIS_TAG or CI_BUILD_TAG) required: ignoring deploy"
           return
-        elsif packager.package_cloud.empty?
-          warn "No package cloud settings " +
-               "(PACKAGECLOUD, PACKAGECLOUD_TOKEN, PACKAGECLOUD_TOKEN_<ORG>) [WARN]"
+        elsif buildizer.package_cloud.empty?
+          buildizer.warn "No package cloud settings " +
+                         "(PACKAGECLOUD, PACKAGECLOUD_TOKEN, PACKAGECLOUD_TOKEN_<ORG>)"
           return
         end
 
-        packager.package_cloud_org.each do |org, token|
+        buildizer.package_cloud_org.each do |org, token|
           unless token
-            warn "No package cloud token defined for org '#{org}' " +
-                 "(PACKAGECLOUD_TOKEN or PACKAGECLOUD_TOKEN_#{org.upcase}) [WARN]"
+            buildizer.warn "No package cloud token defined for org '#{org}' " +
+                           "(PACKAGECLOUD_TOKEN or PACKAGECLOUD_TOKEN_#{org.upcase})"
           end
         end
 
         targets.map do |target|
           target.tap do
-            if packager.package_version_tag_required_for_deploy? and
-               packager.package_version_tag != target.package_version_tag
+            if buildizer.package_version_tag_required_for_deploy? and
+               buildizer.package_version_tag != target.package_version_tag
               raise(Error, error: :logical_error,
                            message: "#{target.package_version_tag_param_name} and "+
                                     "package_version_tag (env TRAVIS_TAG or CI_BUILD_TAG) " +
@@ -200,12 +195,12 @@ module Buildizer
                     )
                   end
                 }.flatten.each {|desc|
-                  packager.command desc[:yank],
+                  buildizer.command desc[:yank],
                     desc: ["Package cloud yank package '#{desc[:package]}'",
                            " of target '#{target.name}'"].join,
                     environment: {'PACKAGECLOUD_TOKEN' => desc[:token]}
 
-                  packager.command desc[:push],
+                  buildizer.command desc[:push],
                     desc: ["Package cloud push package '#{desc[:package]}'",
                            " of target '#{target.name}'"].join,
                     environment: {'PACKAGECLOUD_TOKEN' =>desc[:token]}

data/lib/buildizer/builder/fpm.rb

@@ -15,15 +15,15 @@ module Buildizer
 
       def initial_target_params
         super.tap do |params|
-          params[:fpm_script] = Array(packager.buildizer_conf['fpm_script'])
-          params[:fpm_config_files] = packager.buildizer_conf['fpm_config_files'].to_h
-          params[:fpm_files] = packager.buildizer_conf['fpm_files'].to_h
-          params[:fpm_conflicts] = Array(packager.buildizer_conf['fpm_conflicts'])
-          params[:fpm_replaces] = Array(packager.buildizer_conf['fpm_replaces'])
-          params[:fpm_provides] = Array(packager.buildizer_conf['fpm_provides'])
-          params[:fpm_depends] = Array(packager.buildizer_conf['fpm_depends'])
-          params[:fpm_description] = packager.buildizer_conf['fpm_description']
-          params[:fpm_url] = packager.buildizer_conf['fpm_url']
+          params[:fpm_script] = Array(buildizer.buildizer_conf['fpm_script'])
+          params[:fpm_config_files] = buildizer.buildizer_conf['fpm_config_files'].to_h
+          params[:fpm_files] = buildizer.buildizer_conf['fpm_files'].to_h
+          params[:fpm_conflicts] = Array(buildizer.buildizer_conf['fpm_conflicts'])
+          params[:fpm_replaces] = Array(buildizer.buildizer_conf['fpm_replaces'])
+          params[:fpm_provides] = Array(buildizer.buildizer_conf['fpm_provides'])
+          params[:fpm_depends] = Array(buildizer.buildizer_conf['fpm_depends'])
+          params[:fpm_description] = buildizer.buildizer_conf['fpm_description']
+          params[:fpm_url] = buildizer.buildizer_conf['fpm_url']
         end
       end
 
@@ -75,7 +75,7 @@ module Buildizer
         end
 
         fpm_script.values.map do |desc|
-          desc[:file].write ["#!/bin/bash", *desc[:cmd], nil].join("\n")
+          desc[:file].write! ["#!/bin/bash", *desc[:cmd], nil].join("\n")
           desc[:file].chmod 0755
         end
 

data/lib/buildizer/builder/patch.rb

@@ -11,8 +11,8 @@ module Buildizer
 
       def initial_target_params
         super.tap do |params|
-          params[:patch] = Array(packager.buildizer_conf['patch'])
-          params[:patch_version] = packager.buildizer_conf['patch_version']
+          params[:patch] = Array(buildizer.buildizer_conf['patch'])
+          params[:patch_version] = buildizer.buildizer_conf['patch_version']
         end
       end
 

data/lib/buildizer/{packager → buildizer}/buildizer_conf_mod.rb

@@ -1,8 +1,6 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module BuildizerConfMod
-      using Refine
-
       def buildizer_conf_path
         package_path.join('Buildizer')
       end
@@ -16,7 +14,7 @@ module Buildizer
       end
 
       def buildizer_conf_setup!
-        write_path(buildizer_conf_path, YAML.dump(buildizer_conf))
+        write_yaml(buildizer_conf_path, buildizer_conf)
       end
 
       def package_name
@@ -59,5 +57,5 @@ module Buildizer
         buildizer_conf['maintainer']
       end
     end # BuildizerConfMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/ci_mod.rb

@@ -1,5 +1,5 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module CiMod
       def ci_name
         @ci_name ||= begin
@@ -23,5 +23,5 @@ module Buildizer
         end
       end
     end # CiMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/docker_cache_mod.rb

@@ -1,5 +1,5 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module DockerCacheMod
       def docker_cache
         return unless repo = ENV['BUILDIZER_DOCKER_CACHE']
@@ -11,7 +11,7 @@ module Buildizer
       end
 
       def setup_docker_cache_repo
-        cli.options['docker_cache']
+        options[:docker_cache]
       end
 
       def setup_docker_cache_org
@@ -19,14 +19,17 @@ module Buildizer
       end
 
       def setup_docker_cache_user
-        cli.options['docker_cache_user'] || user_settings_docker_cache_user_list(setup_docker_cache_org).first
+        options[:docker_cache_user] || user_settings_docker_cache_user_list(setup_docker_cache_org).first
       end
 
       def setup_docker_cache_password
         @setup_docker_cache_password ||= begin
           settings_password = user_settings_docker_cache_user(setup_docker_cache_user)['password']
-          if cli.options['reset_docker_cache_password'] or settings_password.nil?
-            cli.ask("Docker cache user '#{setup_docker_cache_user}' password:", echo: false).tap{puts}
+          if options[:reset_docker_cache_password] or settings_password.nil?
+            secure_option(
+              :docker_cache_password,
+              ask: "Docker cache user '#{setup_docker_cache_user}' password:"
+            )
           else
             settings_password
           end
@@ -34,11 +37,11 @@ module Buildizer
       end
 
       def setup_docker_cache_email
-        cli.options['docker_cache_email'] || user_settings_docker_cache_user(setup_docker_cache_user)['email']
+        options[:docker_cache_email] || user_settings_docker_cache_user(setup_docker_cache_user)['email']
       end
 
       def setup_docker_cache_server
-        cli.options['docker_cache_server'] || user_settings_docker_cache_user(setup_docker_cache_user)['server']
+        options[:docker_cache_server] || user_settings_docker_cache_user(setup_docker_cache_user)['server']
       end
 
       def user_settings_docker_cache
@@ -68,7 +71,7 @@ module Buildizer
       end
 
       def docker_cache_clear_settings?
-        cli.options['clear_docker_cache']
+        options[:clear_docker_cache]
       end
 
       def docker_cache_setup!
@@ -99,5 +102,5 @@ module Buildizer
         ci.docker_cache_setup!
       end
     end # DockerCacheMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/git_mod.rb

@@ -1,5 +1,5 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module GitMod
       def git_available?
         res = raw_command 'git status'
@@ -12,5 +12,5 @@ module Buildizer
         res.stdout.strip
       end
     end # GitMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/misc_mod.rb

@@ -1,8 +1,8 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module MiscMod
       def command(*args, do_raise: false, **kwargs)
-        Shellfold.run(*args, **kwargs).tap do |cmd|
+        Shellfold.run(*args, live_log: debug, **kwargs).tap do |cmd|
           if not cmd.status.success? and do_raise
             raise Error.new(error: :error, message: "external command error")
           end
@@ -36,22 +36,50 @@ module Buildizer
             if path.read == value
               fin.call 'OK'
             else
-              path.write value
+              path.write! value
               fin.call 'UPDATED'
             end
           else
-            path.write value
+            path.write! value
             fin.call 'CREATED'
           end
         end
       end
 
-      def with_log(desc: nil, &blk)
+      def write_yaml(path, cfg)
+        with_log(desc: "Update config #{path}") do |&fin|
+          old_cfg = path.load_yaml
+          if old_cfg == cfg
+            fin.call 'OK'
+          elsif cfg.empty?
+            if path.exist?
+              path.delete
+              fin.call 'DELETED'
+            else
+              fin.call 'OK'
+            end
+          else
+            if path.exist?
+              path.dump_yaml(cfg)
+              fin.call 'UPDATED'
+            else
+              path.dump_yaml(cfg)
+              fin.call 'CREATED'
+            end
+          end
+        end
+      end
+
+      def with_log(desc: nil, &blk) # TODO: rename to verbose
         puts("   #{desc}") if desc
         blk.call do |status|
           puts("=> #{desc} [#{status || 'OK'}]") if desc
         end
       end
+
+      def warn(msg)
+        Kernel::warn msg.to_s.colorize(:yellow)
+      end
     end # MiscMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/overcommit_mod.rb

@@ -1,8 +1,6 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module OvercommitMod
-      using Refine
-
       def overcommit_conf_path
         package_path.join('.overcommit.yml')
       end
@@ -19,28 +17,39 @@ module Buildizer
         @overcommit_conf ||= overcommit_conf_path.load_yaml
       end
 
-      def overcommit_conf_raw
-        YAML.dump(overcommit_conf)
-      end
-
       def overcommit_conf_dump!
-        write_path overcommit_conf_path, overcommit_conf_raw
+        write_yaml overcommit_conf_path, overcommit_conf
         command! 'overcommit --sign'
       end
 
       def overcommit_setup!
-        overcommit_hooks_path.mkpath
         overcommit_conf_dump!
         command! 'overcommit --install'
       end
 
+      def overcommit_buildizer_require_list
+        [].tap do |res|
+          res << 'bundler/setup' if ENV.key? 'BUNDLE_BIN_PATH'
+          res << 'buildizer'
+        end
+      end
+
+      def overcommit_buildizer_require
+        overcommit_buildizer_require_list.map {|req| "      require '#{req}'"}.join("\n")
+      end
+
       def overcommit_verify_setup!
         hookcode = <<-HOOKCODE
 module Overcommit::Hook::PreCommit
   class BuildizerVerify < Base
     def run
-      return :fail unless system("buildizer verify")
+#{overcommit_buildizer_require}
+
+      ::Buildizer::Buildizer.new.verify!
       :pass
+    rescue ::Buildizer::Error => e
+      $stderr.puts e.net_status.net_status_message
+      :fail
     end
   end
 end
@@ -54,8 +63,13 @@ end
 module Overcommit::Hook::PreCommit
   class BuildizerCiVerify < Base
     def run
-      return :fail unless system("buildizer setup --verify-ci")
+#{overcommit_buildizer_require}
+
+      Buildizer::Buildizer.new.ci.configuration_actual!
       :pass
+    rescue ::Buildizer::Error => e
+      $stderr.puts e.net_status.net_status_message
+      :fail
     end
   end
 end
@@ -75,11 +89,10 @@ end
         end
         overcommit_conf_dump!
 
-        overcommit_hooks_pre_commit_path.mkpath
         path = overcommit_hooks_pre_commit_path.join("#{name}.rb")
         write_path path, hookcode
         command! 'overcommit --sign pre-commit'
       end
     end # OvercommitMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/package_cloud_mod.rb

@@ -1,5 +1,5 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module PackageCloudMod
       def package_cloud_repo
         ENV['PACKAGECLOUD'].to_s.split(',')
@@ -30,7 +30,7 @@ module Buildizer
       end
 
       def setup_package_cloud_repo_list
-        Array(cli.options['package_cloud']).uniq
+        Array(options[:package_cloud]).uniq
       end
 
       def setup_package_cloud_repo_desc_list
@@ -49,21 +49,23 @@ module Buildizer
       end
 
       def package_cloud_update_settings?
-        cli.options['package_cloud']
+        options[:package_cloud]
       end
 
       def package_cloud_clear_settings?
-        cli.options['clear_package_cloud']
+        options[:clear_package_cloud]
       end
 
       def package_cloud_setup!
         if package_cloud_update_settings?
           update_user_settings = false
           setup_package_cloud_org_list.each do |org|
-            if user_settings_package_cloud_token[org].nil? or
-               cli.options['reset_package_cloud_token']
-              token = cli.ask("Enter token for package_cloud org '#{org}':",
-                               echo: false, default: 'none').tap{puts}
+            if user_settings_package_cloud_token[org].nil? or options[:reset_package_cloud_token]
+              token = secure_option(
+                "package_cloud_token_#{org}",
+                ask: "Enter token for package_cloud org '#{org}':",
+                default: "none",
+              )
               token = (token == 'none' ? nil : token)
               if user_settings_package_cloud_token[org] != token
                 user_settings_package_cloud_token[org] = token
@@ -77,5 +79,5 @@ module Buildizer
         ci.package_cloud_setup!
       end
     end # PackageCloudMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/package_version_tag_mod.rb

@@ -1,8 +1,6 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module PackageVersionTagMod
-      using Refine
-
       def package_version_tag_required_for_deploy?
         ENV['BUILDIZER_REQUIRE_TAG'].to_s.on?
       end
@@ -11,5 +9,5 @@ module Buildizer
         ci.git_tag
       end
     end # PackageVersionTagMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/project_settings_mod.rb

@@ -1,27 +1,25 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module ProjectSettingsMod
-      using Refine
-
       def project_settings_path
         package_path.join('.buildizer.yml')
       end
 
       def project_settings
         @project_settings ||= begin
-          (project_settings_path.load_yaml || {}).tap do |settings|
-            settings['master'] = cli.options['master'] if cli.options.key? 'master'
+          project_settings_path.load_yaml.tap do |settings|
+            settings['master'] = options[:master] if options.key? :master
           end
         end
       end
 
       def project_settings_save!
-        write_path(project_settings_path, YAML.dump(project_settings))
+        write_yaml project_settings_path, project_settings
       end
 
       def project_settings_setup!
         project_settings_save!
       end
     end # ProjectSettingsMod
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/{packager → buildizer}/user_settings_mod.rb

@@ -1,18 +1,16 @@
 module Buildizer
-  class Packager
+  class Buildizer
     module UserSettingsMod
-      using Refine
-
       def user_settings_path
         work_path.join('settings.yml')
       end
 
       def user_settings
-        @user_settings ||= (user_settings_path.load_yaml || {})
+        @user_settings ||= user_settings_path.load_yaml
       end
 
       def user_settings_save!
-        write_path(user_settings_path, YAML.dump(user_settings))
+        write_yaml user_settings_path, user_settings
         user_settings_path.chmod(0600)
       end
 
@@ -20,5 +18,5 @@ module Buildizer
         user_settings_save!
       end
     end # UserSettingsMod
-  end # Packager
+  end # Buildizer
 end # Buildizer