cocoapods-flutter-dt 0.0.3 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f5e54d76525f37dd069456318eac1d194bb8da3238f85d59ff1cec9ab174e7
-  data.tar.gz: 8b07578c4702e2d99be36fb99970afe732275cbf30e89acf269166a401f452eb
+  metadata.gz: 0d058cdad92967be7cdb6faf68d8bce286faee3ba289296a5a6f11df41738f53
+  data.tar.gz: eb3e2b8a366cbe38e1db06e19aae8e1d4a7e1694bb4153077895f96c1c3aa578
 SHA512:
-  metadata.gz: 4dcab1bf0b6cabfa622724dbd69764eef0861b76c9e4ddd74030ba002ac5db8b696e759254bb0a09cc306ee985bc9fb217fe99454a3c896ac959b302250f2ef7
-  data.tar.gz: 9ecbb88939b5498078b00c5610a7ae7f3945feb651bcfbd80107c8a3b4fa035190ecc34caba83ad4f7dd9b4f33aadd68f49a620653177ca7cf94d0a87c470a80
+  metadata.gz: 20879048433c4ef4939104a66c4362a265f41dbd1e2f9a0bb1a098f5338f153b9bea446bb3997b56ad4fd4963b9191e30a960854ac269a1b84b36c7fcbe2e61b
+  data.tar.gz: f580c9792e50cd5a57651944c961f18fd22667d02faa45d8a93cfe21e582c7e949d47a984467daa1690f4c1568689cc3e0a71240d0177f7f77c3cbfd0d5dc0ae

data/README.md

@@ -1,23 +1,24 @@
 # cocoapods-flutter
 
-cocoapods plugin for integration Flutter easily.
+Cocoapods plugin for Flutter project integration.
 
 ## Installation
 
 **Precondition**
-Before you use `cocoapods-flutter`, make sure binary server and archive CI tool is ready. I provide you an archive tool and a binary server. Click link below and redirect to another repository.
+
+Before you use `cocoapods-flutter`, make sure binary server is ready. I provide you a simple binary server. Click link below and redirect to another repository.
 
 [BinaryServer](https://github.com/NicolasKim/binary_server.git)
-[FlutterArchiveTool](https://github.com/NicolasKim/flutter_archive.git)
+
 
 **Gem install**
 
 ```
-$ gem install cocoapods-flutter
+$ gem install cocoapods-flutter-dt
 ```
 Or download source code build gem on your own
 ```
-$ gem install cocoapods-flutter.gem
+$ gem install cocoapods-flutter-dt.gem
 ```
 
 **Config environment**
@@ -26,28 +27,63 @@ $ export FLUTTER_BINARY_SERVER_BASEURL=https://www.example.com
 ```
 Here is simple [binary server](https://github.com/NicolasKim/binary_server.git)
 
+
 ## Usage
+
+
+### Archive
+
+```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
+```
+
+
+There is more options
+```shell script
+$ pod flutter archive --help
+--repo                                 podspec repo
+--sources                              podspec sources
+--upgrade                              pub upgrade
+--wrapper                              Default is flutter
+--flutterversion                       FlutterSDK version
+--buildrun                             run build-runner
+```
+If you need to customize the .ios/Podfile, you can create a file name of 'local_podfile', the tool will use this file in first priority.
+
+### Use
+
 In Podfile
+```
+plugin 'cocoapods-flutter-dt'
+```
 
 
+#### Case 1
+Use binary of flutter, In this case, tool will download code from binary server.
+```ruby
+flutter_pod 'package_name', '0.0.1', :mode=>'debug/release'
+```
 
-### Case 1
+#### Case 2
+Use local flutter project, compile dart code every time when you build native code
 ```ruby
-flutter_pod 'package_name', '0.0.1', :mode=>'debug/release', :sdk_version=>'1.12.13'
+flutter_pod 'package_name', '0.0.1',:mode=>'debug/release', :path=>'local path of pubspec file'
 ```
 
-**package_name**
-Name of package
-**:sdk_version**
-Flutter sdk version,default is 1.12.13
-**:mode**
-Download binary package of version of debug/release from binary server. On mode debug, of course you can attach, and on mode release, yeah it is just release.
 
-### Case 2
+#### Case 3
+Pull flutter project from git repository. In this case, the tool will pull the flutter project into native project root directory and create framework when you pod install or update
 ```ruby
-flutter_pod 'PACKAGE_NAME', :path=>'local/module/path'
+flutter_pod 'package_name', '0.0.1', :mode=>'debug/release', :git=>{
+
+:url=>'http://github.com/flutter/package_name.git',
+
+:ref=>'master',
+
+:wrapper => 'flutterw'
+
+}
 ```
-**:path** 
-Local path of module
 
 and `pod install`

data/cocoapods-flutter.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = CocoapodsFlutter::VERSION
   spec.authors       = ['Dreamtracer']
   spec.email         = ['jinqiucheng1006@live.cn']
-  spec.description   = %q{A short description of cocoapods-flutter.}
-  spec.summary       = %q{A longer description of cocoapods-flutter.}
-  spec.homepage      = 'https://github.com/EXAMPLE/cocoapods-flutter'
+  spec.description   = %q{Flutter archive tool}
+  spec.summary       = %q{Simple way to archive and use}
+  spec.homepage      = 'https://github.com/NicolasKim/cocoapods-flutter-dt.git'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

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

@@ -10,7 +10,7 @@ module Pod
         DESC
 
         self.arguments = [
-            CLAide::Argument.new(['MODULE', 'VERSION', 'PODREPO'], false)
+            CLAide::Argument.new([''], false)
         ]
 
         def self.options
@@ -26,7 +26,32 @@ module Pod
 
         def initialize(argv)
           @module_name = argv.shift_argument
-          @version = argv.shift_argument
+          tmp_version = argv.shift_argument
+          #如果满足
+          if tmp_version =~ /([0-9]+\.)+[0-9]+/
+            @version = tmp_version
+          else
+            tmp_str = tmp_version.dup
+            last_v = "0"
+            mid_v = "0"
+            main_v = "0"
+            unless tmp_str.empty?
+              last_v = tmp_str.slice!(tmp_str.length - 1, 1)
+            end
+            unless tmp_str.empty?
+              mid_v = tmp_str.slice!(tmp_str.length - 1, 1)
+            end
+            unless tmp_str.empty?
+              main_v = tmp_str
+            end
+
+            versions = Array.new
+            versions << main_v
+            versions << mid_v
+            versions << last_v
+            @version = versions.join "."
+          end
+
           @pod_repo = argv.option('repo', 'master')
           @sources = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @flutter_wrapper = argv.option('wrapper', 'flutter')

data/lib/cocoapods-flutter/gem_version.rb

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

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

@@ -48,7 +48,12 @@ class Archiver
   def archive
 
     @pub_upgrade ? pub_upgrade : pub_get
-    setup_pod_sources
+    if local_podfile_exists?
+      use_local_podfile
+    else
+      setup_pod_sources
+    end
+
     if @build_run
       excute_build_run
     end
@@ -118,6 +123,11 @@ class Archiver
     end
   end
 
+  def local_podfile_exists?
+    local_podfile_dir = @working_dir + '/local_podfile'
+    File.exist? local_podfile_dir
+  end
+
   def setup_pod_sources
     Pod::UserInterface.info 'Setup pod sources...'
     origin_pod_file_root_dir = @working_dir + '/.ios'
@@ -166,23 +176,33 @@ class Archiver
 
   end
 
+  def use_local_podfile
+    origin_pod_file_root_dir = @working_dir + '/.ios'
+    origin_pod_file_dir = origin_pod_file_root_dir+ '/Podfile'
+    if File.exist? origin_pod_file_dir
+      File.delete(origin_pod_file_dir)
+    end
+    local_podfile_dir = @working_dir + '/local_podfile'
+    FileUtils.copy_file local_podfile_dir, origin_pod_file_dir
+  end
+
   def excute_build_run
     if CommandRunner.run(@flutter_wrapper, 'packages','pub','run','build_runner','build','--delete-conflicting-outputs') == false
-      raise "run build_runner fail"
+      raise "Error running #{@flutter_wrapper} packages pub run build_runner build --delete-conflicting-outputs"
     end
   end
 
   def build_framework
-    if CommandRunner.run(@flutter_wrapper, 'build','ios-framework',"--output=#{@product_dir}") == false
+    if CommandRunner.run(@flutter_wrapper, 'build','ios-framework','--debug','--release',"--output=#{@product_dir}") == false
       # FileUtils.remove_dir product_dir, true
-      raise "run build_runner fail"
+      raise "Error running #{@flutter_wrapper} build ios-framework --debug --release --output=#{@product_dir} "
     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"
+      raise "Error running #{@flutter_wrapper} build ios --#{mode} --no-codesign"
     end
   end
 
@@ -348,6 +368,8 @@ end
       s.source                = { :http => app_download_url }
       s.ios.deployment_target = '9.0'
       s.prepare_command = "ruby download_sdk.rb #{sdk_download_url}"
+      s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
+      s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
       vendored_frameworks = ["App.framework", "Flutter.framework", "FlutterPluginRegistrant.framework"]
       @plugins.each do |plugin|
         vendored_frameworks.append "#{plugin.name}.framework"
@@ -366,7 +388,7 @@ end
     end
 
     Dir.chdir temp_dir do |dir|
-      Pod::Command::Repo::Push.run([@pod_repo, '--allow-warnings', "--sources=#{@sources.join(',')}"])
+      Pod::Command::Repo::Push.run([@pod_repo, '--skip-import-validation', '--verbose', '--allow-warnings', "--sources=#{@sources.join(',')}"])
     end
 
   end

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

@@ -5,13 +5,19 @@ class CommandRunner
   def CommandRunner.run(*args)
     command = args.join ' '
     Pod::UserInterface.info "Running #{command}..."
-    stdin, stdout, stderr, wait_thr = Open3.popen3(*args)
+    stdin, stdout_stderr, wait_thr = Open3.popen2e(*args)
+    Thread.new do
+      stdout_stderr.each {|l| puts l }
+    end
+
     exit_status = wait_thr.value
     if exit_status.success?
-      puts stdout.gets
+      puts stdout_stderr.gets
     else
-      puts stderr.gets
+      puts stdout_stderr.gets
     end
+    stdin.close
+    stdout_stderr.close
     return exit_status.success?
   end
 end

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

@@ -26,9 +26,6 @@ module Pod
         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"
@@ -42,6 +39,9 @@ module Pod
         end
 
         unless flutter_project_repo.nil?
+          flutter_project_repo_url =  flutter_project_repo[:url]
+          flutter_project_repo_ref =  flutter_project_repo[:ref]
+          flutter_command_wrapper =  flutter_project_repo[:wrapper]
           UI.info "Using git source..."
           if flutter_project_repo_ref.nil?
             flutter_project_repo_ref = 'master'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-flutter-dt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.9
 platform: ruby
 authors:
 - "\bDreamtracer"
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A short description of cocoapods-flutter.
+description: Flutter archive tool
 email:
 - jinqiucheng1006@live.cn
 executables: []
@@ -142,11 +142,11 @@ files:
 - lib/cocoapods_plugin.rb
 - spec/command/flutter_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/EXAMPLE/cocoapods-flutter
+homepage: https://github.com/NicolasKim/cocoapods-flutter-dt.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,9 +162,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
-summary: A longer description of cocoapods-flutter.
+summary: Simple way to archive and use
 test_files:
 - spec/command/flutter_spec.rb
 - spec/spec_helper.rb