rpm 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+before_install:
+  - sudo apt-get install rpm
+  - sudo apt-get install -y -q fakeroot fakechroot
+  - sudo apt-get install -y -q locales
+  - sudo locale-gen es_ES.utf8
+rvm:
+  - 1.9.3
+script: fakechroot rake
+

data/ChangeLog

@@ -0,0 +1,5 @@
+
+2012-02-23  Duncan Mac-Vicar P. <dmacvicar@suse.de>
+
+  * RPM::FFI module is now RPM::C
+  * implement Trasaction#commit, Trasaction#install, Trasaction#upgrade,

data/README.rdoc

@@ -34,6 +34,16 @@ This is an alpha release! There is still work to be done
       end
     end
 
+== Install a package
+
+    require 'rpm'
+    pkg = RPM::Package.open('foo.rpm')
+
+    RPM.transaction(rootdir) do |t|   
+      t.install(pkg, 'foo.rpm')
+      t.commit
+    end
+
 = Introduction
 
 This library is a replacement for the ruby-rpm gem, originally
@@ -65,7 +75,7 @@ from 1130 lines of code to 320.
 
 The gem is divided in two modules:
 
-* RPM::FFI:: which contains the 1:1 mapping to the librpm API
+* RPM::C:: which contains the 1:1 mapping to the librpm API
   Not all functions are attached, only the ones we actually use.
 * RPM:: contains the actual higher level API
 

data/lib/rpm/{ffi → c}/header.rb

@@ -1,7 +1,7 @@
 
 module RPM
 
-  module FFI
+  module C
 
     typedef :pointer, :header
 

data/lib/rpm/c/rpmcallback.rb

@@ -0,0 +1,28 @@
+
+module RPM
+  module C
+
+    CallbackType = enum(:rpmCallbackType, [
+      :unknown,         0,
+      :inst_progress,   (1 << 0),
+      :inst_start,      (1 << 1),
+      :inst_open_file,  (1 << 2), 
+      :inst_close_file, (1 << 3),
+      :trans_progress,  (1 << 4),
+      :trans_start,     (1 <<  5),
+      :trans_stop,      (1 <<  6),
+      :uninst_progress, (1 <<  7),
+      :uninst_start,    (1 <<  8),
+      :uninst_stop,        (1 << 9),
+      :repackage_progress, (1 << 10),
+      :repackage_start,    (1 << 11),
+      :repackage_stop,     (1 << 12),
+      :unpack_error,       (1 << 13),
+      :cpio_error,         (1 << 14),
+      :script_error,       (1 << 15) ])
+
+    typedef :pointer, :rpmCallbackData
+    callback :rpmCallbackFunction, [:pointer, :rpmCallbackType, :rpm_loff_t, :rpm_loff_t, :fnpyKey, :rpmCallbackData], :pointer
+
+  end
+end

data/lib/rpm/c/rpmcli.rb

@@ -0,0 +1,7 @@
+
+module RPM
+  module C
+
+    attach_function 'rpmShowProgress', [:pointer, :rpmCallbackType, :rpm_loff_t, :rpm_loff_t, :fnpyKey, :pointer], :pointer
+  end
+end

data/lib/rpm/{ffi → c}/rpmdb.rb

@@ -1,6 +1,6 @@
 module RPM
 
-  module FFI
+  module C
 
     typedef :pointer, :rpmdb
     typedef :pointer, :rpmdbMatchIterator

data/lib/rpm/{ffi → c}/rpmds.rb

@@ -1,7 +1,7 @@
  
 module RPM
 
-    module FFI
+    module C
 
       typedef :pointer, :rpmds
 
@@ -21,11 +21,6 @@ module RPM
             :script_preun, (1 << 11),
             :script_postun, (1 << 12),
             :script_verify, (1 << 13),
-            :script_pre, (1 << 9),
-            :script_post, (1 << 10),
-            :script_preun, (1 << 11),
-            :script_postun, (1 << 12),
-            :script_verify, (1 << 13),
             :find_requires, (1 << 14),
             :find_provides, (1 << 15),
             #

data/lib/rpm/{ffi → c}/rpmfi.rb

@@ -1,7 +1,7 @@
 
 module RPM
 
