device_api-ios 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44a319cbde8d0c83a2c6ce73f50a9f659381363e
-  data.tar.gz: 5a5251780401174266d85ce74f4c547f8736633b
+  metadata.gz: f131af055b0b58b5ef4378fed43b28e7b67d028a
+  data.tar.gz: 353f90a18052442c2213db25ee7007defb8a27af
 SHA512:
-  metadata.gz: 62bd6649f4d4beceb65bbbae499a0daec718543557380eaefb6d6717c62369af546d50806961c720ee30ed8f22d20c8587777773ca842c2c3afe5f2e8110158b
-  data.tar.gz: 0654d20a10cc4b7d461c3d31253f50fa2ea090d9d3af46be195e62ef6cf9c2a7fbc0f7b4e1b1b637e2fab4985f0feb2276b165a502f0855f8c1cc5566bdc5a70
+  metadata.gz: 437802096cbf0dec1d15c350d3d74189d6bb299f0a3fb3bd4bd208ebc5e11742949bcae4b24a722d96b744903f74ac57fd177105e02bc149e9d66e0e97dfa728
+  data.tar.gz: 4477c6442a539b7a8bda12e1657c931e763d481aa98e8e9d45c081dfa5cf412ba5c520bd893d991e4270aa74a4df5c571b2a164eddd967cddede98bdb4056064

data/Gemfile

@@ -6,5 +6,4 @@ gem 'ox'
 
 group :test do
   gem 'rspec'
-  gem 'pry'
 end

data/Gemfile.lock

@@ -1,16 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.0)
     device_api (1.0.1)
     diff-lcs (1.2.5)
     ios-devices (0.2.1)
-    method_source (0.8.2)
-    ox (2.2.1)
-    pry (0.10.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -24,7 +17,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    slop (3.6.0)
 
 PLATFORMS
   ruby
@@ -32,6 +24,7 @@ PLATFORMS
 DEPENDENCIES
   device_api (>= 1.0.0)
   ios-devices
-  ox
-  pry
   rspec
+
+BUNDLED WITH
+   1.10.5

data/device_api-ios.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'device_api-ios'
-  s.version     = '1.0.3'
+  s.version     = '1.0.4'
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.summary     = 'IOS Device Management API'
   s.description = 'iOS implementation of DeviceAPI'

data/lib/device_api/ios/plistutil.rb

@@ -31,17 +31,23 @@ module DeviceAPI
         raise PlistutilCommandError.new('plistutil not found') unless plistutil_available?
         result = execute("plistutil -i #{plist}")
         raise PlistutilCommandError.new(result.stderr) if result.exit != 0
-        info = Ox.parse(result.stdout)
+        parse_xml(result.stdout)
+      end
+
+      def self.parse_xml(xml)
+        info = Ox.parse(xml)
         nodes = info.locate('*/dict')
         values = {}
         last_key = nil
-        nodes.each do |node|
-          node.nodes.each do |child|
-            if child.value == 'key'
-              last_key = child.nodes.first
-            elsif child.value == 'string'
-              values[last_key] = child.nodes.first
+        nodes.first.nodes.each do |child|
+          if child.value == 'key'
+            if child.nodes.first == 'get-task-allow'
+              values['get-task-allow'] = nodes.first.nodes[nodes.first.nodes.index(child)+1].value
+              next
             end
+            last_key = child.nodes.first
+          elsif child.value == 'string'
+            values[last_key] = child.nodes.first
           end
         end
         values

data/lib/device_api/ios/signing.rb

@@ -1,4 +1,5 @@
 require 'device_api/execution'
+require 'device_api/ios/plistutil'
 
 # DeviceAPI - an interface to allow for automation of devices
 module DeviceAPI
@@ -42,11 +43,33 @@ module DeviceAPI
         cert          = options[:cert]
         entitlements  = options[:entitlements]
         app           = options[:app]
+        original_app  = nil
 
-        result = execute("codesign --force --sign #{cert} --entitlements #{entitlements} '#{app}'")
+        if is_ipa?(app)
+          original_app = app
+          app = unpack_ipa(app)
+        end
+
+        # Check to see if the entitlements passed in is a file or the XML
+        unless File.exists?(entitlements)
+          file = Tempfile.new('entitlements')
+          file.write(entitlements)
+          file.close
+          entitlements = file.path
+        end
+
+        result = execute("codesign --force --sign '#{cert}' --entitlements #{entitlements} '#{app}'")
 
         raise SigningCommandError.new(result.stderr) if result.exit != 0
 
+        zip_app(app, original_app) if original_app
+      end
+
+      def self.zip_app(payload_path, ipa_path)
+        result = execute("cd #{File.dirname(payload_path)}; zip -r #{ipa_path} ../Payload ")
+        raise SigningCommandError.new(result.stderr) if result.exit != 0
+
+        true
       end
 
       def self.get_signing_certs
@@ -63,16 +86,29 @@ module DeviceAPI
         certs
       end
 
-      def self.get_entitlements(app_path)
+      def self.get_entitlements(app_path, raw = false)
         app_path = unpack_ipa(app_path) if is_ipa?(app_path)
         result = execute("codesign -d --entitlements - #{app_path}")
 
-        require 'pry'
-        binding.pry
         if result.exit != 0
           raise SigningCommandError.new(result.stderr)
         end
-        return result.stdout
+
+        # Clean up the result as it occasionally contains invalid UTF-8 characters
+        xml = result.stdout.to_s.encode('UTF-8', 'UTF-8', invalid: :replace)
+        xml = xml[xml.index('<')..xml.length]
+
+        return xml if raw
+        entitlements = Plistutil.parse_xml(xml)
+        return entitlements
+      end
+
+      def self.enable_get_tasks(app_path)
+        entitlements = get_entitlements(app_path, raw: true)
+
+        return entitlements if entitlements.scan(/<key>get-task-allow<\/key>\\n.*<true\/>/).count > 0
+
+        entitlements.gsub('<false/>', '<true/>') if entitlements.scan(/<key>get-task-allow<\/key>\\n.*<false\/>/)
       end
     end
 

data/spec/ios_signing_spec.rb

@@ -43,20 +43,61 @@ describe DeviceAPI::IOS::Signing do
   end
 
   describe "entitlements" do
+    plist = <<-eos
+    <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+        <plist version="1.0">
+        <dict>
+          <key>application-identifier</key>
+          <string>uk.co.bbc.test</string>
+          <key>com.apple.developer.team-identifier</key>
+          <string>ABC1DE2345</string>
+          <key>get-task-allow</key>
+          <false/>
+          <key>keychain-access-groups</key>
+          <array>
+            <string>uk.co.bbc.iplayer.test</string>
+          </array>
+        </dict>
+        </plist>
+    eos
+
     it 'returns a list of entitlements for an app' do
-      out = <<-eos
-      <dict>
-        <key>application-identifier</key>
-        <string>uk.co.bbc.test</string>
-        <key>get-task-allow</key>
-        <false/>
-      </dict>
-      eos
       allow(Open3).to receive(:capture3) {
-        [out, '', (Struct.new(:exitstatus)).new(0)]
+        [plist, '', (Struct.new(:exitstatus)).new(0)]
+      }
+
+      expected_result = {
+          'application-identifier' => 'uk.co.bbc.test',
+          'com.apple.developer.team-identifier' => 'ABC1DE2345',
+          'get-task-allow' => 'false'
       }
+      expect(DeviceAPI::IOS::Signing.get_entitlements('')).to eq(expected_result)
+    end
 
-      expect(DeviceAPI::IOS::Signing.get_entitlements('test.ipa')).to eq(true)
+    it 'should replace the entitlements for an app' do
+      expected = <<-eos
+<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+        <plist version="1.0">
+        <dict>
+          <key>application-identifier</key>
+          <string>uk.co.bbc.test</string>
+          <key>com.apple.developer.team-identifier</key>
+          <string>ABC1DE2345</string>
+          <key>get-task-allow</key>
+          <true/>
+          <key>keychain-access-groups</key>
+          <array>
+            <string>uk.co.bbc.iplayer.test</string>
+          </array>
+        </dict>
+        </plist>
+      eos
+      allow(Open3).to receive(:capture3) {
+        [plist, '', (Struct.new(:exitstatus)).new(0)]
+      }
+      expect(DeviceAPI::IOS::Signing.enable_get_tasks('test.ipa')).to eq(expected)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_api-ios
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api