cocoapods-modularization 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cde6391ce2e9acbdfda733ce4ee1f7554efc154e25609497ed5e2c0311dc4ab
-  data.tar.gz: 1136a975ded5270f9b57f521c97cfce57e13d3ba184bc9057cf93562540cf5f3
+  metadata.gz: de8f24caef31650588dd309bd663416bb5322030af7c3b642f6c44db43d49d21
+  data.tar.gz: e955afc7b9efd3b975ad53cf8be764de90c5e881e0557ef458fa4aa43375373d
 SHA512:
-  metadata.gz: 6cdb49c8786470aafae93516037445123a3305f9c6f7ff1eb406cbfe317fb1e300bfee9daee93df70e9de7960d7e278fa9f3f9e6610561e9b02b5ded5c78f4f0
-  data.tar.gz: 6b22853de266f03dde6f0959ea24403dd7d8de592db92546449d034994bf9a5d64cb2436ab14fe89587e20ee72ecb00a7c854e36238a40ba303c892a6b25a3c7
+  metadata.gz: 54f16cd703bc29bab7a39b4427106e1eab975444898d624309b0aac426b1700b7d7b48db9671db39dbdfd63f4af564120deab327c8083519520ee33c5b82c387
+  data.tar.gz: 9fe85d77afaf64152ce9b4ce33e2790f50f4f8c7c6ee2d09f38804c4ef73d36af26c6c800e505290b0dd2b2a3a16decc8189514678b2e1a4262aaf194db34111

data/lib/cocoapods-modularization/command/gen.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require 'cocoapods-modularization/generate'
+
+module Pod
+  class Command
+    class Gen < Command
+      self.summary = 'Generates Xcode workspaces from a podspec.'
+
+      self.description = <<-DESC.strip_heredoc
+        #{summary}
+
+        pod gen allows you to keep your Podfile and podspecs as the single source of
+        truth for pods under development. By generating throw-away workspaces capable of
+        building, running, and testing a pod, you can focus on library development
+        without worrying about other code or managing an Xcode project.
+
+        pod gen works particularly well for monorepo projects, since it is capable of
+        using your existing settings when generating the workspace, making each gen'ed
+        project truly a small slice of the larger application.
+      DESC
+
+      def self.options
+        super.concat(Generate::Configuration.options.map do |option|
+          next unless option.cli_name
+
+          flag = "--#{option.cli_name}"
+          flag += "=#{option.arg_name}" if option.arg_name
+          [flag, option.message]
+        end.compact)
+      end
+
+      self.arguments = [
+        CLAide::Argument.new(%w[PODSPEC DIR], false, true)
+      ]
+
+      # @return [Configuration]
+      #         the configuration used when generating workspaces
+      #
+      attr_reader :configuration
+
+      def initialize(argv)
+        options_hash = Generate::Configuration.options.each_with_object({}) do |option, options|
+          value =
+            if option.name == :podspec_paths
+              argv.arguments!
+            elsif option.flag?
+              argv.flag?(option.cli_name)
+            else
+              argv.option(option.cli_name)
+            end
+
+          next if value.nil?
+          options[option.name] = option.coerce(value)
+        end
+        UI.puts "options_hash: #{options_hash}"
+        @configuration = merge_configuration(options_hash)
+        super
+      end
+
+      def run
+        UI.puts "[pod gen] Running with #{configuration.to_s.gsub("\n", "         \n")}" if configuration.pod_config.verbose?
+
+        # this is done here rather than in the installer so we only update sources once,
+        # even if there are multiple podspecs
+        update_sources if configuration.repo_update?
+
+        Generate::PodfileGenerator.new(configuration).podfiles_by_spec.each do |spec, podfile|
+          Generate::Installer.new(configuration, spec, podfile).install!
+        end
+
+        remove_warnings(UI.warnings)
+      end
+
+      def validate!
+        super
+
+        config_errors = configuration.validate
+        help! config_errors.join("\n    ") if config_errors.any?
+      end
+
+      private
+
+      def merge_configuration(options)
+        # must use #to_enum explicitly since descend doesn't return an enumerator on 2.1
+        config_hashes = Pathname.pwd.to_enum(:descend).map do |dir|
+          path = dir + '.gen_config.yml'
+          next unless path.file?
+          Pod::Generate::Configuration.from_file(path)
+        end.compact
+
+        options.delete(:podspec_paths) if options[:podspec_paths].empty? && config_hashes.any? { |h| h.include?(:podspec_paths) }
+
+        env = Generate::Configuration.from_env(ENV)
+        config_hashes = [env] + config_hashes
+        config_hashes << options
+
+        configuration = config_hashes.compact.each_with_object({}) { |e, h| h.merge!(e) }
+        Pod::Generate::Configuration.new(pod_config: config, **configuration)
+      end
+
+      def remove_warnings(warnings)
+        warnings.reject! do |warning|
+          warning[:message].include? 'Automatically assigning platform'
+        end
+      end
+
+      def update_sources
+        UI.title 'Updating specs repos' do
+          configuration.sources.each do |source|
+            source = config.sources_manager.source_with_name_or_url(source)
+            UI.titled_section "Updating spec repo `#{source.name}`" do
+              source.update(config.verbose?)
+              source.verify_compatibility!
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-modularization/command/install.rb