-  module FFI
+  module C
 
     FileAttrs = enum(:rpmfileAttrs, [
       :none, 0,

data/lib/rpm/c/rpmio.rb

@@ -0,0 +1,21 @@
+module RPM
+  module C
+
+    typedef :pointer, :FD_t
+    # RPMIO
+    attach_function 'Fstrerror', [:FD_t], :string
+    # ...
+    attach_function 'Fclose', [:FD_t], :int
+    # ...
+    attach_function 'Fopen', [:string, :string], :FD_t
+    # ...
+    attach_function 'Ferror', [:FD_t], :int
+
+    attach_function 'fdDup', [:int], :FD_t
+
+    attach_function 'Fstrerror', [:FD_t], :string
+
+    attach_function 'fdLink', [:pointer], :FD_t
+
+  end
+end

data/lib/rpm/{ffi → c}/rpmlib.rb

@@ -1,7 +1,7 @@
 
 module RPM
 
-  module FFI
+  module C
     
     attach_variable :RPMVERSION, :RPMVERSION, :string
     attach_variable :RPMEVR, :rpmEVR, :string

data/lib/rpm/{ffi → c}/rpmlog.rb

@@ -1,7 +1,7 @@
 
 module RPM
 
-  module FFI
+  module C
 
      # rpmlog
     RPMLOG_PRIMASK = 0x07
@@ -19,6 +19,8 @@ module RPM
 
     attach_function 'rpmlogSetMask', [:int], :int
     # TODO: defines to set verbosity
+    # ...
+    attach_function 'rpmlogMessage', [], :string
 
   end
 end

data/lib/rpm/{ffi → c}/rpmmacro.rb

@@ -1,7 +1,7 @@
 
 module RPM
 
-  module FFI
+  module C
 
     attach_variable :MACROFILES, :macrofiles, :string
     # ...
@@ -24,15 +24,6 @@ module RPM
     # ...
     attach_function 'rpmInitMacros', [:pointer, :string], :void
     # ...
-
-    # RPMIO
-    attach_function 'Fstrerror', [:pointer], :string
-    # ...
-    attach_function 'Fclose', [:pointer], :int
-    # ...
-    attach_function 'Fopen', [:string, :string], :pointer
-    # ...
-    attach_function 'Ferror', [:pointer], :int
   end
   
 end

data/lib/rpm/{ffi → c}/rpmprob.rb

@@ -1,7 +1,7 @@
  
 module RPM
 
-  module FFI
+  module C
 
     typedef :pointer, :rpmProblem
 
@@ -35,8 +35,22 @@ module RPM
       :obsoletes
     ])
 
+    attach_function 'rpmProblemCreate', [:rpmProblemType, :string, :fnpyKey, :string, :string, :uint64], :rpmProblem
+    attach_function 'rpmProblemFree', [:rpmProblem],  :rpmProblem
+    attach_function 'rpmProblemLink', [:rpmProblem],  :rpmProblem
     attach_function 'rpmProblemGetType', [:rpmProblem], :rpmProblemType
     attach_function 'rpmProblemGetKey', [:rpmProblem], :fnpyKey
-    attach_function 'rpmProblemString', [:rpmProblem], :pointer
+    attach_function 'rpmProblemGetStr', [:rpmProblem], :string
+    attach_function 'rpmProblemString', [:rpmProblem], :string
+
+    begin
+      attach_function 'rpmProblemCompare', [:rpmProblem, :rpmProblem], :int
+    rescue ::FFI::NotFoundError
+      # TODO: Implement this for librpm 4.8.
+      def self.rpmProblemCompare(a, b)
+        raise NotImplementedError, "rpmProblemCompare is not present in librpm 4.8 and below"
+      end
     end
-end
+
+  end
+end

data/lib/rpm/{ffi → c}/rpmps.rb

@@ -1,6 +1,6 @@
 module RPM
 
-  module FFI
+  module C
 
     typedef :pointer, :rpmps
     typedef :pointer, :rpmpsi

data/lib/rpm/{ffi → c}/rpmtag.rb

@@ -1,6 +1,6 @@
 module RPM
 
