ffi-gphoto2 0.6.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39745534e29e0571decd8eda706d74278a146cc1
-  data.tar.gz: 83c84f47474b4bd940748b11f4b65769db508550
+SHA256:
+  metadata.gz: 702ccb603f9bf780f315079988a8425bd52aa0f2a6dddb2bfc5f56da30de0ec6
+  data.tar.gz: 4862a3b83e34ba8733ae1db7bb604301015081e86bcebaa61927362e26ee62b0
 SHA512:
-  metadata.gz: 287d38fca23d5e76207ea9f4e93d89ee4856f4c30a7deb198c5c2dc305d1eae171b881b3427671c10d623d605ffa877e9708a1db4efbc72ceb19fe0bc3c2589b
-  data.tar.gz: 8e69d5a190b2db161ce6d8be0bdb153282d7407955b8ce98a8b0269ecc544b63d2ac7b3bf0a2ffcf22631f23e75694bf15d1f0d7441d8124753b8a4a4f7f83bf
+  metadata.gz: a4e885da24b7822d8e6898f7931ffcd038bda8285b9c669a0f1e48e8f5081d06b710827304593270dea08dd3f75cea7c3a14b2bc0f3ba56501a76d2e2c17eef4
+  data.tar.gz: e2dc98f0cbd3af44262b98850b009b9d2da0cd6ee098538a892739dd13f3e009422092f263d5037c4a90dada6b38ef4ac2845b2a560afc07bd7eef464b0a3b5c

data/.travis.yml

@@ -4,7 +4,7 @@ language: ruby
 rvm:
   - 2.3.1
 before_install:
-  - gem install bundler -v 1.12.5
+  - gem install bundler
   - sudo apt-get -qq update
   - sudo apt-get install libgphoto2-6 libgphoto2-port10
   - sudo ln -s /usr/lib/x86_64-linux-gnu/libgphoto2.so{.6,}

data/CHANGELOG.md

@@ -1,8 +1,36 @@
 # Changelog
 
-## HEAD
+## Unreleased
 
-## 0.6.0
+## 0.9.0 (2021-04-17)
+
+* [CHANGE] Update to ffi 1.15.0. This raises the minimum Ruby version to 2.3.0.
+
+## 0.8.0 (2020-06-29)
+
+* [FIX] Fix deprecation warning (`warning: rb_safe_level will be removed in
+  Ruby 3.0`) by updating to ffi 1.12.0.
+* [CHANGE] Raise minimum Ruby version to 2.0.0, which comes from the dependency
+  on ffi 1.12.0 (specifically 1.11.1).
+
+## 0.7.1 (2017-01-02)
+
+* [FIX] Load `ffi` before any usage of the bindings.
+
+## 0.7.0 (2016-09-19)
+
+* [CHANGE] Raise minimum `libgphoto2` version to 2.5.2. This version introduced
+  `gp_port_reset`.
+* [ADD] Add `FFI::GPhoto2Port::GPPort` struct and related functions to do a
+  port reset.
+
+## 0.6.1 (2016-08-21)
+
+* [FIX] `ManagedStruct.release` actually calls `*_free` functions. Autorelease
+  invocations were silently failing with a `TypeError` because the functions
+  expected structs, not pointers.
+
+## 0.6.0 (2016-07-11)
 
 * [FIX] Use the correct default filename when a `CameraFile` is a preview.
 * [ADD] Add `CameraFileInfo` and related operations. `CameraFile#info` only

data/README.md

@@ -12,8 +12,9 @@ idiomatic Ruby way.
 
 ### Prerequisites
 
-  * Ruby >= 1.9
-  * libgphoto2 >= 2.5.0
+  * Ruby >= 2.3
+  * libgphoto2 >= 2.5.2
+  * libgphoto2_port >= 0.10.1
 
 ### Gem
 

data/ffi-gphoto2.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.requirements << 'libgphoto2 >= 2.5.0'
-  spec.required_ruby_version = '>= 1.9'
+  spec.requirements << 'libgphoto2 >= 2.5.2'
+  spec.requirements << 'libgphoto2_port >= 0.10.1'
+  spec.required_ruby_version = '>= 2.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.5.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10.0'
   spec.add_development_dependency 'yard', '~> 0.9.0'
 
