cocoapods-modularization 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e40440ac85c3f76d60897b6d8541c0515aef17bb50433f9f0f9aef676c13dd9
-  data.tar.gz: 348cbc0824c49d346d089b67309e7ec1857c728d39c59a725703ed2731acbe8b
+  metadata.gz: 63944ae82b5b66ce3c213dd2cbc15fd378832bef84f6a33c74711967abad347b
+  data.tar.gz: a474c043be6b3031543d996cac56f1ce5558679cbce979d943a70008c86c5ea4
 SHA512:
-  metadata.gz: aef11d2042692d62afc5bf45b38e857d8568c091be639f6c2dd691072453e9218434d95a796b6124abefbbb2134598852a126e0ab5ab92493ae1e3c38e8ad3dd
-  data.tar.gz: 14a49245d80bc7996f9ae843353f2c939f855766737236faeed7863136459fb1f1d52cb32a1aa6670b5301818d0efe0cb9820c7e2d746341a7cbd18d73943220
+  metadata.gz: f2a46b8ca4aa610346e769684710129f772b31e59d1b352651e3e2e6ef1ff68aebfc56403331f6ded433751509e10bd6efdb454b5303e0867c65397c0007ccb4
+  data.tar.gz: 6f1ecf9615e0cf901d0ab78bb56e282ccbd1ac2322efb7a1221e821ceb7e58310f730c8e68b285ec3f861ba6158d7e2cda3fcd000c5e4e27142c6fdf78dee7c6

data/lib/cocoapods-modularization/command/mod/create.rb

@@ -9,12 +9,22 @@ module Pod
         DESC
 
         self.arguments = [
-          CLAide::Argument.new('NAME', true)
+          CLAide::Argument.new('NAME', true),
+          CLAide::Argument.new('PATH', true),
         ]
 
+        def self.options
+          [
+            ['--template-url=URL', 'The URL of the git repo containing a compatible template'],
+          ].concat(super)
+        end
+
         def initialize(argv)
           @name = argv.shift_argument
+          @path = argv.shift_argument
+          @template_url = argv.option('template-url', TEMPLATE_REPO)
           super
+          @additional_args = argv.remainder!
         end
 
         def validate!
@@ -26,7 +36,42 @@ module Pod
         end
 
         def run
-          `pod lib create #{@name} --template-url='https://gitlab.appshahe.com/ios-specs/template.git'`
+          clone_template
+          configure_template
+          print_info
+        end
+
+        private
+
+        extend Executable
+        executable :git
+
+        TEMPLATE_REPO = 'https://github.com/CocoaPods/pod-template.git'.freeze
+        TEMPLATE_INFO_URL = 'https://github.com/CocoaPods/pod-template'.freeze
+        CREATE_NEW_POD_INFO_URL = 'https://guides.cocoapods.org/making/making-a-cocoapod'.freeze
+
+        def clone_template
+          puts "Cloning `#{template_repo_url}` into `#{@name}`."
+          git! ['clone', template_repo_url, @name]
+        end
+
+        def configure_template
+          Dir.chdir(@name) do
+            if File.exist?('configure')
+              system({ 'COCOAPODS_VERSION' => Pod::VERSION }, './configure', @name, @path, *@additional_args)
+            else
+              UI.warn 'Template does not have a configure file.'
+            end
+          end
+        end
+
+        def print_info
+          puts "\nTo learn more about the template see `#{template_repo_url}`."
+          puts "To learn more about creating a new pod, see `#{CREATE_NEW_POD_INFO_URL}`."
+        end
+
+        def template_repo_url
+          @template_url || TEMPLATE_REPO
         end
       end
     end

data/lib/cocoapods-modularization/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsModularization
-  VERSION = "0.1.5"
+  VERSION = "0.2.1"
 end

data/lib/cocoapods-modularization/meta/meta_constants.rb

@@ -129,6 +129,10 @@ module Pod
         def branch_key
           'branch'
         end
+
+        def configuration
+          'configuration'
+        end
       end
     end
   end

data/lib/cocoapods-modularization/meta/meta_reference.rb

@@ -121,12 +121,14 @@ module Pod
         def try_source(e, dependency_data)
           binary = dependency_data[MetaConstants.binary_key]
           source_url = dependency_data[MetaConstants.source_key]
+          _source_url = Private::PrivateCache.source_repo_url(e)
 
-          if binary && (source_url == Private::PrivateCache.source_repo_url || source_url == nil)
-            source_url = Private::PrivateCache.binary_repo_url
+          if binary && (source_url == _source_url || source_url == nil)
+            source_url = Private::PrivateCache.binary_repo_url(e)
           else
-            source_url ||= Private::PrivateCache.source_repo_url
+            source_url ||= Private::PrivateCache.source_repo_url(e)
           end
+
           Hash[e => [dependency_data[MetaConstants.version_key], Hash[:source => source_url]]]
         end
 

data/lib/cocoapods-modularization/private/private_cache.rb

@@ -49,32 +49,16 @@ module Pod
           File.open(@@repo_map_path, 'w') { |io| io << repo_map.to_json }
         end
 
-        def binary_repo_name
-          repo_map = cached_repo_map
-          binary_map = repo_map[@@binary_repo_key]
-          return nil unless binary_map.kind_of?(Hash)
-          binary_map.keys.first
-        end
-
-        def source_repo_name
-          repo_map = cached_repo_map
-          source_map = repo_map[@@source_repo_key]
-          return nil unless source_map.kind_of?(Hash)
-          source_map.keys.first
-        end
-
-        def binary_repo_url
-          repo_map = cached_repo_map
-          binary_map = repo_map[@@binary_repo_key]
-          return nil unless binary_map.kind_of?(Hash)
-          binary_map.values.first
+        def binary_repo_url(name)
+          repo_url = repo_url(name, ".*?specs[-_]?binary")
+          return nil unless repo_url.kind_of?(String) && repo_url.length > 0
+          repo_url
         end
 
-        def source_repo_url
-          repo_map = cached_repo_map
-          source_map = repo_map[@@source_repo_key]
-          return nil unless source_map.kind_of?(Hash)
-          source_map.values.first
+        def source_repo_url(name)
+          repo_url = repo_url(name, ".*?specs[-_]?source")
+          return nil unless repo_url.kind_of?(String) && repo_url.length > 0
+          repo_url
         end
 
         def root_path
@@ -190,6 +174,14 @@ module Pod
         end
 
         private
+        def repo_url(name, regex)
+          puts "#{Config.instance.sources_manager.all.select { |e| e.name =~ /#{regex}/ }}"
+          url = Config.instance.sources_manager.all.select { |e| e.name =~ /#{regex}/ }.find { |e| Dir.exists?("#{Pathname.new(File.expand_path('~'))}/.cocoapods/repos/#{e}/#{name}") }.url
+          url ||= 'https://github.com/CocoaPods/Specs.git'
+          puts url
+          url
+        end
+
         def cached_repo_map
           repo_map = Hash.new
           if File.exists?(@@repo_map_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-modularization
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - lazy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler