deploygate 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWQyZmNkNWY5MDkxMjc2YmUxOTM4MTMwZTY4MmFlMTZiNzc4MTQxNg==
+    MDIxOWM0M2U2OThlNmZlYjVmNTMwMmE4MTliNWNhNGRmZjRiN2E1OQ==
   data.tar.gz: !binary |-
-    MWU0NWVmZDViMTYxZWJjNjg1NTc3YTc1MWExNTM4YWMyYTE5NDgxNA==
+    NGQyZThlNGQ5ZjQyYzA2ZmNlODhiMTk1NzdhZWVkZTZkNzkzMWU3MQ==
 SHA512:
   metadata.gz: !binary |-
-    MDkxMmZiYzVkYWQ0NjhhNjM3YzNmNTAzMjExODY0NmJhZDFiNDhiNTZiZWM1
-    ZDZjZTZkOGRhZTgzOGUyZDMxMGQ4YTBmZDM1MTJlMTg2OGQ5OTJkNmEyMmVh
-    NTM5Yjg4ODU1ZDJlMzA0MWU4YThkZmYyZmY3MDA4MDFjZTJjNzA=
+    NWIyOGU4YjFhMTg4NTU4MjRiYTA1M2Q0ZDQ3ODU2OThmODI0YTI1NTE4MDNk
+    MDZmY2JiYzQ2ZDFmNzUwYmI5MmNmOWUzMDI3MDZlYzE2MGFkMDlhYmJhNmNm
+    M2M2NDBmNWViNzczOTg5NjIzNDU5ZDllZmMyODkzOTQ2MTExZjA=
   data.tar.gz: !binary |-
-    MWVjOGRhNWFiNTE1ODcyNzk2MzlhMGI1OGFhYzRjNDkzMDE4MzdmODg5NjFk
-    NTk5Y2NiZDAzMjEyNDRhYjJlZGYxNDBjMDNhOTAyZDE4MGZkNTE2ZDIwNmJj
-    NzJhOTIyODZjMWVlZTEzMzdlYjI3MDQ2ZGY4NzU4MGQ3NDdhZmE=
+    ZjA0YTI4MTU4ZGY2OTAxMDM5NGRhZDJlZWVhMzc4MDI1MzdmMzZjYjM4N2Jm
+    OGIyY2YyNGM2M2JhOThhOTJiMTY0MmI4ZTJhYzVmNDZmMGM2NjFmYzFmYjRm
+    YzU0NGViZWQ4OTFiNTdjMDMxYTlmYTQ5YmZiNDZlMDRhMWI5MTc=

data/config/locales/en.yml

@@ -125,7 +125,7 @@ en:
             provisioning_profile: 'Error: Failed to create provisioning profile'
       select_teams:
         prompt: 'Please select a team'
-        choice: '%{team_id} %{team_name}'
+        choice: '%{team_name} %{team_id}'
       check_local_certificates:
         not_local_install_certificate:
           error_message: 'Error: No applicable iPhone Distribution certificate found on your Mac.'
@@ -162,3 +162,6 @@ en:
 
           Note: Your password will be stored to your Keychain and never be sent to DeployGate.
         email: 'Email: '
+      provisioning_profile:
+        not_installed_certificate_error: 'No iPhone Distribution Certificate associated with private key was found in local Keychain'
+        not_exist_uuid_provisioning_profile_error: 'No provisioning profile found for the specified UUID (%{uuid})'

data/deploygate.gemspec

@@ -32,12 +32,12 @@ POST_INSTALL_MESSAGE
   spec.add_dependency 'activesupport', '~> 4.2.4'
   spec.add_dependency 'i18n'
   spec.add_dependency 'launchy'
+  spec.add_dependency 'locale'
 
   # ios build
-  spec.add_dependency 'gym', '~> 1.0.0'
-  spec.add_dependency 'spaceship', '~> 0.12.3'
-  spec.add_dependency 'sigh', '~> 1.1.0'
-  spec.add_dependency 'locale'
+  spec.add_dependency 'gym', '~> 1.4.0'
+  spec.add_dependency 'spaceship', '~> 0.19.0'
+  spec.add_dependency 'sigh', '~> 1.2.2'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/deploygate/command_builder.rb

@@ -153,6 +153,7 @@ EOF
     def error_handling(command, error)
       STDERR.puts HighLine.color(I18n.t('command_builder.error_handling.message', message: error.message), HighLine::RED)
 
+      return if error.kind_of?(DeployGate::NotIssueError)
       puts ''
       if HighLine.agree(I18n.t('command_builder.error_handling.agree')) {|q| q.default = "n"}
         url = create_issue_url(command, error)

data/lib/deploygate/deploy.rb

@@ -1,10 +1,10 @@
 module DeployGate
   class Deploy
-    class NotLoginError < StandardError
+    class NotLoginError < DeployGate::NotIssueError
     end
-    class NotFileExistError < StandardError
+    class NotFileExistError < DeployGate::NotIssueError
     end
-    class UploadError < StandardError
+    class UploadError < DeployGate::NotIssueError
     end
 
     class << self

data/lib/deploygate/not_issue_error.rb

@@ -0,0 +1,4 @@
+module DeployGate
+  class NotIssueError < StandardError
+  end
+end

data/lib/deploygate/session.rb

@@ -1,6 +1,6 @@
 module DeployGate
   class Session
-    class LoginError < StandardError
+    class LoginError < DeployGate::NotIssueError
     end
 
     attr_reader :name, :token

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/deploygate/xcode/analyze.rb

@@ -3,9 +3,6 @@ module DeployGate
     class Analyze
       attr_reader :workspaces, :scheme_workspace, :build_workspace, :scheme
 
-      class NotLocalProvisioningProfileError < StandardError
-      end
-
       BASE_WORK_DIR_NAME = 'project.xcworkspace'
       BUILD_CONFIGRATION = 'Release'
 

data/lib/deploygate/xcode/export.rb

@@ -12,17 +12,17 @@ module DeployGate
         # @param [String] uuid
         # @return [String]
         def provisioning_profile(bundle_identifier, uuid = nil)
-          data = DeployGate::Xcode::Export.find_local_data(bundle_identifier, uuid)
-          profiles = data[:profiles]
-          teams = data[:teams]
+          local_teams = DeployGate::Xcode::Export.find_local_data(bundle_identifier, uuid)
 
           target_provisioning_profile = nil
-          if teams.empty?
-            target_provisioning_profile = create_provisioning(bundle_identifier, uuid)
-          elsif teams.count == 1
-            target_provisioning_profile = select_profile(profiles[teams.keys.first])
-          elsif teams.count >= 2
-            target_provisioning_profile = select_teams(teams, profiles)
+          case local_teams.teams_count
+            when 0
+              target_provisioning_profile = create_provisioning(bundle_identifier, uuid)
+            when 1
+              target_provisioning_profile = select_profile(local_teams.first_team_profile_paths)
+            else
+              # when many teams
+              target_provisioning_profile = select_teams(local_teams)
           end
 
           target_provisioning_profile
@@ -30,10 +30,10 @@ module DeployGate
 
         # @param [String] bundle_identifier
         # @param [String] uuid
-        # @return [Hash]
+        # @return [LocalTeams]
         def find_local_data(bundle_identifier, uuid = nil)
-          result_profiles = {}
-          teams = {}
+          local_teams = LocalTeams.new
+
           profile_paths = load_profile_paths
           profiles = profile_paths.map{|p| profile_to_plist(p)}
           profiles.reject! {|profile| profile['UUID'] != uuid} unless uuid.nil?
@@ -41,25 +41,20 @@ module DeployGate
           profiles.each do |profile|
             entities = profile['Entitlements']
             unless entities['get-task-allow']
-              team = entities['com.apple.developer.team-identifier']
+              team_id = entities['com.apple.developer.team-identifier']
               application_id = entities['application-identifier']
