io-afc 0.0.3.2 → 0.0.3.3

data/.gitignore

@@ -0,0 +1,23 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.DS_Store
+*.swp
+mkmf.log
+*.o
+*.bundle
+Makefile

data/.yardopts

@@ -0,0 +1,2 @@
+lib/**/*.rb
+ext/**/*.cpp

data/ext/io/afc/extconf.rb

@@ -3,5 +3,8 @@ require 'mkmf'
 $CPPFLAGS="`pkg-config --cflags libimobiledevice-1.0`"
 $LDFLAGS="`pkg-config --libs libimobiledevice-1.0`"
 pkg_config("libimobiledevice-1.0")
+have_header("libimobiledevice/house_arrest.h")
+have_func("lockdownd_service_descriptor_free")
+have_func("lockdownd_get_device_udid")
 
 create_makefile("io/afc/afc_base")

data/ext/io/afc/ioafc.cpp

@@ -66,7 +66,9 @@ static void rb_raise_SystemCallErrorAFC(afc_error_t err)
         {AFC_E_READ_ERROR           , ENOTDIR},
         {AFC_E_WRITE_ERROR          , EIO},
         {AFC_E_UNKNOWN_PACKET_TYPE  , EIO},
+#ifdef AFC_E_INVALID_ARG
         {AFC_E_INVALID_ARG          , EINVAL},
+#endif
         {AFC_E_OBJECT_NOT_FOUND     , ENOENT},
         {AFC_E_OBJECT_IS_DIR        , EISDIR},
         {AFC_E_DIR_NOT_EMPTY        , ENOTEMPTY},
@@ -121,8 +123,10 @@ IoAFC::IoAFC()
     _blocksize = 4096;
     _idev = NULL;
     _control = NULL;
+#ifdef HAVE_LIBIMOBILEDEVICE_HOUSE_ARREST_H
     _house_arrest = NULL;
-    _port = NULL;
+#endif
+    _port = LOCKDOWND_INVALID_PORT;
     _afc = NULL;
 }
 
@@ -139,12 +143,16 @@ void IoAFC::teardown()
 {
     DBG("- IO::AFC: %p\n", _afc);
     if (_afc) afc_client_free(_afc);
+#ifdef HAVE_LOCKDOWND_SERVICE_DESCRIPTOR_FREE
     if (_port) lockdownd_service_descriptor_free(_port);
+#endif
+#ifdef HAVE_LIBIMOBILEDEVICE_HOUSE_ARREST_H
     if (_house_arrest) house_arrest_client_free(_house_arrest);
+#endif
     if (_control) lockdownd_client_free(_control);
     if (_idev) idevice_free(_idev);
     _afc = NULL;
-    _port = NULL;
+    _port = LOCKDOWND_INVALID_PORT;
     _house_arrest = NULL;
     _control = NULL;
     _idev = NULL;
@@ -195,8 +203,9 @@ void IoAFC::init(VALUE rb_device_uuid, VALUE rb_appid)
         teardown();
         rb_raise(rb_eConnectFailed, "Failed to start %s service.", _service_name);
     }
-    
+
     if (appid) {
+#ifdef HAVE_LIBIMOBILEDEVICE_HOUSE_ARREST_H
         // check document foider?
         house_arrest_client_new(_idev, _port, &_house_arrest);
         if (!_house_arrest) {
@@ -231,13 +240,21 @@ void IoAFC::init(VALUE rb_device_uuid, VALUE rb_appid)
             rb_raise(rb_eConnectFailed, "Error: %s", _errmsg.c_str());
         }
         plist_free(dict);
+#else
+        teardown();
+        rb_raise(rb_eStandardError, "Document sharing servce is not supported. Please use more recent libimobiledevice.");
+#endif
     }
     
+#ifdef HAVE_LIBIMOBILEDEVICE_HOUSE_ARREST_H
     if (_house_arrest) {
         afc_client_new_from_house_arrest_client(_house_arrest, &_afc);
     } else {
+#endif
         afc_client_new(_idev, _port, &_afc);
+#ifdef HAVE_LIBIMOBILEDEVICE_HOUSE_ARREST_H
     }
+#endif
     
     if (!_afc) {
         teardown();
@@ -417,7 +434,7 @@ VALUE IoAFC::mkdir(VALUE rb_path)
 VALUE IoAFC::get_device_udid()
 {
     checkHandle();
-    
+#ifdef HAVE_LOCKDOWND_GET_DEVICE_UDID
     char* udid = NULL;
     lockdownd_error_t le = lockdownd_get_device_udid(_control, &udid);
     if (le!=LOCKDOWN_E_SUCCESS) {
@@ -429,6 +446,9 @@ VALUE IoAFC::get_device_udid()
         ::free(udid);
     }
     return result;
+#else
+    rb_raise(rb_eStandardError, "get_device_udid() is not supported. Please use more recent libimobiledevice.");
+#endif
 }
 
 
@@ -468,7 +488,7 @@ VALUE IoAFC::enum_applications()
 {
     checkHandle();
     
-    lockdownd_service_descriptor_t port = NULL;
+    LOCKDOWND_PORT port = LOCKDOWND_INVALID_PORT;
     lockdownd_error_t le = lockdownd_start_service(_control, INSTALLATION_PROXY_SERVICE_NAME, &port);
     if ((le!=LOCKDOWN_E_SUCCESS) || (port==0)) {
         rb_raise(rb_eConnectFailed, "Failed to start %s service.", INSTALLATION_PROXY_SERVICE_NAME);
@@ -477,14 +497,18 @@ VALUE IoAFC::enum_applications()
     instproxy_client_t client = NULL;
     instproxy_error_t ie = instproxy_client_new(_idev, port, &client);
     if ((ie!=INSTPROXY_E_SUCCESS) || (client==NULL)) {
+#ifdef HAVE_LOCKDOWND_SERVICE_DESCRIPTOR_FREE
         lockdownd_service_descriptor_free(port);
+#endif
         rb_raise(rb_eRuntimeError, "instproxy_client_new() failed - %d", ie);
     }
     
     plist_t client_opts = instproxy_client_options_new();
     if (client_opts==NULL) {
         instproxy_client_free(client);
+#ifdef HAVE_LOCKDOWND_SERVICE_DESCRIPTOR_FREE
         lockdownd_service_descriptor_free(port);
+#endif
         rb_raise(rb_eRuntimeError, "instproxy_client_options_new() failed");
     }
     
@@ -493,7 +517,9 @@ VALUE IoAFC::enum_applications()
     ie = instproxy_browse(client, client_opts, &apps);
     instproxy_client_options_free(client_opts);
     instproxy_client_free(client);
+#ifdef HAVE_LOCKDOWND_SERVICE_DESCRIPTOR_FREE
     lockdownd_service_descriptor_free(port);
+#endif
     if (ie!=INSTPROXY_E_SUCCESS) {
         rb_raise(rb_eRuntimeError, "instproxy_browse() failed - %d", ie);
     }

data/ext/io/afc/ioafc.h

@@ -19,9 +19,22 @@
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>
 #include <libimobiledevice/afc.h>
-#include <libimobiledevice/house_arrest.h>
 #include <libimobiledevice/installation_proxy.h>
 
+#ifdef HAVE_LIBIMOBILEDEVICE_HOUSE_ARREST_H
+#include <libimobiledevice/house_arrest.h>
+#else
+typedef void*   house_arrest_client_t;
+#endif
+
+#ifdef HAVE_LOCKDOWND_SERVICE_DESCRIPTOR_FREE
+typedef lockdownd_service_descriptor_t LOCKDOWND_PORT;
+#   define LOCKDOWND_INVALID_PORT   (NULL)
+#else
+typedef uint16_t LOCKDOWND_PORT;
+#   define LOCKDOWND_INVALID_PORT   0
+#endif
+
 
 #define DBG(...)    //printf(__VA_ARGS__)
 
@@ -34,7 +47,7 @@ protected:
     off_t               _blocksize; //= 4096
     idevice_t           _idev;
     lockdownd_client_t  _control;
-    lockdownd_service_descriptor_t _port;
+    LOCKDOWND_PORT      _port;
     afc_client_t        _afc;
     house_arrest_client_t _house_arrest;
 

data/io-afc.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/suzumura-ss/ruby-io-afc"
   spec.license       = "MIT"
 
-  spec.files         = Dir["**/*"]
+  spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/lib/io/afc/version.rb

@@ -1,5 +1,5 @@
 class IO
 module AFCVersion
-  VERSION = "0.0.3.2"
+  VERSION = "0.0.3.3"
 end
 end

data/lib/io/afc.rb

@@ -23,8 +23,9 @@ public
 
   ##
   # Connect to iOS-Device and yield block with handle if specified.
-  # @option [:uuid=>String] Target UUID. if nil, connect to default device.
-  # @option [:appid=>String] Mount application document folder if specified.
+  # @param [Hash] opt options for connect device.
+  # @option opt [String] :uuid Target UUID. if nil, connect to default device.
+  # @option opt [String] :appid Mount application's document folder if specified.
   # @return [IO::AFC or block-result]
   def self.connect(opt={}, &block)
     dev = self.new(opt[:udid], opt[:appid])
@@ -43,21 +44,20 @@ public
   ##
   # Get storage info.
   # @return [Hash]
-  #
-  # Example:
-  # afc.statfs
-  # => {:FSBlockSize=>4096,
-  # :FSFreeBytes=>27478216704,
-  # :FSTotalBytes=>30178787328,
-  # :Model=>"iPod5,1"}
+  # @example
+  #     afc.statfs
+  #     => {:FSBlockSize=>4096,
+  #     :FSFreeBytes=>27478216704,
+  #     :FSTotalBytes=>30178787328,
+  #     :Model=>"iPod5,1"}
   def statfs
     dict_to_hash(super)
   end
 
   ##
   # Open file.
-  # @param [String] path for target file.
-  # @param [IO::Constants] mode for open mode. Default is IO::RDONLY.
+  # @param [String] path pathname for target file.
+  # @param [IO::Constants] mode for open mode.
   def open(path, mode = IO::RDONLY, &block)
     raise ArgumentError, "block is required." unless block_given?
     File.open_file(self, path, mode, &block)
@@ -65,25 +65,23 @@ public
 
   ##
   # Get file/directory attribytes.
-  # @param [String] path.
+  # @param [String] path pathname for get attributes.
   # @return [Hash]
-  #
-  # Example:
-  # afc.getattr("/Safari")
-  # => {:st_birthtime=>2012-12-17 12:28:23 +0900,
-  # :st_mtime=>2013-06-22 20:32:01 +0900
-  # :st_ifmt=>"S_IFDIR",
-  # :st_nlink=>2,
-  # :st_blocks=>0,
-  # :st_size=>102}
-  #
-  # afc.getattr("/Safari/goog-phish-shavar.db")
-  # => {:st_birthtime=>2013-06-21 02:31:17 +0900,
-  # :st_mtime=>2013-06-21 02:31:18 +0900,
-  # :st_ifmt=>"S_IFREG",
-  # :st_nlink=>1,
-  # :st_blocks=>11256,
-  # :st_size=>5763072}
+  # @example
+  #     afc.getattr("/Safari")
+  #     => {:st_birthtime=>2012-12-17 12:28:23 +0900,
+  #     :st_mtime=>2013-06-22 20:32:01 +0900
+  #     :st_ifmt=>"S_IFDIR",
+  #     :st_nlink=>2,
+  #     :st_blocks=>0,
+  #     :st_size=>102}
+  #     afc.getattr("/Safari/goog-phish-shavar.db")
+  #     => {:st_birthtime=>2013-06-21 02:31:17 +0900,
+  #     :st_mtime=>2013-06-21 02:31:18 +0900,
+  #     :st_ifmt=>"S_IFREG",
+  #     :st_nlink=>1,
+  #     :st_blocks=>11256,
+  #     :st_size=>5763072}
   def getattr(path)
     r = dict_to_hash(super(path))
     [:st_birthtime, :st_mtime].each{|k|
@@ -94,7 +92,7 @@ public
 
   ##
   # Check exist
-  # @param [String] path.
+  # @param [String] path pathname for check exists.
   # @return [String or nil] return type or nil.
   def exist?(path)
     begin
@@ -106,7 +104,7 @@ public
 
   ##
   # Read symlink.
-  # @param [String] path.
+  # @param [String] path pathname for read symlink.
   # @return [String or nil] return symlink-target.
   def readlink(path)
     getattr(path)[:LinkTarget]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-afc
 version: !ruby/object:Gem::Version
-  version: 0.0.3.2
+  version: 0.0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,23 +51,22 @@ extensions:
 - ext/io/afc/extconf.rb
 extra_rdoc_files: []
 files:
+- .gitignore
+- .yardopts
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
 - ext/io/afc/build.xcconfig
 - ext/io/afc/extconf.rb
 - ext/io/afc/ioafc.cpp
 - ext/io/afc/ioafc.h
 - ext/io/afc/ruby_wrapper.h
-- Gemfile
-- Gemfile.lock
 - io-afc.gemspec
 - io-afc.xcodeproj/project.pbxproj
+- lib/io/afc.rb
 - lib/io/afc/file.rb
 - lib/io/afc/version.rb
-- lib/io/afc.rb
-- LICENSE.txt
-- pkg/io-afc-0.0.3.1.gem
-- pkg/io-afc-0.0.3.2.gem
-- Rakefile
-- README.md
 - spec/afc_file_spec.rb
 - spec/afc_spec.rb
 - spec/basicio_filectrl_spec.rb
@@ -87,18 +86,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 378568250842512408
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 378568250842512408
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -112,3 +105,4 @@ test_files:
 - spec/basicio_fileio_spec.rb
 - spec/basicio_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    io-afc (0.0.3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.0.9)
-    diff-lcs (1.2.4)
-    method_source (0.8.1)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    rake (10.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    slop (3.4.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  io-afc!
-  pry
-  pry-nav
-  rake
-  rspec