big_keeper 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614030e993375adb543b94c896f0a9c140e1aeb7
-  data.tar.gz: ee9dae88f9b0f8057907240b11a0bc4d74cd1a43
+  metadata.gz: 52955ae921730c15a2fdb6f0f82153d78bea2739
+  data.tar.gz: 52760849a27d986991b9ea512b31a36bbd7ad9ca
 SHA512:
-  metadata.gz: 1e407a4b7fcdc8c12247476dca57d04df0bf159d66d360235d06f45870e877b6c525c8730327e57f64063335c8904e29b59b2ff8f72e3d7f8c7f39db8f3e50b4
-  data.tar.gz: 567f52bb566f129a5bd6e232d3c1269a3b18df5afeb7c3f7f0ff994950ec22ab06b618a848c2a4a0168cee0e28793a720bf23c40f353133781ea9829b6fb12f6
+  metadata.gz: 2099cceb030a28c55f9b6f6e776e238fbdb26cae48a8f4082c0c6ac00115da47c878fc89e2b63cf2690758de23bec4ef10a8bcbde1177ae68ea750674ffeb4bc
+  data.tar.gz: fc6c444d0abb77deea22741ab4ea2dcd2279d11e2bb62d195c7eeadff72f4c2585e444c800859d7ec64de95dceba67e8623bd779c8d0b61637dede46113b27aa

data/Gemfile.lock

@@ -2,6 +2,10 @@ PATH
   remote: .
   specs:
     big_keeper (0.2.0)
+      big_stash (~> 0.1)
+      cocoapods
+      gli (~> 2.16)
+      plist
 
 GEM
   remote: https://ruby.taobao.org/

data/big_keeper.gemspec

@@ -30,6 +30,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "gli", "~> 2.16"
+  spec.add_runtime_dependency "big_stash", "~> 0.1"
+  spec.add_runtime_dependency "cocoapods"
+  spec.add_runtime_dependency "plist"
+
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "gli", "~> 2.16"

data/lib/big_keeper/command/feature_start.rb

@@ -38,12 +38,7 @@ module BigKeeper
       end
 
       # Start home feature
-      GitOperator.new.git_checkout(path, 'master') if GitOperator.new.has_remote_branch(path, 'master')
-      GitOperator.new.git_checkout(path, 'develop') if GitOperator.new.has_remote_branch(path, 'develop')
-
-      GitOperator.new.pull(path, 'develop') if GitOperator.new.has_remote_branch(path, 'develop')
-
-      GitflowOperator.new.start(path, feature_name, GitflowType::FEATURE)
+      GitService.new.start(path, feature_name, GitflowType::FEATURE)
 
       # Modify podfile as path and Start modules feature
       modules.each do |module_name|

data/lib/big_keeper/service/git_service.rb

@@ -5,6 +5,48 @@ require 'big_keeper/model/operate_type'
 module BigKeeper
   # Operator for got
   class GitService
+    def start(path, name, type)
+      if GitOperator.new.has_remote_branch(path, 'master')
+        if GitOperator.new.has_local_branch(path, 'master')
+          if GitOperator.new.has_commits(path, 'master')
+            raise %Q('master' has unpushed commits, you should fix it)
+          else
+            GitOperator.new.git_checkout(path, 'master')
+            GitOperator.new.pull(path, 'master')
+          end
+        else
+          GitOperator.new.git_checkout(path, 'master')
+        end
+      end
+
+      if GitOperator.new.has_remote_branch(path, 'develop')
+        if GitOperator.new.has_local_branch(path, 'develop')
+          if GitOperator.new.has_commits(path, 'develop')
+            raise %Q('develop' has unpushed commits, you should fix it)
+          else
+            GitOperator.new.git_checkout(path, 'develop')
+            GitOperator.new.pull(path, 'develop')
+          end
+        else
+          GitOperator.new.git_checkout(path, 'develop')
+        end
+      end
+
+      if !GitflowOperator.new.verify_git_flow(path)
+        GitOperator.new.push(path, 'develop') if !GitOperator.new.has_remote_branch(path, 'develop')
+        GitOperator.new.push(path, 'master') if !GitOperator.new.has_remote_branch(path, 'master')
+      end
+
+      branch_name = "#{GitflowType.name(type)}/#{name}"
+      if GitOperator.new.has_branch(path, branch_name)
+        GitOperator.new.git_checkout(path, branch_name)
+        GitOperator.new.pull(path, branch_name)
+      else
+        GitflowOperator.new.start(path, name, type)
+        GitOperator.new.push(path, branch_name)
+      end
+    end
+
     def verify_branch(path, branch_name, type)
       GitOperator.new.git_fetch(path)
 

data/lib/big_keeper/service/module_service.rb

@@ -63,13 +63,7 @@ module BigKeeper
         GitOperator.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
       end
 
-      GitOperator.new.git_checkout(module_full_path, 'master') if GitOperator.new.has_remote_branch(module_full_path, 'master')
-      GitOperator.new.git_checkout(module_full_path, 'develop') if GitOperator.new.has_remote_branch(module_full_path, 'develop')
-
-      GitOperator.new.pull(module_full_path, 'develop') if GitOperator.new.has_remote_branch(module_full_path, 'develop')
-
-      GitflowOperator.new.start(module_full_path, name, type)
-      GitOperator.new.push(module_full_path, branch_name)
+      GitService.new.start(module_full_path, name, type)
 
       BigStash::StashOperator.new(module_full_path).apply_stash(branch_name)
 

data/lib/big_keeper/util/git_operator.rb

@@ -9,9 +9,19 @@ module BigKeeper
 
     def has_remote_branch(path, branch_name)
       has_branch = false
