bigkeeper 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0865993502adc9ea5a674ce5201cc9d28cad25b
-  data.tar.gz: 98224dd734ab65172620028b5a6138fa0a73d872
+  metadata.gz: a178ce998f09ae1fdb14f742aef17629f330d180
+  data.tar.gz: f827fe0abbef6453e5cced72fb2304b3b1f39382
 SHA512:
-  metadata.gz: eb028888e708fd0156d0d1a4c03d6d107ac5f1c64b4138ecd8922e78a3048051d6f87dcf87a46b66ac0a5fb68f404463a9a13737ff9a6f4aed82a4109874d2ef
-  data.tar.gz: fcecfc0731700f362578423571b472fa1b277421df0653e88f79ac457b06462f7618315e4597f373754c690c7b1765ca7f2a07d4d159a082a1d233a1ecfb0e9e
+  metadata.gz: a25c17c7db3fdb78d8500ec06e9500741414c22b9a16dc57069c3969b584c23c9b997acd048c2fdb8897394d7563deb914a82552f1ff16788960d12e6e3c35f3
+  data.tar.gz: d254ed1eb23b54495fe0098bbb92370618233b9598aa843bcca2ecdab9c795aefc5619c9ea5554f43a48b77517b0666b0c7e395a38ac5dbe39d1aab2d8700b58

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.8.2)
+    bigkeeper (0.8.3)
       big_stash (~> 0.1)
       cocoapods
       colorize

data/lib/big_keeper.rb

@@ -12,6 +12,7 @@ require 'big_keeper/command/feature&hotfix'
 require 'big_keeper/command/release'
 require 'big_keeper/command/pod'
 require 'big_keeper/command/module'
+require 'big_keeper/command/spec'
 
 require 'big_keeper/service/git_service'
 
@@ -47,6 +48,8 @@ module BigKeeper
 
   module_command
 
+  spec_command
+
   desc 'Show version of bigkeeper'
   command :version do |version|
     version.action do |global_options, options, args|

data/lib/big_keeper/command/module/list.rb

@@ -13,6 +13,6 @@ module BigKeeper
         module_list << dic
       end
       json = JSON.pretty_generate(module_list)
-      Logger.default(json)
+      puts json
   end
 end

data/lib/big_keeper/command/spec.rb

@@ -0,0 +1,39 @@
+require 'big_keeper/command/spec/analyze'
+require 'big_keeper/command/spec/add'
+require 'big_keeper/command/spec/delete'
+require 'big_keeper/command/spec/search'
+
+module BigKeeper
+
+  def self.spec_command
+    desc 'spec command'
+
+    command :spec do |spec|
+      spec.switch [:a,:all]
+      spec.command :analyze do |analyze|
+        analyze.action do |global_options, options, args|
+          path = File.expand_path(global_options[:path])
+          is_all = options[:all]
+          module_names = args
+          spec_analyze(path, is_all, module_names)
+        end
+      end
+      spec.command :add do |add|
+        add.action do
+          spec_add()
+        end
+      end
+      spec.command :delete do |delete|
+        delete.action do
+          spec_delete()
+        end
+      end
+      spec.command :search do |search|
+        search.action do
+          spec_search()
+        end
+      end
+
+    end
+  end
+end

data/lib/big_keeper/command/spec/add.rb

@@ -0,0 +1,9 @@
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/dependency/dep_type'
+require 'big_keeper/util/logger'
+
+module BigKeeper
+  def self.spec_add
+    puts "Hello spec_add"
+  end
+end

data/lib/big_keeper/command/spec/analyze.rb

@@ -0,0 +1,88 @@
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/dependency/dep_type'
+require 'big_keeper/util/logger'
+require 'big_keeper/model/library_model'
+
+module BigKeeper
+  def self.spec_analyze(path,is_all,find_module_names)
+    is_default = !is_all&&find_module_names.size==0
+    if is_all && find_module_names.size>0
+      Logger.error("parameter conflict: [--all] | [module_names]")
+      return
+    end
+    puts "start spec analyze..."
+    puts Time.now.to_s
+
+    # Parse Bigkeeper file
+    # BigkeeperParser.parse("#{path}/Bigkeeper")
+    # module_names = BigkeeperParser.module_names
+
+    # find modules
+    puts "get all modules..."
+    module_names = []
+    pod_path = path+"/Pods/"
+    dir = Dir.open(pod_path)
+    dir.each do |dir_name|
+      if !dir_name.include?(".") && dir_name != "Headers" && dir_name != "Local Podspecs" && dir_name != "Target Support Files"
+        module_names[module_names.size]=dir_name
+      end
+    end
+
+    is_legal = true
+    for input_moudle_name in find_module_names do
+      if !module_names.include?(input_moudle_name)
+        is_legal = false
+        Logger.error("["+input_moudle_name+"] not exist.")
+      end
+    end
+    if !is_legal
+      return
+    end
+
+    # setup modules
+    module_list = []
+    module_keyword_map = Hash.new
+    file_count = 0
+    for module_name in module_names do
+      library = LibraryModel.new(module_name)
+      library.get_all_public_file(path)
+      module_list[module_list.size]=library
+      module_keyword_map[module_name]=library.keyword_list
+      if is_all || find_module_names.include?(library.name)
+        file_count = file_count + library.file_list.size
+      end
+    end
+    # analyze modules spec
+
+    puts "analyze modules "+Time.now.to_s
+    file_index = 0
+    for library in module_list do
+      if is_all || find_module_names.include?(library.name)
+        puts "analyzing "+library.name
+        file_index = file_index + library.file_list.size
+        library.spec_dependece_library(module_keyword_map.clone)#(Hash.new(module_keyword_map)).to_hash)
+        progress = (file_index*100.0)/file_count
+        progress = format("%.02f", progress).to_f
+        puts "progress >>>> "+String(progress)+"% ["+library.name+" done] "
+      end
+    end
+    puts "analyze complete "+Time.now.to_s
+
+    # log spec info
+    for library in module_list do
+      if is_all || find_module_names.include?(library.name)
+        Logger.highlight("\n-"+library.name+":")
+        for spec_library in library.spec_library do
+          puts " -"+spec_library
+        end
+      end
+    end
+
+    # save cache to file
+    if is_all
+
+    end
+
+  end
+
+end

