buildizer 0.0.9 → 0.1.0

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

@@ -1,17 +1,15 @@
 module Buildizer
-  class Packager
-    autoload :MiscMod, 'buildizer/packager/misc_mod'
-    autoload :ProjectSettingsMod, 'buildizer/packager/project_settings_mod'
-    autoload :UserSettingsMod, 'buildizer/packager/user_settings_mod'
-    autoload :CiMod, 'buildizer/packager/ci_mod'
-    autoload :BuildizerConfMod, 'buildizer/packager/buildizer_conf_mod'
-    autoload :PackageVersionTagMod, 'buildizer/packager/package_version_tag_mod'
-    autoload :GitMod, 'buildizer/packager/git_mod'
-    autoload :OvercommitMod, 'buildizer/packager/overcommit_mod'
-    autoload :PackageCloudMod, 'buildizer/packager/package_cloud_mod'
-    autoload :DockerCacheMod, 'buildizer/packager/docker_cache_mod'
-
-    using Refine
+  class Buildizer
+    autoload :MiscMod, 'buildizer/buildizer/misc_mod'
+    autoload :ProjectSettingsMod, 'buildizer/buildizer/project_settings_mod'
+    autoload :UserSettingsMod, 'buildizer/buildizer/user_settings_mod'
+    autoload :CiMod, 'buildizer/buildizer/ci_mod'
+    autoload :BuildizerConfMod, 'buildizer/buildizer/buildizer_conf_mod'
+    autoload :PackageVersionTagMod, 'buildizer/buildizer/package_version_tag_mod'
+    autoload :GitMod, 'buildizer/buildizer/git_mod'
+    autoload :OvercommitMod, 'buildizer/buildizer/overcommit_mod'
+    autoload :PackageCloudMod, 'buildizer/buildizer/package_cloud_mod'
+    autoload :DockerCacheMod, 'buildizer/buildizer/docker_cache_mod'
 
     include MiscMod
     include ProjectSettingsMod
@@ -24,16 +22,30 @@ module Buildizer
     include PackageCloudMod
     include DockerCacheMod
 
-    attr_reader :cli
+    attr_reader :options
     attr_reader :package_path
     attr_reader :work_path
     attr_reader :debug
 
-    def initialize(cli)
+    def initialize(cli: nil, **kwargs)
       @cli = cli
+      @options = kwargs
       @package_path = Pathname.new(ENV['BUILDIZER_PATH'] || '.').expand_path
       @work_path = Pathname.new(ENV['BUILDIZER_WORK_PATH'] || '~/.buildizer').expand_path
-      @debug = ENV['BUILDIZER_DEBUG'].nil? ? cli.options['debug'] : ENV['BUILDIZER_DEBUG'].to_s.on?
+      @debug = ENV['BUILDIZER_DEBUG'].nil? ? options[:debug] : ENV['BUILDIZER_DEBUG'].to_s.on?
+      @color = interactive? ? options[:color] : false
+    end
+
+    def interactive?
+      @cli and $stdout.isatty
+    end
+
+    def secure_option(name, ask: nil, default: nil)
+      if interactive? and ask
+        @cli.ask(ask, echo: false, default: default).tap{puts}
+      else
+        options.fetch(name.to_sym, default)
+      end
     end
 
     def prepare!
@@ -52,22 +64,6 @@ module Buildizer
       builder.verify
     end
 
-    def git_hooks_path
-      package_path.join('.git').join('hooks')
-    end
-
-    def git_old_hooks_path
-      git_hooks_path.join('old-hooks')
-    end
-
-    def git_precommit_path
-      git_hooks_path.join('pre-commit')
-    end
-
-    def git_old_precommit_path
-      git_old_hooks_path.join('pre-commit')
-    end
-
     def builder
       @builder ||= begin
         build_type = buildizer_conf['build_type']
@@ -79,5 +75,5 @@ module Buildizer
         klass.new(self)
       end
     end
-  end # Packager
+  end # Buildizer
 end # Buildizer

data/lib/buildizer/ci/base.rb

@@ -1,14 +1,12 @@
 module Buildizer
   module Ci
     class Base
