akabei 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52604057edd7d358099dee7d00be7e1f4a82a4b0
-  data.tar.gz: bd75e223fcefc7464911e31b588abaa9b587858d
+  metadata.gz: 37430f6491dee2d877942915bc0a25bc7ea85faf
+  data.tar.gz: 69449642a9808f4227477c2e4647bd6a5502ec1e
 SHA512:
-  metadata.gz: ae4b2aa2c1894092876336e80a112cc8d801f7bc4bd977c1b40645f3f17e41f7ec78eef9bec9239c631b080e7d26a64411c52ffc70903cd2c5fdad7d42fb3c66
-  data.tar.gz: 935f90dd05513568b2b6709fa58b10ede079cf5318fa9b2a349cdee8d1341f405cb79b29f28977f0baaf219cd12735fefdba8999d4880ac5c2b5bde0b75d0923
+  metadata.gz: b4f279daae2e2dcae04e44aadc454f00102aa25390409982dc7112322e29e38bb483b7d8217fcc4cc717a2268575a8f795c91fa2adf84b51df68ff326aea4930
+  data.tar.gz: d8db38d394e73ced5c95f11b35ca3a79e880c7da8874e5ea73876c1e7b83177915cd4f7073713881238484c124bb9e6554ed30c9ee745e9ae352d4d63c4e5db9

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
+addons:
+  apt:
+    packages:
+      - libarchive-dev
 before_install:
-  - sudo apt-get install -y libarchive-dev
+  - gem update bundler
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.5.0 (2016-01-10)
+- Add `chroot` option to .akabei.yml
+
 # 0.4.1 (2015-01-10)
 - Do not depend on aws-sdk-resources
 

data/README.md

@@ -1,8 +1,8 @@
 # Akabei
-[![Gem Version](https://badge.fury.io/rb/akabei.png)](http://badge.fury.io/rb/akabei)
+[![Gem Version](https://badge.fury.io/rb/akabei.svg)](https://badge.fury.io/rb/akabei)
 [![Build Status](https://api.travis-ci.org/eagletmt/akabei.svg)](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)
+[![Code Climate](https://codeclimate.com/github/eagletmt/akabei.svg)](https://codeclimate.com/github/eagletmt/akabei)
+[![Coverage Status](https://img.shields.io/coveralls/eagletmt/akabei.svg)](https://coveralls.io/r/eagletmt/akabei)
 
 Custom repository manager for ArchLinux pacman.
 

data/lib/akabei/chroot_tree.rb

@@ -11,7 +11,7 @@ module Akabei
     attr_path_accessor :makepkg_config, :pacman_config
 
     def initialize(root, arch)
-      @root = root && Pathname.new(root)
+      @root = root && Pathname.new(root).realpath
       @arch = arch
     end
 
@@ -19,7 +19,9 @@ module Akabei
 
     def with_chroot(&block)
       if @root
-        mkarchroot(BASE_PACKAGES)
+        unless @root.join('root').directory?
+          mkarchroot(BASE_PACKAGES)
+        end
         block.call
       else
         @root = Pathname.new(Dir.mktmpdir)

data/lib/akabei/omakase/cli.rb

@@ -78,7 +78,7 @@ module Akabei
         s3 = S3.new(config['s3'], shell)
 
         config.builds.each do |arch, config_file|
-          chroot = ChrootTree.new(nil, arch)
+          chroot = ChrootTree.new(config_file['chroot'], arch)
           chroot.makepkg_config = config_file['makepkg']
           chroot.pacman_config = config_file['pacman']
 

data/lib/akabei/omakase/templates/.akabei.yml.tt

@@ -10,6 +10,9 @@ builds:
   <%= arch %>:
     makepkg: etc/makepkg.<%= arch %>.conf
     pacman: etc/pacman.<%= arch %>.conf
+    # Uncomment the following line to keep chroot directory.
+    # btrfs users are recommended to uncomment it.
+    # chroot: ../<%= arch %>-root
 <%- end -%>
 s3:
 <%- if options[:s3] -%>

data/lib/akabei/version.rb

@@ -1,3 +1,3 @@
 module Akabei
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/spec_helper.rb

@@ -75,26 +75,6 @@ module TarHelpers
   end
 end
 
-module ArrayStartingWith
-  class Matcher
-    def initialize(expected)
-      @expected = expected
-    end
-
-    def description
-      "array_starting_with(#{@expected.join(',')})"
-    end
-
-    def ==(actual)
-      actual[0 ... @expected.length] == @expected
-    end
-  end
-
-  def array_starting_with(expected)
-    Matcher.new(expected)
-  end
-end
-
 module IntegrationSpecHelper
   def akabei(*cmd)
     system(File.expand_path('../../bin/akabei', __FILE__), *cmd)
@@ -103,7 +83,7 @@ end
 
 module BuildSpecHelper
   def setup_command_expectations(arch, package_dir)
-    expect(Akabei::System).to receive(:sudo).with(array_starting_with(['mkarchroot']), hash_including(arch: arch))
+    expect(Akabei::System).to receive(:sudo).with(start_with('mkarchroot'), hash_including(arch: arch))
     expect(Akabei::System).to receive(:sudo).with(['rm', '-rf', anything], {})
 
     expect(Akabei::System).to receive(:sudo).with(['makechrootpkg', '-cur', anything], hash_including(arch: arch, chdir: package_dir)) { |args, opts|
@@ -143,6 +123,5 @@ RSpec.configure do |config|
   config.include OutputHelpers
   config.include TarHelpers
   config.include IntegrationSpecHelper
-  config.include ArrayStartingWith
   config.include BuildSpecHelper
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akabei
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpgme
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Custom repository manager for ArchLinux pacman