cocoapods-flutter-dt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bed8dc160bb69508717eddc4e3f8a7666dec9765a1f23342dfb6c59424a9a4a
-  data.tar.gz: fb4a26c1694ddbd9cf88ac24b9482aa7208c80b32764added0a40ce348a656c4
+  metadata.gz: 18f5e54d76525f37dd069456318eac1d194bb8da3238f85d59ff1cec9ab174e7
+  data.tar.gz: 8b07578c4702e2d99be36fb99970afe732275cbf30e89acf269166a401f452eb
 SHA512:
-  metadata.gz: 6c07e00b95ae952d155c59f5d8437fb1c59bbfa6f2269c0768efbe2bf2a7f2d3679c5368532c1f242aaabc71aeada7afcbed739996de6d5edbc58ab779074d1b
-  data.tar.gz: 385c6793709ddfaacdfb954536b83fe6da2e2117b4fa7098edb39722ce60e108e689ed31b5ff8fa774284d2fd8aeefe79572ddbb474e6052387700dea5805cc9
+  metadata.gz: 4dcab1bf0b6cabfa622724dbd69764eef0861b76c9e4ddd74030ba002ac5db8b696e759254bb0a09cc306ee985bc9fb217fe99454a3c896ac959b302250f2ef7
+  data.tar.gz: 9ecbb88939b5498078b00c5610a7ae7f3945feb651bcfbd80107c8a3b4fa035190ecc34caba83ad4f7dd9b4f33aadd68f49a620653177ca7cf94d0a87c470a80

data/lib/cocoapods-flutter/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFlutter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/cocoapods-flutter/native/archive/archive.rb

@@ -59,6 +59,39 @@ class Archiver
     Pod::UserInterface.message "All is ready to use!, now you can use 'flutter_pod '#{@module_name}', '#{@version}', :mode=>'debug/release' to use the pod"
   end
 
+  def make_flutter_pods(mode)
+    @pub_upgrade ? pub_upgrade : pub_get
+    setup_pod_sources
+    if @build_run
+      excute_build_run
+    end
+
+    build_app mode
+
+    flutter_spec_dir = @product_dir + 'Flutter'
+    flutter_spec_file = flutter_spec_dir + '/Flutter.podspec.json'
+    flutter_spec = Pod::Spec.from_file @working_dir + '/.ios/Flutter/engine/Flutter.podspec'
+    flutter_spec.vendored_frameworks = ['Flutter.framework', 'App.framework']
+    plugin_registrant_spec_file = @working_dir + '/.ios/Flutter/FlutterPluginRegistrant/FlutterPluginRegistrant.podspec'
+
+    unless Dir.exist? flutter_spec_dir
+      FileUtils.mkdir_p flutter_spec_dir
+    end
+
+    File.open flutter_spec_file, "w+" do |file|
+      file.write flutter_spec.to_pretty_json
+    end
+
+    FileUtils.cp_r @working_dir + '/.ios/Flutter/engine/Flutter.framework', flutter_spec_dir
+    FileUtils.cp_r @working_dir + '/.ios/Flutter/App.framework', flutter_spec_dir
+
+    plugins = fetch_plugins
+    plugins.append Plugins.new('Flutter',flutter_spec_file,flutter_spec)
+    plugins.append Plugins.new('FlutterPluginRegistrant',plugin_registrant_spec_file, Pod::Spec.from_file(plugin_registrant_spec_file))
+
+    plugins
+  end
+
   private
 
   def release
@@ -146,6 +179,13 @@ class Archiver
     end
   end
 
+  def build_app(mode)
+    if CommandRunner.run(@flutter_wrapper, 'build','ios',"--#{mode}" ,"--no-codesign") == false
+      # FileUtils.remove_dir product_dir, true
+      raise "run build_runner fail"
+    end
+  end
+
   def fetch_plugins
     results = []
     flutter_plugins_list = @working_dir + '/.flutter-plugins'
@@ -297,6 +337,7 @@ end
     sdk_download_url = remote.download_url "Flutter", @flutter_version, mode.downcase
     app_download_url = remote.download_url @module_name, @version, mode.downcase
     spec = Pod::Spec.new do |s|
+      s.swift_version         = '5.0'
       s.name                  = "#{@module_name}_#{mode.downcase}"
       s.version               = @version
       s.summary               = @module_name

data/lib/cocoapods-flutter/native/flutterhelper.rb

@@ -0,0 +1,42 @@
+
+def update_flutter_app_debug(path, url, ref)
+    if !File.exist?(path)
+       `git clone #{url} #{path}`
+       `cd #{path} && git fetch --all -v && \
+       git reset --hard origin/master && \
+       git pull && \
+       git checkout #{ref} && \
+       cd #{path} && \
+       sh build_ios.sh -m release`
+    end
+    puts "Flutter project is already existed, remove '.flutter' folder and `pod install` again the flutter project will be rebuilded with new code."
+end
+
+def install_debug_flutter_app(url, ref)
+
+    puts "Compiling☕️️️️️☕️☕️\n"
+
+    flutter_application_path = __dir__ + "/.flutter"
+    flutter_application_url = ""
+    flutter_application_branch = 'master'
+
+    if url != nil
+        flutter_application_url = url
+        if ref != nil
+            flutter_application_branch = ref
+        end
+    else
+        raise "Error: 请在'Podfile'里增加Flutter App git地址配置，配置格式请查看'flutterhelper.rb'文件"
+    end
+
+    update_flutter_app_debug(flutter_application_path, flutter_application_url, flutter_application_branch)
+
+    if $?.to_i == 0
+
+        flutter_package_path = "#{flutter_application_path}/.build_ios/product"
+        # 开始安装
+        install_release_flutter_app_pod(flutter_package_path)
+    else
+        raise "Error: 编译 Flutter App失败"
+    end
+end

data/lib/cocoapods-flutter/native/podfile.rb

@@ -1,6 +1,7 @@
 require 'digest'
 require 'open-uri'
 require 'json'
+require 'cocoapods-flutter/native/archive/archive'
 
 module Pod
   class Podfile
@@ -14,22 +15,59 @@ module Pod
         unless name
           raise StandardError, 'A dependency requires a name.'
         end
-
+        # {
+        #     :git => {
+        #         :url => '',
+        #         :ref => '',
+        #         :wrapper => 'flutterw'
+        #     }
+        # }
         flutter_project_name = name
         flutter_project_mode = parse_key(:mode, requirements)
         flutter_project_path = parse_key(:path, requirements)
+        flutter_project_repo = parse_key(:git, requirements)
+        flutter_project_repo_url =  flutter_project_repo[:url]
+        flutter_project_repo_ref =  flutter_project_repo[:ref]
+        flutter_command_wrapper =  flutter_project_repo[:wrapper]
         flutter_project_version = parse_version requirements
         if flutter_project_mode.nil?
           flutter_project_mode = "release"
         end
 
         unless flutter_project_path.nil?
-          UI.info "Using local flutter project.."
+          UI.info "Using local flutter project..."
           load File.join(flutter_project_path, '.ios', 'Flutter', 'podhelper.rb')
           install_all_flutter_pods flutter_project_path
           return
         end
 
+        unless flutter_project_repo.nil?
+          UI.info "Using git source..."
+          if flutter_project_repo_ref.nil?
+            flutter_project_repo_ref = 'master'
+          end
+
+          if flutter_command_wrapper.nil?
+            flutter_command_wrapper = 'flutter'
+          end
+
+          flutter_application_path = Dir.pwd + + "/.flutter"
+
+          CommandRunner.run 'git', 'clone', flutter_project_repo_url, flutter_application_path
+          Dir.chdir flutter_application_path  do |dir|
+            CommandRunner.run 'git', 'fetch', '--all', '-v'
+            CommandRunner.run 'git', 'reset', '--hard', 'origin/master'
+            CommandRunner.run 'git', 'pull'
+            CommandRunner.run 'git', 'checkout', flutter_project_repo_ref
+            archiver = Archiver.new(flutter_project_name,flutter_project_version,sources,flutter_command_wrapper,true ,"",true ,dir, "")
+            pods = archiver.make_flutter_pods flutter_project_mode
+            pods.each do |p|
+              pod p.name, :path => p.path
+            end
+          end
+          return
+        end
+
         pod "#{flutter_project_name}_#{flutter_project_mode}", flutter_project_version
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-flutter-dt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - "\bDreamtracer"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -131,6 +131,7 @@ files:
 - lib/cocoapods-flutter/native/archive/command_runner.rb
 - lib/cocoapods-flutter/native/archive/remote.rb
 - lib/cocoapods-flutter/native/archive/zip_tool.rb
+- lib/cocoapods-flutter/native/flutterhelper.rb
 - lib/cocoapods-flutter/native/pod_source_preparer.rb
 - lib/cocoapods-flutter/native/podfile.rb
 - lib/cocoapods-flutter/native/specification/consumer.rb