@@ -51,7 +51,7 @@ module Pod
         # encode podfile
         begin
           Meta::MetaReference.encode_podfile(@enable_branch)
-        rescue StandardError => e
+        rescue Exception => e
           UI.puts "pod install error: #{e}"
         end
 
@@ -66,7 +66,7 @@ module Pod
 
         begin
           add_modularization_into_xcode_reference
-        rescue StandardError => e
+        rescue Exception => e
           UI.puts e
         end
       end

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

@@ -0,0 +1,40 @@
+require 'fileutils'
+
+module Pod
+  class Command
+    class Mod < Command
+      class Template < Mod
+
+        self.summary = 'Fetch build.rb from remote' 
+
+        self.description = <<-DESC
+          Fetch build.rb from remote
+        DESC
+
+        def initialize(argv)
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          build_path = "#{Dir.pwd}/build.rb"
+          if File.exist?(build_path)
+            FileUtils.rm_rf(build_path)
+          end
+          `git clone http://gitlab.appshahe.com/ios-specs/template.git .build`
+
+          unless File.exist?("#{Dir.pwd}/.build")
+            puts "./.build not found"
+            return
+          end
+
+          FileUtils.mv("#{Dir.pwd}/.build/build.rb", "#{Dir.pwd}/build.rb")
+          FileUtils.rm_rf("#{Dir.pwd}/.build")
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ require 'cocoapods-modularization/command/mod/config'
 require 'cocoapods-modularization/command/mod/add'
 require 'cocoapods-modularization/command/mod/update'
 require 'cocoapods-modularization/command/mod/base'
+require 'cocoapods-modularization/command/mod/template'
 
 module Pod
   class Command

data/lib/cocoapods-modularization/command.rb

@@ -1,2 +1,3 @@
 require 'cocoapods-modularization/command/mod'
 require 'cocoapods-modularization/command/install'
+require 'cocoapods-modularization/command/gen'

data/lib/cocoapods-modularization/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsModularization
-  VERSION = "0.0.2"
+  VERSION = "0.0.6"
 end

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

@@ -29,7 +29,10 @@ module Pod
 
         # podfile <= meta & data
         def encode_podfile(enable_branch = false)
+          raise 'meta.yml not found, run \'pod mod sync\' at first' unless File.exists?(Meta::MetaConstants.meta_path)
           meta = MetaConstants.generate_yml_to_hash(MetaConstants.meta_path)
+
+          raise 'data.yml not found, run \'pod mod sync\' at first' unless File.exists?(Meta::MetaConstants.data_path)
           data = MetaConstants.read_data(enable_branch)
 
           target_definitions = meta['target_definitions']
@@ -117,8 +120,9 @@ module Pod
         def try_source(e, dependency_data)
           binary = dependency_data[MetaConstants.binary_key]
           source_url = dependency_data[MetaConstants.source_key]
-          if binary
-            source_url ||= Private::PrivateCache.binary_repo_url
+          puts "e: #{e}, dependency_data: #{dependency_data}"
+          if binary && source_url == Private::PrivateCache.source_repo_url
+            source_url = Private::PrivateCache.binary_repo_url
           else
             source_url ||= Private::PrivateCache.source_repo_url
           end

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

@@ -198,7 +198,7 @@ module Pod
 
         def make_branch_cache_workspace_if_needed
           unless File.directory?(Meta::MetaConstants.pods_generator_path)
-            raise "#{Meta::MetaConstants.pods_generator_path} not found"
+            raise "#{Meta::MetaConstants.pods_generator_path} not found, run 'pod sync' at first"
           end
 
           unless File.exists?(Meta::MetaConstants.branch_cache_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-modularization
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - lazy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocoapods-disable-podfile-validations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: A short description of cocoapods-modularization.
 email:
 - 515310192@qq.com
@@ -47,6 +61,7 @@ extra_rdoc_files: []
 files:
 - lib/cocoapods-modularization.rb
 - lib/cocoapods-modularization/command.rb
+- lib/cocoapods-modularization/command/gen.rb
 - lib/cocoapods-modularization/command/install.rb
 - lib/cocoapods-modularization/command/mod.rb
 - lib/cocoapods-modularization/command/mod/add.rb
@@ -57,6 +72,7 @@ files:
 - lib/cocoapods-modularization/command/mod/inspect.rb
 - lib/cocoapods-modularization/command/mod/source.rb
 - lib/cocoapods-modularization/command/mod/sync.rb
+- lib/cocoapods-modularization/command/mod/template.rb
 - lib/cocoapods-modularization/command/mod/update.rb
 - lib/cocoapods-modularization/gem_version.rb
 - lib/cocoapods-modularization/generate.rb