-      using Refine
+      attr_reader :buildizer
 
-      attr_reader :packager
-
-      def initialize(packager)
+      def initialize(buildizer)
         super()
 
-        @packager = packager
+        @buildizer = buildizer
       end
 
       def conf
@@ -16,7 +14,7 @@ module Buildizer
       end
 
       def conf_path
-        packager.package_path.join(conf_file_name)
+        buildizer.package_path.join(conf_file_name)
       end
 
       def conf_file_name
@@ -35,6 +33,10 @@ module Buildizer
         raise
       end
 
+      def configuration_actual!
+        raise Error, message: "#{ci_name} confugration update needed" unless configuration_actual?
+      end
+
       def git_tag
         res = _git_tag.to_s
         if res.empty? then nil else res end

data/lib/buildizer/ci/travis/docker_cache_mod.rb

@@ -15,9 +15,9 @@ module Buildizer
         end # << self
 
         def docker_cache_setup!
-          if packager.docker_cache_clear_settings?
+          if buildizer.docker_cache_clear_settings?
             with_travis do
-              packager.with_log(desc: "Travis docker cache settings") do |&fin|
+              buildizer.with_log(desc: "Travis docker cache settings") do |&fin|
                 docker_cache_repo_var_delete!
                 docker_cache_user_var_delete!
                 docker_cache_password_var_delete!
@@ -27,14 +27,14 @@ module Buildizer
                 fin.call 'DELETED'
               end # with_log
             end # with_travis
-          elsif packager.docker_cache_update_settings?
+          elsif buildizer.docker_cache_update_settings?
             with_travis do
-              packager.with_log(desc: "Travis docker cache settings") do |&fin|
-                docker_cache_repo_var_update! packager.setup_docker_cache_repo, public: true
-                docker_cache_user_var_update! packager.setup_docker_cache_user, public: false
-                docker_cache_password_var_update! packager.setup_docker_cache_password, public: false
-                docker_cache_email_var_update! packager.setup_docker_cache_email, public: false
-                docker_cache_server_var_update! packager.setup_docker_cache_server, public: true
+              buildizer.with_log(desc: "Travis docker cache settings") do |&fin|
+                docker_cache_repo_var_update! buildizer.setup_docker_cache_repo, public: true
+                docker_cache_user_var_update! buildizer.setup_docker_cache_user, public: true
+                docker_cache_password_var_update! buildizer.setup_docker_cache_password, public: false
+                docker_cache_email_var_update! buildizer.setup_docker_cache_email, public: false
+                docker_cache_server_var_update! buildizer.setup_docker_cache_server, public: true
 
                 fin.call 'UPDATED'
               end # with_log

data/lib/buildizer/ci/travis/package_cloud_mod.rb

@@ -36,33 +36,33 @@ module Buildizer
         end
 
         def package_cloud_setup!
-          if packager.package_cloud_clear_settings?
+          if buildizer.package_cloud_clear_settings?
             with_travis do
               repo_list = []
               repo_list = package_cloud_repo_list_var.value.split(',') if package_cloud_repo_list_var
               org_list = repo_list.map {|repo| repo.split('/').first}.uniq
               org_list.each do |org|
-                packager.with_log(desc: "Travis package cloud token for '#{org}'") do |&fin|
+                buildizer.with_log(desc: "Travis package cloud token for '#{org}'") do |&fin|
                   package_cloud_token_var_delete! org: org
                   fin.call 'DELETED'
                 end
               end
 
-              packager.with_log(desc: "Travis package cloud repo list") do |&fin|
+              buildizer.with_log(desc: "Travis package cloud repo list") do |&fin|
                 package_cloud_repo_list_var_delete!
                 fin.call 'DELETED'
               end
             end # with_travis
-          elsif packager.package_cloud_update_settings?
+          elsif buildizer.package_cloud_update_settings?
             with_travis do
-              packager.with_log(desc: "Travis package cloud repo list") do |&fin|
-                package_cloud_repo_list_var_update! packager.setup_package_cloud_repo_list.join(','), public: true
+              buildizer.with_log(desc: "Travis package cloud repo list") do |&fin|
+                package_cloud_repo_list_var_update! buildizer.setup_package_cloud_repo_list.join(','), public: true
                 fin.call 'UPDATED'
               end # with_log
 