-              application_id.slice!(/^#{team}\./)
+              application_id.slice!(/^#{team_id}\./)
               application_id = '.' + application_id if application_id == '*'
               if bundle_identifier.match(application_id) &&
                   DateTime.now < profile['ExpirationDate'] &&
                   installed_certificate?(profile['Path'])
 
-                teams[team] = profile['TeamName'] if teams[team].nil?
-                result_profiles[team] = [] if result_profiles[team].nil?
-                result_profiles[team].push(profile['Path'])
+                local_teams.add(team_id, profile['TeamName'], profile['Path'])
               end
             end
           end
 
-          {
-              :teams => teams,
-              :profiles => result_profiles
-          }
+          local_teams
         end
 
         # @param [String] profile_path
@@ -226,17 +221,17 @@ module DeployGate
           select_profile(provisioning_profiles)
         end
 
-        # @param [Hash] teams
-        # @param [Hash] profiles
+        # @param [LocalTeams] local_teams
         # @return [String]
-        def select_teams(teams, profiles)
+        def select_teams(local_teams)
           result = nil
           cli = HighLine.new
           cli.choose do |menu|
             menu.prompt = I18n.t('xcode.export.select_teams.prompt')
-            teams.each_with_index do |team, index|
-              menu.choice(I18n.t('xcode.export.select_teams.choice', team_id: team[1], team_name: team[0])) {
-                result = DeployGate::Xcode::Export.select_profile(profiles[team])
+            local_teams.teams.each do |team|
+              menu.choice(I18n.t('xcode.export.select_teams.choice', team_name: team[:name], team_id: team[:id])) {
+                profile_paths = local_teams.profile_paths(team[:id])
+                result = DeployGate::Xcode::Export.select_profile(profile_paths)
               }
             end
           end

data/lib/deploygate/xcode/ios.rb

@@ -4,7 +4,7 @@ module DeployGate
       WORK_DIR_EXTNAME = '.xcworkspace'
       PROJECT_DIR_EXTNAME = '.xcodeproj'
 
-      class NotSupportExportMethodError < StandardError
+      class NotSupportExportMethodError < DeployGate::NotIssueError
       end
 
       class << self

data/lib/deploygate/xcode/local_teams.rb

@@ -0,0 +1,60 @@
+module DeployGate
+  module Xcode
+    class LocalTeams
+
+      def initialize
+        @team_ids = []
+        @team_names = []
+        @team_profile_paths = {}
+      end
+
+      # @param [String] id
+      # @param [String] name
+      # @param [String] profile_path
+      # @return [void]
+      def add(id, name, profile_path)
+        unless @team_ids.include?(id)
+          @team_ids.push(id)
+          @team_names.push(name)
+
+          @team_profile_paths[id] = []
+        end
+
+        @team_profile_paths[id].push(profile_path) unless @team_profile_paths.include?(profile_path)
+      end
+
+      # @return [Fixnum]
+      def teams_count
+        @team_ids.count
+      end
+
+      # @return [Array<String>]
+      def first_team_profile_paths
+        return [] if @team_ids.empty?
+        profile_paths(@team_ids.first)
+      end
+
+      # @return [Array<Hash>]
+      #
+      # [
+      #   {id: xxxx, name: xxxxx},
+      #   {id: xxxx, name: xxxxx}
+      # ]
+      #
+      def teams
+        teams = []
+        @team_ids.each_with_index{|id, index| teams.push({id: id, name: @team_names[index]})}
+
+        teams
+      end
+
+      # @param [String] id
+      # @return [Array<String>]
+      def profile_paths(id)
+        return [] unless @team_ids.include?(id)
+
+        @team_profile_paths[id]
+      end
+    end
+  end
+end

data/lib/deploygate/xcode/member_centers/provisioning_profile.rb

@@ -4,6 +4,11 @@ module DeployGate
       class ProvisioningProfile
         attr_reader :member_center, :app_identifier
 
+        class NotInstalledCertificateError < DeployGate::NotIssueError
+        end
+        class NotExistUUIDProvisioningProfileError < DeployGate::NotIssueError
+        end
+
         OUTPUT_PATH = '/tmp/dg/provisioning_profile/'
         CERTIFICATE_OUTPUT_PATH = '/tmp/dg/certificate/'
 
@@ -45,7 +50,7 @@ module DeployGate
             File.write(path, raw_data)
             distribution_cert_ids.push(cert.id) if FastlaneCore::CertChecker.installed?(path)
           end
-          raise 'Not local install certificate' if distribution_cert_ids.empty?
+          raise NotInstalledCertificateError, I18n.t('xcode.member_center.provisioning_profile.not_installed_certificate_error') if distribution_cert_ids.empty?
 
           provisionings = []
           distribution_cert_ids.each do |cert_id|
@@ -62,7 +67,7 @@ module DeployGate
         def download(uuid)
           profiles = Spaceship.provisioning_profile.all.reject!{|p| p.uuid != uuid}
 
-          raise 'Not Xcode selected Provisioning Profile' if profiles.empty?
+          raise NotExistUUIDProvisioningProfileError, I18n.t('xcode.member_center.provisioning_profile.not_exist_uuid_provisioning_profile_error', uuid: uuid) if profiles.empty?
           select_profile = profiles.first
           method = select_profile.kind_of?(Spaceship::Portal::ProvisioningProfile::AdHoc)
 

data/lib/deploygate.rb

@@ -31,6 +31,7 @@ require "xcodeproj"
 module DeployGate
 end
 
+require "deploygate/not_issue_error"
 require "deploygate/api/v1/base"
 require "deploygate/api/v1/session"
 require "deploygate/api/v1/push"
@@ -56,6 +57,7 @@ require "deploygate/xcode/member_center"
 require "deploygate/xcode/member_centers/app"
 require "deploygate/xcode/member_centers/provisioning_profile"
 require "deploygate/xcode/member_centers/device"
+require "deploygate/xcode/local_teams"
 require "deploygate/xcode/export"
 require "deploygate/xcode/analyze"
 require "deploygate/xcode/ios"

data/spec/deploygate/xcode/local_teams_spec.rb

@@ -0,0 +1,45 @@
+describe DeployGate::Xcode::LocalTeams do
+
+  let(:local_teams) { DeployGate::Xcode::LocalTeams.new }
+
+  context '#add' do
+    it 'not count up when add already team id' do
+      local_teams.add('1', 'name', 'path')
+      local_teams.add('1', 'name', 'path')
+
+      expect(local_teams.teams_count).to eq 1
+    end
+
+    it 'count up when add team id' do
+      local_teams.add('1', 'name', 'path')
+      local_teams.add('2', 'name', 'path')
+
+      expect(local_teams.teams_count).to eq 2
+    end
+  end
+
+  context '#profile_paths' do
+    before do
+      local_teams.add('1', 'name', 'path')
+    end
+
+    it 'should empty not register team id profile_paths' do
+      expect(local_teams.profile_paths('not_id').empty?).to be_truthy
+    end
+
+    it 'should not empty registered team id profile_paths' do
+      expect(local_teams.profile_paths('1')).to eq ['path']
+    end
+  end
+
+  context 'first_team_profile_paths' do
+    it 'should return empty not register team' do
+      expect(local_teams.first_team_profile_paths.empty?).to be_truthy
+    end
+
+    it 'should return first team profile paths' do
+      local_teams.add('1', 'name', 'path')
+      expect(local_teams.first_team_profile_paths).to eq ['path']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -179,61 +179,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gym
+  name: locale
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: spaceship
+  name: gym
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: sigh
+  name: spaceship
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
-  name: locale
+  name: sigh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -345,6 +345,7 @@ files:
 - lib/deploygate/config/cache_version.rb
 - lib/deploygate/config/credential.rb
 - lib/deploygate/deploy.rb
+- lib/deploygate/not_issue_error.rb
 - lib/deploygate/project.rb
 - lib/deploygate/session.rb
 - lib/deploygate/user.rb
@@ -352,6 +353,7 @@ files:
 - lib/deploygate/xcode/analyze.rb
 - lib/deploygate/xcode/export.rb
 - lib/deploygate/xcode/ios.rb
+- lib/deploygate/xcode/local_teams.rb
 - lib/deploygate/xcode/member_center.rb
 - lib/deploygate/xcode/member_centers/app.rb
 - lib/deploygate/xcode/member_centers/device.rb
@@ -369,6 +371,7 @@ files:
 - spec/deploygate/xcode/analyze_spec.rb
 - spec/deploygate/xcode/export_spec.rb
 - spec/deploygate/xcode/ios_spec.rb
+- spec/deploygate/xcode/local_teams_spec.rb
 - spec/deploygate/xcode/member_center_spec.rb
 - spec/deploygate/xcode/member_centers/app_spec.rb
 - spec/deploygate/xcode/member_centers/provisioning_profile_spec.rb
@@ -412,6 +415,7 @@ test_files:
 - spec/deploygate/xcode/analyze_spec.rb
 - spec/deploygate/xcode/export_spec.rb
 - spec/deploygate/xcode/ios_spec.rb
+- spec/deploygate/xcode/local_teams_spec.rb
 - spec/deploygate/xcode/member_center_spec.rb
 - spec/deploygate/xcode/member_centers/app_spec.rb
 - spec/deploygate/xcode/member_centers/provisioning_profile_spec.rb