deploygate 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzJhMjA3ODg1OTY2ZmUwMjdjODgyZjBhYWViNjY1YmI4YzYwZDQ4MA==
+    YzI3ZjM5YmJmY2I1YmZlYzBiYWMxNDMwM2U1NjQ0NjVjNGMxZjRmYg==
   data.tar.gz: !binary |-
-    NjU4N2M4YWQ2NjJkOWY3YzliYjMxYzQxMjg1MDdmMjVmOGZhNzgyNg==
+    ODg5YTEzOGZiMTAxOGRmNjdlMzY2NmQ3ZjI4MmRjZjk5ODllMDk0OQ==
 SHA512:
   metadata.gz: !binary |-
-    MjEzZGM5MDc1NDEwMjUzMjg5ZmUyMDc5NDVjYTBhOTEyZThlMzQ2MDIxM2Qy
-    ZDgxYTFmOWQ0ZmUyYzkwODliMWFhN2I2MjZlMjNhNjM2NDE5ZjQ0YjQ4MzNi
-    MjIxNDgyZmM3ZmM1NGNmZDUwMTNhNDk1NWJlNGI3NjYwNmNlMTE=
+    YmMxOTNmNzg1MmM0NzhmMDhmMzE2ZWExNzIxZjBhNjllMWU3ZGVjZTkwYzJi
+    ODk0NDgyMDMzMjZkNzUwMzNmNDAwN2UyNGZmNWRmZDI1NDNhZGEwZjYwNTA4
+    MGE5M2Y2OGY1NTEwMjVhY2QxYzBkNTJjMzlhZWMxNzUxZTI5OWE=
   data.tar.gz: !binary |-
-    MDkyODc5NWI4YjAzMzQ3ZGNhMGJjN2QyNmE2NzM4M2Y0NWY3YjQ5YTNlZmUw
-    NDY3ZTk5NDkzYTdkYTYyMzlhNTM5MWQ3ZWY4YTA2NzI0ZWRhNDUyNjg1YTc0
-    YWRkODNiN2QzZTE2MzkyOGMxYTk2ZThkMjk5MDU0YmE4NzI0MjE=
+    YjkyODMyOWM1N2EwZWRlOGEzZDhhODMzMGNhMWZhZDljNjVhYjljZTA4ZDNl
+    MTAzYTNkZDFkNDMxNzRhZjM4YTM5ZjEzYWE0OGZhYzE3YWY2ZTU5NWI3ODcw
+    MjgwYzc5ZTBiMjVlMDZiMzU1ZjRlYTcxMDhjMmYyZjE1ZmU0NmY=

data/.travis.yml

@@ -3,7 +3,7 @@ env:
   global:
     secure: gGY+C54Cfp082o5Oaf6tZqzfOlXsWSMcVNvTpoOgMfJGsHo//d9t/si9Bn1pFaFyjJedW+IcC0pt+FcKVCDgnsUaL0Y0HT/ZsGkV8k7vv9F5nbHOde4nk189Sr2HtHR3wdr7KaMh2/DialisnqllxgzxA/wRLfHKsjqRsjWUw/VWL5E7Z734mzpTGE2mVJNRj02/cs0Y/izZgdi6wrt4lEZfxE3jS+QkJZHMjGNfcwvH26whU6oX1PiJ4o5xl0Rr8Q8xav3wbtTCcOJNPSeMkkiH5sSXuqrjI6kgwvjlByKhyg2Ws0GvZLxAfTml+Vo5po1uWsohdZJaJcEhd4GsGfbMZWCFuBP2mCE+gVmkkMeJxRKnWoi6NotgPmqG1JWlzGngDB/hJ4wuuh+swa0KJvZGiMEJ5P3GNydCybEPOsk1Ww+lUkXRHxD+/LW03EkxMd5LA3He/nYXz3pWCYA6qcFgrYMmq+3ozjSaQr+1d/Iu14Awv5+cwCltPfl5bERDno0jc0TdSs/7qplAL/efpjBsP7DkGE5r521gg8mIiXx509jU08i9S60SXiw0RBnYyjE5SzlsiOqaFdJxVygDGcDIAA/GTefLHO9i3SinZHFS6jr3Xi/vpOIc7Jz4W2Jmuqv+CJP4gspPoAxdWOE/QipTt0Jv4kCMf7dJwd9jaRc=
 rvm:
-- 2.0.0
+- 2.2.0
 script:
 - bundle exec rake
 deploy:

data/config/locales/en.yml

@@ -54,6 +54,7 @@ en:
         print_no_target: |
           No deploy target found.
           Please run dg on the root directory of Android/iOS project or specify .apk/.ipa file to deploy.
+        print_no_install_xcode: 'Unable to locate Xcode. Please make sure to have Xcode installed on your machine'
       push:
         upload:
           loading: 'Uploading to %{owner}..'

data/lib/deploygate/commands/deploy/build.rb

@@ -33,13 +33,17 @@ module DeployGate
 
             bundle_identifier = analyze.target_bundle_identifier
             xcode_provisioning_profile_uuid = analyze.target_xcode_setting_provisioning_profile_uuid