-  module FFI
+  module C
 
     Tag = enum(:rpmTag, [
       :not_found, -1,
@@ -70,7 +70,7 @@ module RPM
       :exclude, 1041,
       :exclusive, 1042,
       :icon, 1043,
-      :source, 1044,
+      :sourcerpm, 1044,
       :fileverifyflags, 1045,
       :archivesize, 1046,
       :providename, 1047,
@@ -90,7 +90,7 @@ module RPM
       :exclusivearch, 1061,
       :exclusiveos, 1062,
       :autoreqprov, 1063,
-      :version, 1064,
+      :rpmversion, 1064,
       :triggerscripts, 1065,
       :triggername, 1066,
       :triggerversion, 1067,
@@ -293,7 +293,15 @@ module RPM
     )
     typedef :rpmFlags, :rpmTagReturnType
 
-    attach_function 'rpmTagGetReturnType', [:rpmTagVal], :rpmTagReturnType
+    begin
+      attach_function 'rpmTagGetReturnType', [:rpmTagVal], :rpmTagReturnType
+    rescue ::FFI::NotFoundError
+      attach_function 'rpmTagGetType', [:rpmTagVal], :rpmTagType
+
+      def self.rpmTagGetReturnType(tag)
+        TagReturnType[rpmTagGetType(tag) & TagReturnType[:mask_return_type]]
+      end
+    end
 
   end
 end

data/lib/rpm/{ffi → c}/rpmtd.rb

@@ -1,6 +1,6 @@
 module RPM
 
-  module FFI
+  module C
 
     typedef :pointer, :rpmtd
 

data/lib/rpm/{ffi → c}/rpmts.rb

@@ -1,6 +1,6 @@
 module RPM
 
-  module FFI
+  module C
 
     TransFlags = enum(:rpmtransFlags_e, [
       :none, 0,
@@ -49,6 +49,8 @@ module RPM
     attach_function 'rpmtsInitIterator', [:rpmts, :rpmDbiTagVal, :pointer, :int], :rpmdbMatchIterator
     # ...
     attach_function 'rpmtsProblems', [:rpmts], :rpmps
+    # ...
+    attach_function 'rpmtsClean', [:rpmts], :void
     # more...
     attach_function 'rpmtsFree', [:rpmts], :pointer
     #..
@@ -62,9 +64,11 @@ module RPM
     attach_function 'rpmtsFlags', [:rpmts], :rpmtransFlags
     attach_function 'rpmtsSetFlags', [:rpmts, :rpmtransFlags], :rpmtransFlags
     #...
+    attach_function 'rpmtsSetNotifyCallback', [:rpmts, :rpmCallbackFunction, :rpmCallbackData], :int
+    #...
     attach_function 'rpmtsCreate', [], :rpmts
     attach_function 'rpmtsAddInstallElement', [:rpmts, :header, :fnpyKey, :int, :rpmRelocation], :int
-    # ...    
+    attach_function 'rpmtsAddEraseElement', [:rpmts, :header, :int], :int
 
   end
 end

data/lib/rpm/{ffi → c}/rpmtypes.rb

@@ -1,7 +1,7 @@
 
 module RPM
 
-  module FFI
+  module C
 
   	Rc = enum(
       :ok, 0,
@@ -18,6 +18,8 @@ module RPM
     typedef :rpm_tag_t, :rpmDbiTagVal
 
     typedef :uint32, :rpmFlags
+    typedef :uint32, :rpm_off_t
+    typedef :uint64, :rpm_loff_t
 
     typedef :pointer, :FD_t
     typedef :pointer, :fnpyKey

data/lib/rpm/c.rb

@@ -0,0 +1,47 @@
+require 'rubygems'
+require 'ffi'
+
+module RPM
+  module C
+
+    extend ::FFI::Library
+
+    begin
+      ffi_lib ['rpm', 'librpm.so.2', 'librpm.so.1']
+    rescue LoadError => e
+      raise(
+        "Can't find rpm libs on your system: #{e.message}"
+      )
+    end
+
+  end
+end
+
+require 'rpm/c/rpmtypes'
+require 'rpm/c/rpmcallback'
+require 'rpm/c/rpmtag'
+require 'rpm/c/rpmlib'
+require 'rpm/c/rpmlog'
+require 'rpm/c/rpmmacro'
+require 'rpm/c/rpmio'
+require 'rpm/c/header'
+require 'rpm/c/rpmprob'
+require 'rpm/c/rpmps'
+require 'rpm/c/rpmfi'
+require 'rpm/c/rpmdb'
+require 'rpm/c/rpmcallback'
+require 'rpm/c/rpmcli'
+require 'rpm/c/rpmts'
+require 'rpm/c/rpmds'
+require 'rpm/c/rpmtd'
+
+module RPM
+  module C
+
+    def self.rpm_version_code
+      ver = ::RPM::C.RPMVERSION.split('.', 3)
+      return (ver[0].to_i<<16) + (ver[1].to_i<<8) + (ver[2].to_i<<0)
+    end
+
+  end
+end

data/lib/rpm/db.rb

@@ -12,7 +12,7 @@ module RPM
       opts[:writable] ||= false
 
       @ts = ts
-      RPM::FFI.rpmtsOpenDB(@ts.ptr, opts[:writable] ? Fcntl::O_RDWR | Fcntl::O_CREAT : Fcntl::O_RDONLY )
+      RPM::C.rpmtsOpenDB(@ts.ptr, opts[:writable] ? Fcntl::O_RDWR | Fcntl::O_CREAT : Fcntl::O_RDONLY )
     end
 
     # @return [RPM::MatchIterator] Creates an iterator for +tag+ and +val+
@@ -48,11 +48,11 @@ module RPM
 
     # @visibility private
     def ptr
-      RPM::FFI.rpmtsGetRdb(@ts.ptr)
+      RPM::C.rpmtsGetRdb(@ts.ptr)
     end
 
     def close
-      RPM::FFI.rpmtsCloseDB(@ts.ptr)
+      RPM::C.rpmtsCloseDB(@ts.ptr)
     end
 
     def closed?
@@ -98,13 +98,13 @@ module RPM
 
     # @return [String] The root path of the database
     def root
-      RPM::FFI.rpmtsRootDir(@ts.ptr)
+      RPM::C.rpmtsRootDir(@ts.ptr)
     end
 
     # @deprecated Use RPM::Transaction#each
     def self.each
       DB.open do |db|
-        it = MatchIterator.from_ptr(RPM::FFI.rpmdbInitIterator(db.ptr, 0, nil, 0))
+        it = MatchIterator.from_ptr(RPM::C.rpmdbInitIterator(db.ptr, 0, nil, 0))
         if block_given?
           it.each do |pkg|
             yield pkg

data/lib/rpm/dependency.rb

@@ -37,16 +37,16 @@ module RPM
           end
           return false
         when RPM::Dependency then
-          RPM::FFI.rpmdsCompare(
-            RPM::FFI.rpmdsSingle(:providename, other.name,
+          RPM::C.rpmdsCompare(
+            RPM::C.rpmdsSingle(:providename, other.name,
               other.version.to_vre, other.flags),
-            RPM::FFI.rpmdsSingle(:providename, name,
+            RPM::C.rpmdsSingle(:providename, name,
               version.to_vre, flags)) != 0
         when RPM::Version then
-          RPM::FFI.rpmdsCompare(
-            RPM::FFI.rpmdsSingle(:providename, name,
+          RPM::C.rpmdsCompare(
+            RPM::C.rpmdsSingle(:providename, name,
               other.to_vre, other.to_vre.empty? ? 0 : :equal),
-            RPM::FFI.rpmdsSingle(:providename, name,
+            RPM::C.rpmdsSingle(:providename, name,
               version.to_vre, flags)) != 0
         else
           raise(TypeError, "#{other} is not a Version or Dependency")
@@ -118,13 +118,13 @@ module RPM
 
   end
 
-  class Conflict < Dependency
+  class Obsolete < Dependency
 
     def initialize(name, version, flags, owner)
       super(name, version, flags, owner)
-      @nametag = RPM::TAG[:conflictname]
-      @versiontag = RPM::TAG[:conflictversion]
-      @flagstag = RPM::TAG[:conflictflags]
+      @nametag = RPM::TAG[:obsoletename]
+      @versiontag = RPM::TAG[:obsoleteversion]
+      @flagstag = RPM::TAG[:obsoleteflags]
     end
 
   end