yegor256 / zache

Zero-footprint Ruby In-Memory Thread-Safe Cache: when a naive implementation is enough
https://www.yegor256.com/2019/02/05/zache.html
MIT License
43 stars 6 forks source link

Add remove_all method #12

Closed Qew7 closed 5 years ago

Qew7 commented 5 years ago

@yegor256 see issue https://github.com/yegor256/zache/issues/6

Qew7 commented 5 years ago

@yegor256 ive remade remove_all logic, can you check it?

yegor256 commented 5 years ago

@rultor merge

rultor commented 5 years ago

@rultor merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

rultor commented 5 years ago

@rultor merge

@qew7 @yegor256 Oops, I failed. You can see the full log here (spent 21s)

+ squash=false
+ vars=('--env=head=git@github.com:yegor256/zache.git' '--env=pull_id=12' '--env=fork=git@github.com:Qew7/zache.git' '--env=fork_branch=11' '--env=head_branch=master' '--env=pull_title=Add remove_all method' '--env=author=yegor256' '--env=scripts=( '\''export '\''\'\'''\''head=git@github.com:yegor256/zache.git'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''pull_id=12'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''fork=git@github.com:Qew7/zache.git'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''fork_branch=11'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''head_branch=master'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''pull_title=Add remove_all method'\''\'\'''\'''\'' '\'';'\'' '\''export '\''\'\'''\''author=yegor256'\''\'\'''\'''\'' '\'';'\'' '\''export GEM_HOME=~/.ruby'\'' '\'';'\'' '\''export GEM_PATH=$GEM_HOME:$GEM_PATH'\'' '\'';'\'' )')
+ scripts=('export '\''head=git@github.com:yegor256/zache.git'\''' ';' 'export '\''pull_id=12'\''' ';' 'export '\''fork=git@github.com:Qew7/zache.git'\''' ';' 'export '\''fork_branch=11'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Add remove_all method'\''' ';' 'export '\''author=yegor256'\''' ';' 'export GEM_HOME=~/.ruby' ';' 'export GEM_PATH=$GEM_HOME:$GEM_PATH' ';')
+ container=yegor256_zache_12
+ as_root=false
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:yegor256/zache.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'export '\''head=git@github.com:yegor256/zache.git'\''' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''head=git@github.com:yegor256/zache.git'\''' ';' 'export '\''pull_id=12'\''' ';' 'export '\''fork=git@github.com:Qew7/zache.git'\''' ';' 'export '\''fork_branch=11'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Add remove_all method'\''' ';' 'export '\''author=yegor256'\''' ';' 'export GEM_HOME=~/.ruby' ';' 'export GEM_PATH=$GEM_HOME:$GEM_PATH' ';'
+ sensitive=()
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:Qew7/zache.git
+ git remote update
Fetching origin
Fetching fork
From github.com:Qew7/zache
 * [new branch]      11         -> fork/11
 * [new branch]      3          -> fork/3
 * [new branch]      4          -> fork/4
 * [new branch]      5          -> fork/5
 * [new branch]      master     -> fork/master
 * [new branch]      ref        -> fork/ref
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ wc -l
++ git show-branch __rultor
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/11
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch 11 from fork.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch master set up to track remote branch master from origin.
Your branch is up-to-date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging test/test_zache.rb
Auto-merging lib/zache.rb
CONFLICT (content): Merge conflict in lib/zache.rb
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, container wasn't started correctly
yegor256 commented 5 years ago

@Qew7 there are merge conflicts, see above. Please resolve them and let me know when the branch is ready. I will try to merge again.

Qew7 commented 5 years ago

@yegor256 ive resolved conflicts, please try to merge again

yegor256 commented 5 years ago

@rultor merge

rultor commented 5 years ago

@rultor merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

rultor commented 5 years ago

@rultor merge

@yegor256 Done! FYI, the full log is here (took me 2min)