rpm 0.0.3 → 0.0.4

data/ChangeLog

@@ -1,4 +1,9 @@
 
+2013-10-24  Duncan Mac-Vicar P. <dmacvicar@suse.de>
+
+* v0.0.4
+* Bugfix: too many open files on transaction with blocks
+
 2012-02-23  Duncan Mac-Vicar P. <dmacvicar@suse.de>
 
   * RPM::FFI module is now RPM::C

data/lib/rpm.rb

@@ -31,9 +31,13 @@ module RPM
   #   end
   #
   def self.transaction(root = '/')
-    ts = Transaction.new
-    ts.root_dir = root
-    yield ts
+    begin
+      ts = Transaction.new
+      ts.root_dir = root
+      yield ts
+    ensure
+      ts.ptr.free
+    end
   end
 
   # @param [String] name Name of the macro

data/lib/rpm/c/rpmfi.rb

@@ -7,7 +7,7 @@ module RPM
       :none, 0,
       :config, (1 << 0),
       :doc, (1 << 1),
-      :icon, (1 <<2),
+      :icon, (1 << 2),
       :missingok, (1 << 3),
       :noreplace, (1 << 4),
       :specfile, (1 << 5),

data/lib/rpm/file.rb

@@ -34,17 +34,17 @@ module RPM
 
     # @return [Boolean] True if the file is marked as a configuration file
     def config?
-      ! (@attr & FileAttrs[:config]).zero?
+      ! (@attr & RPM::C::FileAttrs[:config]).zero?
     end
 
     # @return [Boolean] True if the file is marked as documentation
     def doc?
-      ! (@attr & FileAttrs[:doc]).zero?
+      ! (@attr & RPM::C::FileAttrs[:doc]).zero?
     end
 
     # @return [Boolean] True if the file is marked as do not use
     def donotuse?
-      ! (@attr & FileAttrs[:donotuse]).zero?
+      ! (@attr & RPM::C::FileAttrs[:donotuse]).zero?
     end
 
     # @return [Boolean] True if the file is marked that can be missing on disk
@@ -52,7 +52,7 @@ module RPM
     # This modifier is used for files or links that are created during the %post scripts
     # but will need to be removed if the package is removed
     def is_missingok?
-      ! (@attr & FileAttrs[:missingok]).zero?
+      ! (@attr & RPM::C::FileAttrs[:missingok]).zero?
     end
 
     # @return [Boolean] True if the file is marked as configuration not to be replaced
@@ -63,12 +63,12 @@ module RPM
     #   if the file has been modified on disk, the rpm command will copy the new file with an extra
     #   file-name extension of .rpmnew.
     def is_noreplace?
-      ! (@attr & FileAttrs[:noreplace]).zero?
+      ! (@attr & RPM::C::FileAttrs[:noreplace]).zero?
     end
 
     # @return [Boolean] True if the file is marked as a spec file
     def is_specfile?
-      ! (@attr & FileAttrs[:specfile]).zero?
+      ! (@attr & RPM::C::FileAttrs[:specfile]).zero?
     end
 
     # @return [Boolean] True if the file is marked as ghost
@@ -78,37 +78,37 @@ module RPM
     #   will create.
     # For example, you may want to ensure that a program’s log file has certain attributes.
     def ghost?
-      ! (@attr & FileAttrs[:ghost]).zero?
+      ! (@attr & RPM::C::FileAttrs[:ghost]).zero?
     end
 
     # @return [Boolean] True if the file is a license
     def license?
-      ! (@attr & FileAttrs[:license]).zero?
+      ! (@attr & RPM::C::FileAttrs[:license]).zero?
     end
 
     # @return [Boolean] True if the file is a README
     def readme?
-      ! (@attr & FileAttrs[:readme]).zero?
+      ! (@attr & RPM::C::FileAttrs[:readme]).zero?
     end
 
     # @return [Boolean] True if the file is listed in the exlude section
     def exclude?
-      ! (@attr & FileAttrs[:exclude]).zero?
+      ! (@attr & RPM::C::FileAttrs[:exclude]).zero?
     end
 
     # @return [Boolean] True if the file is replaced during installation
     def replaced?
-      ! (@attr & FileState[:replaced]).zero?
+      ! (@attr & RPM::C::FileState[:replaced]).zero?
     end
 
     # @return [Boolean] True if the file is not installed
     def notinstalled?
-      ! (@attr & FileState[:notinstalled]).zero?
+      ! (@attr & RPM::C::FileState[:notinstalled]).zero?
     end
 
     # @return [Boolean] True if the file is shared over the network
     def netshared?
-      ! (@attr & FileState[:netshared]).zero?
+      ! (@attr & RPM::C::FileState[:netshared]).zero?
     end
 
     def initialize(path, md5sum, link_to, size, mtime, owner, group, rdev, mode, attr, state)

data/lib/rpm/gem_version.rb

@@ -3,5 +3,5 @@
 # is because it conflicts with the version.rb class
 module RPM
   PKG_NAME = "ruby-rpm"
-  GEM_VERSION = "0.0.3"
+  GEM_VERSION = "0.0.4"
 end

data/test/test_file.rb

@@ -8,5 +8,25 @@ class RPM_File_Tests < Test::Unit::TestCase
     f = RPM::File.new("path", "md5sum", "link_to", 42, 1, 
                       "owner", "group", 43, 0777, 44, 45)
     assert_equal("link_to", f.link_to)
-    end
+  end
+
+  def test_flags
+    f = RPM::File.new("path", "md5sum", nil, 42, 1, 
+                      "owner", "group", 43, 0777, 44, 45)
+    f.config?
+    f.doc?
+    f.donotuse?
+    f.is_missingok?
+    f.is_noreplace?
+    f.is_specfile?
+    f.ghost?
+    f.license?
+    f.readme?
+    f.exclude?
+    f.replaced?
+    f.notinstalled?
+    f.netshared?
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20015700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *20015700
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20034180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *20034180
 description: Ruby bindings for rpm. Almost a drop-in replacement for ruby-rpm. Uses
   FFI.
 email:
@@ -122,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rpm
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for rpm (package manager)