-      IO.popen("cd #{path}; git branch -a") do |io|
+      IO.popen("cd #{path}; git branch -r") do |io|
         io.each do |line|
-          has_branch = true if line =~ /remotes\/origin\/#{branch_name}/
+          has_branch = true if line.include? branch_name
+        end
+      end
+      has_branch
+    end
+
+    def has_local_branch(path, branch_name)
+      has_branch = false
+      IO.popen("cd #{path}; git branch") do |io|
+        io.each do |line|
+          has_branch = true if line.include? branch_name
         end
       end
       has_branch
@@ -70,6 +80,16 @@ module BigKeeper
       end
     end
 
+    def has_commits(path, branch_name)
+      has_commits = false
+      IO.popen("cd #{path}; git log --branches --not --remotes") do |io|
+        io.each do |line|
+          has_commits = true if line.include? branch_name
+        end
+      end
+      has_commits
+    end
+
     def has_changes(path)
       has_changes = true
       clear_flag = 'nothing to commit, working tree clean'

data/lib/big_keeper/util/gitflow_operator.rb

@@ -4,26 +4,26 @@ module BigKeeper
   # Operator for gitflow
   class GitflowOperator
     def start(path, name, type)
-      init_git_flow(path)
       Dir.chdir(path) do
         gitflow_type_name = GitflowType.name(type)
         p `git flow #{gitflow_type_name} start #{name}`
       end
     end
 
-    def init_git_flow(path)
+    def verify_git_flow(path)
+      has_git_flow = false
       Dir.chdir(path) do
         clear_flag = 'Already initialized for gitflow'
         IO.popen('git flow init -d') do |io|
           io.each do |line|
-            if !line.include? clear_flag
-              GitOperator.new.push(module_full_path, 'master') if !GitOperator.new.has_remote_branch(module_full_path, 'master')
-              GitOperator.new.push(module_full_path, 'develop') if !GitOperator.new.has_remote_branch(module_full_path, 'develop')
+            if line.include? clear_flag
+              has_git_flow = true
               break
             end
           end
         end
       end
+      has_git_flow
     end
 
     def finish_release(path, release_name)

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/big_keeper.rb

@@ -28,27 +28,26 @@ 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
 
   path = ''
   version = ''
+  user = GitOperator.new.user
 
   pre do |global_options, _command, options, args|
     path = File.expand_path(global_options[:path])
     version = global_options[:ver]
+    user = global_options[:user]
   end
 
   desc 'Feature operations'
   command :feature do |c|
 
-    c.flag %i[u user], default_value: GitOperator.new.user
-    user = GitOperator.new.user
-    c.pre do |global_options, _command, options, args|
-      user = global_options[:user]
-    end
-
     c.desc 'Start a new feature with name for given modules and main project'
     c.command :start do |start|
       start.action do |global_options, options, args|
+        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
+        help_now!('user name is required') if user and user.empty?
         help_now!('feature name is required') if args.length < 1
         name = args[0]
         modules = args[(1...args.length)] if args.length > 1
@@ -59,6 +58,8 @@ module BigKeeper
     c.desc 'Update moduels for the feature with name'
     c.command :update do |update|
       update.action do |global_options, options, args|
+        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
+        help_now!('user name is required') if user and user.empty?
         modules = args[(0...args.length)] if args.length > 0
         feature_update(path, user, modules)
       end
@@ -67,6 +68,8 @@ module BigKeeper
     c.desc 'Switch to the feature with name'
     c.command :switch do |switch|
       switch.action do |global_options, options, args|
+        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
+        help_now!('user name is required') if user and user.empty?
         help_now!('feature name is required') if args.length < 1
         name = args[0]
         feature_switch(path, version, user, name)
@@ -76,6 +79,8 @@ module BigKeeper
     c.desc 'Pull remote changes for current feature'
     c.command :pull do |pull|
       pull.action do |global_options, options, args|
+        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
+        help_now!('user name is required') if user and user.empty?
         feature_pull(path, user)
       end
     end
@@ -83,6 +88,8 @@ module BigKeeper
     c.desc 'Push local changes to remote for current feature'
     c.command :push do |push|
       push.action do |global_options, options, args|
+        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
+        help_now!('user name is required') if user and user.empty?
         help_now!('comment message is required') if args.length < 1
         comment = args[0]
         feature_push(path, user, comment)
@@ -92,6 +99,8 @@ module BigKeeper
     c.desc 'Finish current feature'
     c.command :finish do |finish|
       finish.action do |global_options, options, args|
+        user = user.gsub(/[^0-9A-Za-z]/, '').downcase
+        help_now!('user name is required') if user and user.empty?
         feature_finish(path, user)
       end
     end
@@ -110,12 +119,6 @@ module BigKeeper
   desc 'Release operations'
   command :release do |c|
 
-    c.flag %i[u user], default_value: GitOperator.new.user
-    user = GitOperator.new.user
-    c.pre do |global_options, _command, options, args|
-      user = global_options[:user]
-    end
-
     c.desc 'Release home project operations'
     c.command :home do |home|
       home.desc 'Start release home project'
@@ -125,6 +128,8 @@ module BigKeeper
           # version(optional): if null, will read verson in Bigkeeper file
           # e.g: ruby big_keeper.rb -p /Users/SFM/Downloads/BigKeeperMain-master
           # /Bigkeeper  -v 3.0.0 release home start
+          user = user.gsub(/[^0-9A-Za-z]/, '').downcase
+          help_now!('user name is required') if user and user.empty?
           release_home_start(path, version, user)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_keeper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - mmoaay
@@ -10,6 +10,62 @@ bindir: bin
 cert_chain: []
 date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
+- !ruby/object:Gem::Dependency
+  name: big_stash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: cocoapods
+  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: plist
+  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