ffi-gphoto2 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47eba00fa220e5731024fb274417962e94dd3f9d
-  data.tar.gz: 7dc8ef9e1df14a714b959b0155d229aa4bced308
+  metadata.gz: cf11eabf2214ce078d1aeb77ead538196bd288a7
+  data.tar.gz: ea9df058f1c06e0d490bdc9ef8be4c6b5de4aaf8
 SHA512:
-  metadata.gz: f4c3d6e6eeaf9ccb3579405b3410214a299c0b5ef9a94b0f3c1462963d5012a82585354411d4803609526191477f495374e5668c1f190812471ac6ec31d9bd9b
-  data.tar.gz: c8323dd877ff8d23fb5e9c3aca348be5cd6683f5643cc46e7b498da246f5e08b4b7b30aec248e85220cb55dbe90d48cc97a52fc9a3b65ad29e56d9d2d1206b57
+  metadata.gz: c56d4570c4888b01440abd7dd8e4cf0782b99cec74958f15ae2751ec8c16a0df3ccb110f7b23ab84898be468da1b1cd7af61031eccb73e6a24cf273aa65cc811
+  data.tar.gz: 98b399dbb55eb4d813befb69494caf9c841c3eb663440c0fc1dfd0add182ec294a99655039fbc5e83c45db20cd4eeea30a754045571dff13127e6d83b6d291e3

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## HEAD
 
+## 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.

data/README.md

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

data/ffi-gphoto2.gemspec

@@ -19,7 +19,8 @@ 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.requirements << 'libgphoto2 >= 2.5.2'
+  spec.requirements << 'libgphoto2_port >= 0.10.1'
   spec.required_ruby_version = '>= 1.9'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/ffi/gphoto2_port.rb

@@ -8,9 +8,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'
 
@@ -27,5 +34,16 @@ module FFI
 
     # 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

@@ -35,6 +35,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/port.rb

@@ -0,0 +1,61 @@
+module GPhoto2
+  class Port
+    include FFI::GPhoto2Port
+    include GPhoto2::Struct
+
+    def initialize
+      @ptr = new
+    end
+
+    # @param [PortInfo]
+    # @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/version.rb

@@ -1,3 +1,3 @@
 module GPhoto2
-  VERSION = '0.6.1'
+  VERSION = '0.7.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.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Macias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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
@@ -211,7 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- libgphoto2 >= 2.5.0
+- libgphoto2 >= 2.5.2
+- libgphoto2_port >= 0.10.1
 rubyforge_project: 
 rubygems_version: 2.6.4
 signing_key: 
@@ -235,6 +245,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