ffi-vix_disk_lib 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92ed99ac8d29efac4f6f94ee5041926b04c778bba3fdcc850320fe0df0eb6b86
-  data.tar.gz: b2dff56ce28cb62caf65afc3752235035f3aed39d37b6742320609ed4ff2a4b3
+  metadata.gz: dec46d727021a1399ce41f4e7caab724adcac94c5c6d542386028b983757678c
+  data.tar.gz: 430e64b3014c80bc40eed3c747081f14455ae1601d663885319fbfcf5fe2a35b
 SHA512:
-  metadata.gz: a379c112f129cb4cf8b8887e9c78e9ac9381e71fbc7d5ab61ebf5ea00d00ff66fd907816a6641e4d8ddb920605f2a0f43d1d15b3e8198d496985904b90d28f07
-  data.tar.gz: c46e55e98cb86dd65d6307a5f46bf8c66241fb5825a22599378aff24a37dd03862ac1bb90bc3add157634b9785d7474816b8824ee2a43e0e2a121545ed12de22
+  metadata.gz: b2ea59744d68169c3d6e00a99730fab4875679b8ad31ba7781d3504560183eb99502c90614af933c98e9c8d3f9541f4bc5bfc7fa5392a9e09c8db993ba718373
+  data.tar.gz: eeb46c80f91637d872bc06bfd2b5bb29b87eb34310548204c19a7514b38a755a63560c72a519043103a50a7173787846a2f988f695f80ff066876b48e8eeaac4

data/lib/ffi-vix_disk_lib/api.rb

@@ -19,7 +19,7 @@ module FFI
         nil
       end
 
-      candidate_versions  = %w[8.0.2 8.0.1 8.0.0 7.0.3 7.0.2 7.0.1 7.0.0 6.7.3 6.7.2 6.7.1 6.7.0 6.5.4 6.5.3 6.5.2 6.5.1 6.5.0 6.0.3 6.0.2 6.0.1 6.0.0]
+      candidate_versions  = %w[8.0.3 8.0.2 8.0.1 8.0.0 7.0.3 7.0.2 7.0.1 7.0.0 6.7.3 6.7.2 6.7.1 6.7.0 6.5.4 6.5.3 6.5.2 6.5.1 6.5.0 6.0.3 6.0.2 6.0.1 6.0.0]
       candidate_libraries = candidate_versions.map { |v| "vixDiskLib.so.#{v}" }
 
       # LD_LIBRARY_PATH/DYLD_LIBRARY_PATH is not passed to child process on a Mac with SIP

data/lib/ffi-vix_disk_lib/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module VixDiskLib
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-vix_disk_lib
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Jerry Keselman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -101,14 +101,12 @@ email:
 - jerryk@redhat.com
 - roliveri@redhat.com
 - jfrey@redhat.com
-executables:
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- bin/setup
 - lib/ffi-vix_disk_lib.rb
 - lib/ffi-vix_disk_lib/api.rb
 - lib/ffi-vix_disk_lib/api_wrapper.rb
@@ -121,12 +119,6 @@ files:
 - lib/ffi-vix_disk_lib/safe_create_params.rb
 - lib/ffi-vix_disk_lib/struct.rb
 - lib/ffi-vix_disk_lib/version.rb
-- spec/ext/.gitignore
-- spec/ext/Makefile
-- spec/ext/vixDiskLib.c
-- spec/ffi-vix_disk_lib/api_spec.rb
-- spec/ffi-vix_disk_lib/api_wrapper_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/ManageIQ/ffi-vix_disk_lib
 licenses:
 - Apache-2.0
@@ -146,14 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Ruby FFI Binding to VMware VixDiskLib.
-test_files:
-- spec/ext/.gitignore
-- spec/ext/Makefile
-- spec/ext/vixDiskLib.c
-- spec/ffi-vix_disk_lib/api_spec.rb
-- spec/ffi-vix_disk_lib/api_wrapper_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
-
-echo "Building spec/ext/libvixDiskLib.so..."
-make -C "$SCRIPT_DIR/../spec/ext"
-echo "Building spec/ext/libvixDiskLib.so...Complete"

