akabei 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a344960f6cb67186fdad797fd77c3608492d389d
-  data.tar.gz: 7106dcb7cb0a6fc65d6539ac9ba302beb55f33cd
+  metadata.gz: 39a3493902116cd70169c7a1382cb5dad14706fa
+  data.tar.gz: 53206e6bee4946e2630bdf6595ca962c072507c6
 SHA512:
-  metadata.gz: 2daaa37e0ad5630f907e06c4a48f469ba27370278ad7793f07faef74548379856f294b8846160e801e7dd511e7d6e390b0d12532905e42d82508e560cb31c57f
-  data.tar.gz: ed557ee39ea6985bd629b6530c187e4a9946cc2f066639806e8d8ac99440dbd919a433544dcd7f71eb39a4f48421dc30a3ae86218be68fb9fec6458d4d4d8bd2
+  metadata.gz: 48ea7905fcac6b97925dd8d24deb305b615456a715c6dcd33925341a1f91aeecd540afc080138b8b9ff3ceb4a93aae430e6908359d721531a92bf108c2c123b2
+  data.tar.gz: 4058f0fb57b93b7df183de54bae4ef241fc483b47473d4b054b5443505236e13437f6fef92316dd9d67ae8ec0c823a53de18397d387a8dde1df2b662a9a94f71

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.2.1 (2014-01-19)
+- Fix Repository#add to remove old entry with same pkgname
+
 # 0.2.0 (2014-01-19)
 - Add omakase mode
     - akabei omakase init

data/lib/akabei/package.rb

@@ -36,10 +36,6 @@ module Akabei
       raise NotFound.new(@path, '.PKGINFO')
     end
 
-    def db_name
-      "#{pkgname}-#{pkgver}"
-    end
-
     def csize
       @path.size
     end

data/lib/akabei/package_entry.rb

@@ -65,6 +65,10 @@ module Akabei
       end
     end
 
+    def db_name
+      "#{name}-#{version}"
+    end
+
     def write_desc(io)
       ARRAY_DESC_ATTRIBUTES.each do |attr|
         write_array(io, attr)

data/lib/akabei/repository.rb

@@ -17,15 +17,7 @@ module Akabei
 
     extend Forwardable
     include Enumerable
-    def_delegator(:@db, :each)
-
-    def [](package_name)
-      @db.each do |_, entry|
-        if entry.name == package_name
-          return entry
-        end
-      end
-    end
+    def_delegators(:@db, :each, :[])
 
     def ==(other)
       other.is_a?(self.class) &&
@@ -38,21 +30,25 @@ module Akabei
       path = Pathname.new(path)
       return unless path.readable?
       verify!(path)
+      db = {}
       ArchiveUtils.each_entry(path) do |entry, archive|
-        pkgname, key = *entry.pathname.split('/', 2)
+        db_name, key = *entry.pathname.split('/', 2)
         if key.include?('/')
           raise Error.new("Malformed repository database: #{path}: #{entry.pathname}")
         end
-        @db[pkgname] ||= PackageEntry.new
+        db[db_name] ||= PackageEntry.new
         case key
         when ''
           # Ignore
         when 'desc', 'depends', 'files'
-          load_entries(@db[pkgname], archive.read_data)
+          load_entries(db[db_name], archive.read_data)
         else
           raise Error.new("Unknown repository database key: #{key}")
         end
       end
+      db.each_value do |entry|
+        @db[entry.name] = entry
+      end
       nil
     end
 
@@ -77,17 +73,11 @@ module Akabei
     end
 
     def add(package)
-      @db[package.db_name] = package.to_entry
+      @db[package.name] = package.to_entry
     end
 
     def remove(pkgname)
-      @db.keys.each do |key|
-        if @db[key].name == pkgname
-          @db.delete(key)
-          return true
-        end
-      end
-      false
+      @db.delete(pkgname)
     end
 
     def verify!(path)
@@ -114,8 +104,8 @@ module Akabei
     end
 
     def store_tree(topdir)
