akabei 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573c7770c6f4880b4805deecf432dd1d893435fa
-  data.tar.gz: 5ba638d8e424de0d86b570ee3f4060d15100d08d
+  metadata.gz: a344960f6cb67186fdad797fd77c3608492d389d
+  data.tar.gz: 7106dcb7cb0a6fc65d6539ac9ba302beb55f33cd
 SHA512:
-  metadata.gz: a89b4bdce9f46c869a90e255f07d124bd3f27bdea251de7593a5d93e938532b07aab9aea16f882148e5e684ef0576b65ac0db5e125d551c7350094cb4cb200a9
-  data.tar.gz: b93ee03dffba2e814da2f38e6077b4fa4865776f658ada381af69df06afd7d1b165ddec623e34aab4a3755a0ef537b7c4aeafaf00fffa6145290f72c606758c4
+  metadata.gz: 2daaa37e0ad5630f907e06c4a48f469ba27370278ad7793f07faef74548379856f294b8846160e801e7dd511e7d6e390b0d12532905e42d82508e560cb31c57f
+  data.tar.gz: ed557ee39ea6985bd629b6530c187e4a9946cc2f066639806e8d8ac99440dbd919a433544dcd7f71eb39a4f48421dc30a3ae86218be68fb9fec6458d4d4d8bd2

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# 0.2.0 (2014-01-19)
+- Add omakase mode
+    - akabei omakase init
+    - akabei omakase init --s3
+    - akabei omakase build
+
+# 0.1.0 (2014-01-17)
+- Initial release
+    - akabei build
+    - akabei abs-add
+    - akabei abs-remove
+    - akabei files-add
+    - akabei files-remove
+    - akabei repo-add
+    - akabei repo-remove

data/README.md

@@ -1,4 +1,5 @@
 # Akabei
