hive-runner-ios 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 795efeda489333e822f6d4ada9766ecac446cb13
-  data.tar.gz: 6b1beda1e396457b9e24eafc76ef4124b3bcd5b5
+  metadata.gz: 9e19a8402c5a02c35d70ec36a84137ffceceb6e8
+  data.tar.gz: dede2f8bf1a5f183ad032ab1afd4e37761e42225
 SHA512:
-  metadata.gz: 6fc8cee98e5b46d90d2b61cb6f7b9ed7e6d671dbfd08331dc1c141158df69a2d5a6a7b1d63384df596662db4644d89a10eaf6325b413ae45f1357e25126a90be
-  data.tar.gz: 28c5d86a2307bbecd4eb02d3ab2b2edef9bf642bf3d0bc87148654df82ecbe83845144584e3ee20325ad8a406d5589cf7031d0cb86ed4f90c1581b18da7ea727
+  metadata.gz: da80b81082e07195e070163cbd0b8e470957c5f570f51cac66e73e3d0f30ea5e9976e5b7fc999d89ee867d5fb4147425138429cabcea47ff7365b07560c53a3e
+  data.tar.gz: a3cf25ee622a2feb3401002c5b989ee13e24aeddd9c0cee7ca3713caaa099caccaa1442d93e38ba1c68b820b5a00b8cb41e925448282172c2ee59b5c065e06e5

data/lib/hive/messages/ios_job.rb

@@ -6,6 +6,10 @@ module Hive
       def build
         self.target.symbolize_keys[:build]
       end
+
+      def resign
+        self.target.symbolize_keys[:resign].to_i != 0
+      end
     end
   end
-end
+end

data/lib/hive/worker/ios.rb

@@ -42,12 +42,20 @@ module Hive
         # Check to see if a project has been passed in
         return unless helper.has_project?
 
-        helper.build.replace_bundle_id(@options['bundle_id'])
-
-        helper.build.replace_dev_team(dev_team)
-        helper.build.replace_code_sign_identity(signing_identity)
-        helper.build.replace_provisioning_profile(provisioning_profile)
-        helper.build.save_project_properties
+        @log.debug("Resign: #{job.resign}")
+        if job.resign
+          @log.debug("Resign: Changing bundle id to #{@options['bundle_id']}")
+          helper.build.replace_bundle_id(@options['bundle_id'])
+
+          @log.debug("Resign: Changing dev team to #{dev_team}")
+          helper.build.replace_dev_team(dev_team)
+          @log.debug("Resign: Changing signing identity to #{signing_identity}")
+          helper.build.replace_code_sign_identity(signing_identity)
+          @log.debug("Resign: Changing provisioning profile to #{provisioning_profile}")
+          helper.build.replace_provisioning_profile(provisioning_profile)
+          helper.build.save_project_properties
+          @log.debug("Finished resigning")
+        end
       end
 
       def replace_project_data(options = {})
@@ -66,18 +74,29 @@ module Hive
 
         set_device_status('busy')
         device = DeviceAPI::IOS.device(self.device['serial'])
+        @installed_apps = device.list_installed_packages
+        @log.debug("Apps installed before test:")
+        @installed_apps.each_pair do |app, details|
+          @log.debug("  #{app}")
+          details.each_pair do |k, v|
+            @log.debug("    #{k}: #{v}")
+          end
+        end
 
         if job.build
           FileUtils.mkdir(file_system.home_path + '/build')
           app_path = file_system.home_path + '/build/' + 'build.ipa'
 
           file_system.fetch_build(job.build, app_path)
-          entitlements = FruityBuilder::IOS::Signing.enable_get_tasks(app_path)
-          FruityBuilder::IOS::Signing.sign_app({ cert: @options['signing_identity'], entitlements: entitlements, app: app_path } )
-          app_info = FruityBuilder::IOS::Plistutil.get_bundle_id_from_app(app_path)
-          app_bundle = app_info['CFBundleIdentifier']
-          device.install(app_path)
-          script.set_env 'BUNDLE_ID', app_bundle
+          @log.debug("Resign: #{job.resign}")
+          if job.resign
+            entitlements = FruityBuilder::IOS::Signing.enable_get_tasks(app_path)
+            FruityBuilder::IOS::Signing.sign_app({ cert: @options['signing_identity'], entitlements: entitlements, app: app_path } )
+            app_info = FruityBuilder::IOS::Plistutil.get_bundle_id_from_app(app_path)
+            app_bundle = app_info['CFBundleIdentifier']
+            device.install(app_path) if job.install_build
+            script.set_env 'BUNDLE_ID', app_bundle
+          end
         else
           alter_project(file_system.home_path + '/test_code/code/')
         end
@@ -122,6 +141,20 @@ module Hive
         @worker_ports.ports.each do |name, port|
           @port_allocator.release_port(port)
         end
+
+        device = DeviceAPI::IOS.device(self.device['serial'])
+        @installed_apps_after = device.list_installed_packages
+        @log.debug("Apps installed after test:")
+        @installed_apps_after.each_pair do |app, details|
+          @log.debug("  #{app}")
+          details.each_pair do |k, v|
+            @log.debug("    #{k}: #{v}")
+          end
+        end
+        (@installed_apps_after.keys - @installed_apps.keys).each do |app|
+          @log.info("Uninstalling #{app} (#{@installed_apps_after[app][:package_name]})")
+          device.uninstall(@installed_apps_after[app][:package_name])
+        end
         set_device_status('happy')
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-ios
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hive-runner
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.7
+- !ruby/object:Gem::Dependency
+  name: hive-messages
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: fruity_builder
   requirement: !ruby/object:Gem::Requirement