-              packager.setup_package_cloud_org_desc_list.each do |desc|
+              buildizer.setup_package_cloud_org_desc_list.each do |desc|
                 next unless desc[:token]
-                packager.with_log(desc: "Travis package cloud token for '#{desc[:org]}'") do |&fin|
+                buildizer.with_log(desc: "Travis package cloud token for '#{desc[:org]}'") do |&fin|
                   package_cloud_token_var_update! desc[:token], org: desc[:org], public: false
                   fin.call 'UPDATED'
                 end # with_log

data/lib/buildizer/ci/travis/package_version_tag_mod.rb

@@ -2,8 +2,6 @@ module Buildizer
   module Ci
     class Travis
       module PackageVersionTagMod
-        using Refine
-
         def require_tag_var_name
           'BUILDIZER_REQUIRE_TAG'
         end
@@ -18,15 +16,15 @@ module Buildizer
 
         def require_tag_setup!
           with_travis do
-            packager.with_log(desc: "Travis require tag for deploy") do |&fin|
-              if packager.cli.options['require_tag'].nil?
+            buildizer.with_log(desc: "Travis require tag for deploy") do |&fin|
+              if buildizer.options[:require_tag].nil?
                 unless require_tag_var
                   require_tag_var_upsert(value: true.to_env)
                   fin.call 'ENABLED'
                 else
                   fin.call
                 end
-              elsif packager.cli.options['require_tag']
+              elsif buildizer.options[:require_tag]
                 require_tag_var_upsert(value: true.to_env)
                 fin.call 'ENABLED'
               else

data/lib/buildizer/ci/travis.rb

@@ -34,7 +34,7 @@ module Buildizer
       include PackageVersionTagMod
 
       def setup!
-        packager.write_path(conf_path, YAML.dump(actual_conf))
+        buildizer.write_yaml conf_path, actual_conf
         require_tag_setup!
       end
 
@@ -55,9 +55,9 @@ module Buildizer
 
           'echo "docker-engine hold" | sudo dpkg --set-selections',
         ]
-        install.push(*Array(buildizer_install_instructions(master: packager.project_settings['master'])))
+        install.push(*Array(buildizer_install_instructions(master: buildizer.project_settings['master'])))
 