+[![Gem Version](https://badge.fury.io/rb/akabei.png)](http://badge.fury.io/rb/akabei)
 [![Build Status](https://secure.travis-ci.org/eagletmt/akabei.png)](https://travis-ci.org/eagletmt/akabei)
 [![Code Climate](https://codeclimate.com/github/eagletmt/akabei.png)](https://codeclimate.com/github/eagletmt/akabei)
 [![Coverage Status](https://coveralls.io/repos/eagletmt/akabei/badge.png)](https://coveralls.io/r/eagletmt/akabei)
@@ -46,6 +47,82 @@ foo-1.0.0.tar.gz
 foo-1.0.0-1-x86_64-build.log  foo-1.0.0-1-x86_64-package.log
 ```
 
+## Omakase mode
+Omakase mode supports a typical situation managing the custom repository.
+
+### Initialize a repository
+`--repo-key` and `--package-key` are optional.
+
+```
+% akabei omakase init foo --repo-key $GPGKEY --package-key $GPGKEY
+      create  .akabei.yml
+      create  foo
+      create  sources
+      create  logs
+      create  PKGBUILDs
+      create  etc
+      create  etc/makepkg.i686.conf
+      create  etc/pacman.i686.conf
+      create  etc/makepkg.x86_64.conf
+      create  etc/pacman.x86_64.conf
+Edit etc/makepkg.*.conf and set PACKAGER first!
+% echo 'PACKAGER="John Doe <john@doe.com>"' >> etc/makepkg.i686.conf
+% echo 'PACKAGER="John Doe <john@doe.com>"' >> etc/makepkg.x86_64.conf
+```
+
+### Build a package
+Write a PKGBUILD in `PKGBUILDs/#{pkgname}` directory.
+
+```
+% mkdir PKGBUILDs/bar
+% vim PKGBUILDs/bar/PKGBUILD
+```
+
+Then build the package.
+
+```
+% akabei omakase build bar
+(snip)
+% tree foo
+foo
+`-- os
+    |-- i686
+    |   |-- bar-1.0.0-1-i686.pkg.tar.xz
+    |   |-- bar-1.0.0-1-i686.pkg.tar.xz.sig
+    |   |-- foo.abs.tar.gz
+    |   |-- foo.db
+    |   |-- foo.db.sig
+    |   `-- foo.files
+    `-- x86_64
+        |-- bar-1.0.0-1-x86_64.pkg.tar.xz
+        |-- bar-1.0.0-1-x86_64.pkg.tar.xz.sig
+        |-- foo.abs.tar.gz
+        |-- foo.db
+        |-- foo.db.sig
+        `-- foo.files
+```
+
+### Publish the repository
+For the server, serve files under the foo directory by HTTP server like nginx or Apache.
+
+For clients, add the server's repository configuration to /etc/pacman.conf like below.
+
+```
+[foo]
+SigLevel = Required
+Server = http://example.com/$repo/os/$arch
+```
+
+### Publish the repository (Amazon S3)
+Initialize repository with `--s3` option and set your credentials to .akabei.yml.
+aws-sdk gem is required.
+
+Each time you execute `akabei omakase build`:
+
+1. Download repository databases (not including packages)
+2. Build a package
+3. Upload the built package and repository databases.
+
 ## Contributing
 
 1. Fork it ( https://github.com/eagletmt/akabei/fork )

data/Rakefile

@@ -12,3 +12,31 @@ namespace :spec do
   desc 'Run RSpec examples including :arch. It requires sudo and devtools package.'
   task :arch => %w[spec:set_arch spec]
 end
+
+namespace :template do
+  desc 'Update makepkg.conf and pacman.conf'
+  task :update do
+    h = `LANG=C pacman -Qi pacman`.each_line.map(&:chomp).each_with_object({}) do |line, h|
+      next if line.empty?
+      m = line.match(/\A([^:]+?)\s*:\s*(.+)\z/)
+      h[m[1]] = m[2]
+    end
+    current_pacman = h['Version']
+
+    require 'akabei/archive_utils'
+    cache_dir = '/var/cache/pacman/pkg'
+    template_dir = Pathname.new(__FILE__).join('../lib/akabei/omakase/templates')
+    %w[i686 x86_64].each do |arch|
+      Akabei::ArchiveUtils.each_entry("#{cache_dir}/pacman-#{current_pacman}-#{arch}.pkg.tar.xz") do |entry, archive|
+        case entry.pathname
+        when 'etc/makepkg.conf'
+          puts "Update makepkg.#{arch}.conf"
+          template_dir.join("makepkg.#{arch}.conf").open('w') { |f| f.write(archive.read_data) }
+        when 'etc/pacman.conf'
+          puts "Update pacman.#{arch}.conf"
+          template_dir.join("pacman.#{arch}.conf").open('w') { |f| f.write(archive.read_data) }
+        end
+      end
+    end
+  end
+end

data/akabei.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "gpgme"
   spec.add_dependency "libarchive"
+  spec.add_dependency "safe_yaml"
   spec.add_dependency "thor"
+  spec.add_development_dependency "aws-sdk"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake"

data/lib/akabei/build_helper.rb

@@ -0,0 +1,15 @@
+module Akabei
+  module BuildHelper
+    def build_in_chroot(builder, chroot, repo_db, repo_files, abs, package_dir)
+      chroot.with_chroot do
+        packages = builder.build_package(package_dir, chroot)
+        packages.each do |package|
+          repo_db.add(package)
+          repo_files.add(package)
+        end
+        abs.add(package_dir, builder)
+        packages
+      end
+    end
+  end
+end

data/lib/akabei/builder.rb

@@ -10,6 +10,13 @@ module Akabei
     attr_path_accessor :srcdest, :pkgdest, :logdest
     attr_accessor :signer
 
+    def initialize(opts = {})
+      self.srcdest = opts[:srcdest]
+      self.pkgdest = opts[:pkgdest]
+      self.logdest = opts[:logdest]
+      self.signer = opts[:signer]
+    end
+
     def build_package(dir, chroot_tree)
       Dir.mktmpdir do |tmp_pkgdest|
         wrap_dir(:srcdest) do

data/lib/akabei/chroot_tree.rb

@@ -13,6 +13,7 @@ module Akabei
       end
     end
 
+    attr_reader :root, :arch
     extend AttrPath
     attr_path_accessor :makepkg_config, :pacman_config
 

data/lib/akabei/cli.rb

@@ -1,6 +1,8 @@
 require 'akabei/abs'
+require 'akabei/build_helper'
 require 'akabei/builder'
 require 'akabei/chroot_tree'
+require 'akabei/omakase/cli'
 require 'akabei/package'
 require 'akabei/repository'
 require 'akabei/signer'
@@ -41,6 +43,7 @@ module Akabei
     end
     extend CommonOptions
 
+    include BuildHelper
     desc 'build DIR', 'Build package in chroot environment'
     option :chroot_dir,
       desc: 'Path to chroot top',
@@ -75,44 +78,28 @@ module Akabei
     common_options :repo_name, :repo_key, :srcdest
     def build(package_dir)
       chroot = ChrootTree.new(options[:chroot_dir], options[:arch])
-      if options[:makepkg_config]
-        chroot.makepkg_config = options[:makepkg_config]
-      end
-      if options[:pacman_config]
-        chroot.pacman_config = options[:pacman_config]
-      end
-
-      repo_db = Repository.new
-      repo_db.signer = options[:repo_key] && Signer.new(options[:repo_key])
-      repo_files = Repository.new
-      repo_files.include_files = true
-
-      builder = Builder.new
-      builder.signer = options[:package_key] && Signer.new(options[:package_key])
-      builder.srcdest = options[:srcdest]
-      builder.logdest = options[:logdest]
+      chroot.makepkg_config = options[:makepkg_config]
+      chroot.pacman_config = options[:pacman_config]
 
       repo_path = Pathname.new(options[:repo_dir])
       repo_name = options[:repo_name]
-      builder.pkgdest = repo_path
+      builder = Builder.new(
+        signer: Signer.get(options[:package_key]),
+        srcdest: options[:srcdest],
+        logdest: options[:logdest],
+        pkgdest: repo_path,
+      )
 
       db_path = repo_path.join("#{repo_name}.db")
       files_path = repo_path.join("#{repo_name}.files")
-      repo_db.load(db_path)
-      repo_files.load(files_path)
+      repo_db = Repository.load(db_path, signer: Signer.get(options[:repo_key]))
+      repo_files = Repository.load(files_path, include_files: true)
 
       abs = Abs.new(repo_path.join("#{repo_name}.abs.tar.gz"), repo_name)
 
-      chroot.with_chroot do
-        packages = builder.build_package(package_dir, chroot)
-        packages.each do |package|
-          repo_db.add(package)
-          repo_files.add(package)
-        end
-        abs.add(package_dir, builder)
-        repo_db.save(db_path)
-        repo_files.save(files_path)
-      end
+      build_in_chroot(builder, chroot, repo_db, repo_files, abs, package_dir)
+      repo_db.save(db_path)
+      repo_files.save(files_path)
     end
 
     desc 'abs-add DIR ABS_TARBALL', 'Add the package inside DIR to ABS_TARBALL'
@@ -168,5 +155,7 @@ module Akabei
       repo.remove(package_name)
       repo.save(db_path)
     end
+
+    Akabei::CLI.register(Akabei::Omakase::CLI, 'omakase', 'omakase <command>', 'Omakase mode')
   end
 end

data/lib/akabei/omakase/cli.rb

@@ -0,0 +1,116 @@
+require 'akabei/build_helper'
+require 'akabei/omakase/config'
+require 'akabei/omakase/s3'
+require 'thor'
+
+module Akabei
+  module Omakase
+    class CLI < Thor
+      namespace :omakase
+
+      include Thor::Actions
+      include Thor::Shell
+      include BuildHelper
+
+      def self.source_root
+        File.expand_path('../templates', __FILE__)
+      end
+
+      def self.banner(task, namespace = nil, subcommand = false)
+        super(task, nil, true)
+      end
+
+      desc 'init NAME', "Generate omakase template for NAME repository"
+      option :repo_key,
+        desc: 'GPG key to sign repository database',
+        banner: 'GPGKEY',
+        type: :string
+      option :package_key,
+        desc: 'GPG key to sign repository database',
+        banner: 'GPGKEY',
+        type: :string
+      option :s3,
+        desc: 'Enable S3 repository',
+        type: :boolean,
+        default: false
+      def init(name)
+        # Check key's validity
+        if options[:repo_key]
+          Signer.new(options[:repo_key])
+        end
+        if options[:package_key]
+          Signer.new(options[:package_key])
+        end
+
+        if options[:s3]
+          begin
+            require 'aws-sdk'
+          rescue LoadError => e
+            say("WARNING: You don't have aws-sdk installed. Disable S3 repository.", :yellow)
+            options[:s3] = false
+          end
+        end
+
+        @name = name
+        @archs = %w[i686 x86_64]
+        template('.akabei.yml.tt')
+        empty_directory(name)
+        empty_directory('sources')
+        empty_directory('logs')
+        empty_directory('PKGBUILDs')
+        empty_directory('etc')
+        @archs.each do |arch|
+          copy_file("makepkg.#{arch}.conf", "etc/makepkg.#{arch}.conf")
+          copy_file("pacman.#{arch}.conf", "etc/pacman.#{arch}.conf")
+        end
+
+        say('Edit etc/makepkg.*.conf and set PACKAGER first!', :green)
+      end
+
+      desc 'build PACKAGE_NAME', "build PACKAGE_NAME"
+      def build(package_name)
+        builder = Builder.new(
+          signer: config.package_signer,
+          srcdest: config.srcdest,
+          logdest: config.logdest,
+        )
+        repo_signer = config.repo_signer
+
+        s3 = S3.new(config['s3'], shell)
+
+        config.builds.each do |arch, config_file|
+          chroot = ChrootTree.new(nil, arch)
+          chroot.makepkg_config = config_file['makepkg']
+          chroot.pacman_config = config_file['pacman']
+
+          repo_path = config.repo_path(arch)
+          repo_path.mkpath
+          builder.pkgdest = repo_path
+
+          db_path = config.db_path(arch)
+          files_path = config.files_path(arch)
+          abs = Abs.new(config.abs_path(arch), config.name)
+
+          s3.before!(config, arch)
+          repo_db = Repository.load(db_path, signer: repo_signer)
+          repo_files = Repository.load(files_path, include_files: true)
+
+          packages = build_in_chroot(builder, chroot, repo_db, repo_files, abs, config.package_dir(package_name))
+          repo_db.save(db_path)
+          repo_files.save(files_path)
+          s3.after!(config, arch, packages)
+        end
+      end
+
+      private
+
+      def config
+        @config ||= begin
+          c = Config.load
+          c.validate!
+          c
+        end
+      end
+    end
+  end
+end

data/lib/akabei/omakase/config.rb

@@ -0,0 +1,113 @@
+require 'akabei/error'
+require 'akabei/signer'
+require 'forwardable'
+require 'safe_yaml/load'
+
+module Akabei
+  module Omakase
+    class Config
+      class InvalidConfig < Error
+      end
+
+      FILE_NAME = '.akabei.yml'
+
+      def self.load
+        config = new
+        config.load(FILE_NAME)
+        config
+      end
+
+      extend Forwardable
+      def_delegators :@config, :[], :each
+      include Enumerable
+
+      def initialize
+        @config = {}
+      end
+
+      def load(path)
+        @config.merge!(SafeYAML.load_file(path, deserialize_symbols: true))
+        true
+      rescue Errno::ENOENT
+        false
+      end
+
+      REQUIRED_ATTRIBUTES = %w[
+        name
+        package_key
+        repo_key
+        srcdest
+        logdest
+        pkgbuild
+      ].freeze
+      REQUIRED_BUILD_ATTRIBUTES = %w[makepkg pacman]
+
+      def validate!
+        REQUIRED_ATTRIBUTES.each do |attr|
+          unless @config.has_key?(attr)
+            raise InvalidConfig.new("#{attr.inspect} is required")
+          end
+        end
+        unless @config['builds'].is_a?(Hash)
+          raise InvalidConfig.new('"builds" must be a Hash')
+        end
+        @config['builds'].each do |arch, config_file|
+          REQUIRED_BUILD_ATTRIBUTES.each do |attr|
+            unless config_file.has_key?(attr)
+              raise InvalidConfig.new("builds.#{arch}: #{attr.inspect} is required")
+            end
+          end
+        end
+        true
+      end
+
+      def name
+        @config['name']
+      end
+
+      def srcdest
+        Pathname.new(@config['srcdest'])
+      end
+
+      def logdest
+        Pathname.new(@config['logdest'])
+      end
+
+      def pkgbuild
+        Pathname.new(@config['pkgbuild'])
+      end
+
+      def package_dir(package_name)
+        pkgbuild.join(package_name)
+      end
+
+      def package_signer
+        Signer.get(@config['package_key'])
+      end
+
+      def repo_signer
+        Signer.get(@config['repo_key'])
+      end
+
+      def builds
+        @config['builds']
+      end
+
+      def repo_path(arch)
+        Pathname.new(@config['name']).join('os', arch)
+      end
+
+      def db_path(arch)
+        repo_path(arch).join("#{@config['name']}.db")
+      end
+
+      def files_path(arch)
+        repo_path(arch).join("#{@config['name']}.files")
+      end
+
+      def abs_path(arch)
+        repo_path(arch).join("#{@config['name']}.abs.tar.gz")
+      end
+    end
+  end
+end