data/lib/big_keeper/command/spec/delete.rb

@@ -0,0 +1,9 @@
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/dependency/dep_type'
+require 'big_keeper/util/logger'
+
+module BigKeeper
+  def self.spec_delete
+    puts "Hello spec_delete"
+  end
+end

data/lib/big_keeper/command/spec/search.rb

@@ -0,0 +1,9 @@
+require 'big_keeper/util/bigkeeper_parser'
+require 'big_keeper/dependency/dep_type'
+require 'big_keeper/util/logger'
+
+module BigKeeper
+  def self.spec_search
+    puts "Hello spec_search"
+  end
+end

data/lib/big_keeper/model/library_model.rb

@@ -0,0 +1,116 @@
+require 'big_keeper/util/file_operator'
+require 'big_keeper/util/code_operator'
+
+
+module BigKeeper
+  class LibraryModel
+    attr_accessor :name, :file_list, :header_file_list, :keyword_list, :spec_library
+    def initialize(name)
+      @name = name
+      @file_list = []
+      @header_file_list = []
+      @spec_library = []
+      @keyword_list = []
+    end
+
+    def get_all_public_file(path)
+      all_header = FileOperator.find_all_header_file("#{path}/Pods/#{@name}")
+      for file_path in all_header do
+        @header_file_list[@header_file_list.size] = file_path
+        file_name = File.basename(file_path)
+        @keyword_list[@keyword_list.size] = file_name
+        in_note = false
+        File.foreach(file_path) { |line|
+          hash = Hash.new
+          hash["in_note"]=in_note
+          hash["line"]=line
+          OCCodeOperator.in_note_code(hash)
+          in_note = hash["in_note"]
+          line = hash["line"]
+          if line.empty?
+            next
+          end
+          if line.include?("@interface ")
+            line[0,line.index("@interface ")+11]=""
+            column = line.split(/:/)
+            if column.size > 1
+              class_name = column[0]
+              if class_name.include?("<")
+                class_name = class_name[0, class_name.index("<")]
+              end
+              class_name = class_name.strip
+              if (@keyword_list.include?(class_name+".h"))
+                @keyword_list.delete(class_name+".h")
+              end
+              @keyword_list[@keyword_list.size] = class_name
+            end
+          end
+        }
+      end
+      # if @name == ""
+      #   puts @keyword_list
+      # end
+      @file_list = FileOperator.find_all_code_file("#{path}/Pods/#{@name}")
+    end
+
+    def spec_dependece_library(library_keywords_hash)
+      if library_keywords_hash.include?(@name)
+        library_keywords_hash.delete(@name)
+      end
+
+      for file_path in @file_list do
+        # note for coding
+        in_note = false
+        File.foreach(file_path) { |line|
+          hash = Hash.new
+          hash["in_note"]=in_note
+          hash["line"]=line
+          OCCodeOperator.in_note_code(hash)
+          in_note = hash["in_note"]
+          line = hash["line"]
+          if line.empty?
+            next
+          end
+          library_keywords_hash.each {|library_name, keyword_list|
+            is_dependence = false
+            tip = ""
+            for keyword in keyword_list do
+              if line.include?(keyword)
+                last_char = '.'
+                last_index = line.index(keyword)-1
+                if last_index >= 0
+                  last_char = line[last_index]
+                end
+                next_char = '.'
+                next_index = line.index(keyword)+keyword.size
+                if next_index < line.size
+                  next_char = line[next_index]
+                end
+                if !(((next_char<='z'&&next_char>='a')||(next_char<='Z'&&next_char>='A')||(next_char<='9'&&next_char>='0')||next_char=='_')||((last_char<='z'&&last_char>='a')||(last_char<='Z'&&last_char>='A')||(last_char<='9'&&last_char>='0')||last_char=='_'))
+                  if keyword.include?(".h") && line.include?("import") && line.include?("/"+keyword+">")
+                    dependence_library_name = line[line.index("<")+1...line.index("/"+keyword+">")]
+                    if dependence_library_name == library_name
+                      tip = " [file]:"+File.basename(file_path)+" [line]: "+line.strip+" [keyword]: "+keyword
+                      is_dependence = true
+                      break
+                    end
+                  else
+                    tip = " [file]:"+File.basename(file_path)+" [line]: "+line.strip+" [keyword]: "+keyword
+                    is_dependence = true
+                    break
+                  end
+                end
+              end
+            end
+            if is_dependence
+              @spec_library[@spec_library.size] = library_name+tip
+              library_keywords_hash.delete(library_name)
+            end
+          }
+
+        }
+      end
+    end
+
+  end
+end

data/lib/big_keeper/util/code_operator.rb

@@ -0,0 +1,37 @@
+module BigKeeper
+
+  class OCCodeOperator
+  end
+
+  class << OCCodeOperator
+
+    def in_note_code(line_hash)
+      line = line_hash["line"]
+      in_note = line_hash["in_note"]
+      line = line.strip
+      if in_note
+        line_hash["line"]=""
+        if (line.include?("*/"))
+          line_hash["in_note"] = false
+        end
+        return
+      end
+      if line[0,2] == "//" || line[0,7] == "#pragma"
+        line_hash["line"]=""
+        return
+      end
+      if line.include?("/*")
+        line_hash["in_note"] = true
+        before_line = line[line.index("/*")+1...line.size]
+        if before_line.include?("*/")
+          line_hash["in_note"] = false
+        end
+        line_hash["line"] = line[0,line.index("/*")]
+        return
+      end
+
+    end
+
+  end
+
+end

data/lib/big_keeper/util/file_operator.rb

@@ -16,6 +16,18 @@ module BigKeeper
       current_name = `whoami`
       current_name.chomp
     end
-    
+
+  end
+
+  class << FileOperator
+    def find_all_header_file(path)
+      return Dir.glob("#{path}/**/*.h")
+    end
+    def find_all_code_file(path)
+      header_file_list = Dir.glob("#{path}/**/*.[h]")
+      m_file_list = Dir.glob("#{path}/**/*.[m]")
+      return header_file_list+m_file_list
+    end
   end
+  
 end

data/lib/big_keeper/util/list_generator.rb

@@ -9,6 +9,7 @@ module BigKeeper
       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)
     end
 
       #generate json print throught console
@@ -18,6 +19,7 @@ module BigKeeper
       module_branches_dic = JSON.parse(json_data)
       json = to_json(home_branches, module_branches_dic, version)
       puts JSON.pretty_generate(json)
+      File.delete(file_path)
     end
 
     def self.to_json(home_branches, module_info_list, version)
@@ -31,7 +33,7 @@ module BigKeeper
             next unless module_info_dic["branches"] != nil
             module_name = module_info_dic["module_name"]
             module_info_dic["branches"].each do | module_branch |
-              if module_branch.strip.delete("*") == home_branch_name
+              if module_branch.strip.delete("*") == home_branch_name.strip.delete("*")
                 module_current_info = {}
                 module_current_info["module_name"] = module_name
                 module_current_info["current_branch"] = module_info_dic["current_branch"]
@@ -41,6 +43,8 @@ module BigKeeper
           end
 
           branch_dic["is_remote"] = false
+          branch_dic["is_current"] = false
+
           if home_branch_name =~ /^remotes\//
             home_branch_name = $~.post_match
             branch_dic["is_remote"] = true
@@ -50,6 +54,11 @@ module BigKeeper
             home_branch_name = $~.post_match
           end
 
+          if home_branch_name.include?("*")
+            home_branch_name = home_branch_name.delete("*")
+            branch_dic["is_current"] = true
+          end
+
           if home_branch_name =~ /^feature\//
             home_branch_name = $~.post_match
           end

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -242,12 +242,18 @@ files:
 - lib/big_keeper/command/release.rb
 - lib/big_keeper/command/release/home.rb
 - lib/big_keeper/command/release/module.rb
+- lib/big_keeper/command/spec.rb
+- lib/big_keeper/command/spec/add.rb
+- lib/big_keeper/command/spec/analyze.rb
+- lib/big_keeper/command/spec/delete.rb
+- lib/big_keeper/command/spec/search.rb
 - lib/big_keeper/dependency/dep_gradle_operator.rb
 - lib/big_keeper/dependency/dep_operator.rb
 - lib/big_keeper/dependency/dep_pod_operator.rb
 - lib/big_keeper/dependency/dep_service.rb
 - lib/big_keeper/dependency/dep_type.rb
 - lib/big_keeper/model/gitflow_type.rb
+- lib/big_keeper/model/library_model.rb
 - lib/big_keeper/model/operate_type.rb
 - lib/big_keeper/model/podfile_model.rb
 - lib/big_keeper/service/git_service.rb
@@ -255,6 +261,7 @@ files:
 - lib/big_keeper/service/stash_service.rb
 - 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/file_operator.rb
 - lib/big_keeper/util/git_operator.rb
 - lib/big_keeper/util/gitflow_operator.rb