-        env = packager.targets.map {|t| "BUILDIZER_TARGET=#{t}"}
+        env = buildizer.targets.map {|t| "BUILDIZER_TARGET=#{t}"}
         conf.merge(
           'dist' => 'trusty',
           'sudo' => 'required',
@@ -77,11 +77,15 @@ module Buildizer
       end
 
       def repo_name
-        packager.git_remote_url.split(':')[1].split('.')[0]
+        if buildizer.git_remote_url.start_with? 'http'
+          buildizer.git_remote_url.split('github.com/')[1]
+        else
+          buildizer.git_remote_url.split(':')[1].split('.')[0]
+        end
       rescue
         raise Error, error: :input_error,
                      message: "unable to determine travis repo name " +
-                              "from git remote url #{packager.git_remote_url}"
+                              "from git remote url #{buildizer.git_remote_url}"
       end
 
       def repo
@@ -90,21 +94,21 @@ module Buildizer
 
       def login
         @logged_in ||= begin
-          packager.with_log(desc: "Login into travis") do |&fin|
-            packager.user_settings['travis'] ||= {}
+          buildizer.with_log(desc: "Login into travis") do |&fin|
+            buildizer.user_settings['travis'] ||= {}
 
-            if packager.cli.options['reset_github_token']
-              packager.user_settings['travis'].delete('github_token')
-              packager.user_settings_save!
+            if buildizer.options[:reset_github_token]
+              buildizer.user_settings['travis'].delete('github_token')
+              buildizer.user_settings_save!
             end
 
-            packager.user_settings['travis']['github_token'] ||= begin
+            buildizer.user_settings['travis']['github_token'] ||= begin
               reset_github_token = true
-              packager.cli.ask("GitHub access token:", echo: false).tap{puts}
+              buildizer.secure_option(:github_token, ask: "GitHub travis access token:").to_s
             end
 
-            ::Travis.github_auth(packager.user_settings['travis']['github_token'])
-            packager.user_settings_save! if reset_github_token
+            ::Travis.github_auth(buildizer.user_settings['travis']['github_token'])
+            buildizer.user_settings_save! if reset_github_token
 
             fin.call "LOGGED IN: #{::Travis::User.current.name}"
           end # with_log

data/lib/buildizer/cli/base.rb

@@ -5,11 +5,12 @@ module Buildizer
 
       add_shared_options(
         debug: {type: :boolean, default: false, desc: "turn on live logging for external commands"},
+        color: {type: :boolean, default: true, desc: "colorized output"},
       )
 
       no_commands do
-        def packager
-          @packager ||= Buildizer::Packager.new(self)
+        def buildizer
+          @buildizer ||= ::Buildizer::Buildizer.new(cli: self, **options.zymbolize_keys_deep)
         end
       end # no_commands
     end # Base

data/lib/buildizer/cli/main.rb

@@ -38,47 +38,47 @@ module Buildizer
                                          desc: "clear all docker cache settings"
       def setup
         if options['verify_ci']
-          raise(Error, message: "#{packager.ci.ci_name} confugration update needed") unless packager.ci.configuration_actual?
+          buildizer.ci.configuration_actual!
         else
-          packager.project_settings_setup!
-          packager.user_settings_setup!
-          packager.ci.setup!
-          packager.package_cloud_setup!
-          packager.docker_cache_setup!
-          packager.overcommit_setup!
-          packager.overcommit_verify_setup!
-          packager.overcommit_ci_setup!
+          buildizer.project_settings_setup!
+          buildizer.user_settings_setup!
+          buildizer.ci.setup!
+          buildizer.package_cloud_setup!
+          buildizer.docker_cache_setup!
+          buildizer.overcommit_setup!
+          buildizer.overcommit_verify_setup!
+          buildizer.overcommit_ci_setup!
         end
       end
 
       desc "deinit", "Deinitialize settings (.buildizer.yml, git pre-commit hook)"
       shared_options
       def deinit
-        packager.deinit!
+        buildizer.deinit!
       end
 
       desc "prepare", "Prepare images for building packages"
       shared_options
       def prepare
-        packager.prepare!
+        buildizer.prepare!
       end
 
       desc "build", "Build packages"
       shared_options
       def build
-        packager.build!
+        buildizer.build!
       end
 
       desc "deploy", "Deploy packages"
       shared_options
       def deploy
-        packager.deploy!
+        buildizer.deploy!
       end
 
       desc "verify", "Verify targets params"
       shared_options
       def verify
-        packager.verify!
+        buildizer.verify!
       end
     end # Main
   end # Cli

data/lib/buildizer/core_ext/false_class.rb

@@ -0,0 +1,5 @@
+class FalseClass
+  def to_env
+    'no'
+  end
+end # FalseClass

data/lib/buildizer/core_ext/hash.rb

@@ -0,0 +1,48 @@
+class Hash
+  def zymbolize_keys
+    map do |key, value|
+      [_symbolize(key), value]
+    end.to_h
+  end
+
+  def zymbolize_keys!
+    keys.each do |key|
+      self[_symbolize(key)] = delete(key)
+    end
+    self
+  end
+
+  def zymbolize_keys_deep
+    map do |key, value|
+      [_symbolize(key), if value.is_a? Hash
+        value.zymbolize_keys_deep
+      else
+        value
+      end]
+    end.to_h
+  end
+
+  def zymbolize_keys_deep!
+    queue = [self]
+    visited = Set.new
+    while hash = queue.shift
+      visited.add hash
+      hash.keys.each do |key|
+        value = hash.delete(key)
+        hash[_symbolize(key)] = value
+        queue << value if value.is_a? Hash and not visited.include? hash
+      end
+    end
+    self
+  end
+
+  def net_status_message
+    [self[:error], self[:message]].compact.join(': ')
+  end
+
+  private
+
+  def _symbolize(value)
+    value.respond_to?(:to_sym) ? value.to_sym : value
+  end
+end # Hash

data/lib/buildizer/core_ext/pathname.rb

@@ -0,0 +1,17 @@
+class Pathname
+  def load_yaml
+    exist? ? YAML.load(read) : {}
+  rescue Psych::Exception => err
+    raise Error, error: :input_error,
+                 message: "bad yaml config file #{self}: #{err.message}"
+  end
+
+  def dump_yaml(cfg)
+    write! YAML.dump(cfg)
+  end
+
+  def write!(*args, &blk)
+    dirname.mkpath
+    write(*args, &blk)
+  end
+end # Pathname

data/lib/buildizer/core_ext/string.rb

@@ -0,0 +1,17 @@
+class String
+  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
+
+  def off?
+    !on?
+  end
+end # String

data/lib/buildizer/core_ext/true_class.rb

@@ -0,0 +1,5 @@
+class TrueClass
+  def to_env
+    'yes'
+  end
+end # TrueClass

data/lib/buildizer/docker.rb

@@ -31,10 +31,10 @@ module Buildizer
     end
 
     def with_cache(&blk)
-      warn("No docker cache account settings " +
-           "(BUILDIZER_DOCKER_CACHE, BUILDIZER_DOCKER_CACHE_USERNAME," +
-           " BUILDIZER_DOCKER_CACHE_PASSWORD, BUILDIZER_DOCKER_CACHE_EMAIL," +
-           " BUILDIZER_DOCKER_CACHE_SERVER) [WARN]") unless cache
+      builder.buildizer.warn "No docker cache account settings " +
+                             "(BUILDIZER_DOCKER_CACHE, BUILDIZER_DOCKER_CACHE_USERNAME," +
+                             " BUILDIZER_DOCKER_CACHE_PASSWORD, BUILDIZER_DOCKER_CACHE_EMAIL," +
+                             " BUILDIZER_DOCKER_CACHE_SERVER)" unless cache
 
       cache_login! if cache
       begin
@@ -52,47 +52,47 @@ module Buildizer
       cmd << "--username=#{cache[:user]}" if cache[:user]
       cmd << "--password=#{cache[:password]}" if cache[:password]
       cmd << "--server=#{cache[:server]}" if cache[:server]
-      builder.packager.command! cmd.join(' '), desc: "Docker cache account login"
+      builder.buildizer.command! cmd.join(' '), desc: "Docker cache account login"
     end
 
     def cache_logout!
       raise Error, error: :logical_error, message: "no docker cache account info" unless cache
-      builder.packager.command! 'docker logout', desc: "Docker cache account logout"
+      builder.buildizer.command! 'docker logout', desc: "Docker cache account logout"
     end
 
     def pull_image(image)
-      builder.packager.command! "docker pull #{image.base_image}", desc: "Pull docker base image #{image.base_image}"
+      builder.buildizer.command! "docker pull #{image.base_image}", desc: "Pull docker base image #{image.base_image}"
       if cache
-        pull_cache_res = builder.packager.command(
+        pull_cache_res = builder.buildizer.command(
           "docker pull #{image.cache_name}",
-          desc: "Try to pull docker cache image #{image.cache_name}"
+           desc: "Try to pull docker cache image #{image.cache_name}"
         )
         if pull_cache_res.status.success?
-          builder.packager.command! "docker tag -f #{image.cache_name} #{image.name}",
-                                     desc: "Tag cache image #{image.cache_name}" +
-                                           " as prepared build image #{image.name}"
-          builder.packager.command! "docker rmi #{image.cache_name}",
-                                     desc: "Remove cache image #{image.cache_name}"
+          builder.buildizer.command! "docker tag -f #{image.cache_name} #{image.name}",
+                                      desc: "Tag cache image #{image.cache_name}" +
+                                            " as prepared build image #{image.name}"
+          builder.buildizer.command! "docker rmi #{image.cache_name}",
+                                      desc: "Remove cache image #{image.cache_name}"
         end
       end
     end
 
     def push_image(image)
       if cache
-        builder.packager.command! "docker tag -f #{image.name} #{image.cache_name}",
-                                   desc: "Tag prepared build image #{image.name}" +
-                                         " as cache image #{image.cache_name}"
-        builder.packager.command! "docker push #{image.cache_name}",
-                                   desc: "Push cache image #{image.cache_name}"
+        builder.buildizer.command! "docker tag -f #{image.name} #{image.cache_name}",
+                                    desc: "Tag prepared build image #{image.name}" +
+                                          " as cache image #{image.cache_name}"
+        builder.buildizer.command! "docker push #{image.cache_name}",
+                                    desc: "Push cache image #{image.cache_name}"
       end
     end
 
     def build_image!(target)
       pull_image target.image
 
-      target.image_work_path.join('Dockerfile').write [*target.image.instructions, nil].join("\n")
-      builder.packager.command! "docker build -t #{target.image.name} #{target.image_work_path}",
-                                 desc: "Build docker image #{target.image.name}"
+      target.image_work_path.join('Dockerfile').write! [*target.image.instructions, nil].join("\n")
+      builder.buildizer.command! "docker build -t #{target.image.name} #{target.image_work_path}",
+                                  desc: "Build docker image #{target.image.name}"
 
       push_image target.image
     end
@@ -119,37 +119,40 @@ module Buildizer
 
     def run_target_container!(target:, env: {})
       container = SecureRandom.uuid
-      builder.packager.command! [
+      builder.buildizer.command! [
         "docker run --detach --name #{container}",
-        *Array(_common_docker_params(target, env)),
+        *Array(_prepare_docker_params(target, env)),
         _wrap_docker_run("while true ; do sleep 1 ; done"),
       ].join(' '), desc: "Run container '#{container}' from docker image '#{target.image.name}'"
       container
     end
 
     def shutdown_container!(container:)
-      builder.packager.command! "docker kill #{container}", desc: "Kill container '#{container}'"
-      builder.packager.command! "docker rm #{container}", desc: "Remove container '#{container}'"
+      builder.buildizer.command! "docker kill #{container}", desc: "Kill container '#{container}'"
+      builder.buildizer.command! "docker rm #{container}", desc: "Remove container '#{container}'"
     end
 
     def run_in_container!(container:, cmd:, desc: nil)
-      builder.packager.command! [
+      builder.buildizer.command! [
         "docker exec #{container}",
         _wrap_docker_exec(cmd),
       ].join(' '), timeout: 24*60*60, desc: desc
     end
 
     def run_in_image!(target:, cmd:, env: {}, desc: nil)
-      builder.packager.command! [
+      builder.buildizer.command! [
         "docker run --rm",
-        *Array(_common_docker_params(target, env)),
+        *Array(_prepare_docker_params(target, env)),
         _wrap_docker_run(cmd),
       ].join(' '), timeout: 24*60*60, desc: desc
     end
 
-    def _common_docker_params(target, env)
+    def _prepare_docker_params(target, env)
+      target.image_extra_path.mkpath
+      target.image_build_path.mkpath
+
       [*env.map {|k,v| "-e #{k}=#{v}"},
-       "-v #{builder.packager.package_path}:#{container_package_mount_path}:ro",
+       "-v #{builder.buildizer.package_path}:#{container_package_mount_path}:ro",
        "-v #{target.image_extra_path}:#{container_extra_path}:ro",
        "-v #{target.image_build_path}:#{container_build_path}",
        target.image.name]

data/lib/buildizer/target/base.rb

@@ -30,10 +30,6 @@ module Buildizer
         @maintainer = maintainer
 
         yield if block_given?
-
-        image_work_path.mkpath
-        image_build_path.mkpath
-        image_extra_path.mkpath
       end
 
       def image_work_path
@@ -62,7 +58,7 @@ module Buildizer
       end
 
       def docker_image_repository
-        "buildizer/#{package_name}"
+        package_name
       end
 
       def docker_image_tag

data/lib/buildizer/version.rb

@@ -1,3 +1,3 @@
 module Buildizer
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end