-      @db.each do |db_name, pkg_entry|
-        pkgdir = topdir.join(db_name)
+      @db.each_value do |pkg_entry|
+        pkgdir = topdir.join(pkg_entry.db_name)
         pkgdir.mkpath
         pkgdir.join('desc').open('w') do |f|
           pkg_entry.write_desc(f)
@@ -132,15 +122,15 @@ module Akabei
     end
 
     def create_db(topdir, archive)
-      @db.keys.sort.each do |db_name|
-        pkg_entry = @db[db_name]
+      @db.keys.sort.each do |pkgname|
+        pkg_entry = @db[pkgname]
         archive.new_entry do |entry|
-          entry.pathname = "#{db_name}/"
+          entry.pathname = "#{pkg_entry.db_name}/"
           entry.copy_stat(topdir.join(entry.pathname).to_s)
           archive.write_header(entry)
         end
         %w[desc depends files].each do |fname|
-          pathname = "#{db_name}/#{fname}"
+          pathname = "#{pkg_entry.db_name}/#{fname}"
           path = topdir.join(pathname)
           if path.readable?
             archive.new_entry do |entry|

data/lib/akabei/version.rb

@@ -1,3 +1,3 @@
 module Akabei
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/akabei/cli_spec.rb

@@ -19,7 +19,7 @@ describe Akabei::CLI do
       # Disable warning
       entry.add('files', 'usr/bin/nkf')
 
-      allow(package).to receive(:db_name).and_return('nkf-2.1.3-1')
+      allow(package).to receive(:name).and_return('nkf')
       allow(package).to receive(:to_entry).and_return(entry)
 
       allow_any_instance_of(Akabei::ChrootTree).to receive(:with_chroot) { |chroot, &block|

data/spec/akabei/omakase/cli_spec.rb

@@ -80,7 +80,7 @@ describe Akabei::Omakase::CLI do
       tar('xf', test_input('nkf.tar.gz').to_s, '-C', config.pkgbuild.to_s)
 
       packages.each do |arch, package|
-        allow(package).to receive(:db_name).and_return('nkf-2.1.3-1')
+        allow(package).to receive(:name).and_return('nkf')
         allow(package).to receive(:to_entry).and_return(entry)
         allow(package).to receive(:path).and_return(Pathname.new("test/os/#{arch}/nkf-2.1.3-1-#{arch}.pkg.tar.xz"))
       end

data/spec/akabei/package_spec.rb

@@ -8,7 +8,8 @@ describe Akabei::Package do
   describe '#pkginfo' do
     it 'returns PackageInfo' do
       pkginfo = package.pkginfo
-      expect(package.db_name).to eq('nkf-2.1.3-1')
+      expect(package.name).to eq('nkf')
+      expect(package.version).to eq('2.1.3-1')
     end
 
     context "when pkg_path doesn't exist" do

data/spec/akabei/repository_spec.rb

@@ -81,13 +81,33 @@ describe Akabei::Repository do
     it 'adds an entry' do
       package = double('package')
       entry = double('entry')
-      allow(package).to receive(:db_name).and_return('nkf-2.1.3-1')
+      allow(package).to receive(:name).and_return('nkf')
       expect(package).to receive(:to_entry).and_return(entry)
       allow(entry).to receive(:name).and_return('nkf')
 
       repo.add(package)
       expect(repo['nkf']).to eql(entry)
     end
+
+    context 'with old version' do
+      let(:old_package) { double('old package') }
+      let(:old_entry) { double('old entry') }
+
+      before do
+        allow(old_package).to receive(:name).and_return('nkf')
+        allow(old_package).to receive(:to_entry).and_return(old_entry)
+        repo.add(old_package)
+      end
+
+      it 'replaces old version' do
+        package = double('package')
+        entry = double('entry')
+        allow(package).to receive(:name).and_return('nkf')
+        allow(package).to receive(:to_entry).and_return(entry)
+
+        expect { repo.add(package) }.to change { repo['nkf'] }.from(old_entry).to(entry)
+      end
+    end
   end
 
   describe '#remove' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akabei
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kohei Suzuki