big_keeper 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52955ae921730c15a2fdb6f0f82153d78bea2739
-  data.tar.gz: 52760849a27d986991b9ea512b31a36bbd7ad9ca
+  metadata.gz: 18a0e9bf18ad96844aa32421e09b56aa48681fd9
+  data.tar.gz: 63ea947213a94d6b8707acf5232d2dc7e475f9ed
 SHA512:
-  metadata.gz: 2099cceb030a28c55f9b6f6e776e238fbdb26cae48a8f4082c0c6ac00115da47c878fc89e2b63cf2690758de23bec4ef10a8bcbde1177ae68ea750674ffeb4bc
-  data.tar.gz: fc6c444d0abb77deea22741ab4ea2dcd2279d11e2bb62d195c7eeadff72f4c2585e444c800859d7ec64de95dceba67e8623bd779c8d0b61637dede46113b27aa
+  metadata.gz: af8e302003e39f9b0b5c020eb45429166843420fa0ec01fcff02e8eff2be215b33d6f5195e645e0e44f292e7994abb36db532af24aa8175251d4ea6864a3e3c8
+  data.tar.gz: 30fcdf96aeecee91a1518944c029b92d2e6f6b04aa0d43d967e060dc6bf5fd2a02dfbe4e75664345a3afde80bf7f18e8d566e5835ea85197921e5b126747c4ba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    big_keeper (0.2.0)
+    big_keeper (0.3.0)
       big_stash (~> 0.1)
       cocoapods
       gli (~> 2.16)

data/lib/big_keeper/command/feature_pull.rb

@@ -14,9 +14,8 @@ module BigKeeper
         ModuleService.new.pull(path, user, module_name, branch_name)
       end
 
-      p 'Start pulling home...'
+      p "Pull branch #{branch_name} for home..."
       GitOperator.new.pull(path, branch_name)
-      p 'Finish pulling home...'
     ensure
     end
   end

data/lib/big_keeper/command/feature_push.rb

@@ -16,20 +16,18 @@ module BigKeeper
         module_branch_name = GitOperator.new.current_branch(module_full_path)
 
         if GitOperator.new.has_changes(module_full_path)
-          p "Start pushing #{module_name}..."
+          p "Push branch #{branch_name} for module #{module_name}..."
           GitOperator.new.commit(module_full_path, comment)
           GitOperator.new.push(module_full_path, module_branch_name)
-          p "Finish pushing #{module_name}..."
         else
           p "Nothing to push for #{module_name}."
         end
       end
 
       if GitOperator.new.has_changes(path)
-        p "Start pushing home..."
+        p "Push branch #{branch_name} for home..."
         GitOperator.new.commit(path, comment)
         GitOperator.new.push(path, branch_name)
-        p "Finish pushing home..."
       else
         p "Nothing to push for home."
       end

data/lib/big_keeper/service/module_service.rb

@@ -11,23 +11,23 @@ module BigKeeper
         GitOperator.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
         GitOperator.new.git_checkout(module_full_path, branch_name)
       else
-        module_branch_name = GitOperator.new.current_branch(module_full_path)
-        if module_branch_name != branch_name
-          p "Current branch of #{module_name} is #{module_branch_name},\
+        current_branch_name = GitOperator.new.current_branch(module_full_path)
+        if current_branch_name != branch_name
+          p "Current branch of #{module_name} is #{current_branch_name},\
             stash it and checkout #{branch_name}..."
-          BigStash::StashOperator.new(module_full_path).stash(module_branch_name)
+          BigStash::StashOperator.new(module_full_path).stash(current_branch_name)
           GitOperator.new.git_checkout(module_full_path, branch_name)
         end
-        p "Start pulling #{module_name}..."
+        p "Pull branch #{branch_name} for module #{module_name}..."
         GitOperator.new.pull(module_full_path, branch_name)
-        p "Finish pulling #{module_name}..."
       end
     end
 
     def switch(path, user, module_name, branch_name)
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
-      p "Start switching #{module_name}..."
+      p "Switch to branch #{branch_name} for module #{module_name}..."
+
       if !File.exist? module_full_path
         module_git = BigkeeperParser.module_git(module_name)
         GitOperator.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
@@ -36,7 +36,6 @@ module BigKeeper
         GitOperator.new.git_checkout(module_full_path, branch_name)
         GitOperator.new.pull(module_full_path, branch_name)
       end
-      p "Finish switching #{module_name}..."
     end
 
     def finish(path, user, module_name)
@@ -44,6 +43,8 @@ module BigKeeper
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
       branch_name = GitOperator.new.current_branch(module_full_path)
 
+      p "Finish branch #{branch_name} for module #{module_name}..."
+
       PodfileOperator.new.find_and_replace("#{path}/Podfile",
                                            module_name,
                                            ModuleType::GIT,
@@ -56,15 +57,25 @@ module BigKeeper
 
     def add(path, user, module_name, name, type)
       branch_name = "#{GitflowType.name(type)}/#{name}"
+
+      p "Add branch #{branch_name} for module #{module_name}..."
+
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
+      # clone module if not exist
       if !File.exist? module_full_path
         module_git = BigkeeperParser.module_git(module_name)
         GitOperator.new.clone(File.expand_path("#{module_full_path}/../"), module_git)
       end
 
+      # stash current branch
+      current_branch_name = GitOperator.new.current_branch(module_full_path)
+      BigStash::StashOperator.new(module_full_path).stash(current_branch_name)
+
+      # start new feature/hotfix
       GitService.new.start(module_full_path, name, type)
 
+      # apply stash
       BigStash::StashOperator.new(module_full_path).apply_stash(branch_name)
 
       module_path = BigkeeperParser.module_path(user, module_name)
@@ -76,6 +87,9 @@ module BigKeeper
 
     def del(path, user, module_name, name, type)
       branch_name = "#{GitflowType.name(type)}/#{name}"
+
+      p "del branch #{branch_name} for module #{module_name}..."
+
       module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
 
       BigStash::StashOperator.new(module_full_path).stash(branch_name)

data/lib/big_keeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: big_keeper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - mmoaay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli