idevice 1.1.6.0 → 1.1.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDgzZWIwNTkzZjg0ZTc4OWNjYmUzZWFmOTBkNGFhNDI4Mzg3Njk0YQ==
-  data.tar.gz: !binary |-
-    YTIzMzdkNmJhMGI0YTc4MTE0MzkxOTcwYTFmZmQ5NzViYjkxOGZjZQ==
+SHA1:
+  metadata.gz: f503fdd0e7e3b4150930b3e77dbadf65b70d0100
+  data.tar.gz: b13f584e785bf58693f315942d016340e9020acf
 SHA512:
-  metadata.gz: !binary |-
-    MDk0YTcyZmQxOTllYmIwMjNkODA2ODkyY2M4Y2NlNDUzMDg3YTZhY2I3ODYy
-    MmNlZTMyOTEyMzhkYjk5MWNhNDg3YTE3OGMxZWE2Nzc3NDRmZTExNTcwOWE5
-    YjkyYzdjNjg2MTQxMTcwOTI4OTNhZGQ5ODFlMjQwMTM1ZWQzNDQ=
-  data.tar.gz: !binary |-
-    NTJlNjQwZDQ1ZmM5NmQzNGZjNGQ3MWI2MDhiZDQwZGE2NTExYzFmMWJkYmE0
-    Yzc3Yjk1ZmY0ODQxNGU1YTg4ZTM2MjIwOThkMzYxM2I3NWEyY2JhZTQ4MGQy
-    MzlmYjE5ZTUyM2M0OWE0YjllY2E4YjRiMzk0NmNkNzcyYzgyODA=
+  metadata.gz: 5e2f2518f4dffec0d4f95bf31ef83fd9a790bc4c7c053f8ce351997807d5defa08ab6d518c1cb27058725e8cea8d1f489e7b66f7c3e9cf60ae56c04a7ef6f942
+  data.tar.gz: 35f02bceaa7c735dafa2a8b782a22423cd7ec11960b6f5cf046a582b1e8acdb5f6bb7a8e30e7cc20c30ccf117a99aa973b42cc9f098661d6e06981ed05d56afa

data/README.md

@@ -36,18 +36,20 @@ Or install it yourself as:
 
 See 
 
-- https://github.com/blueboxsecurity/idevice/tree/master/examples
-- https://github.com/blueboxsecurity/idevice/tree/master/spec
+- https://github.com/emonti/idevice/tree/master/examples
+- https://github.com/emonti/idevice/tree/master/spec
 
-## Author
+## Contact
 
-Eric Monti - monti@bluebox.com
+Eric Monti - esmonti@gmail.com (Author)
 
+This code is released under the ASF license by Bluebox Security
+- https://www.bluebox.com
 
 ## Issues / Contributing
 
 Please submit pull requests using github.
-Report issues at https://github.com/blueboxsecurity/idevice/issues
+Report issues at https://github.com/emonti/idevice/issues
 
 
 ## License

data/idevice.gemspec

@@ -15,7 +15,7 @@ The ruby Idevice library was written primarily as a research tool for
 prototyping iOS tools that use USB as well as a tool to aid in 
 reverse-engineering new areas of the iOS USB protocols.
 }
-  spec.homepage      = "https://github.com/blueboxsecurity/idevice"
+  spec.homepage      = "https://github.com/emonti/idevice"
   spec.license       = "Apache License, Version 2.0"
 
   spec.files         = `git ls-files`.split($/)
@@ -28,6 +28,6 @@ reverse-engineering new areas of the iOS USB protocols.
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
 end

data/lib/idevice/lockdown.rb

@@ -127,9 +127,13 @@ module Idevice
       res = nil
       FFI::MemoryPointer.new(:pointer) do |p_val|
         err = C.lockdownd_get_value(self, domain, key, p_val)
-        raise LockdownError, "Lockdownd error: #{err}" if err != :SUCCESS
-
-        res = p_val.read_pointer.read_plist_t
+        if err == :SUCCESS
+            res = p_val.read_pointer.read_plist_t
+        elsif err == :UNKNOWN_ERROR
+            res = nil
+        else
+            raise LockdownError, "Lockdownd error: #{err}"
+        end
       end
       return res
     end

data/lib/idevice/notification_proxy.rb

@@ -93,27 +93,25 @@ module Idevice
       return true
     end
 
-    def observe_notification
-      FFI::MemoryPointer.new(:pointer) do |p_notification|
-        err = C.np_observe_notification(self, p_notification)
-        raise NotificationProxyError, "Notification Proxy Error: #{err}" if err != :SUCCESS
+    def observe_notification(notification_type)
+      err = C.np_observe_notification(self, notification_type)
+      raise NotificationProxyError, "Notification Proxy Error: #{err}" if err != :SUCCESS
 
-        notification = p_notification.read_pointer
-        unless notification.null?
-          ret = notification.read_string
-          C.free(notification)
-          return ret
-        end
-      end
     end
 
-    def observe_notifications
-      FFI::MemoryPointer.new(:pointer) do |p_notifications|
-        err = C.np_observe_notifications(self, p_notifications)
-        raise NotificationProxyError, "Notification Proxy Error: #{err}" if err != :SUCCESS
+    def observe_notifications(notification_types)
+	  ntypes_ary = []
+	  notification_types.each do |ntype|
+		ntypes_ary << FFI::MemoryPointer.from_string(ntype)
+	  end
+	  ntypes_ary << nil
+	  ntypes = FFI::MemoryPointer.new(:pointer, ntypes_ary.length)
+	  ntypes_ary.each_with_index do |p, i|
+		ntypes[i].put_pointer(0, p)
+	  end
+	  err = C.np_observe_notifications(self, ntypes)
+      raise NotificationProxyError, "Notification Proxy Error: #{err}" if err != :SUCCESS
 
-        return _unbound_list_to_array(p_notifications)
-      end
     end
 
     def set_notify_callback(&block)

data/lib/idevice/version.rb

@@ -1,3 +1,3 @@
 module Idevice
-  VERSION = "1.1.6.0"
+  VERSION = "1.1.7.0"
 end

data/spec/afc_devicespec.rb

@@ -81,13 +81,13 @@ describe Idevice::AFCClient do
     remotepath='TOTALLYATESTFILECREATEDTEST'
 
     @afc.put_path(@fromfile.to_s, remotepath).should == @fromfile.size
-    @afc.remove_path(remotepath).should be_true
+    @afc.remove_path(remotepath).should == true
   end
 
   it "should remove an (empty) directory path" do
     remotepath='TOTALLYATESTDIRCREATEDTEST'
-    @afc.make_directory(remotepath).should be_true
-    @afc.remove_path(remotepath).should be_true
+    @afc.make_directory(remotepath).should == true
+    @afc.remove_path(remotepath).should == true
   end
 
   it "should rename a file path" do
@@ -97,13 +97,13 @@ describe Idevice::AFCClient do
     begin
       @afc.put_path(@fromfile.to_s, remotepath).should == @fromfile.size
       originfo = @afc.file_info(remotepath)
-      @afc.rename_path(remotepath, renamepath).should be_true
+      @afc.rename_path(remotepath, renamepath).should == true
       lambda{ @afc.file_info(remotepath) }.should raise_error Idevice::AFCError
       info = @afc.file_info(renamepath)
       info.should == originfo
     ensure
       @afc.remove_path(remotepath) rescue nil
-      @afc.remove_path(renamepath).should be_true
+      @afc.remove_path(renamepath).should == true
     end
 
   end
@@ -112,22 +112,22 @@ describe Idevice::AFCClient do
     remotepath = 'TOTALLYATESTDIRCREATEDTEST'
     renamepath = remotepath+'2'
     begin
-      @afc.make_directory(remotepath).should be_true
+      @afc.make_directory(remotepath).should == true
       originfo = @afc.file_info(remotepath)
-      @afc.rename_path(remotepath, renamepath).should be_true
+      @afc.rename_path(remotepath, renamepath).should == true
       lambda{ @afc.file_info(remotepath) }.should raise_error Idevice::AFCError
       info = @afc.file_info(renamepath)
       info.should == originfo
     ensure
       @afc.remove_path(remotepath) rescue nil
-      @afc.remove_path(renamepath).should be_true
+      @afc.remove_path(renamepath).should == true
     end
   end
 
   it "should make a directory" do
     remotepath = 'TOTALLYATESTDIR'
     begin
-      @afc.make_directory(remotepath).should be_true
+      @afc.make_directory(remotepath).should == true
       result = @afc.file_info(remotepath)
       result[:st_ifmt].should == :S_IFDIR
     ensure
@@ -137,7 +137,7 @@ describe Idevice::AFCClient do
 
   it "should make a symbolic link to a directory" do
     begin
-      @afc.symlink('.', 'TOTALLYATESTSYMLINKTOCURRENTDIR').should be_true
+      @afc.symlink('.', 'TOTALLYATESTSYMLINKTOCURRENTDIR').should == true
       result = @afc.file_info('TOTALLYATESTSYMLINKTOCURRENTDIR')
       result[:st_ifmt].should == :S_IFLNK
     ensure
@@ -150,8 +150,8 @@ describe Idevice::AFCClient do
     remotelink = 'TOTEALLYATESTSYMLINK3'
 
     begin
-      @afc.touch(remotefile).should be_true
-      @afc.symlink(remotefile, remotelink).should be_true
+      @afc.touch(remotefile).should == true
+      @afc.symlink(remotefile, remotelink).should == true
       @afc.file_info(remotefile)[:st_ifmt].should == :S_IFREG
       @afc.file_info(remotelink)[:st_ifmt].should == :S_IFLNK
 
@@ -172,8 +172,8 @@ describe Idevice::AFCClient do
     remotelink = 'TOTEALLYATESTHARDLINK'
 
     begin
-      @afc.touch(remotefile).should be_true
-      @afc.hardlink(remotefile, remotelink).should be_true
+      @afc.touch(remotefile).should == true
+      @afc.hardlink(remotefile, remotelink).should == true
       @afc.file_info(remotefile)[:st_ifmt].should == :S_IFREG
       @afc.file_info(remotelink)[:st_ifmt].should == :S_IFREG
 
@@ -212,7 +212,7 @@ describe Idevice::AFCClient do
         gotblock=true
         (0..2).should include(chunksz)
       end.should == @fromfile.size
-      gotblock.should be_true
+      gotblock.should == true
 
       catsize = 0
       catbuf = StringIO.new
@@ -227,7 +227,7 @@ describe Idevice::AFCClient do
 
       catsize.should == @fromfile.size
       catbuf.string.should == @fromfile.read()
-      gotblock.should be_true
+      gotblock.should == true
     ensure
       @afc.remove_path(remotepath) rescue nil
     end
@@ -252,10 +252,10 @@ describe Idevice::AFCClient do
     remotepath = 'TESTFILEUPLOADFORTRUNCATE'
 
     begin
-      (@fromfile.size > 10).should be_true
+      (@fromfile.size > 10).should == true
       @afc.put_path(@fromfile.to_s, remotepath).should == @fromfile.size
       @afc.size(remotepath).should == @fromfile.size
-      @afc.truncate(remotepath, 10).should be_true
+      @afc.truncate(remotepath, 10).should == true
       @afc.size(remotepath).should == 10
     ensure
       @afc.remove_path(remotepath) rescue nil
@@ -281,7 +281,7 @@ describe Idevice::AFCClient do
   it "should touch a file" do
     remotefile = "TESTFILETOUCH"
     begin
-      @afc.touch(remotefile).should be_true
+      @afc.touch(remotefile).should == true
       @afc.cat(remotefile).should == ""
       @afc.ctime(remotefile).should == @afc.mtime(remotefile)
     ensure
@@ -293,11 +293,11 @@ describe Idevice::AFCClient do
     remotefile = "TESTINGFILETIMESETTING"
     settime = Time.parse("June 29, 2007 4:20 UTC")
     begin
-      @afc.touch(remotefile).should be_true
+      @afc.touch(remotefile).should == true
       @afc.ctime(remotefile).should_not == settime
       @afc.mtime(remotefile).should_not == settime
 
-      @afc.set_file_time(remotefile, settime).should be_true
+      @afc.set_file_time(remotefile, settime).should == true
       @afc.ctime(remotefile).should == settime
       @afc.mtime(remotefile).should == settime
     ensure

data/spec/diagnostics_relay_devicespec.rb

@@ -99,22 +99,22 @@ describe Idevice::DiagnosticsRelayClient do
   end
 
   it "should say goodbye to disconnect from the service" do
-    @drc.goodbye.should be_true
+    @drc.goodbye.should == true
     lambda{ @drc.diagnostics }.should raise_error(Idevice::DiagnosticsRelayError)
   end
 
   it "should put a device to sleep" do
-    pending "don't actually put the device to sleep"
+    skip "don't actually put the device to sleep"
     @drc.sleep
   end
 
   it "should restart a device" do
-    pending "don't actually reboot the device"
+    skip "don't actually reboot the device"
     @drc.restart(0) #(with optional flags arg)
   end
 
   it "should shutdown a device" do
-    pending "don't actually shutdown the device"
+    skip "don't actually shutdown the device"
     @drc.shutdown(0) #(with optional flags arg)
   end
 

data/spec/heartbeat_devicespec.rb

@@ -30,10 +30,10 @@ describe Idevice::HeartbeatClient do
   end
 
   it "should send and receive a heartbeat" do
-    pending "Heartbeat is not working on my test device"
+    skip "Heartbeat is not working on my test device"
     marco = @hb.receive_plist
     marco.should be_a Hash
-    @hb.send_plist("Command" => "Polo").should be_true
+    @hb.send_plist("Command" => "Polo").should == true
   end
 end
 

data/spec/image_mounter_devicespec.rb

@@ -56,7 +56,7 @@ describe Idevice::ImageMounterClient do
   end
 
   it "should hangup" do
-    @imgmounter.hangup.should be_true
+    @imgmounter.hangup.should == true
     lambda{ @imgmounter.lookup_image }.should raise_error(Idevice::ImageMounterError)
   end
 

data/spec/lockdown_devicespec.rb

@@ -95,7 +95,7 @@ describe Idevice::LockdownClient do
       ldsvc = @lockdown.start_service("com.apple.afc")
       ldsvc.should_not be_nil
       ldsvc[:port].should > 1024
-      [0,1].include?(ldsvc[:ssl_enabled]).should be_true
+      [0,1].include?(ldsvc[:ssl_enabled]).should == true
     end
 
     it "should raise an error starting a nonexistent lockdown service" do

data/spec/mobilebackup_devicespec.rb

@@ -35,7 +35,7 @@ if ENV["TEST_MOBILEBACKUP1"]
     end
 
     it "needs functional tests" do
-      pending "writing more specs for MobileBackupClient"
+      skip "writing more specs for MobileBackupClient"
     end
   end
 end

data/spec/restore_devicespec.rb

@@ -40,29 +40,29 @@ describe Idevice::RestoreClient do
   it "should start a restore" 
 
   it "should get the query type of the service daemon" do
-    pending "getting PLIST_ERROR on iOS 7.x"
+    skip "getting PLIST_ERROR on iOS 7.x"
     res = @rc.query_type
   end
 
   it "should 'query' a value from the device specified by a key" do
-    pending "getting PLIST_ERROR on iOS 7.x"
+    skip "getting PLIST_ERROR on iOS 7.x"
     res = @rc.query_value "foo"
   end
 
   it "should 'get' a value from information plist based by a key" do
-    pending "getting NOT_ENOUGH_DATA on iOS 7.x"
+    skip "getting NOT_ENOUGH_DATA on iOS 7.x"
     res = @rc.get_value "foo"
   end
 
   it "should request a device reboot" do
-    pending "don't actually reboot"
-    pending "getting PLIST_ERROR on iOS 7.x"
-    @rc.reboot.should be_true
+    skip "don't actually reboot"
+    skip "getting PLIST_ERROR on iOS 7.x"
+#    @rc.reboot.should == true
   end
 
   it "should say goodbye" do
-    pending "getting PLIST_ERROR on iOS 7.x"
-    @rc.goodbye.should be_true
+    skip "getting PLIST_ERROR on iOS 7.x"
+    @rc.goodbye.should == true
   end
 
   it "should send a plist"

data/spec/sbservices_devicespec.rb

@@ -36,7 +36,7 @@ describe Idevice::SBSClient do
   end
 
   it "should set the icon state" do
-    pending "dont actually mess with icon state"
+    skip "dont actually mess with icon state"
     @sbs.set_icon_state({"somthing" => 'here'})
   end
 

data/spec/screenshotr_devicespec.rb

@@ -22,7 +22,7 @@ require_relative 'spec_helper'
 
 describe Idevice::ScreenShotrClient do
   before :each do
-    pending "needs developer disk mounted" unless ENV["DEVTESTS"]
+    skip "needs developer disk mounted" unless ENV["DEVTESTS"]
     @ss = Idevice::ScreenShotrClient.attach(idevice:shared_idevice, lockdown_client:shared_lockdown_client)
   end
 

data/spec/spec_helper.rb

@@ -31,6 +31,10 @@ $LOAD_PATH << $SPECROOT.join("..", "lib").expand_path
 require 'idevice'
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
   def sample_file(filename)
     $SPECROOT.join("samples", filename)
   end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: idevice
 version: !ruby/object:Gem::Version
-  version: 1.1.6.0
+  version: 1.1.7.0
 platform: ruby
 authors:
 - Eric Monti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,42 +56,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby FFI bindings for libimobiledevice
@@ -166,7 +166,7 @@ files:
 - spec/screenshotr_devicespec.rb
 - spec/spec_helper.rb
 - spec/webinspector_devicespec.rb
-homepage: https://github.com/blueboxsecurity/idevice
+homepage: https://github.com/emonti/idevice
 licenses:
 - Apache License, Version 2.0
 metadata: {}
@@ -176,17 +176,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ruby FFI bindings for libimobiledevice.  The ruby Idevice library was written