data/spec/ext/.gitignore

@@ -1,3 +0,0 @@
-*.o
-*.d
-*.so*

data/spec/ext/Makefile

@@ -1,30 +0,0 @@
-CC=gcc
-CFLAGS=-I.
-CFLAGS = -fPIC -O0 -g
-LDFLAGS = -shared
-LN = ln -sf
-SRCS = vixDiskLib.c
-OBJS = ${SRCS:.c=.o}
-TARGET_LIB = libvixDiskLib.so
-MAJOR_VERSION = $(shell echo ${VDDK_VERSION} | cut -f1 -d.)
-VDDK_VERSION ?= 6.7.0
-
-.PHONY: all
-all: ${TARGET_LIB}.${VDDK_VERSION}
-
-${SRCS:.c=.d}:%.d:%.c
-	${CC} ${CFLAGS} -MM $< >$@
-
-${TARGET_LIB}.${MAJOR_VERSION}: ${TARGET_LIB}
-	${LN} $^ $@
-${TARGET_LIB}.${VDDK_VERSION}: ${TARGET_LIB}.${MAJOR_VERSION}
-	${LN} $^ $@
-
-${TARGET_LIB}: ${OBJS}
-	${CC} ${LDFLAGS} -o $@ $^
-
-include ${SRCS:.c=.d}
-
-.PHONY: clean
-clean:
-	-${RM} ${TARGET_LIB} ${TARGET_LIB}.${MAJOR_VERSION} ${TARGET_LIB}.${VDDK_VERSION} ${OBJS} ${SRCS:.c=.d}

data/spec/ext/vixDiskLib.c

@@ -1,456 +0,0 @@
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <stdint.h>
-
-typedef uint64_t uint64;
-typedef  int64_t  int64;
-typedef uint32_t uint32;
-typedef  int32_t  int32;
-typedef uint16_t uint16;
-typedef  int16_t  int16;
-typedef  uint8_t  uint8;
-typedef   int8_t   int8;
-typedef     char   Bool;
-typedef uint64 VixError;
-
-enum {
-   VIX_OK = 0,
-};
-
-typedef struct VixDiskLibHandleStruct VixDiskLibHandleStruct;
-typedef VixDiskLibHandleStruct *VixDiskLibHandle;
-typedef void (VixDiskLibGenericLogFunc)(const char *fmt, va_list args);
-struct VixDiskLibConnectParam;
-typedef struct VixDiskLibConnectParam *VixDiskLibConnection;
-typedef Bool (*VixDiskLibProgressFunc)(void *progressData,
-                                       int percentCompleted);
-typedef void (*VixDiskLibCompletionCB)(void *cbData, VixError result);
-typedef enum {
-   VIXDISKLIB_DISK_UNKNOWN = 256
-} VixDiskLibDiskType;
-
-typedef enum {
-   VIXDISKLIB_ADAPTER_UNKNOWN = 256
-} VixDiskLibAdapterType;
-
-typedef uint64 VixDiskLibSectorType;
-
-typedef struct {
-   VixDiskLibDiskType           diskType;
-   VixDiskLibAdapterType        adapterType;
-   uint16                       hwVersion;
-   VixDiskLibSectorType         capacity;
-} VixDiskLibCreateParams;
-
-typedef enum {
-   VIXDISKLIB_CRED_UNKNOWN = 256
-} VixDiskLibCredType;
-
-typedef struct {
-   uint32 cylinders;
-   uint32 heads;
-   uint32 sectors;
-} VixDiskLibGeometry;
-
-typedef struct {
-   VixDiskLibGeometry   biosGeo;      // BIOS geometry for booting and partitioning
-   VixDiskLibGeometry   physGeo;      // physical geometry
-   VixDiskLibSectorType capacity;     // total capacity in sectors
-   VixDiskLibAdapterType adapterType; // adapter type
-   int numLinks;                      // number of links (i.e. base disk + redo logs)
-   char *parentFileNameHint;          // parent file for a redo log
-   char *uuid;                        // disk UUID
-} VixDiskLibInfo;
-
-typedef struct VixDiskLibConnectParamsState VixDiskLibConnectParamsState;
-
-typedef struct {
-   VixDiskLibSectorType offset;   // offset in sectors
-   VixDiskLibSectorType length;
-} VixDiskLibBlock;
-
-typedef struct {
-   uint32 numBlocks;
-   VixDiskLibBlock blocks[1];
-} VixDiskLibBlockList;
-
-typedef struct {
-   char *id;
-   char *datastoreMoRef;
-   char *ssId;
-} VixDiskLibVStorageObjectSpec;
-
-typedef enum {
-   VIXDISKLIB_SPEC_UNKNOWN = 2
-} VixDiskLibSpecType;
-
-typedef struct {
-   char *vmxSpec;     // URL like spec of the VM.
-   char *serverName;  // Name or IP address of VC / ESX.
-   char *thumbPrint;  // SSL Certificate thumb print.
-   long privateUse;   // This value is ignored.
-   VixDiskLibCredType credType;
-
-   union VixDiskLibCreds {
-      struct VixDiskLibUidPasswdCreds {
-         char *userName; // User id and password on the
-         char *password; // VC/ESX host.
-      } uid;
-      struct VixDiskLibSessionIdCreds { // Not supported in 1.0
-         char *cookie;
-         char *userName;
-         char *key;
-      } sessionId;
-      struct VixDiskLibTicketIdCreds *ticketId; // Internal use only.
-   } creds;
-
-   uint32 port;        // port to use for authenticating with VC/ESXi host
-   uint32 nfcHostPort; // port to use for establishing NFC connection to ESXi host
-
-   char *vimApiVer;    // not used
-   char reserved[8];   // internal use only
-   VixDiskLibConnectParamsState *state; // internal use only
-
-   union {
-      VixDiskLibVStorageObjectSpec vStorageObjSpec;
-   } spec;
-   VixDiskLibSpecType specType;  // disk or VM spec
-} VixDiskLibConnectParams;
-
-VixError
-VixDiskLib_InitEx(uint32 majorVersion,
-                  uint32 minorVersion,
-                  VixDiskLibGenericLogFunc *log,
-                  VixDiskLibGenericLogFunc *warn,
-                  VixDiskLibGenericLogFunc *panic,
-                  const char* libDir,
-                  const char* configFile)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Init(uint32 majorVersion,
-                uint32 minorVersion,
-                VixDiskLibGenericLogFunc *log,
-                VixDiskLibGenericLogFunc *warn,
-                VixDiskLibGenericLogFunc *panic,
-                const char* libDir)
-{
-	return VIX_OK;
-}
-
-void
-VixDiskLib_Exit(void)
-{
-}
-
-const char *
-VixDiskLib_ListTransportModes(void)
-{
-	return "";
-}
-
-VixError
-VixDiskLib_Cleanup(const VixDiskLibConnectParams *connectParams,
-                   uint32 *numCleanedUp, uint32 *numRemaining)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Connect(const VixDiskLibConnectParams *connectParams,
-                   VixDiskLibConnection *connection)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_PrepareForAccess(const VixDiskLibConnectParams *connectParams,
-                            const char *identity)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_ConnectEx(const VixDiskLibConnectParams *connectParams,
-                     Bool readOnly,
-                     const char *snapshotRef,
-                     const char *transportModes,
-                     VixDiskLibConnection *connection)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Disconnect(VixDiskLibConnection connection)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_EndAccess(const VixDiskLibConnectParams *connectParams,
-                     const char *identity)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Create(const VixDiskLibConnection connection,
-                  const char *path,
-                  const VixDiskLibCreateParams *createParams,
-                  VixDiskLibProgressFunc progressFunc,
-                  void *progressCallbackData)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_CreateChild(VixDiskLibHandle diskHandle,
-                       const char *childPath,
-                       VixDiskLibDiskType diskType,
-                       VixDiskLibProgressFunc progressFunc,
-                       void *progressCallbackData)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Open(const VixDiskLibConnection connection,
-                const char *path,
-                uint32 flags,
-                VixDiskLibHandle *diskHandle)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_QueryAllocatedBlocks(VixDiskLibHandle diskHandle,
-                                VixDiskLibSectorType startSector,
-                                VixDiskLibSectorType numSectors,
-                                VixDiskLibSectorType chunkSize,
-                                VixDiskLibBlockList **blockList)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_FreeBlockList(VixDiskLibBlockList *blockList)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_GetInfo(VixDiskLibHandle diskHandle,
-                   VixDiskLibInfo **info)
-{
-	return VIX_OK;
-}
-
-void
-VixDiskLib_FreeInfo(VixDiskLibInfo *info)
-{
-}
-
-const char *
-VixDiskLib_GetTransportMode(VixDiskLibHandle diskHandle)
-{
-	return "";
-}
-
-VixError
-VixDiskLib_Close(VixDiskLibHandle diskHandle)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Read(VixDiskLibHandle diskHandle,
-                VixDiskLibSectorType startSector,
-                VixDiskLibSectorType numSectors,
-                uint8 *readBuffer)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_ReadAsync(VixDiskLibHandle diskHandle,
-                     VixDiskLibSectorType startSector,
-                     VixDiskLibSectorType numSectors,
-                     uint8 *readBuffer,
-                     VixDiskLibCompletionCB callback,
-                     void *cbData)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Write(VixDiskLibHandle diskHandle,
-                 VixDiskLibSectorType startSector,
-                 VixDiskLibSectorType numSectors,
-                 const uint8 *writeBuffer)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_WriteAsync(VixDiskLibHandle diskHandle,
-                      VixDiskLibSectorType startSector,
-                      VixDiskLibSectorType numSectors,
-                      const uint8 *writeBuffer,
-                      VixDiskLibCompletionCB callback,
-                      void *cbData)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Flush(VixDiskLibHandle diskHandle)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Wait(VixDiskLibHandle diskHandle)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_ReadMetadata(VixDiskLibHandle diskHandle,
-                        const char *key,
-                        char *buf,
-                        size_t bufLen,
-                        size_t *requiredLen)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_WriteMetadata(VixDiskLibHandle diskHandle,
-                         const char *key,
-                         const char *val)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_GetMetadataKeys(VixDiskLibHandle diskHandle,
-                           char *keys,
-                           size_t maxLen,
-                           size_t *requiredLen)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Unlink(VixDiskLibConnection connection,
-                  const char *path)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Grow(VixDiskLibConnection connection,
-                const char *path,
-                VixDiskLibSectorType capacity,
-                Bool updateGeometry,
-                VixDiskLibProgressFunc progressFunc,
-                void *progressCallbackData)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Shrink(VixDiskLibHandle diskHandle,
-                  VixDiskLibProgressFunc progressFunc,
-                  void *progressCallbackData)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Defragment(VixDiskLibHandle diskHandle,
-                      VixDiskLibProgressFunc progressFunc,
-                      void *progressCallbackData)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Rename(const char *srcFileName,
-                  const char *dstFileName)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Clone(const VixDiskLibConnection dstConnection,
-                 const char *dstPath,
-                 const VixDiskLibConnection srcConnection,
-                 const char *srcPath,
-                 const VixDiskLibCreateParams *vixCreateParams,
-                 VixDiskLibProgressFunc progressFunc,
-                 void *progressCallbackData,
-                 Bool overWrite)
-{
-	return VIX_OK;
-}
-
-char *
-VixDiskLib_GetErrorText(VixError err, const char *locale)
-{
-	return NULL;
-}
-
-void
-VixDiskLib_FreeErrorText(char* errMsg)
-{
-}
-
-VixError
-VixDiskLib_IsAttachPossible(VixDiskLibHandle parent, VixDiskLibHandle child)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_Attach(VixDiskLibHandle parent, VixDiskLibHandle child)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_SpaceNeededForClone(VixDiskLibHandle diskHandle,
-                               VixDiskLibDiskType cloneDiskType,
-                               uint64* spaceNeeded)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_CheckRepair(const VixDiskLibConnection connection,
-                       const char *filename,
-                       Bool repair)
-{
-	return VIX_OK;
-}
-
-VixError
-VixDiskLib_GetConnectParams(const VixDiskLibConnection connection,
-                            VixDiskLibConnectParams** connectParams)
-{
-	return VIX_OK;
-}
-
-void
-VixDiskLib_FreeConnectParams(VixDiskLibConnectParams* connectParams)
-{
-}
-
-VixDiskLibConnectParams *
-VixDiskLib_AllocateConnectParams()
-{
-	return NULL;
-}

data/spec/ffi-vix_disk_lib/api_spec.rb

@@ -1,38 +0,0 @@
-describe FFI::VixDiskLib::API do
-  let(:log)     { lambda { |_string, _pointer| } }
-  let(:lib_dir) { nil }
-  let(:version) { ENV.fetch("VDDK_VERSION", "6.7.0") }
-
-  it "VERSION" do
-    expect(described_class::VERSION).to eq version
-  end
-
-  it "VERSION_MAJOR" do
-    expect(described_class::VERSION_MAJOR).to eq Gem::Version.new(version).segments[0]
-  end
-
-  it "VERSION_MINOR" do
-    expect(described_class::VERSION_MINOR).to eq Gem::Version.new(version).segments[1]
-  end
-
-  describe ".init" do
-    it "initializes successfully" do
-      err = described_class.init(described_class::VERSION_MAJOR, described_class::VERSION_MINOR, log, log, log, lib_dir)
-      expect(err).to eq(described_class::VixErrorType[:VIX_OK])
-    end
-  end
-
-  describe "ConnectParams" do
-    context "with #{described_class::VERSION}" do
-      if Gem::Version.new(described_class::VERSION) >= Gem::Version.new("6.5.0")
-        it "has vimApiVer" do
-          expect(described_class::ConnectParams.members).to include(:vimApiVer)
-        end
-      else
-        it "doesn't have vimApiVer" do
-          expect(described_class::ConnectParams.members).to_not include(:vimApiVer)
-        end
-      end
-    end
-  end
-end

data/spec/ffi-vix_disk_lib/api_wrapper_spec.rb

@@ -1,15 +0,0 @@
-require 'ffi-vix_disk_lib/api_wrapper'
-
-describe FFI::VixDiskLib::ApiWrapper do
-  context "connect" do
-    before do
-      described_class.init
-    end
-
-    it "returns a connection" do
-      connect_params = {}
-      connection = described_class.connect(connect_params)
-      expect(connection).not_to be_nil
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,15 +0,0 @@
-if ENV['CI']
-  require 'simplecov'
-  SimpleCov.start
-end
-
-# LD_LIBRARY_PATH/DYLD_LIBRARY_PATH is not passed to child process on a Mac with SIP
-# enabled, so build our own rudimentary version based on a different name
-ENV["LIBRARY_PATH"] ||= File.expand_path("ext", __dir__) if RbConfig::CONFIG["host_os"] =~ /darwin/
-
-require 'ffi-vix_disk_lib'
-puts
-puts "\e[93mUsing libvixDiskLib #{FFI::VixDiskLib::API::VERSION}\e[0m"
-
-RSpec.configure do |config|
-end