From 5f299408bed0df90073b8ac3370668bcc95faf35 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 18:18:53 -0700 Subject: [PATCH 01/20] need a vim with Python support --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8a554ea..fa5313d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: vim before_script: | git clone https://github.com/junegunn/vader.vim.git + sudo apt-get install vim-nox script: | vim -Nu <(cat << VIMRC From c4dc6173557d56b1e9de267f2c7c5400aa370b93 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 18:24:16 -0700 Subject: [PATCH 02/20] add IPython to travis reqs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa5313d..4d31489 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: vim before_script: | git clone https://github.com/junegunn/vader.vim.git - sudo apt-get install vim-nox + sudo apt-get install vim-nox ipython python-zmq script: | vim -Nu <(cat << VIMRC From 0dba98d38cb7323cbeb68d766adaa0d261ccbd0e Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 18:28:58 -0700 Subject: [PATCH 03/20] adding pyzmq --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d31489..3c82f22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ language: vim before_script: | git clone https://github.com/junegunn/vader.vim.git - sudo apt-get install vim-nox ipython python-zmq + sudo easy_install -q pyzmq + sudo apt-get install vim-nox ipython script: | vim -Nu <(cat << VIMRC From a564f1f19cd1e40f51885e044f488c98470da3d8 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 18:45:42 -0700 Subject: [PATCH 04/20] don't suppress output --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c82f22..d8a5502 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,5 @@ script: | set rtp+=. set rtp+=after filetype plugin indent on - VIMRC) -c 'Vader! test/*' > /dev/null + VIMRC) -c 'Vader! test/*' + # > /dev/null From a2f062e733ddfe77ef5a0243a8f3cadbd5bfcbde Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 18:55:11 -0700 Subject: [PATCH 05/20] minor info for vim on Travis --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8a5502..6bc7cf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ language: vim before_script: | - git clone https://github.com/junegunn/vader.vim.git + sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm + sudo apt-get install vim-nox ipython libzmq-dev sudo easy_install -q pyzmq - sudo apt-get install vim-nox ipython + git clone https://github.com/junegunn/vader.vim.git + echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" + vim -c "echo has('python')" -c "quit" + echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" script: | vim -Nu <(cat << VIMRC From 764ca26baa6efd672a07d402e6593a8cc972e0e9 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 18:59:13 -0700 Subject: [PATCH 06/20] small test for basic Vader --- test/simple.vader | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/simple.vader b/test/simple.vader index dfc831f..c49ac12 100644 --- a/test/simple.vader +++ b/test/simple.vader @@ -1,6 +1,14 @@ Given (): Hello +Do ( check basic Vim support ): + yy2p + +Expect: + Hello + Hello + Hello + Execute python ( check Python support ): import os import vim From c91e9ff1e774b52e6ed87a2153cc162dc82650d8 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 19:05:08 -0700 Subject: [PATCH 07/20] trying to get to the bottom of this --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bc7cf4..54a836d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,12 @@ before_script: | sudo apt-get install vim-nox ipython libzmq-dev sudo easy_install -q pyzmq git clone https://github.com/junegunn/vader.vim.git + +script: | echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" vim -c "echo has('python')" -c "quit" echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - -script: | + vim -c "python import os; print os.__file__" -c "quit" vim -Nu <(cat << VIMRC filetype off set rtp+=vader.vim From ff801cd251d9eb18938ed86919b707b8b8d0f730 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 22:16:51 -0700 Subject: [PATCH 08/20] added rudimentary Makefile --- Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..35c7360 --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +test: + vim -N -c 'Vader! test/*'\ + -c 'if !exists("g:loaded_vader")'\ + -c 'echo "ERROR: vim-ipython needs Vader to run the test suite\n\n"'\ + -c 'echo "Vader installtion instructions:\n"'\ + -c 'echo "\n https://github.com/junegunn/vader.vim#installation "'\ + -c 'echo "\nIf you are using Pathogen:\n\n"'\ + -c 'echo " git clone https://github.com/junegunn/vader.vim.git ~/.vim/bundle/vader.vim"'\ + -c 'exit endif' + +.PHONY: test From 6ee5f0261a6b3da86eb58b2a8d44e3ccbfe108d4 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 22:22:34 -0700 Subject: [PATCH 09/20] c'mon, Travis, be serious! --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 54a836d..8d69e81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: vim +language: python before_script: | sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm @@ -10,6 +10,7 @@ script: | echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" vim -c "echo has('python')" -c "quit" echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" + python --version vim -c "python import os; print os.__file__" -c "quit" vim -Nu <(cat << VIMRC filetype off From b1f5ceeab6e4682737d978d6c3a8193653329fc4 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 22:27:38 -0700 Subject: [PATCH 10/20] :\ --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d69e81..5eee727 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,18 @@ before_script: | sudo apt-get install vim-nox ipython libzmq-dev sudo easy_install -q pyzmq git clone https://github.com/junegunn/vader.vim.git - -script: | echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" vim -c "echo has('python')" -c "quit" echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" python --version + +script: | vim -c "python import os; print os.__file__" -c "quit" - vim -Nu <(cat << VIMRC - filetype off - set rtp+=vader.vim - set rtp+=. - set rtp+=after - filetype plugin indent on - VIMRC) -c 'Vader! test/*' + #vim -Nu <(cat << VIMRC + #filetype off + #set rtp+=vader.vim + #set rtp+=. + #set rtp+=after + #filetype plugin indent on + #VIMRC) -c 'Vader! test/*' # > /dev/null From 81654d2647947b24204842c5aa68d8ad51a2da0b Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 22:31:44 -0700 Subject: [PATCH 11/20] another attempt --- .travis.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5eee727..675c4df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,9 @@ before_script: | python --version script: | - vim -c "python import os; print os.__file__" -c "quit" - #vim -Nu <(cat << VIMRC - #filetype off - #set rtp+=vader.vim - #set rtp+=. - #set rtp+=after - #filetype plugin indent on - #VIMRC) -c 'Vader! test/*' - # > /dev/null + vim -Nu <(cat << VIMRC + filetype off + set rtp+=vader.vim + set rtp+=. + filetype plugin indent on + VIMRC) -c 'Vader! test/*' > /dev/null From 7d03c29a7da804d055202041ead5962863727a1f Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 22:42:19 -0700 Subject: [PATCH 12/20] try to build vim from scratch --- .travis.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 675c4df..b0de2f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,24 @@ -language: python +language: vim before_script: | - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm - sudo apt-get install vim-nox ipython libzmq-dev - sudo easy_install -q pyzmq - git clone https://github.com/junegunn/vader.vim.git - echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - vim -c "echo has('python')" -c "quit" - echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - python --version + # sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm + # sudo apt-get install vim-nox ipython libzmq-dev + # sudo easy_install -q pyzmq + # git clone https://github.com/junegunn/vader.vim.git + # echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" + # vim -c "echo has('python')" -c "quit" + # echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" + # python --version + hg clone https://code.google.com/p/vim/ + cd vim + ./configure --with-features=huge --enable-rubyinterp --enable-pythoninterp + make + sudo make install + cd - + git clone https://github.com/junegunn/vader.vim.git script: | - vim -Nu <(cat << VIMRC + /usr/local/bin/vim -Nu <(cat << VIMRC filetype off set rtp+=vader.vim set rtp+=. From 7cacd28f1fa28d6c287ad16a92d3d9b109ef4c66 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 23:09:21 -0700 Subject: [PATCH 13/20] use vim-gtk --- .travis.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0de2f7..4e84dbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,13 @@ language: vim before_script: | - # sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm - # sudo apt-get install vim-nox ipython libzmq-dev - # sudo easy_install -q pyzmq - # git clone https://github.com/junegunn/vader.vim.git - # echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - # vim -c "echo has('python')" -c "quit" - # echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - # python --version - hg clone https://code.google.com/p/vim/ - cd vim - ./configure --with-features=huge --enable-rubyinterp --enable-pythoninterp - make - sudo make install - cd - - git clone https://github.com/junegunn/vader.vim.git + sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm + sudo apt-get install vim-gtk ipython libzmq-dev + sudo easy_install -q pyzmq + git clone https://github.com/junegunn/vader.vim.git script: | - /usr/local/bin/vim -Nu <(cat << VIMRC + vim -Nu <(cat << VIMRC filetype off set rtp+=vader.vim set rtp+=. From 774c4715cf5819250e19152ccf400f3e12fb4ea3 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 23:20:11 -0700 Subject: [PATCH 14/20] another try at getting vim 7.4 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e84dbd..2c6dd37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,9 @@ language: vim before_script: | sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm - sudo apt-get install vim-gtk ipython libzmq-dev + sudo add-apt-repository -y ppa:nmi/vim-snapshots + sudo apt-get update + sudo apt-get install vim ipython libzmq-dev sudo easy_install -q pyzmq git clone https://github.com/junegunn/vader.vim.git From f6e2974c952a5560eeb5a40dbf8e4be405283077 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 23:34:00 -0700 Subject: [PATCH 15/20] add a test for Drone --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 35c7360..a582381 100644 --- a/Makefile +++ b/Makefile @@ -8,4 +8,8 @@ test: -c 'echo " git clone https://github.com/junegunn/vader.vim.git ~/.vim/bundle/vader.vim"'\ -c 'exit endif' +testci: + # Continuous integration services clone Vader local to this directory + vim -N -u .test.vimrc -c 'Vader test/*' + .PHONY: test From d05f6b2b932200851bcace957ba0595662b3198c Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 23:43:37 -0700 Subject: [PATCH 16/20] I'm going slightly mad! --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c6dd37..cae64d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,14 +2,18 @@ language: vim before_script: | sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm - sudo add-apt-repository -y ppa:nmi/vim-snapshots - sudo apt-get update - sudo apt-get install vim ipython libzmq-dev + sudo apt-get install ipython libzmq-dev python-dev sudo easy_install -q pyzmq git clone https://github.com/junegunn/vader.vim.git + hg clone https://code.google.com/p/vim/ + cd vim + ./configure --with-features=huge --enable-pythoninterp + make + sudo make install + cd - script: | - vim -Nu <(cat << VIMRC + /usr/local/bin/vim -Nu <(cat << VIMRC filetype off set rtp+=vader.vim set rtp+=. From e9e16063a06c98a361050b96b066fec69d7c1a2f Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 23:44:48 -0700 Subject: [PATCH 17/20] added .test.vimrc --- .test.vimrc | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .test.vimrc diff --git a/.test.vimrc b/.test.vimrc new file mode 100644 index 0000000..8ac8733 --- /dev/null +++ b/.test.vimrc @@ -0,0 +1,4 @@ +filetype off +set rtp+=vader.vim +set rtp+=. +filetype plugin indent on From a48559603d920b30cc332cd0f05e0050cb37f53d Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Thu, 17 Jul 2014 23:46:19 -0700 Subject: [PATCH 18/20] !-ing my head against the wall --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a582381..80f680d 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,6 @@ test: testci: # Continuous integration services clone Vader local to this directory - vim -N -u .test.vimrc -c 'Vader test/*' + vim -N -u .test.vimrc -c 'Vader! test/*' .PHONY: test From a57a4a3bfe8be77858505237a0eaebd77751ea76 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Fri, 18 Jul 2014 00:05:55 -0700 Subject: [PATCH 19/20] adding docker image for drone service --- .drone.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..15212a9 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,5 @@ +image: ivanov/vim-ipython +scripts: + - git clone https://github.com/junegunn/vader.vim.git + - make testci + - echo "finished commands from .drone.yml" From 2876c052f7f30ab9c862460237b870e98e0d02a6 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Fri, 18 Jul 2014 00:16:32 -0700 Subject: [PATCH 20/20] clutching at straws --- .travis.yml | 1 + TODO.md | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/.travis.yml b/.travis.yml index cae64d8..f25d4f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_script: | make sudo make install cd - + sudo pip install -U ipython script: | /usr/local/bin/vim -Nu <(cat << VIMRC diff --git a/TODO.md b/TODO.md index e9e4098..7ba48ac 100644 --- a/TODO.md +++ b/TODO.md @@ -40,3 +40,16 @@ This is a list of things I'm planning to work on with vim-ipython [ ] support profiledir + +docker for vim + - built against python3 + - built against python2 + +test for python support in vim test suite + +- vim test suite using: + vader: https://github.com/junegunn/vader.vim + + https://github.com/lukaszb/vimmock + + https://github.com/AndrewRadev/vimrunner