Skip to content

Commit

Permalink
fix plugin bug
Browse files Browse the repository at this point in the history
  • Loading branch information
fengming.shi committed Sep 7, 2019
1 parent cda59a6 commit 62abc65
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
bigkeeper (0.9.15)
bigkeeper (0.9.17)
big_resources
big_stash (~> 0.1)
cocoapods
Expand Down
12 changes: 0 additions & 12 deletions lib/big_keeper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,6 @@ module BigKeeper
is_show_log = false
end
LeanCloudLogger.instance.end_log(true, is_show_log)

current_cmd = LeanCloudLogger.instance.command

if BigkeeperParser.post_install_command.keys.include? current_cmd
path = global_options[:path]
cmd = BigkeeperParser.post_install_command[current_cmd]
if path
Dir.chdir(path) do
system cmd
end
end
end
end

feature_and_hotfix_command(GitflowType::FEATURE)
Expand Down
14 changes: 13 additions & 1 deletion lib/big_keeper/command/feature&hotfix/publish.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,19 @@ def self.publish(path, user, type)
# Rebase Home
GitService.new.verify_rebase(path, GitflowType.base_branch(type), 'Home')

`open #{BigkeeperParser.home_pulls()}`
current_cmd = LeanCloudLogger.instance.command
cmds = BigkeeperParser.post_install_command

if cmds && (cmds.keys.include? current_cmd)
cmd = BigkeeperParser.post_install_command[current_cmd]
if path
Dir.chdir(path) do
system cmd
end
end
else
`open #{BigkeeperParser.home_pulls()}`
end
ensure
end
end
Expand Down
14 changes: 13 additions & 1 deletion lib/big_keeper/service/module_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,19 @@ def publish(path, user, module_name, home_branch_name, type)
module_full_path = BigkeeperParser.module_full_path(path, user, module_name)
GitService.new.verify_push(module_full_path, "publish branch #{home_branch_name}", home_branch_name, module_name)

`open #{BigkeeperParser.module_pulls(module_name)}`
current_cmd = LeanCloudLogger.instance.command
cmds = BigkeeperParser.post_install_command

if cmds && (cmds.keys.include? current_cmd)
cmd = BigkeeperParser.post_install_command[current_cmd]
if module_full_path
Dir.chdir(module_full_path) do
system cmd
end
end
else
`open #{BigkeeperParser.module_pulls(module_name)}`
end

ModuleCacheOperator.new(path).del_git_module(module_name)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/big_keeper/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module BigKeeper
VERSION = "0.9.16"
VERSION = "0.9.17"
end

0 comments on commit 62abc65

Please sign in to comment.