-            target_provisioning_profile = DeployGate::Xcode::Export.provisioning_profile(bundle_identifier, xcode_provisioning_profile_uuid)
+
+            provisioning_team = analyze.provisioning_team
+            target_provisioning_profile = DeployGate::Xcode::Export.provisioning_profile(bundle_identifier, xcode_provisioning_profile_uuid, provisioning_team)
 
             method = DeployGate::Xcode::Export.method(target_provisioning_profile)
 
             codesigning_identity= nil
-            unless analyze.automatic_provisioning?
-              # Only run Provisioning Style is Manual
+            provisioning_style = analyze.provisioning_style
+            if (!over_xcode_8? && provisioning_style == nil) ||
+                provisioning_style == DeployGate::Xcode::Analyze::PROVISIONING_STYLE_MANUAL
+              # Only run Provisioning Style is Manual or nil
               codesigning_identity = DeployGate::Xcode::Export.codesigning_identity(target_provisioning_profile)
             end
 
@@ -52,6 +56,22 @@ module DeployGate
             puts HighLine.color(I18n.t('commands.deploy.build.print_no_target'), HighLine::YELLOW)
             puts ''
           end
+
+          def over_xcode_8?
+            version = Gym::Xcode.xcode_version
+            if version == nil
+              print_no_install_xcode
+              exit 1
+            end
+
+            version.split('.')[0].to_i >= 8
+          end
+
+          def print_no_install_xcode
+            puts ''
+            puts HighLine.color(I18n.t('commands.deploy.build.print_no_install_xcode'), HighLine::YELLOW)
+            puts ''
+          end
         end
       end
     end

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/deploygate/xcode/analyze.rb

@@ -6,6 +6,9 @@ module DeployGate
       BASE_WORK_DIR_NAME = 'project.xcworkspace'
       BUILD_CONFIGRATION = 'Release'
 
+      PROVISIONING_STYLE_AUTOMATIC = 'Automatic'
+      PROVISIONING_STYLE_MANUAL    = 'Manual'
+
       class BundleIdentifierDifferentError < DeployGate::NotIssueError
       end
 
@@ -81,35 +84,61 @@ module DeployGate
         UUID.validate(uuid) ? uuid : nil
       end
 
-      def automatic_provisioning?
-        get_provisioning_style == 'Automatic'
-      end
+      def provisioning_style
+        target = target_provisioning_info
 
-      private
+        style = PROVISIONING_STYLE_MANUAL
+        if target
+          # Manual or Automatic or nil (Xcode7 below)
+          begin
+            style = target['ProvisioningStyle']
+          rescue
+            # Not catch error
+          end
+        end
 
-      def target_build_configration
-        target_project_setting.build_configuration_list.build_configurations.reject{|conf| conf.name != BUILD_CONFIGRATION}.first
+        style
       end
 
-      def target_product_name
-        target_project_setting.product_name
+      def provisioning_team
+        target = target_provisioning_info
+
+        team = nil
+        if target
+          begin
+            team = target['DevelopmentTeam']
+          rescue
+            # Not catch error
+          end
+        end
+
+        team
       end
 
-      def get_provisioning_style
+      private
+
+      def target_provisioning_info
         main_target = target_project_setting
         main_target_uuid = main_target && main_target.uuid
 
-        style = 'Manual'
+        target = nil
         if main_target_uuid
-          # Manual or Automatic
           begin
-            style = target_project.root_object.attributes['TargetAttributes'][main_target_uuid]['ProvisioningStyle']
+            target = target_project.root_object.attributes['TargetAttributes'][main_target_uuid]
           rescue
             # Not catch error
           end
         end
 
-        style
+        target
+      end
+
+      def target_build_configration
+        target_project_setting.build_configuration_list.build_configurations.reject{|conf| conf.name != BUILD_CONFIGRATION}.first
+      end
+
+      def target_product_name
+        target_project_setting.product_name
       end
 
       def target_project_setting

data/lib/deploygate/xcode/export.rb

@@ -10,11 +10,11 @@ module DeployGate
 
         # @param [String] bundle_identifier
         # @param [String] uuid
+        # @param [String] provisioning_team
         # @return [String]
-        def provisioning_profile(bundle_identifier, uuid = nil)
-          local_teams = DeployGate::Xcode::Export.find_local_data(bundle_identifier, uuid)
+        def provisioning_profile(bundle_identifier, uuid = nil, provisioning_team = nil)
+          local_teams = DeployGate::Xcode::Export.find_local_data(bundle_identifier, uuid, provisioning_team)
 
-          target_provisioning_profile = nil
           case local_teams.teams_count
             when 0
               target_provisioning_profile = create_provisioning(bundle_identifier, uuid)
@@ -30,8 +30,9 @@ module DeployGate
 
         # @param [String] bundle_identifier
         # @param [String] uuid
+        # @param [String] provisioning_team
         # @return [LocalTeams]
-        def find_local_data(bundle_identifier, uuid = nil)
+        def find_local_data(bundle_identifier, uuid = nil, provisioning_team = nil)
           local_teams = LocalTeams.new
 
           profile_paths = load_profile_paths
@@ -44,6 +45,8 @@ module DeployGate
             entities = profile['Entitlements']
             unless entities['get-task-allow']
               team_id = entities['com.apple.developer.team-identifier']
+              next if provisioning_team != nil && team_id != provisioning_team
+
               application_id = entities['application-identifier']
               application_id.slice!(/^#{team_id}\./)
               application_id = '.' + application_id if application_id == '*'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json