bigkeeper 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a178ce998f09ae1fdb14f742aef17629f330d180
-  data.tar.gz: f827fe0abbef6453e5cced72fb2304b3b1f39382
+  metadata.gz: 94a86d4f15a32e4d04576c9e244da060e5c1fb44
+  data.tar.gz: 138d77e976d07a10306b7e16b7462f03773785fa
 SHA512:
-  metadata.gz: a25c17c7db3fdb78d8500ec06e9500741414c22b9a16dc57069c3969b584c23c9b997acd048c2fdb8897394d7563deb914a82552f1ff16788960d12e6e3c35f3
-  data.tar.gz: d254ed1eb23b54495fe0098bbb92370618233b9598aa843bcca2ecdab9c795aefc5619c9ea5554f43a48b77517b0666b0c7e395a38ac5dbe39d1aab2d8700b58
+  metadata.gz: 7b2914cc67868b6fd125b5fbe615012efbb70bb8c8e78edf5ae90aa33a98d4d81b1675c72ae8db80e527e214f0b0aaf9961678f37a7196dc278f238f81c9bd07
+  data.tar.gz: 1e7ba514b4724074df6c28bae6f1a64d83810399e829087db8de59885317b297d6df96336c0ac3fd1974185abc38ece3ba4d3d1703f5314d52ea675632a2430a

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    bigkeeper (0.8.3)
+    bigkeeper (0.8.5)
+      big_resources
       big_stash (~> 0.1)
       cocoapods
       colorize
@@ -19,8 +20,15 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ast (2.3.0)
+    big_resources (0.1.1)
+      chunky_png
+      cocoapods
+      colorize
+      gli (~> 2.16)
+      plist
     big_stash (0.6.0)
       gli (~> 2.16)
+    chunky_png (1.3.10)
     claide (1.0.1)
     cocoapods (1.2.1)
       activesupport (>= 4.0.2, < 5)
@@ -100,6 +108,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  big_resources
   big_stash (~> 0.1)
   bigkeeper!
   bundler (~> 1.15)

data/big_keeper.gemspec

@@ -35,11 +35,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "cocoapods"
   spec.add_runtime_dependency "plist"
   spec.add_runtime_dependency "colorize"
+  spec.add_runtime_dependency "big_resources"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "gli", "~> 2.16"
   spec.add_development_dependency "big_stash", "~> 0.1"
+  spec.add_development_dependency "big_resources"
   spec.add_development_dependency "cocoapods"
   spec.add_development_dependency "plist"
   spec.add_development_dependency "colorize"

data/lib/big_keeper.rb

@@ -13,6 +13,7 @@ require 'big_keeper/command/release'
 require 'big_keeper/command/pod'
 require 'big_keeper/command/module'
 require 'big_keeper/command/spec'
+require 'big_keeper/command/image'
 
 require 'big_keeper/service/git_service'
 
@@ -50,6 +51,8 @@ module BigKeeper
 
   spec_command
 
+  image_command
+
   desc 'Show version of bigkeeper'
   command :version do |version|
     version.action do |global_options, options, args|

data/lib/big_keeper/command/image.rb

@@ -0,0 +1,26 @@
+require 'big_resources/util/image/name_analyze_util'
+
+module BigKeeper
+
+  def self.image_command
+
+    desc 'Image operation'
+    command :image do | c |
+      c.desc "Detect duplicate name images."
+        c.command :name do | name |
+          name.action do | global_options, options, args |
+            path = File.expand_path(global_options[:path])
+            BigResources::ImageAnalyzeUtil.get_duplicate_name_file_with_type(path, BigResources::PNG)
+          end
+        end
+
+        c.desc "Detect duplicate content images."
+        c.command :content do | content |
+          content.action do | global_options, options, args |
+            path = File.expand_path(global_options[:path])
+            BigResources::ImageAnalyzeUtil.get_duplicate_content_file_with_type(path, BigResources::PNG)
+          end
+        end
+    end
+  end
+end

data/lib/big_keeper/command/release/home.rb

@@ -13,11 +13,14 @@ module BigKeeper
     version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
     modules = BigkeeperParser.module_names
 
-    CacheOperator.new(path).save('Podfile')
-
     #stash
     StashService.new.stash_all(path, GitOperator.new.current_branch(path), user, modules)
 
+    # delete cache
+    CacheOperator.new(path).clean()
+    # cache Podfile
+    CacheOperator.new(path).save('Podfile')
+
     # check
     GitOperator.new.check_diff(path, "develop", "master")
 
@@ -42,6 +45,7 @@ module BigKeeper
     # step 3 change Info.plist value
     InfoPlistOperator.new.change_version_build(path, version)
 
+    GitService.new.verify_push(path, "Change version to #{version}", "release/#{version}", 'Home')
     DepService.dep_operator(path, user).install(true)
     XcodeOperator.open_workspace(path)
   end
@@ -50,38 +54,37 @@ module BigKeeper
     BigkeeperParser.parse("#{path}/Bigkeeper")
     version = BigkeeperParser.version if version == 'Version in Bigkeeper file'
     Logger.highlight("Start finish release home for #{version}")
+
     if GitOperator.new.has_branch(path, "release/#{version}")
       if GitOperator.new.current_branch(path) != "release/#{version}"
         GitOperator.new.checkout(path, "release/#{version}")
       end
 
