flow-cli 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24aa1cf518f2148d862cc0b5607e18471f5494e2
-  data.tar.gz: ff58cc71bb78b8ec63c7aa5c8dff647385f1c405
+  metadata.gz: 21fd812ff71af588d84221a5db5edff651e5fe85
+  data.tar.gz: 83886130d5a88d1d594a425d6ab0db2aa427fae2
 SHA512:
-  metadata.gz: 9942e1cb0598a931c901eb5bdbfd6775e278d1b6b49bf74959ad2968e237e8045868cd9176f51be82c80473060d58f4e401de4b9d6abe0a30f39a7b2546f76d9
-  data.tar.gz: c6a5595d4ec972caedd40ffd63456814ee9aa8bc0746225283528598e0794c28e8311954488f61e609cfdb4d4fc9c3a130a4ed4eeef24327aa5b1f589ec0ef7c
+  metadata.gz: e312ff26145629f00ae94d5894561bb954c5359db18fde128eec3107da3d7cdd6aaa2d959ecd1e59478799d7172b39e2fa3f8a0675b766cd23a8598f0c356cc2
+  data.tar.gz: a9b08da5091376a43217d14c5018a5bd9a8e96dd192befec7a4e301f56927a15d45b6298d6043072fcb14dced5d47440aee4bc291ee7bb1a6e1b3e7b287bc45e

data/lib/flow/cli/cmd_manager.rb

@@ -15,9 +15,14 @@ module Flow::Cli
     desc "build_yaml_file", "build flow ci project yaml"
     def build_yaml_file
       config = ProjectAnalytics.new.config
+
+      # 用来交互
+      # TODO: 优化点，以后放到其他地方
+      config[:gym_config] = ask_gym_build_options if config[:flow_language] == "objc" && ENV["FLOW_CLI_TEST"] != "TRUE"
+
       str = FlowYamlBuilder.new(config).build_yaml
-      raise YamlError, "存在 flow.yml, 删除后才能重新生成" if File.file?("flow.yml")
-      File.open("flow.yml", "wb") do |file|
+      raise YamlError, "存在 #{FLOW_YML_NAME}, 删除后才能重新生成" if File.file?(FLOW_YML_NAME)
+      File.open(FLOW_YML_NAME, "wb") do |file|
         file.write(str)
       end
       @warning.call "yaml created...\n#{str}"
@@ -44,6 +49,11 @@ module Flow::Cli
       puts VERSION
     end
 
+    desc "upgrade", "upgrade flow-cli"
+    def upgrade
+      run_script "gem install flow-cli"
+    end
+
     desc 'help', 'Describe available commands or one specific command (aliases: `h`).'
     map Thor::HELP_MAPPINGS => :help
     def help(command = nil, subcommand = false)
@@ -55,8 +65,8 @@ module Flow::Cli
 
     no_commands do
       def select_yml_steps(step_name)
-        raise YamlError, "Can not found flow.yml" unless File.file?("flow.yml")
-        dict = YAML.safe_load(File.read("flow.yml"))
+        raise YamlError, "Can not found flow.yml" unless File.file?(FLOW_YML_NAME)
+        dict = YAML.safe_load(File.read(FLOW_YML_NAME))
 
         the_steps = []
         dict["flows"].map do |flow|
@@ -81,7 +91,7 @@ module Flow::Cli
       end
 
       def yml_build_script
-        if File.file?("flow.yml") == false
+        if File.file?(FLOW_YML_NAME) == false
           return unless @prompt.yes?('no flow.yml found, need to build . y/n')
           build_yaml_file
         end
@@ -98,6 +108,14 @@ module Flow::Cli
       def print_line
         puts "*" * 30
       end
+
+      def ask_gym_build_options
+        user_gym_config = {}
+        user_gym_config[:export_method] = @prompt.select("export_method? ", %w[development app-store ad-hoc package enterprise developer-id])
+        user_gym_config[:silent] = "" if @prompt.yes?("less log?")
+
+        user_gym_config
+      end
     end
   end
 end

data/lib/flow/cli/constant.rb

@@ -0,0 +1,5 @@
+module Flow
+  module Cli
+    FLOW_YML_NAME = "flow.yml".freeze
+  end
+end

data/lib/flow/cli/flow_yaml_builder.rb

@@ -49,7 +49,7 @@ module Flow::Cli
 
     # 生成编译脚本
     def generate_custom_build_step
-      script = IosBuildStepGenerator.new(flow_cli_config[:gym_config]).generate_gym_script
+      script = IosBuildStepGenerator.new(flow_cli_config).generate_gym_script
       {
         name: "build",
         scripts: [script]

data/lib/flow/cli/ios_build_step_generator.rb

@@ -3,40 +3,35 @@ require 'gym'
 
 module Flow::Cli
   class IosBuildStepGenerator
-    attr_accessor :config
-    attr_accessor :debug
-    def initialize(default_config = nil)
-      if default_config.nil? && ENV["FLOW_CLI_TEST"] != "TRUE"
+    attr_accessor :cli_config
+    def initialize(cli_config = {})
+      self.cli_config = cli_config
+      if ENV["FLOW_CLI_TEST"] != "TRUE"
         Gym.config = FastlaneCore::Configuration.create(Gym::Options.available_options, {})
         config = Gym.config.values(ask: false).reject { |_k, v| v.nil? }
         allowed_params = %i[workspace project scheme clean output_name configuration
                             codesigning_identity include_symbols include_bitcode
                             export_method export_options export_xcargs]
-        default_config = config.select { |k, _v| allowed_params.include? k }
+        @gym_config = config.select { |k, _v| allowed_params.include? k }
       else
-        default_config = {}
+        @gym_config = {}
       end
-
-      self.config = default_config
     end
 
-    def generate_gym_script(category = 'ad-hoc', force = false)
-      set_export_params(category, force)
+    def generate_gym_script
+      merge_user_cli_gym_config
       "fastlane gym build #{build_gym_params}"
     end
 
     # 返回 由 gym 调用的 core 的生成的相关参数
-    def set_export_params(category = 'ad-hoc', force = false)
-      raise ParamsError, "#{category} not exists" unless %w[app-store ad-hoc package enterprise development
-                                                            developer-id].include? category
-      return config if config[:export_method] && force == false
-
-      config[:export_method] = category
-      config
+    def merge_user_cli_gym_config
+      user_gym_config = { export_method: 'ad-hoc' }.merge(cli_config[:gym_config] || {} )
+      @gym_config.merge!(user_gym_config)
+      @gym_config
     end
 
     def build_gym_params
-      config.map { |k, v| "--#{k} #{v}" }.join(' ')
+      @gym_config.map { |k, v| "--#{k} #{v}".rstrip }.join(' ')
     end
   end
 end

data/lib/flow/cli/version.rb

@@ -1,5 +1,5 @@
 module Flow
   module Cli
-    VERSION = "0.0.1".freeze
+    VERSION = "0.0.2".freeze
   end
 end

data/lib/flow/cli.rb

@@ -1,4 +1,5 @@
 require_relative "./cli/version"
+require_relative "./cli/constant"
 require_relative "./cli/vendors/all"
 require_relative "./cli/exception"
 require_relative "./cli/project_analytics"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flow-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - atpking
@@ -159,6 +159,7 @@ files:
 - flow-cli.gemspec
 - lib/flow/cli.rb
 - lib/flow/cli/cmd_manager.rb
+- lib/flow/cli/constant.rb
 - lib/flow/cli/exception.rb
 - lib/flow/cli/flow_yaml_builder.rb
 - lib/flow/cli/ios_build_step_generator.rb