-  spec.add_dependency 'ffi', '~> 1.9.0'
+  spec.add_dependency 'ffi', '~> 1.15.0'
 end

data/lib/ffi/gphoto2.rb

@@ -1,3 +1,4 @@
+require 'ffi'
 require 'ffi/gphoto2_port'
 
 module FFI
@@ -38,7 +39,7 @@ module FFI
 
     # gphoto2/gphoto2-abilities-list.h
     attach_function :gp_abilities_list_new, [:pointer], :int
-    attach_function :gp_abilities_list_free, [CameraAbilitiesList.by_ref], :int
+    attach_function :gp_abilities_list_free, [:pointer], :int
     attach_function :gp_abilities_list_load, [CameraAbilitiesList.by_ref, GPContext.by_ref], :int
     attach_function :gp_abilities_list_detect, [CameraAbilitiesList.by_ref, GPhoto2Port::GPPortInfoList.by_ref, CameraList.by_ref, GPContext.by_ref], :int
     attach_function :gp_abilities_list_lookup_model, [CameraAbilitiesList.by_ref, :string], :int
@@ -70,12 +71,12 @@ module FFI
 
     # gphoto2/gphoto2-file.h
     attach_function :gp_file_new, [:pointer], :int
-    attach_function :gp_file_free, [CameraFile.by_ref], :int
+    attach_function :gp_file_free, [:pointer], :int
     attach_function :gp_file_get_data_and_size, [CameraFile.by_ref, :pointer, :pointer], :int
 
     # gphoto2/gphoto2-list.h
     attach_function :gp_list_new, [:pointer], :int
-    attach_function :gp_list_free, [CameraList.by_ref], :int
+    attach_function :gp_list_free, [:pointer], :int
     attach_function :gp_list_count, [CameraList.by_ref], :int
     attach_function :gp_list_get_name, [CameraList.by_ref, :int, :pointer], :int
     attach_function :gp_list_get_value, [CameraList.by_ref, :int, :pointer], :int

data/lib/ffi/gphoto2_port.rb

@@ -1,3 +1,5 @@
+require 'ffi'
+
 module FFI
   module GPhoto2Port
     extend FFI::Library
@@ -8,9 +10,16 @@ module FFI
     require 'ffi/gphoto2_port/gp_port_result'
 
     # enums
+    require 'ffi/gphoto2_port/gp_port_serial_parity'
     require 'ffi/gphoto2_port/gp_port_type'
 
     # structs
+    require 'ffi/gphoto2_port/gp_port_settings_serial'
+    require 'ffi/gphoto2_port/gp_port_settings_usb'
+    require 'ffi/gphoto2_port/gp_port_settings_usb_disk_direct'
+    require 'ffi/gphoto2_port/gp_port_settings_usb_scsi'
+    require 'ffi/gphoto2_port/gp_port_settings'
+    require 'ffi/gphoto2_port/gp_port'
     require 'ffi/gphoto2_port/gp_port_info'
     require 'ffi/gphoto2_port/gp_port_info_list'
 
@@ -20,12 +29,23 @@ module FFI
     attach_function :gp_port_info_get_type, [GPPortInfo, :pointer], :int
 
     attach_function :gp_port_info_list_new, [:pointer], :int
-    attach_function :gp_port_info_list_free, [GPPortInfoList.by_ref], :int
+    attach_function :gp_port_info_list_free, [:pointer], :int
     attach_function :gp_port_info_list_load, [GPPortInfoList.by_ref], :int
     attach_function :gp_port_info_list_lookup_path, [GPPortInfoList.by_ref, :string], :int
     attach_function :gp_port_info_list_get_info, [GPPortInfoList.by_ref, :int, :pointer], :int
 
     # libgphoto2_port/gphoto2/gphoto2-port-result.h
     attach_function :gp_port_result_as_string, [:int], :string
