[DRE-commits] [ruby-neovim] 02/02: update changelog to 0.6.1-1, refresh patches
Jason Pleau
jpleau-guest at moszumanska.debian.org
Wed Nov 22 02:12:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
jpleau-guest pushed a commit to branch master
in repository ruby-neovim.
commit e95f0add9eb96162b8d98af5df3f44e626a7c35a
Author: Jason Pleau <jason at jpleau.ca>
Date: Tue Nov 21 21:03:11 2017 -0500
update changelog to 0.6.1-1, refresh patches
---
debian/changelog | 7 +--
debian/control | 4 +-
.../disable_documentation_version_test.patch | 68 ++++++++++++----------
debian/patches/disable_shada.patch | 14 ++---
debian/patches/neovim_ruby_host_path.patch | 31 ----------
debian/patches/require_tempfile.patch | 22 -------
debian/patches/series | 2 -
7 files changed, 49 insertions(+), 99 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 58b8935..060e63b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,18 @@
-ruby-neovim (0.5.1-1) UNRELEASED; urgency=medium
+ruby-neovim (0.6.1-1) UNRELEASED; urgency=medium
* New upstream release
* Refreshed patch remove_coveralls_pry_bundler.patch
* Removed patches no longer needed:
- disable_failing_test_schroot.patch
- fix_current_window_test.patch
+ - require_tempfile.patch
* New patches:
- - require_tempfile.patch (applied in upstream VCS)
- disable_documentation_version_test.patch
- disable_shada.patch
- - neovim_ruby_host_path.patch
* Bump Standards-Version to 4.1.1 (no changes were needed)
* Bump debhelper compatibility to 10
- -- Jason Pleau <jason at jpleau.ca> Sat, 15 Jul 2017 10:40:43 -0400
+ -- Jason Pleau <jason at jpleau.ca> Tue, 21 Nov 2017 20:52:49 -0500
ruby-neovim (0.3.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index dbd69ba..c1a69ea 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 10),
neovim,
rake,
ruby-msgpack (>= 1.0),
- ruby-rspec
+ ruby-rspec,
+ ruby-multi-json
Standards-Version: 4.1.1
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-neovim.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-neovim.git
@@ -21,6 +22,7 @@ Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
ruby-msgpack (>= 1.0),
+ ruby-multi-json,
neovim,
${misc:Depends}
Description: Ruby client for Neovim
diff --git a/debian/patches/disable_documentation_version_test.patch b/debian/patches/disable_documentation_version_test.patch
index ce0f905..592d36f 100644
--- a/debian/patches/disable_documentation_version_test.patch
+++ b/debian/patches/disable_documentation_version_test.patch
@@ -4,48 +4,52 @@ Description: Disable the documentation version test
release cycle (new neovim version would break it)
Author: Jason Pleau <jason at jpleau.ca>
---- a/spec/integration_spec.rb
-+++ b/spec/integration_spec.rb
-@@ -72,24 +72,24 @@
+--- a/spec/acceptance_spec.rb
++++ b/spec/acceptance_spec.rb
+@@ -35,26 +35,26 @@
end
end
-- specify "neovim-ruby has up-to-date generated method docs" do
-- begin
-- url = "https://api.github.com/repos/neovim/neovim/releases/latest"
-- response = open(url) { |json| JSON.load(json) }
+- describe "Generated documentation" do
+- it "is up to date" do
+- begin
+- url = "https://api.github.com/repos/neovim/neovim/releases/latest"
+- response = open(url) { |json| JSON.load(json) }
-
-- client_file = File.read(
-- File.expand_path("../../lib/neovim/client.rb", __FILE__)
-- )
-- docs_version = client_file[
-- /The methods documented here were generated using (.+)$/,
-- 1
-- ]
+- client_file = File.read(
+- File.expand_path("../../lib/neovim/client.rb", __FILE__)
+- )
+- docs_version = client_file[
+- /The methods documented here were generated using (.+)$/,
+- 1
+- ]
-
-- expect(docs_version).to eq(response["name"])
-- rescue SocketError, OpenURI::HTTPError => e
-- skip "Skipping: #{e}"
+- expect(docs_version).to eq(response["name"])
+- rescue SocketError, OpenURI::HTTPError => e
+- skip "Skipping: #{e}"
+- end
- end
- end
-+# specify "neovim-ruby has up-to-date generated method docs" do
-+# begin
-+# url = "https://api.github.com/repos/neovim/neovim/releases/latest"
-+# response = open(url) { |json| JSON.load(json) }
++#describe "Generated documentation" do
++# it "is up to date" do
++# begin
++# url = "https://api.github.com/repos/neovim/neovim/releases/latest"
++# response = open(url) { |json| JSON.load(json) }
+#
-+# client_file = File.read(
-+# File.expand_path("../../lib/neovim/client.rb", __FILE__)
-+# )
-+# docs_version = client_file[
-+# /The methods documented here were generated using (.+)$/,
-+# 1
-+# ]
++# client_file = File.read(
++# File.expand_path("../../lib/neovim/client.rb", __FILE__)
++# )
++# docs_version = client_file[
++# /The methods documented here were generated using (.+)$/,
++# 1
++# ]
+#
-+# expect(docs_version).to eq(response["name"])
-+# rescue SocketError, OpenURI::HTTPError => e
-+# skip "Skipping: #{e}"
++# expect(docs_version).to eq(response["name"])
++# rescue SocketError, OpenURI::HTTPError => e
++# skip "Skipping: #{e}"
++# end
+# end
+# end
def run_nvim(env, *opts)
- system(env, Neovim.executable.path, "--headless", "-n", "-i", "NONE", "-u", init, *opts)
+ nvim = env.fetch("NVIM_EXECUTABLE", "nvim")
diff --git a/debian/patches/disable_shada.patch b/debian/patches/disable_shada.patch
index 44a0466..cae3867 100644
--- a/debian/patches/disable_shada.patch
+++ b/debian/patches/disable_shada.patch
@@ -3,14 +3,14 @@ Description: Disable ShaDa when running tests
sbuild there is no "user homedir". Disabling shada fixes this.
Author: Jason Pleau <jason at jpleau.ca>
---- a/spec/integration_spec.rb
-+++ b/spec/integration_spec.rb
-@@ -92,7 +92,7 @@
- end
+--- a/spec/acceptance_spec.rb
++++ b/spec/acceptance_spec.rb
+@@ -58,7 +58,7 @@
def run_nvim(env, *opts)
-- system(env, Neovim.executable.path, "--headless", "-n", "-u", init, *opts)
-+ system(env, Neovim.executable.path, "--headless", "-n", "-i", "NONE", "-u", init, *opts)
+ nvim = env.fetch("NVIM_EXECUTABLE", "nvim")
+- system(env, nvim, "--headless", "-n", "-u", init, *opts)
++ system(env, nvim, "--headless", "-n", "-i", "NONE", "-u", init, *opts)
end
- def run_rspec(*args)
+ def run_vader(test_path)
diff --git a/debian/patches/neovim_ruby_host_path.patch b/debian/patches/neovim_ruby_host_path.patch
deleted file mode 100644
index 9a1facb..0000000
--- a/debian/patches/neovim_ruby_host_path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 006daee2bf79602db1173c7be5d7a79354daab00 Mon Sep 17 00:00:00 2001
-From: Jason Pleau <jason at jpleau.ca>
-Date: Wed, 26 Jul 2017 12:12:04 -0400
-Applied-Upstream: commit:006daee2bf79602db1173c7be5d7a79354daab00
-Subject: [PATCH] set neovim-ruby-host path in runtime/init.vim
-
-For the integration tests to work, neovim must be able to find
-'neovim-ruby-host'. This is fine in most cases, but when one wants to
-try and run tests without actually installing the gem, neovim cannot
-find the executable.
-
-Setting g:ruby_host_prog fixes this.
----
- spec/integration/runtime/init.vim | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/spec/integration/runtime/init.vim b/spec/integration/runtime/init.vim
-index a0c03c1..93335f3 100644
---- a/spec/integration/runtime/init.vim
-+++ b/spec/integration/runtime/init.vim
-@@ -1,3 +1,7 @@
-+let s:lib_path = getcwd() . "/../../lib/"
-+let s:bin_path = getcwd() . "/../../bin/neovim-ruby-host"
-+let g:ruby_host_prog = printf("ruby -I %s %s", s:lib_path, s:bin_path)
-+
- set rtp=./runtime,./runtime/vader.vim,$VIMRUNTIME
-
- ruby require "rspec"
---
-2.13.3
-
diff --git a/debian/patches/require_tempfile.patch b/debian/patches/require_tempfile.patch
deleted file mode 100644
index bd860a9..0000000
--- a/debian/patches/require_tempfile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7d7b8f71223414354512be9600e9430afbc13ea9 Mon Sep 17 00:00:00 2001
-From: Jason Pleau <jason at jpleau.ca>
-Date: Mon, 17 Jul 2017 19:52:49 -0400
-Subject: [PATCH] Add missing require for tempfile for integration_spec
-Applied-Upstream: commit:3b90bd22c74900f55f58ecbe609ceff2ca6c73ae
-
----
- spec/integration_spec.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb
-index 80c4935..e3752df 100644
---- a/spec/integration_spec.rb
-+++ b/spec/integration_spec.rb
-@@ -5,6 +5,7 @@
- require "json"
- require "net/http"
- require "open-uri"
-+require "tempfile"
-
- RSpec.describe "integration tests", :timeout => 30 do
- let(:root) { File.expand_path("../integration", __FILE__) }
diff --git a/debian/patches/series b/debian/patches/series
index e5bbecf..3df88c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-neovim_ruby_host_path.patch
disable_shada.patch
disable_documentation_version_test.patch
-require_tempfile.patch
remove_coveralls_pry_bundler.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-neovim.git
More information about the Pkg-ruby-extras-commits
mailing list