buildizer 0.0.7 → 0.0.8

data/lib/buildizer/packager.rb

@@ -1,48 +1,39 @@
 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
 
+    include MiscMod
+    include ProjectSettingsMod
+    include UserSettingsMod
+    include CiMod
+    include BuildizerConfMod
+    include PackageVersionTagMod
+    include GitMod
+    include OvercommitMod
+    include PackageCloudMod
+    include DockerCacheMod
+
+    attr_reader :cli
     attr_reader :package_path
-    attr_reader :buildizer_conf_path
-    attr_reader :options_path
-    attr_reader :travis_path
     attr_reader :work_path
     attr_reader :debug
 
-    def initialize(options: {}, debug: false)
+    def initialize(cli)
+      @cli = cli
       @package_path = Pathname.new(ENV['BUILDIZER_PATH'] || '.').expand_path
-      @buildizer_conf_path = package_path.join('Buildizer')
-      @options_path = package_path.join('.buildizer.yml')
-      @travis_path = package_path.join('.travis.yml')
       @work_path = Pathname.new(ENV['BUILDIZER_WORK_PATH'] || '~/.buildizer').expand_path
-      @_options = options
-      @debug = ENV['BUILDIZER_DEBUG'].nil? ? debug : ENV['BUILDIZER_DEBUG'].to_s.on?
-    end
-
-    def initialized?
-      options_path.exist?
-    end
-
-    def enabled?
-      not (ENV['TRAVIS_TAG'] || ENV['CI_BUILD_TAG']).empty?
-    end
-
-    def init!
-      raise Error, error: :logical_error, message: "already initialized" if initialized?
-
-      git_precommit_init!
-      options_setup!
-      travis_setup!
-    end
-
-    def deinit!
-      raise Error, error: :logical_error, message: "not initialized" unless initialized?
-      options_path.delete
-      git_precommit_deinit!
-    end
-
-    def update!
-      travis_setup!
+      @debug = ENV['BUILDIZER_DEBUG'].nil? ? cli.options['debug'] : ENV['BUILDIZER_DEBUG'].to_s.on?
     end
 
     def prepare!
@@ -61,58 +52,6 @@ module Buildizer
       builder.verify
     end
 
-    def buildizer_conf
-      @buildizer_conf ||= (YAML.load((buildizer_conf_path.read rescue "")) || {})
-    end
-
-    def options
-      @options ||= (YAML.load(options_path.read) rescue {}).tap do |res|
-        @_options.each do |k, v|
-          res[k] = v unless v.nil?
-        end
-      end
-    end
-
-    def options_setup!
-      options_path.write YAML.dump(options)
-      @options = nil
-    end
-
-    def travis
-      @travis ||= (travis_path.exist? ? YAML.load(travis_path.read) : {})
-    rescue Psych::Exception => err
-      raise Error, error: :input_error, message: "bad travis config file #{file}: #{err.message}"
-    end
-
-    def travis_setup!
-      install = [
-        'sudo apt-get update',
-        'sudo apt-get install -y apt-transport-https ca-certificates',
-        'sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D',
-        'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list',
-        'sudo apt-get update',
-        'sudo apt-get -o dpkg::options::="--force-confnew" install -y docker-engine=1.9.1-0~trusty', # FIXME [https://github.com/docker/docker/issues/20316]
-        'echo "docker-engine hold" | sudo dpkg --set-selections',
-      ]
-      install.push(*Array(buildizer_install_instructions(latest: options['latest'])))
-
-      env = targets.map {|t| "BUILDIZER_TARGET=#{t}"}
-
-      travis_path.write YAML.dump(travis.merge(
-        'dist' => 'trusty',
-        'sudo' => 'required',
-        'cache' => 'apt',
-        'language' => 'ruby',
-        'rvm' => '2.2.1',
-        'install' => install,
-        'before_script' => 'buildizer prepare',
-        'script' => 'buildizer build',
-        'env' => env,
-        'after_success' => 'buildizer deploy',
-      ))
-      @travis = nil
-    end
-
     def git_hooks_path
       package_path.join('.git').join('hooks')
     end
@@ -129,122 +68,10 @@ module Buildizer
       git_old_hooks_path.join('pre-commit')
     end
 
-    def git_precommit_init!
-      if git_precommit_path.exist?
-        raise(Error,
-          error: :logical_error,
-          message: [
-            "unable to backup existing precommit script: ",
-            "file already exists: #{git_old_precommit_path}",
-          ].join) if git_old_precommit_path.exist?
-        git_old_hooks_path.mkpath
-        FileUtils.cp git_precommit_path, git_old_precommit_path
-      end
-
-      git_precommit_path.write <<-EOF
-#!/bin/bash
-buildizer update
-git add -v .travis.yml
-      EOF
-      git_precommit_path.chmod 0755
-    end
-
-    def git_precommit_deinit!
-      git_precommit_path.delete if git_precommit_path.exist?
-      FileUtils.cp git_old_precommit_path, git_precommit_path if git_old_precommit_path.exist?
-      git_old_hooks_path.rmtree if git_old_hooks_path.exist?
-    end
-
-    def package_name
-      buildizer_conf['package_name']
-    end
-
-    def package_version
-      buildizer_conf['package_version']
-    end
-
-    def package_version_tag_required_for_deploy?
-      ENV['BUILDIZER_REQUIRE_TAG'].to_s.on?
-    end
-
-    def package_version_tag
-      res = ENV['TRAVIS_TAG'] || ENV['CI_BUILD_TAG']
-      if res.nil? then res elsif res.empty? then nil else res end
-    end
-
-    def before_prepare
-      Array(buildizer_conf['before_prepare'])
-    end
-
-    def after_prepare
-      Array(buildizer_conf['after_prepare'])
-    end
-
-    def targets
-      targets = Array(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
-
-    def prepare
-      Array(buildizer_conf['prepare'])
-    end
-
-    def build_dep
-      Array(buildizer_conf['build_dep']).to_set
-    end
-
-    def before_build
-      Array(buildizer_conf['before_build'])
-    end
-
-    def docker_server
-      buildizer_conf['docker_server']
-    end
-
-    def docker_image
-      buildizer_conf['image']
-    end
-
-    def package_cloud_repo
-      ENV['PACKAGECLOUD'].to_s.split(',')
-    end
-
-    def package_cloud_org
-      default_token = ENV['PACKAGECLOUD_TOKEN']
-      package_cloud_repo.map {|repo| repo.split('/').first}.uniq.map do |org|
-        [org, ENV["PACKAGECLOUD_TOKEN_#{org.upcase}"] || default_token]
-      end.to_h
-    end
-
-    def package_cloud
-      tokens = package_cloud_org
-      package_cloud_repo.map do |repo|
-        org = repo.split('/').first
-        token = tokens[org]
-        {org: org, repo: repo, token: token}
-      end
-    end
-
-    def docker_cache
-      return unless org = ENV['BUILDIZER_DOCKER_CACHE']
-      {username: ENV['BUILDIZER_DOCKER_CACHE_USERNAME'],
-       password: ENV['BUILDIZER_DOCKER_CACHE_PASSWORD'],
-       email: ENV['BUILDIZER_DOCKER_CACHE_EMAIL'],
-       server: ENV['BUILDIZER_DOCKER_CACHE_SERVER'],
-       org: org}
-    end
-
-    def maintainer
-      buildizer_conf['maintainer']
-    end
-
     def builder
       @builder ||= begin
         build_type = buildizer_conf['build_type']
-        raise Error, error: :input_error, message: "build_type is not defined" unless build_type
+        raise Error, error: :input_error, message: "Buildizer build_type is not defined" unless build_type
         klass = {fpm: Builder::Fpm,
                  native: Builder::Native,
                  patch: Builder::Patch}[build_type.to_s.to_sym]
@@ -252,30 +79,5 @@ git add -v .travis.yml
         klass.new(self)
       end
     end
-
-    def buildizer_install_instructions(latest: nil)
-      if latest
-        ['git clone https://github.com/flant/buildizer ~/buildizer',
-         'echo "export BUNDLE_GEMFILE=~/buildizer/Gemfile" | tee -a ~/.bashrc',
-         'export BUNDLE_GEMFILE=~/buildizer/Gemfile',
-         'gem install bundler',
-         'bundle install',
-        ]
-      else
-        'gem install buildizer'
-      end
-    end
-
-    def command(*args, do_raise: false, **kwargs)
-      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
-      end
-    end
-
-    def command!(*args, **kwargs)
-      command(*args, do_raise: true, log_failure: true, **kwargs)
-    end
   end # Packager
 end # Buildizer

data/lib/buildizer/refine.rb

@@ -12,6 +12,31 @@ module Buildizer
       def on?
         ['1', 'true', 'yes'].include? self.downcase
       end
-    end
+
+      def off?
+        !on?
+      end
+    end # String
+
+    refine Pathname do
+      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
+    end # Pathname
+
+    refine TrueClass do
+      def to_env
+        'yes'
+      end
+    end # TrueClass
+
+    refine FalseClass do
+      def to_env
+        'no'
+      end
+    end # FalseClass
   end # Refine
 end # Buildizer

data/lib/buildizer/target/base.rb

@@ -62,7 +62,7 @@ module Buildizer
       end
 
       def docker_image_repository
-        "#{builder.packager.docker_image || "buildizer/#{package_name}"}"
+        "buildizer/#{package_name}"
       end
 
       def docker_image_tag
@@ -73,6 +73,10 @@ module Buildizer
         "#{docker_image_repository}:#{docker_image_tag}"
       end
 
+      def docker_cache_image
+        "#{image.docker.cache[:repo]}:#{docker_image_tag}" if image.docker.cache
+      end
+
       def package_cloud
         @package_cloud.map do |desc|
           desc.merge(package_path: _package_cloud_path(desc[:repo]))

data/lib/buildizer/version.rb

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

data/lib/buildizer.rb

@@ -4,12 +4,21 @@ require 'json'
 require 'net_status'
 require 'pathname'
 require 'shellfold'
+require 'travis'
+require 'travis/tools/github'
 
 require 'buildizer/version'
 require 'buildizer/refine'
 require 'buildizer/error'
 require 'buildizer/docker'
+require 'buildizer/ci'
+require 'buildizer/ci/base'
+require 'buildizer/ci/gitlab_ci'
+require 'buildizer/ci/travis'
 require 'buildizer/cli'
+require 'buildizer/cli/option_mod'
+require 'buildizer/cli/base'
+require 'buildizer/cli/main'
 require 'buildizer/packager'
 require 'buildizer/target'
 require 'buildizer/target/package_name_mod'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildizer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - flant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -90,6 +90,26 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.33.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.33.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +244,17 @@ files:
 - lib/buildizer/builder/fpm.rb
 - lib/buildizer/builder/native.rb
 - lib/buildizer/builder/patch.rb
+- lib/buildizer/ci.rb
+- lib/buildizer/ci/base.rb
+- lib/buildizer/ci/gitlab_ci.rb
+- lib/buildizer/ci/travis.rb
+- lib/buildizer/ci/travis/docker_cache_mod.rb
+- lib/buildizer/ci/travis/package_cloud_mod.rb
+- lib/buildizer/ci/travis/package_version_tag_mod.rb
 - lib/buildizer/cli.rb
+- lib/buildizer/cli/base.rb
+- lib/buildizer/cli/main.rb
+- lib/buildizer/cli/option_mod.rb
 - lib/buildizer/docker.rb
 - lib/buildizer/error.rb
 - lib/buildizer/image.rb
@@ -237,6 +267,16 @@ files:
 - lib/buildizer/image/ubuntu1404.rb
 - lib/buildizer/image/ubuntu1604.rb
 - lib/buildizer/packager.rb
+- lib/buildizer/packager/buildizer_conf_mod.rb
+- lib/buildizer/packager/ci_mod.rb
+- lib/buildizer/packager/docker_cache_mod.rb
+- lib/buildizer/packager/git_mod.rb
+- lib/buildizer/packager/misc_mod.rb
+- lib/buildizer/packager/overcommit_mod.rb
+- lib/buildizer/packager/package_cloud_mod.rb
+- lib/buildizer/packager/package_version_tag_mod.rb
+- lib/buildizer/packager/project_settings_mod.rb
+- lib/buildizer/packager/user_settings_mod.rb
 - lib/buildizer/refine.rb
 - lib/buildizer/target.rb
 - lib/buildizer/target/base.rb