+
+    # libgphoto2_port/gphoto2/gphoto2-port.h
+    attach_function :gp_port_new, [:pointer], :int
+    attach_function :gp_port_free, [:pointer], :int
+
+    attach_function :gp_port_set_info, [GPPort.by_ref, GPPortInfo], :int
+
+    attach_function :gp_port_open, [GPPort.by_ref], :int
+    attach_function :gp_port_close, [GPPort.by_ref], :int
+
+    attach_function :gp_port_reset, [GPPort.by_ref], :int
   end
 end

data/lib/ffi/gphoto2_port/gp_port.rb

@@ -0,0 +1,17 @@
+module FFI
+  module GPhoto2Port
+    class GPPort < FFI::ManagedStruct
+      # libgphoto2_port/libgphoto2_port/gphoto2-port.h
+      layout :type, GPPortType,
+             :settings, GPPortSettings,
+             :settings_pending, GPPortSettings,
+             :timeout, :int,
+             :pl, :pointer, # GPPortPrivateLibrary *
+             :pc, :pointer # GPPortPrivateCore *
+
+      def self.release(ptr)
+        FFI::GPhoto2.gp_port_free(ptr)
+      end
+    end
+  end
+end

data/lib/ffi/gphoto2_port/gp_port_serial_parity.rb

@@ -0,0 +1,6 @@
+module FFI
+  module GPhoto2Port
+    # libgphoto2_port/libgphoto2_port/gphoto2-port.h
+    GPPortSerialParity = enum :off, :even, :odd
+  end
+end

data/lib/ffi/gphoto2_port/gp_port_settings.rb

@@ -0,0 +1,11 @@
+module FFI
+  module GPhoto2Port
+    class GPPortSettings < FFI::Struct
+      # libgphoto2_port/libgphoto2_port/gphoto2-port.h
+      layout :serial, GPPortSettingsSerial,
+             :usb, GPPortSettingsUSB,
+             :usbdiskdirect, GPPortSettingsUsbDiskDirect,
+             :usbscsi, GPPortSettingsUsbScsi
+    end
+  end
+end

data/lib/ffi/gphoto2_port/gp_port_settings_serial.rb

@@ -0,0 +1,12 @@
+module FFI
+  module GPhoto2Port
+    class GPPortSettingsSerial < FFI::Struct
+      # libgphoto2_port/libgphoto2_port/gphoto2-port.h
+      layout :port, [:char, 128],
+             :speed, :int,
+             :bits, :int,
+             :parity, GPPortSerialParity,
+             :stopbits, :int
+    end
+  end
+end

data/lib/ffi/gphoto2_port/gp_port_settings_usb.rb

@@ -0,0 +1,15 @@
+module FFI
+  module GPhoto2Port
+    class GPPortSettingsUSB < FFI::Struct
+      # libgphoto2_port/libgphoto2_port/gphoto2-port.h
+      layout :inep, :int,
+             :outep, :int,
+             :intep, :int,
+             :config, :int,
+             :interface, :int,
+             :altsetting, :int,
+             :maxpacketsize, :int,
+             :port, [:char, 64]
+    end
+  end
+end

data/lib/ffi/gphoto2_port/gp_port_settings_usb_disk_direct.rb

@@ -0,0 +1,8 @@
+module FFI
+  module GPhoto2Port
+    class GPPortSettingsUsbDiskDirect < FFI::Struct
+      # libgphoto2_port/libgphoto2_port/gphoto2-port.h
+      layout :path, [:char, 128]
+    end
+  end
+end

data/lib/ffi/gphoto2_port/gp_port_settings_usb_scsi.rb

@@ -0,0 +1,8 @@
+module FFI
+  module GPhoto2Port
+    class GPPortSettingsUsbScsi < FFI::Struct
+      # libgphoto2_port/libgphoto2_port/gphoto2-port.h
+      layout :path, [:char, 128]
+    end
+  end
+end

data/lib/gphoto2.rb

@@ -1,7 +1,5 @@
 require 'logger'
 
-require 'ffi'
-
 require 'ffi/gphoto2'
 require 'ffi/gphoto2_port'
 
