cocoapods-flutter-dt 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d6f48c8b2c30eed6c96640d6fca157ffcd7f3d296a4033d2c28dbc3499cd6b4
-  data.tar.gz: 3fee21a26991ace46036335b93f4eb07866b55d241086c5923b1b5f96411a619
+  metadata.gz: 51c1e6b26f94766910cca087a1697b87106b48e2cc13474960262b6a90c1112e
+  data.tar.gz: 82b73cbf5750b86d629d881b049db9969662f1715f0581ac4c4c6ca81676620e
 SHA512:
-  metadata.gz: e6465dd51a49d8d1f64efc656b88635fb235b2f451aadc5b7584ec6c08a42e4b112c902896ff832e7dba21ac821dd2c07f029c09079e7e6e690bdecea41033f7
-  data.tar.gz: 05be1f94f4a991114fb87436b9724f1c318c0f046ce57dad8c5e2be0a33f8ddfdce849c4bdf3e4d1962df309d4cab62152cd67cd5d5661e70e787e2df93ffba8
+  metadata.gz: 431372086b26158d86be83052d27fa5d1caee2844e00b056662645a17cfc7f66a0fc2b7f207cd01b165a2295ca5ab3911e340d28d974126e447013e248514aeb
+  data.tar.gz: cf5b96dad0f26cd345dfe6a05eaf1db9bebb72d2853d54d2deef3bf49e1a28d141de2618a27420285713e4980d9c045df190e9ab485f429d6c74d40949c35aab

data/README.md

@@ -35,13 +35,13 @@ Here is simple [binary server](https://github.com/NicolasKim/binary_server.git)
 
 ```shell script
 $ cd flutter project
-$ pod flutter archive package_name 0.0.1 --repo=cocoapods --wrapper=flutterw --sources=https://github.com/private_spec_repo.git,https://github.com/Cocoapods/Specs.git
+$ pod flutter foryou package_name 0.0.1 --repo=cocoapods --wrapper=flutterw --sources=https://github.com/private_spec_repo.git,https://github.com/Cocoapods/Specs.git
 ```
 
 
 There is more options
 ```shell script
-$ pod flutter archive --help
+$ pod flutter foryou --help
 --repo                                 podspec repo
 --sources                              podspec sources
 --upgrade                              pub upgrade

data/cocoapods-flutter.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = CocoapodsFlutter::VERSION
   spec.authors       = ['Dreamtracer']
   spec.email         = ['jinqiucheng1006@live.cn']
-  spec.description   = %q{Flutter archive tool}
-  spec.summary       = %q{Simple way to archive and use}
+  spec.description   = %q{Flutter foryou tool}
+  spec.summary       = %q{Simple way to foryou and use}
   spec.homepage      = 'https://github.com/NicolasKim/cocoapods-flutter-dt.git'
   spec.license       = 'MIT'
 
@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'parallel'
-  spec.add_dependency 'cocoapods', '~> 1.4'
+  spec.add_dependency 'plist'
+  spec.add_dependency 'cocoapods', '~> 1.11.2'
   spec.add_dependency 'rubyzip', '>= 1.0.0'
   spec.add_dependency 'rest-client'
-  spec.add_dependency 'molinillo',  '~> 0.6.6'
+  spec.add_dependency 'molinillo'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 end

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

@@ -4,7 +4,7 @@ module Pod
   class Command
     class Flutter < Command
       class Archive < Flutter
-        self.summary = 'archive flutter'
+        self.summary = 'foryou flutter'
         self.description = <<-DESC
             发布二进制组件 / 源码组件
         DESC

data/lib/cocoapods-flutter/command/flutter/dsym.rb

@@ -0,0 +1,43 @@
+require 'cocoapods-flutter/native/archive/archive'
+
+module Pod
+  class Command
+    class Flutter < Command
+      class DSYM < Flutter
+        self.summary = 'foryou flutter'
+        self.description = <<-DESC
+            Upload dSYM file to server
+        DESC
+
+        self.arguments = [
+            # CLAide::Argument.new([''], false)
+        ]
+
+        def self.options
+          [
+              ['--version', 'FlutterSDK version'],
+              ['--hash', 'FlutterEngine hash see Flutter.frameworks info.plist FlutterEngine value'],
+              ['--dsym', 'zip file path, you should download dSYM manually from "https://storage.cloud.google.com/flutter_infra_release/flutter/{engine hash}/ios-release/Flutter.dSYM.zip"']
+          ]#.concat(Pod::Command::Repo::Push.options).concat(super).uniq
+        end
+
+        def initialize(argv)
+
+          @flutter_version = argv.option('version', '1.22.6')
+          @hash = argv.option('hash')
+          @dsym = argv.option('dsym')
+          @working_dir = Dir.pwd
+
+          super
+        end
+
+        def run
+          remote = Remote.new()
+          remote.upload_flutter_sdk_dsym @flutter_version, @hash, @dsym
+          Pod::UserInterface.info "Upload success"
+        end
+
+      end
+    end
+  end
+end

data/lib/cocoapods-flutter/command/flutter.rb

@@ -1,4 +1,5 @@
 require 'cocoapods-flutter/command/flutter/archive'
+require 'cocoapods-flutter/command/flutter/dsym'
 
 module Pod
   class Command

data/lib/cocoapods-flutter/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFlutter
-  VERSION = "0.2.4"
+  VERSION = "0.2.7"
 end

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

@@ -4,6 +4,7 @@ require 'zip'
 require 'cocoapods-flutter/native/archive/zip_tool'
 require 'cocoapods-flutter/native/archive/remote'
 require 'molinillo'
+require 'plist'
 
 class Archiver
 
@@ -47,6 +48,11 @@ class Archiver
   end
 
   def archive
+    # open('http://127.0.0.1:8080/frameworks/download/Flutter/1.22.6/release/file.zip') do |u|
+    #   File.open('/Users/dreamtracer/Desktop/flutter.zip', "w+") do |file|
+    #     file.write u.read.force_encoding("UTF-8")
+    #   end
+    # end
 
     @pub_upgrade ? pub_upgrade : pub_get
     if local_podfile_exists?
@@ -299,9 +305,54 @@ class Archiver
     end
 
     sdk_file = zip_file_dir + "/Flutter.zip"
+    home_dir = Dir.home
+    cache_dir = home_dir + "/.cocoapods/.cache"
+    flutter_sdk_dsym_dir = cache_dir + "/flutter_sdk_dsym"
+    #创建dsym缓存文件
+    if Dir.exist?(flutter_sdk_dsym_dir) == false
+      Dir.mkdir flutter_sdk_dsym_dir
+    end
+
     Zip::File.open sdk_file, Zip::File::CREATE do |zipfile|
       file = File.join(product_dir, "Flutter.framework")
-      zipfile.add_dir "Flutter.framework", file
+      zipfile.add_dir "Flutter/Flutter.framework", file
+      #读取Flutter.framework中的info.plist文件中的FlutterEngine的值
+      info_plist_path = File.join(file, "Info.plist")
+      info_plist = Plist.parse_xml(info_plist_path)
+      engine_hash = info_plist["FlutterEngine"]
+      dsym_dir = File.join(flutter_sdk_dsym_dir, engine_hash)
+      dsym_zip_file_path = File.join(dsym_dir, 'Flutter.framework.dSYM.zip')
+      dsym_file_path = File.join(dsym_dir, 'Flutter.framework.dSYM')
+      #检查dsym文件缓存
+      Pod::UserInterface.info "Checking Flutter.framework.dSYM at #{dsym_dir}"
+      if Dir.exist?(dsym_dir) == false
+        Pod::UserInterface.info "Flutter.framework.dSYM not found at #{dsym_dir}"
+        Dir.mkdir(dsym_dir) unless Dir.exist?(dsym_dir)
+        #下载dsym
+        remote = Remote.new()
+        remote.download_flutter_sdk_dsym @flutter_version, engine_hash, dsym_zip_file_path
+        Pod::UserInterface.info "Flutter.framework.dSYM download success"
+        Dir.mkdir(dsym_file_path) unless File.exist?(dsym_file_path)
+
+        Pod::UserInterface.info "Start unzip #{dsym_zip_file_path}"
+        Zip::File.open(dsym_zip_file_path) do |zif_file|
+          zif_file.each do |entry|
+            # 通过下句打印可知，entyr是Zip::ZipEntry的对象
+            # puts entry.class
+            # 利用File.join构建文件存放的路径,路径为存放目录加上压缩文件的相对路径
+            entry.extract(File.join(dsym_dir, entry::name))
+          end
+        end
+        #重命名：如果文件名为Flutter.dSYM，则将Flutter.dSYM重命名为Flutter.framework.dSYM，因为cocoapods只识别Flutter.framework.dSYM
+        File.rename( File.join( dsym_dir, 'Flutter.dSYM'), dsym_file_path ) if File.exist? File.join( dsym_dir, 'Flutter.dSYM')
+
+        Pod::UserInterface.info "Unzip #{dsym_zip_file_path} success"
+
+      end
+
+      #向zip中添加dsym文件
+      Pod::UserInterface.info "Add Flutter.framework.dSYM to #{sdk_file}"
+      zipfile.add_dir "Flutter/Flutter.framework.dSYM", dsym_file_path
     end
     [zip_file, sdk_file]
   end
@@ -322,7 +373,7 @@ end
 def download(url, dest)
   open(url) do |u|
     File.open(dest, "w+") do |file|
-      file.write u.read
+      file.write u.read.force_encoding("UTF-8")
     end
   end
 end
@@ -338,8 +389,8 @@ if Dir.exist?(sdk_dir) == false
   Dir.mkdir sdk_dir
   download sdk_url, sdk_file
 end
-if File.exist? "Flutter.framework"
-  `rm -rf Flutter.framework`
+if Dir.exist? "Flutter"
+  `rm -rf Flutter`
 end
 `unzip \#{sdk_file} -d \#{Dir.pwd}`
     CODE
@@ -370,7 +421,6 @@ end
     if result
       Pod::UserInterface.info "Flutter_#{@flutter_version}_#{mode.downcase} was found, skip upload"
     end
-
   end
 
   def ignore_dependency?(name)
@@ -414,7 +464,7 @@ end
       s.prepare_command = "ruby download_sdk.rb #{sdk_download_url}"
       s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 x86_64' }
       s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 x86_64' }
-      vendored_frameworks = ["App.framework", "Flutter.framework", "FlutterPluginRegistrant.framework"]
+      vendored_frameworks = ["App.framework", "Flutter/Flutter.framework", "FlutterPluginRegistrant.framework"]
       @plugins.each do |plugin|
         vendored_frameworks.append "#{plugin.name}.framework"
       end
@@ -430,7 +480,7 @@ end
     File.open spec_file, "w+" do |file|
       file.write spec.to_pretty_json
     end
-
+    Pod::UserInterface.info "podspec file path #{spec_file}"
     Dir.chdir temp_dir do |dir|
       Pod::Command::Repo::Push.run([@pod_repo, '--skip-import-validation', '--verbose', '--allow-warnings', "--sources=#{@sources.join(',')}"])
       File.delete spec_file

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

@@ -1,4 +1,5 @@
 require 'rest-client'
+require 'open-uri'
 
 class Remote
 
@@ -42,4 +43,31 @@ class Remote
     @base_url + json["data"]['download_url']
   end
 
+  def download_flutter_sdk_dsym(version, hash, des_path)
+    uri = URI.join @base_url, "/dsyms/download/flutter/#{version}/#{hash}/file.zip"
+    Pod::UserInterface.info "Start download Flutter.framework.dSYM from #{uri.to_s}"
+    data = RestClient::Request.execute(:method => :get, :url => uri.to_s, :timeout => 3600, :raw_response => true)
+    file = File.new(des_path, 'w+')
+    file.write data
+    file.close
+  end
+
+  def upload_flutter_sdk_dsym(version, hash, file_path)
+    uri = URI.join @base_url, "/dsyms"
+    Pod::UserInterface.info "Start upload '#{file_path}' to #{uri.to_s}"
+    req = RestClient::Request.new(
+        :method => :post,
+        :url => uri.to_s,
+        :timeout => 3600,
+        :payload => {
+            :multipart => true,
+            :file => File.new(file_path, 'rb'),
+            :name => 'flutter',
+            :version => version,
+            :tag => hash
+        }
+    )
+    req.execute
+  end
+
 end

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

@@ -67,6 +67,7 @@ module Pod
           end
           return
         end
+
         pod "#{flutter_project_name}_#{flutter_project_mode}", flutter_project_version
 
       end

data/lib/cocoapods-flutter/native.rb

@@ -5,4 +5,5 @@ require 'cocoapods-flutter/native/specification/consumer'
 require 'cocoapods-flutter/native/podfile'
 require 'cocoapods-flutter/native/pod_source_preparer'
 require 'cocoapods-flutter/native/archive/archive'
+require 'cocoapods-flutter/native/archive/remote'
 require 'cocoapods-flutter/native/archive/command_runner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-flutter-dt
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.7
 platform: ruby
 authors:
 - "\bDreamtracer"
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -24,20 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +84,16 @@ dependencies:
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Flutter archive tool
+description: Flutter foryou tool
 email:
 - jinqiucheng1006@live.cn
 executables: []
@@ -125,6 +139,7 @@ files:
 - lib/cocoapods-flutter/command.rb
 - lib/cocoapods-flutter/command/flutter.rb
 - lib/cocoapods-flutter/command/flutter/archive.rb
+- lib/cocoapods-flutter/command/flutter/dsym.rb
 - lib/cocoapods-flutter/gem_version.rb
 - lib/cocoapods-flutter/native.rb
 - lib/cocoapods-flutter/native/archive/archive.rb
@@ -164,7 +179,7 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Simple way to archive and use
+summary: Simple way to foryou and use
 test_files:
 - spec/command/flutter_spec.rb
 - spec/spec_helper.rb