kookeeper 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfabea23fd7bf2e0197cbf2c147a2f3684c85fc9e580633086fda7c6c8bc4b6c
-  data.tar.gz: 1ebb55ae84fa925a6a9bd6ee0b95591d6bee0c8a85a503d8272a27d7eec6d4f7
+  metadata.gz: 5f71d885879aa95039511f78d5771166a44994f862a45b4bed927f3002ceb5e8
+  data.tar.gz: 4c2ddfdbbd0981917ac6b22de832e4c46a09550fb4a81ca6a9a9f97f8929f41b
 SHA512:
-  metadata.gz: 40b2dce0ab4c9b0b2b1e99c1677c0b1c002a070c5b363040b22e37d99d4455d390edb923ea548beadb3bd0e5eec5a02d1bd2b7b1f9f1f655346b4ac15c94ae7f
-  data.tar.gz: 1c7ef42ff4c4e239f19fe7efba66a5ab2aa66cbbc7ea7fe8ae86b340bf158fbc364cd8623d08f704c8903cf67572a10c44bdf23c40aee0ba3c5fbc619936a1fd
+  metadata.gz: a5565e95c940d75542d2de6dceeabef4302b765178c5256a4dfe3633951f83366c9327f1d1881458e8d0e41a36aff1996a0a1f0ee41fd04b4edecb3dae593634
+  data.tar.gz: 8eefdfbd881c0ac68b39bb4f20c96c2d3f3c9ab0a9687a5302d27319481ac1b8a1d351e2eac044f4048a1e2d7af1c1cf2d11d7ecdb8e5f94f820b629f1d4b679

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kookeeper (3.1.0)
+    kookeeper (3.1.2)
       big_resources
       big_stash (~> 0.1)
       cocoapods

data/lib/big_keeper/command/feature&hotfix/finish.rb

@@ -30,7 +30,9 @@ module BigKeeper
 
       ModuleCacheOperator.new(path).cache_git_modules(ModuleCacheOperator.new(path).all_path_modules)
 
-      modules = ModuleCacheOperator.new(path).remain_git_modules
+      modules = ModuleCacheOperator.new(path).current_path_modules_path(path)
+
+      #modules = ModuleCacheOperator.new(path).remain_git_modules
       # Rebase modules and modify module as git
       modules.each do |module_name|
         ModuleService.new.finish(path, user, module_name, branch_name, type)

data/lib/big_keeper/command/feature&hotfix/switch.rb

@@ -31,8 +31,8 @@ module BigKeeper
       # Apply home stash
       StashService.new.pop_stash(path, home_branch_name, 'Home')
 
-      modules = ModuleCacheOperator.new(path).all_path_modules
-
+      #modules = ModuleCacheOperator.new(path).all_path_modules
+      modules = ModuleCacheOperator.new(path).current_path_modules_path(path)
       modules.each do |module_name|
         ModuleService.new.switch_to(path, user, module_name, branch_name, type)
       end

data/lib/big_keeper/service/module_service.rb

@@ -27,6 +27,8 @@ module BigKeeper
 
         StashService.new.pop_stash(module_full_path, home_branch_name, module_name)
       end
+
+      StashService.new.pop_stash(module_full_path, home_branch_name, module_name)
     end
 
     def push(path, user, module_name, home_branch_name, type, comment)

data/lib/big_keeper/version.rb

@@ -1,3 +1,3 @@
 module BigKeeper
-  VERSION = "3.1.0"
+  VERSION = "3.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kookeeper
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - mmoaay