deploygate 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17db64ccad3b6dbc67aca1430d24b86a35f278c91356633afd71635e1218dc41
-  data.tar.gz: 409f3792317f8bf0d2e73e12ba712c56f8e66e93d7c0116ca9d09d084f6993a5
+  metadata.gz: 0dfa2aaa4fb89cc3c6d42911b5c7546fbae07bc23b708d14337087a8debd3f1e
+  data.tar.gz: cc02a7b75d851d3fef7a8e776d27cce845f942ffaf4f6871d4841c9166ea4872
 SHA512:
-  metadata.gz: 7391995661f77a94f21deead895a83c7e2678e5482b48acb4afb83f2060cc85eb3043b7ac0a266d08078ed47d60c95941f469117d016752a66c2c0411fd94603
-  data.tar.gz: cb0fc091a7a2e83be4aab162cf2a0a596588181812af3ceadda88521511f30f2b34163c73dde39686de027366e4952a8721b6a9c936d597dedcf4f8cea75b9fe
+  metadata.gz: 34083bf5b446f8e1f61bb85cd479af29bb601ec93e830bd9b67bd9de9cd00336b0cc0fd5eae8a07458242ae59f7dc6f6e6db135ff21be016734ed28020c33822
+  data.tar.gz: 0b2a45ba2161ddfb4f8a2e894f0fbe73d1a76c03cb956353ba0156802883acced0424c2f456ecef2e8be956e1718b5444c8b7e34faf468facedf2c5afcc336f9

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/lib/deploygate/xcode/analyze.rb

@@ -72,14 +72,18 @@ module DeployGate
       # @param [String] bundle_identifier
       # @return [String]
       def convert_bundle_identifier(bundle_identifier)
-        identifier = bundle_identifier
-        if match = bundle_identifier.match(/\$\((.+)\)/)
-          custom_id = match[1]
-          identifier = target_build_configration.build_settings[custom_id]
-        end
-        identifier = convert_bundle_identifier(identifier) if bundle_identifier.match(/\$\((.+)\)/)
+        new_bundle_identifier = bundle_identifier.gsub(/\$\(([^\)]+)\)|\${([^}]+)}/) {
+          custom_id = $1 || $2
+          if custom_id == 'TARGET_NAME'
+            target_project_setting.name
+          else
+            target_build_configration.build_settings[custom_id]
+          end
+        }
+        # bail out if the result identical to the original
+        return bundle_identifier if new_bundle_identifier == bundle_identifier
 
-        identifier
+        convert_bundle_identifier(new_bundle_identifier)
       end
 
       # @return [String]

data/spec/deploygate/xcode/analyze_spec.rb

@@ -1,3 +1,59 @@
 describe DeployGate::Xcode::Analyze do
-  # TODO: add test
+
+  context '#convert_bundle_identifier' do
+
+    class DummyProject
+      SCHEME = 'dummy'
+      def schemes
+        [SCHEME, 'dummy2']
+      end
+
+      def options
+        {}
+      end
+    end
+
+    class DummyProjectSetting
+      def name
+        'TargetName'
+      end
+    end
+
+    class DummyBuildConfigration
+      def build_settings
+        {
+            'PRODUCT_NAME' => '$(TARGET_NAME)',
+            'CUSTOM_KEY'   => 'CustomKey',
+            'PRODUCT_BUNDLE_IDENTIFER' => 'com.deploygate.app',
+            'DEBUG_POSTFIX' => '.debug',
+            'LOOP' => '$(LOOP)'
+        }
+      end
+    end
+
+    before do
+      allow_any_instance_of(DeployGate::Xcode::Analyze).to receive(:find_scheme_workspace).and_return('')
+      allow_any_instance_of(DeployGate::Xcode::Analyze).to receive(:find_build_workspace)
+      allow_any_instance_of(DeployGate::Xcode::Analyze).to receive(:target_build_configration).and_return(DummyBuildConfigration.new)
+      allow_any_instance_of(DeployGate::Xcode::Analyze).to receive(:target_project_setting).and_return(DummyProjectSetting.new)
+      allow(FastlaneCore::Configuration).to receive(:create)
+      allow(FastlaneCore::Project).to receive(:new).and_return(DummyProject.new)
+    end
+
+    it do
+      analyze = DeployGate::Xcode::Analyze.new('', nil, DummyProject::SCHEME)
+      expect(analyze.convert_bundle_identifier('com.deploygate.$(PRODUCT_NAME).${CUSTOM_KEY}')).to eq 'com.deploygate.TargetName.CustomKey'
+    end
+
+    it 'if only env' do
+      analyze = DeployGate::Xcode::Analyze.new('', nil, DummyProject::SCHEME)
+      expect(analyze.convert_bundle_identifier('$(PRODUCT_BUNDLE_IDENTIFER)$(DEBUG_POSTFIX)')).to eq 'com.deploygate.app.debug'
+    end
+
+    it 'if loop env' do
+      analyze = DeployGate::Xcode::Analyze.new('', nil, DummyProject::SCHEME)
+      expect(analyze.convert_bundle_identifier('$(LOOP)')).to eq '$(LOOP)'
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -419,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A command-line interface for DeployGate