lib/cocoapods-flutter/command/flutter/archive.rb in cocoapods-flutter-dt-0.2.7 vs lib/cocoapods-flutter/command/flutter/archive.rb in cocoapods-flutter-dt-0.4.1

@@ -21,48 +21,52 @@
               ['--wrapper', 'Default is flutter'],
               ['--flutterversion', 'FlutterSDK version'],
               ['--buildrun', 'run build-runner'],
               ['--debug', 'debug mode'],
               ['--release', 'release mode'],
+              ['--major', 'major version'],
+              ['--minor', 'minor version'],
+              ['--patch', 'patch version'],
           ].concat(Pod::Command::Repo::Push.options).concat(super).uniq
         end
 
         def initialize(argv)
           @module_name = 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
+          @version = [argv.option('major'), argv.option('minor'), argv.option('patch')].join "."
+          # 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
 
-            versions = Array.new
-            versions << main_v
-            versions << mid_v
-            versions << last_v
-            @version = versions.join "."
-          end
 
-
           @build_modes = []
           @pod_repo = argv.option('repo', 'master')
           @sources = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @flutter_wrapper = argv.option('wrapper', 'flutter')
           @pub_upgrade = argv.flag?('upgrade', true)
-          @flutter_version = argv.option('flutterversion', default_fluttter_version)
+          @flutter_version = argv.option('flutterversion')
           @build_run = argv.flag?('buildrun', true)
           @working_dir = Dir.pwd
 
           if argv.flag?('debug', true)
             @build_modes.append 'debug'
@@ -79,10 +83,10 @@
           archiver.archive
         end
 
         def default_fluttter_version
           flutter_version = ''
-          stdin, stdout_stderr, wait_thr = Open3.popen2e(@flutter_wrapper, '--version');
+          stdin, stdout_stderr, wait_thr = Open3.popen2e('fvm', @flutter_wrapper, '--version');
           stdout_stderr.each_line do |line|
             if line.start_with?('Flutter ')
               flutter_version = line.split(' • ').first.split(' ').last
             end
           end