@@ -35,6 +33,7 @@ require 'gphoto2/camera_folder'
 require 'gphoto2/camera_list'
 require 'gphoto2/context'
 require 'gphoto2/entry'
+require 'gphoto2/port'
 require 'gphoto2/port_info'
 require 'gphoto2/port_info_list'
 require 'gphoto2/port_result'

data/lib/gphoto2/camera.rb

@@ -179,7 +179,7 @@ module GPhoto2
     end
 
     def new
-      ptr = FFI::MemoryPointer.new(FFI::GPhoto2::Camera)
+      ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_camera_new(ptr)
       GPhoto2.check!(rc)
       @ptr = FFI::GPhoto2::Camera.new(ptr.read_pointer)

data/lib/gphoto2/camera/configuration.rb

@@ -138,7 +138,7 @@ module GPhoto2
       end
 
       def get_config
-        widget_ptr = FFI::MemoryPointer.new(FFI::GPhoto2::CameraWidget)
+        widget_ptr = FFI::MemoryPointer.new(:pointer)
         rc = gp_camera_get_config(ptr, widget_ptr, context.ptr)
         GPhoto2.check!(rc)
         widget = FFI::GPhoto2::CameraWidget.new(widget_ptr.read_pointer)

data/lib/gphoto2/camera_abilities_list.rb

@@ -32,7 +32,7 @@ module GPhoto2
     private
 
     def new
-      ptr = FFI::MemoryPointer.new(FFI::GPhoto2::CameraAbilitiesList)
+      ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_abilities_list_new(ptr)
       GPhoto2.check!(rc)
       @ptr = FFI::GPhoto2::CameraAbilitiesList.new(ptr.read_pointer)

data/lib/gphoto2/camera_file.rb

@@ -66,7 +66,7 @@ module GPhoto2
     end
 
     def new
-      ptr = FFI::MemoryPointer.new(FFI::GPhoto2::CameraFile)
+      ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_file_new(ptr)
       GPhoto2.check!(rc)
       @ptr = FFI::GPhoto2::CameraFile.new(ptr.read_pointer)

data/lib/gphoto2/camera_list.rb

@@ -21,7 +21,7 @@ module GPhoto2
     private
 
     def new
-      ptr = FFI::MemoryPointer.new(FFI::GPhoto2::CameraList)
+      ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_list_new(ptr)
       GPhoto2.check!(rc)
       @ptr = FFI::GPhoto2::CameraList.new(ptr.read_pointer)

data/lib/gphoto2/camera_widgets/camera_widget.rb

@@ -127,7 +127,7 @@ module GPhoto2
     end
 
     def get_child(index)
-      widget_ptr = FFI::MemoryPointer.new(FFI::GPhoto2::CameraWidget)
+      widget_ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_widget_get_child(ptr, index, widget_ptr)
       GPhoto2.check!(rc)
       widget = FFI::GPhoto2::CameraWidget.new(widget_ptr.read_pointer)

data/lib/gphoto2/port.rb

@@ -0,0 +1,61 @@
+module GPhoto2
+  class Port
+    include FFI::GPhoto2Port
+    include GPhoto2::Struct
+
+    def initialize
+      @ptr = new
+    end
+
+    # @param [PortInfo] info
+    # @return [PortInfo]
+    def info=(info)
+      set_info(info)
+      info
+    end
+
+    # @return [void]
+    def open
+      _open
+    end
+
+    # @return [void]
+    def close
+      _close
+    end
+
+    # @return [void]
+    def reset
+      _reset
+    end
+
+    private
+
+    def new
+      ptr = FFI::MemoryPointer.new(:pointer)
+      rc = gp_port_new(ptr)
+      GPhoto2.check!(rc)
+      FFI::GPhoto2Port::GPPort.new(ptr.read_pointer)
+    end
+
+    def _open
+      rc = gp_port_open(ptr)
+      GPhoto2.check!(rc)
+    end
+
+    def _close
+      rc = gp_port_close(ptr)
+      GPhoto2.check!(rc)
+    end
+
+    def _reset
+      rc = gp_port_reset(ptr)
+      GPhoto2.check!(rc)
+    end
+
+    def set_info(port_info)
+      rc = gp_port_set_info(ptr, port_info.ptr)
+      GPhoto2.check!(rc)
+    end
+  end
+end

data/lib/gphoto2/port_info_list.rb

@@ -25,7 +25,7 @@ module GPhoto2
     private
 
     def new
-      ptr = FFI::MemoryPointer.new(GPPortInfoList)
+      ptr = FFI::MemoryPointer.new(:pointer)
       rc = gp_port_info_list_new(ptr)
       GPhoto2.check!(rc)
       @ptr = GPPortInfoList.new(ptr.read_pointer)

data/lib/gphoto2/version.rb

@@ -1,3 +1,3 @@
 module GPhoto2
-  VERSION = '0.6.0'
+  VERSION = '0.9.0'
 end

data/spec/gphoto2/port_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module GPhoto2
+  describe Port do
+    before do
+      allow_any_instance_of(Port).to receive(:new)
+    end
+
+    describe '#info=' do
+      let(:port) { Port.new }
+
+      before do
+        allow(port).to receive(:set_info)
+      end
+
+      it 'returns the input value' do
+        info = double(:port_info)
+        expect(port.info = info).to eq(info)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-gphoto2
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Macias
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -72,15 +72,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
-description: 
+        version: 1.15.0
+description:
 email:
 - zaeleus@gmail.com
 executables: []
@@ -132,9 +132,16 @@ files:
 - lib/ffi/gphoto2/gp_context.rb
 - lib/ffi/gphoto2/gphoto_device_type.rb
 - lib/ffi/gphoto2_port.rb
+- lib/ffi/gphoto2_port/gp_port.rb
 - lib/ffi/gphoto2_port/gp_port_info.rb
 - lib/ffi/gphoto2_port/gp_port_info_list.rb
 - lib/ffi/gphoto2_port/gp_port_result.rb
+- lib/ffi/gphoto2_port/gp_port_serial_parity.rb
+- lib/ffi/gphoto2_port/gp_port_settings.rb
+- lib/ffi/gphoto2_port/gp_port_settings_serial.rb
+- lib/ffi/gphoto2_port/gp_port_settings_usb.rb
+- lib/ffi/gphoto2_port/gp_port_settings_usb_disk_direct.rb
+- lib/ffi/gphoto2_port/gp_port_settings_usb_scsi.rb
 - lib/ffi/gphoto2_port/gp_port_type.rb
 - lib/gphoto2.rb
 - lib/gphoto2/camera.rb
@@ -162,6 +169,7 @@ files:
 - lib/gphoto2/camera_widgets/window_camera_widget.rb
 - lib/gphoto2/context.rb
 - lib/gphoto2/entry.rb
+- lib/gphoto2/port.rb
 - lib/gphoto2/port_info.rb
 - lib/gphoto2/port_info_list.rb
 - lib/gphoto2/port_result.rb
@@ -184,6 +192,7 @@ files:
 - spec/gphoto2/entry_spec.rb
 - spec/gphoto2/port_info_list_spec.rb
 - spec/gphoto2/port_info_spec.rb
+- spec/gphoto2/port_spec.rb
 - spec/gphoto2_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/camera/capture_examples.rb
@@ -196,7 +205,7 @@ homepage: https://github.com/zaeleus/ffi-gphoto2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,17 +213,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- libgphoto2 >= 2.5.0
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+- libgphoto2 >= 2.5.2
+- libgphoto2_port >= 0.10.1
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: A Ruby FFI for common functions in libgphoto2
 test_files:
@@ -235,6 +244,7 @@ test_files:
 - spec/gphoto2/entry_spec.rb
 - spec/gphoto2/port_info_list_spec.rb
 - spec/gphoto2/port_info_spec.rb
+- spec/gphoto2/port_spec.rb
 - spec/gphoto2_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/camera/capture_examples.rb
@@ -243,4 +253,3 @@ test_files:
 - spec/support/shared_examples/camera/filesystem_examples.rb
 - spec/support/shared_examples/camera_file_info_examples.rb
 - spec/support/shared_examples/camera_widget_examples.rb
-has_rdoc: