kookeeper 3.0.0 → 3.0.3

data/lib/big_keeper/util/leancloud_logger.rb

@@ -7,30 +7,21 @@ module BigKeeper
   class LeanCloudLogger
     include Singleton
 
-    attr_accessor :user, :version, :start_timestamp, :end_timestamp, :command, :parameter, :is_success, :path, :need_log
-
-    def initialize
-      @need_log = "true"
-    end
+    attr_accessor :user, :version, :start_timestamp, :end_timestamp, :command, :parameter, :is_success, :path
 
     def set_command(set_command)
       @command = set_command
     end
 
-    def is_need_log
-      @need_log == "true"
-    end
-
     def start_log(global_options, args)
       @start_timestamp = Time.new.to_i
       @user = global_options['user'].to_s
       @parameter = args.join(",")
       @version = global_options['ver']
       @path = global_options['path']
-      @need_log = "#{global_options[:log]}"
     end
 
-    def end_log(is_success, is_show_log)
+    def end_log(is_success)
       @end_timestamp = Time.new.to_i
       @is_success = is_success
       @version = BigkeeperParser.version if @version == 'Version in Bigkeeper file'
@@ -43,13 +34,12 @@ module BigKeeper
       parameter = parameter.merge('version' => @version) unless @version == nil || @version == ""
       parameter = parameter.merge('parameter' => @parameter) unless @parameter == nil || @parameter == ""
 
-      if @command
-        leancloud_file = @command.split("/").first
-        send_log_cloud(leancloud_file, parameter, is_show_log)
-      end
+      leancloud_file = @command.split("/").first
+
+      send_log_cloud(leancloud_file, parameter)
     end
 
-    def send_log_cloud(file_name, parameter, is_show_log)
+    def send_log_cloud(file_name, parameter)
       if file_name == nil
         return
       end
@@ -70,9 +60,7 @@ module BigKeeper
       req.body = parameter.to_json
       res = https.request(req)
 
-      if is_show_log == true
-        Logger.highlight("Send LeanCloud success, response #{res.body}")
-      end
+      Logger.highlight("Send LeanCloud success, response #{res.body}")
     end
 
     def assemble_request

data/lib/big_keeper/util/list_generator.rb

@@ -6,7 +6,7 @@ module BigKeeper
     #generate tree print throught console
     def self.generate_tree(file_path, home_branches, version)
       module_branches_dic = {}
-      json_data = File.read(file_path, :encoding => 'UTF-8')
+      json_data = File.read(file_path)
       module_branches_dic = JSON.parse(json_data)
       to_tree(module_branches_dic, home_branches, version)
       File.delete(file_path)
@@ -15,7 +15,7 @@ module BigKeeper
       #generate json print throught console
     def self.generate_json(file_path, home_branches, version)
       module_branches_dic = {}
-      json_data = File.read(file_path, :encoding => 'UTF-8')
+      json_data = File.read(file_path)
       module_branches_dic = JSON.parse(json_data)
       json = to_json(home_branches, module_branches_dic, version)
       puts JSON.pretty_generate(json)

data/lib/big_keeper/util/logger.rb

@@ -27,8 +27,7 @@ module BigKeeper
     end
 
     def self.error(sentence)
-      is_need_log = LeanCloudLogger.instance.is_need_log
-      LeanCloudLogger.instance.end_log(false, is_need_log)
+      LeanCloudLogger.instance.end_log(false)
       raise formatter_output(sentence).colorize(:red)
     end
 

data/lib/big_keeper/util/podfile_detector.rb

@@ -1,39 +1,27 @@
 require 'big_keeper/util/bigkeeper_parser'
 require 'big_keeper/model/podfile_model'
 require 'big_keeper/util/logger'
-require 'Singleton'
+
 module BigKeeper
 
-class PodfileParser
-  include Singleton
-  attr_accessor :module_list, :main_path, :pod_list
+class PodfileDetector
+
+  attr_accessor :module_list, :main_path
   $unlock_pod_list = []
   $modify_pod_list = {}
 
-  def initialize
-    @module_list = BigkeeperParser.module_names
-    @pod_list = []
+  def initialize(main_path, module_list)
+    @module_list = module_list
+    @main_path = main_path
   end
 
-  def parse(path)
-    @main_path = path
-    podfile_lines = File.readlines("#{@main_path}/Podfile", :encoding => 'UTF-8')
+  def get_unlock_pod_list
+    podfile_lines = File.readlines("#{@main_path}/Podfile")
     Logger.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
-    podfile_lines.collect do |sentence|
-      if /pod / =~ sentence
-        pod_name = get_pod_name(sentence)
-        @pod_list << pod_name
+      podfile_lines.collect do |sentence|
+      deal_podfile_line(sentence) unless sentence =~(/(\d+.){1,2}\d+/)
       end
-    end
-  end
-
-  def get_unlock_pod_list
-    podfile_lines = File.readlines("#{@main_path}/Podfile", :encoding => 'UTF-8')
-    #Logger.highlight("Analyzing Podfile...") unless podfile_lines.size.zero?
-    podfile_lines.collect do |sentence|
-    deal_podfile_line(sentence) unless sentence =~(/'(\d+.){1,2}\d+'/)
-    end
-    $unlock_pod_list
+      $unlock_pod_list
   end
 
   def deal_podfile_line(sentence)
@@ -44,24 +32,37 @@ class PodfileParser
          pod_model.configurations != '[\'Debug\']' &&
          pod_model.path == nil &&
          pod_model.tag == nil
-            pod_names = pod_model.name.split('/')
-            if pod_names.size > 1
-              pod_name = pod_names[0]
-            else
-              pod_name = pod_model.name
-            end
-            $unlock_pod_list << pod_name unless @module_list.include?(pod_name)
+            $unlock_pod_list << pod_model.name unless @module_list.include?(pod_model.name)
       end
       pod_model
     end
   end
 
-  def get_pod_name(sentence)
 
-    pod_model = deal_podfile_line(sentence)
-    if pod_model != nil
-      return pod_model.name
+  def deal_lock_file(main_path, deal_list)
+      $result = {}
+      podfile_lock_lines = File.readlines("#{main_path}/Podfile.lock")
+      Logger.highlight("Analyzing Podfile.lock...") unless podfile_lock_lines.size.zero?
+      podfile_lock_lines.select do |sentence|
+      if sentence.include?('DEPENDENCIES')  #指定范围解析 Dependencies 之前
+        break
+      end
+
+      temp_sentence = sentence.strip
+      pod_name = get_lock_podname(temp_sentence)
+      if deal_list.include?(pod_name)
+        current_version = $result[pod_name]
+        temp_version = get_lock_version(temp_sentence)
+        if temp_version != nil
+          if current_version != nil
+            $result[pod_name] = chose_version(current_version, temp_version)
+          else
+            $result[pod_name] = temp_version
+          end
+        end
+      end
     end
+    return $result
   end
 
   def self.get_pod_model(sentence)
@@ -71,6 +72,14 @@ class PodfileParser
     end
   end
 
+  def get_pod_name(sentence)
+    pod_model = deal_podfile_line(sentence)
+    pod_name = pod_model.name if pod_model != nil && pod_model.configurations.nil
+    @unlock_pod_list << pod_name unless @module_list.include pod_name
+  end
+
+
+
   def get_lock_podname(sentence) #获得pod名称
     match_result = /(\d+.){1,2}\d+/.match(sentence.delete('- :~>='))
     pod_name = match_result.pre_match unless match_result == nil

data/lib/big_keeper/util/podfile_module.rb

@@ -37,7 +37,7 @@ class PodfileModuleDetector
   end
 
   def deal_module_info
-    podfile_lines = File.readlines("#{@main_path}/bigKeeperPodInfo.tmp", :encoding => 'UTF-8')
+    podfile_lines = File.readlines("#{@main_path}/bigKeeperPodInfo.tmp")
     Logger.highlight("Analyzing modules info...") unless podfile_lines.size.zero?
       podfile_lines.collect do |sentence|
         if sentence =~(/pod/)

data/lib/big_keeper/util/podfile_operator.rb

@@ -36,26 +36,19 @@ module BigKeeper
     end
 
     def find_and_lock(podfile, dictionary)
-      temp_file = Tempfile.new('.Podfile.tmp', :encoding => 'UTF-8')
+      temp_file = Tempfile.new('.Podfile.tmp')
       begin
         File.open(podfile, 'r') do |file|
           file.each_line do |line|
-            pod_model = PodfileParser.get_pod_model(line)
+            pod_model = PodfileDetector.get_pod_model(line)
             if pod_model != nil && pod_model.name != nil && dictionary[pod_model.name] != nil
+                # p "#{pod_name},#{dictionary[pod_name]}"
                 temp_file.puts generate_pod_config(pod_model.name, dictionary[pod_model.name], pod_model.comment)
-                dictionary.delete(pod_model.name)
             else
                 temp_file.puts line
             end
           end
         end
-        if !dictionary.empty?
-          temp_file.puts 'def sub_dependency'
-          dictionary.keys.each do |sub_pod|
-            temp_file.puts generate_pod_config(sub_pod, dictionary[sub_pod], 'bigkeeper')
-          end
-          temp_file.puts 'end'
-        end
         temp_file.close
         FileUtils.mv(temp_file.path, podfile)
       ensure
@@ -65,13 +58,12 @@ module BigKeeper
     end
 
     def find_and_upgrade(podfile, dictionary)
-      temp_file = Tempfile.new('.Podfile.tmp', :encoding => 'UTF-8')
+      temp_file = Tempfile.new('.Podfile.tmp')
       begin
-        File.open(podfile, 'r', :encoding => 'UTF-8') do |file|
+        File.open(podfile, 'r') do |file|
           file.each_line do |line|
-            pod_model = PodfileParser.get_pod_model(line)
+            pod_model = PodfileDetector.get_pod_model(line)
             if pod_model != nil && pod_model.name != nil && dictionary[pod_model.name] != nil
-                #替换
                 temp_file.puts generate_pod_config(pod_model.name, dictionary[pod_model.name], pod_model.comment)
             else
                 temp_file.puts line
@@ -87,10 +79,10 @@ module BigKeeper
     end
 
     def podspec_change(podspec_file, version, module_name)
-      temp_file = Tempfile.new(".#{module_name}.podspec", :encoding => 'UTF-8')
+      temp_file = Tempfile.new(".#{module_name}.podspec")
       has_change = false
       begin
-        File.open(podspec_file, 'r', :encoding => 'UTF-8') do |file|
+        File.open(podspec_file, 'r') do |file|
           file.each_line do |line|
             if line.include?("s.version")
               temp_line = line

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "3.0.0"
+  VERSION = "3.0.3"
 end

data/lib/big_keeper.rb

@@ -13,8 +13,7 @@ require 'big_keeper/command/release'
 require 'big_keeper/command/pod'
 require 'big_keeper/command/spec'
 require 'big_keeper/command/image'
-require 'big_keeper/command/init'
-require 'big_keeper/command/client'
+
 require 'big_keeper/service/git_service'
 require 'big_keeper/util/leancloud_logger'
 
@@ -28,8 +27,7 @@ module BigKeeper
 
   flag %i[p path], default_value: './'
   flag %i[v ver], default_value: 'Version in Bigkeeper file'
-  flag %i[u user], default_value: GitOperator.new.user
-  flag %i[l log], default_value: true
+  flag %i[u user], default_value: GitOperator.new.user.gsub(/[^0-9A-Za-z]/, '').downcase
 
   if VerifyOperator.already_in_process?
     p %Q(There is another 'big' command in process, please wait)
@@ -41,17 +39,13 @@ module BigKeeper
     exit
   end
 
-   # pre do |global_options, command, options, args|
-   #   LeanCloudLogger.instance.start_log(global_options, args)
-   # end
-   #
-   # post do |global_options, command, options, args|
-   #   is_show_log = true
-   #   if global_options[:log] == 'true'
-   #     is_show_log = false
-   #   end
-   #   LeanCloudLogger.instance.end_log(true, is_show_log)
-   # end
+  pre do |global_options,command,options,args|
+    LeanCloudLogger.instance.start_log(global_options, args)
+  end
+
+  post do |global_options,command,options,args|
+    LeanCloudLogger.instance.end_log(true)
+  end
 
   feature_and_hotfix_command(GitflowType::FEATURE)
 
@@ -65,10 +59,6 @@ module BigKeeper
 
   image_command
 
-  init_command
-
-  client_command
-
   desc 'Show version of bigkeeper'
   command :version do |version|
     version.action do |global_options, options, args|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kookeeper
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.3
 platform: ruby
 authors:
-- weiyanwu
+- mmoaay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -154,16 +154,16 @@ dependencies:
   name: big_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
@@ -223,23 +223,23 @@ dependencies:
 description: Efficiency improvement for iOS&Android modular development, iOSer&Androider
   using this tool can make modular development easier.
 email:
-- 2126724184@qq.com
+- mmoaay@sina.com
 executables:
 - koo
 - setup
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
-- ".travis.yml"
+- ".idea/.gitignore"
+- ".idea/bigkeeper.iml"
+- ".idea/modules.xml"
+- ".idea/vcs.xml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
 - big_keeper.gemspec
 - bin/big
 - bin/koo
@@ -255,7 +255,6 @@ files:
 - docs/zh-CN/RELEASE.md
 - docs/zh-CN/SPEC.md
 - lib/big_keeper.rb
-- lib/big_keeper/command/client.rb
 - lib/big_keeper/command/feature&hotfix.rb
 - lib/big_keeper/command/feature&hotfix/delete.rb
 - lib/big_keeper/command/feature&hotfix/finish.rb
@@ -269,15 +268,11 @@ files:
 - lib/big_keeper/command/feature&hotfix/update.rb
 - lib/big_keeper/command/image.rb
 - lib/big_keeper/command/image/image.rb
-- lib/big_keeper/command/init.rb
 - lib/big_keeper/command/pod.rb
 - lib/big_keeper/command/pod/podfile.rb
 - lib/big_keeper/command/release.rb
-- lib/big_keeper/command/release/finish.rb
 - lib/big_keeper/command/release/home.rb
 - lib/big_keeper/command/release/module.rb
-- lib/big_keeper/command/release/publish.rb
-- lib/big_keeper/command/release/start.rb
 - lib/big_keeper/command/spec.rb
 - lib/big_keeper/command/spec/add.rb
 - lib/big_keeper/command/spec/analyze.rb
@@ -300,24 +295,19 @@ files:
 - lib/big_keeper/util/bigkeeper_parser.rb
 - lib/big_keeper/util/cache_operator.rb
 - lib/big_keeper/util/code_operator.rb
-- lib/big_keeper/util/command_line_util.rb
 - lib/big_keeper/util/file_operator.rb
 - lib/big_keeper/util/git_operator.rb
 - lib/big_keeper/util/gitflow_operator.rb
-- lib/big_keeper/util/gradle_content_generator.rb
-- lib/big_keeper/util/gradle_file_operator.rb
-- lib/big_keeper/util/gradle_module_operator.rb
+- lib/big_keeper/util/gradle_operator.rb
 - lib/big_keeper/util/info_plist_operator.rb
 - lib/big_keeper/util/leancloud_logger.rb
 - lib/big_keeper/util/list_generator.rb
-- lib/big_keeper/util/lockfile_parser.rb
 - lib/big_keeper/util/logger.rb
 - lib/big_keeper/util/pod_operator.rb
 - lib/big_keeper/util/podfile_detector.rb
 - lib/big_keeper/util/podfile_module.rb
 - lib/big_keeper/util/podfile_operator.rb
 - lib/big_keeper/util/verify_operator.rb
-- lib/big_keeper/util/version_config_operator.rb
 - lib/big_keeper/util/xcode_operator.rb
 - lib/big_keeper/version.rb
 - resources/banner.png
@@ -327,7 +317,6 @@ files:
 - resources/keynote/big-keeper-readme-feature.key
 - resources/keynote/big-keeper-readme-release.key
 - resources/readme/big-keeper-readme.001.png
-- resources/template/Bigkeeper
 homepage: https://github.com/BigKeeper/bigkeeper
 licenses:
 - MIT
@@ -348,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.10
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Efficiency improvement for iOS&Android modular development.

data/.github/ISSUE_TEMPLATE.md

@@ -1,20 +0,0 @@
-### Check List
-
-Thanks for considering to open an issue. Before you submit your issue, please confirm these boxes are checked.
-
-- [ ] I have read the [README.md](https://github.com/BigKeeper/bigkeeper/blob/master/README.md), but there is no information I need.
-- [ ] I have searched in [existing issues](https://github.com/BigKeeper/bigkeeper/issues?utf8=%E2%9C%93&q=is%3Aissue), but did find a same one.
-
-### Issue Description
-
-#### Description
-
-[Tell us about the issue]
-
-#### Reproduce
-
-[The steps to reproduce this issue. What are the parameters, where did you put your code, etc.]
-
-#### Other Comment
-
-[Add anything else here]

data/.gitignore

@@ -1,50 +0,0 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
-  - 2.1.10
-
-before_install:
-  - gem update --remote bundler
-  - gem update --system
-
-sudo: false
-
-bundler_args: --without=guard
-
-notifications:
-  disabled: true

data/Rakefile

@@ -1,2 +0,0 @@
-require "bundler/gem_tasks"
-task :default => :spec

data/lib/big_keeper/command/client.rb

@@ -1,50 +0,0 @@
-require 'big_keeper/util/leancloud_logger'
-require 'big_keeper/command/pod/podfile'
-require 'big_keeper/command/spec/list'
-require 'big_keeper/util/list_generator'
-
-module BigKeeper
-
-  def self.client_command
-    desc 'API for bigkeeper-client.'
-    command :client do | c |
-      c.desc 'Commands about operate modules.'
-      c.command :modules do |modules|
-        modules.desc 'Get modules list from Bigkeeper file.'
-        modules.command :list do |list|
-            list.action do |global_options, options, args|
-            LeanCloudLogger.instance.set_command("spec/list")
-            path = File.expand_path(global_options[:path])
-            version = global_options[:ver]
-            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
-            spec_list(path, user, options)
-          end
-        end
-        modules.desc 'Update modules.'
-        modules.command :update do |update|
-          update.action do |global_options, options, args|
-            LeanCloudLogger.instance.set_command("spec/list")
-            path = File.expand_path(global_options[:path])
-            version = global_options[:ver]
-            user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
-            spec_list(path, user, options)
-          end
-        end
-      end
-      c.desc 'Commands about features.'
-      c.command :feature do |feature|
-        feature.desc "List all the features including origin."
-        feature.command :list do | list |
-            list.flag %i[v version] , default_value: 'all versions'
-            list.action do |global_options, options, args|
-              LeanCloudLogger.instance.set_command("feature/list/json")
-              options[:json] = true
-              path = File.expand_path(global_options[:path])
-              user = global_options[:user].gsub(/[^0-9A-Za-z]/, '').downcase
-              list(path, user, GitflowType::FEATURE, options)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/big_keeper/command/init.rb

@@ -1,36 +0,0 @@
-require 'big_keeper/util/leancloud_logger'
-require 'big_keeper/util/file_operator'
-require 'fileutils'
-require 'big_keeper/util/logger'
-
-module BigKeeper
-  def self.init_command
-    desc 'BigKeeper file initialize'
-    command :init do | c |
-      c.desc "BigKeeper template file initialize."
-      c.action do | global_options, options, args |
-        LeanCloudLogger.instance.set_command("big/init")
-
-        bin_path = File.dirname(__FILE__)
-        bin_path = File.dirname(bin_path)
-        bin_path = File.dirname(bin_path)
-        bin_path = File.dirname(bin_path)
-        path = global_options['path']
-        Logger.highlight("Initialize BigKeeper File...")
-        #template path
-        source_file = File.join(bin_path, 'resources/template/BigKeeper')
-        #BigKeeper file need exist path
-        target_path = File.join(path, 'BigKeeper')
-
-        if !File.exists?(target_path)
-          FileUtils.cp(source_file, target_path)
-          Logger.highlight("Initialize BigKeeper Complete!")
-        else
-          Logger.highlight("BigKeeper File Has Exist!")
-        end
-
-        LeanCloudLogger.instance.set_command("file/init")
-      end
-    end
-  end
-end