-      GitOperator.new.commit(path, "release: V #{version}")
-      GitOperator.new.push_to_remote(path, "release/#{version}")
+      GitService.new.verify_push(path, "finish release branch", "release/#{version}", 'Home')
 
       # master
       GitOperator.new.checkout(path, "master")
       GitOperator.new.merge(path, "release/#{version}")
-      GitOperator.new.push_to_remote(path, "master")
-      if GitOperator.new.current_branch(path) != "master"
-        GitOperator.new.checkout(path, "master")
-      end
+      GitService.new.verify_push(path, "release V#{version}", "master", 'Home')
+
       GitOperator.new.tag(path, version)
 
-      # develop
+      # release branch
       GitOperator.new.checkout(path, "release/#{version}")
       CacheOperator.new(path).load('Podfile')
       CacheOperator.new(path).clean()
-      GitOperator.new.commit(path, "reset #{verbose} Podfile")
-      GitOperator.new.push_to_remote(path, "release/#{version}")
+      GitOperator.new.commit(path, "reset #{version} Podfile")
+      GitService.new.verify_push(path, "reset #{version} Podfile", "release/#{version}", 'Home')
 
+      # develop
       GitOperator.new.checkout(path, "develop")
       GitOperator.new.merge(path, "release/#{version}")
-      GitOperator.new.push_to_remote(path, "develop")
+      GitService.new.verify_push(path, "merge release/#{version} to develop", "develop", 'Home')
       GitOperator.new.check_diff(path, "develop", "master")
 
       Logger.highlight("Finish release home for #{version}")
     else
-      raise Logger.error("Dont have release/#{version} branch, please use release home start first.")
+      raise Logger.error("There is no release/#{version} branch, please use release home start first.")
     end
   end
 

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

@@ -49,9 +49,9 @@ module BigKeeper
     Logger.highlight(%Q(Merge develop to master))
     # merge develop to master
     GitOperator.new.merge(module_path, "develop")
-    # GitOperator.new.push_to_remote(module_path, "master")
+    GitOperator.new.push_to_remote(module_path, "master")
 
-    # GitOperator.new.tag(module_path, version)
+    GitOperator.new.tag(module_path, version)
     # pod repo push
     if spec == true
       PodOperator.pod_repo_push(module_path, module_name, BigkeeperParser.source_spec_path(module_name), version)

data/lib/big_keeper/service/git_service.rb

@@ -118,7 +118,7 @@ module BigKeeper
     def branchs_with_type(path, type)
       branchs = []
       Dir.chdir(path) do
-        IO.popen('git branch -a') do | io |
+        IO.popen('git branch -r') do | io |
           io.each do | line |
             branchs << line.gsub(/\s/, '') if line =~ /[\s\S]*#{GitflowType.name(type)}*/
           end
@@ -171,6 +171,8 @@ module BigKeeper
         else
           git.push_to_remote(path, branch_name)
         end
+
+        GitOperator.new.check_push_success(path, branch_name, "origin/#{branch_name}")
       else
         Logger.default("Nothing to push for '#{name}'.")
       end

data/lib/big_keeper/util/git_operator.rb

@@ -13,7 +13,7 @@ module BigKeeper
       has_branch = false
       IO.popen("cd #{path}; git branch -r") do |io|
         io.each do |line|
-          has_branch = true if line.include? branch_name
+          has_branch = true if line.include? "(#{branch_name})"
         end
       end
       has_branch
@@ -78,6 +78,7 @@ module BigKeeper
       Dir.chdir(path) do
         `git push -u origin #{branch_name}`
       end
+      GitOperator.new.check_push_success(path, branch_name, "origin/#{branch_name}")
     end
 
     def pull(path)
@@ -186,7 +187,7 @@ module BigKeeper
         }
         Logger.error("#{compare_branch} branch has commit doesn't committed in #{branch}, please check")
       else
-        Logger.highlight("#{compare_branch} branch doesn't has commit before #{branch}")
+        Logger.highlight("#{compare_branch} branch doesn't have commit before #{branch}")
       end
     end
 
@@ -196,6 +197,23 @@ module BigKeeper
       end
     end
 
+    def check_push_success(path, branch, compare_branch)
+      compare_branch_commits = Array.new
+      IO.popen("cd #{path}; git log --left-right #{branch}...#{compare_branch} --pretty=oneline") do |io|
+        io.each do |line|
+          compare_branch_commits.push(line) if (line.include? '>') || (line.include? 'fatal')
+        end
+      end
+      if compare_branch_commits.size > 0
+        compare_branch_commits.map { |item|
+            Logger.default(item)
+        }
+        Logger.error("#{branch} branch push unsuccess, please check")
+      else
+        Logger.highlight("#{branch} branch push success")
+      end
+    end
+
   end
 
   # p GitOperator.new.user

data/lib/big_keeper/util/list_generator.rb

@@ -25,6 +25,7 @@ module BigKeeper
     def self.to_json(home_branches, module_info_list, version)
       json_array = []
       print_all = version == "all versions"
+      home_branches = home_branches.uniq
       home_branches.each do | home_branch_name |
           next unless home_branch_name.include?(version) || print_all
           branch_dic = {}

data/lib/big_keeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigkeeper
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: big_resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: big_resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +263,8 @@ files:
 - lib/big_keeper/command/feature&hotfix/start.rb
 - lib/big_keeper/command/feature&hotfix/switch.rb
 - 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/module.rb
 - lib/big_keeper/command/module/list.rb
 - lib/big_keeper/command/pod.rb