Hello community,
here is the log from the commit of package rubygem-net-ssh-multi for
openSUSE:Factory checked in at 2015-04-13 20:30:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-net-ssh-multi (Old)
and /work/SRC/openSUSE:Factory/.rubygem-net-ssh-multi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-net-ssh-multi"
Changes:
--------
---
/work/SRC/openSUSE:Factory/rubygem-net-ssh-multi/rubygem-net-ssh-multi.changes
2013-06-05 13:12:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.rubygem-net-ssh-multi.new/rubygem-net-ssh-multi.changes
2015-04-13 20:30:30.000000000 +0200
@@ -1,0 +2,7 @@
+Sun Apr 12 05:52:33 UTC 2015 - [email protected]
+
+- updated to version 1.2.1
+ * Fix two problems with :concurrent_connections option (#4) [sersut]
+ * Replaced test-unit with minitest [juliandunn]
+
+-------------------------------------------------------------------
Old:
----
net-ssh-multi-1.2.0.gem
New:
----
gem2rpm.yml
net-ssh-multi-1.2.1.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-net-ssh-multi.spec ++++++
--- /var/tmp/diff_new_pack.PBuL6d/_old 2015-04-13 20:30:30.000000000 +0200
+++ /var/tmp/diff_new_pack.PBuL6d/_new 2015-04-13 20:30:30.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-net-ssh-multi
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,25 @@
#
+#
+# This file was generated with a gem2rpm.yml and not just plain gem2rpm.
+# All sections marked as MANUAL, license headers, summaries and descriptions
+# can be maintained in that file. Please consult this file before editing any
+# of those fields
+#
+
Name: rubygem-net-ssh-multi
-Version: 1.2.0
+Version: 1.2.1
Release: 0
%define mod_name net-ssh-multi
%define mod_full_name %{mod_name}-%{version}
-
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: ruby-macros >= 1
+BuildRequires: %{rubygem gem2rpm}
+BuildRequires: %{ruby}
+BuildRequires: ruby-macros >= 5
Url: https://github.com/net-ssh/net-scp
Source: http://rubygems.org/gems/%{mod_full_name}.gem
+Source1: gem2rpm.yml
Summary: Control multiple Net::SSH connections via a single interface
License: MIT
Group: Development/Languages/Ruby
@@ -33,50 +42,15 @@
%description
Control multiple Net::SSH connections via a single interface.
-%package doc
-Summary: RDoc documentation for %{mod_name}
-Group: Development/Languages/Ruby
-Requires: %{name} = %{version}
-
-%description doc
-Documentation generated at gem installation time.
-Usually in RDoc and RI formats.
-
-%package testsuite
-Summary: Test suite for %{mod_name}
-Group: Development/Languages/Ruby
-Requires: %{name} = %{version}
-
-%description testsuite
-Test::Unit or RSpec files, useful for developers.
-
%prep
-#gem_unpack
-#if you need patches, apply them here and replace the # with a % sign in the
surrounding lines
-#gem_build
%build
%install
-%gem_install -f
-mkdir -p %{buildroot}%{_docdir}/%{name}
-ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/CHANGES.txt
%buildroot/%{_docdir}/%{name}/CHANGES.txt
-ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/README.rdoc
%buildroot/%{_docdir}/%{name}/README.rdoc
-
-%files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}
-%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem
-%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/
-%exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/test
-%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec
-
-%files doc
-%defattr(-,root,root,-)
-%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/
-
-%files testsuite
-%defattr(-,root,root,-)
-%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/test
+%gem_install \
+ --doc-files="CHANGES.txt LICENSE.txt README.rdoc" \
+ -f
+
+%gem_packages
%changelog
++++++ gem2rpm.yml ++++++
# ---
# ## used by gem2rpm
# :summary: this is a custom summary
# ## used by gem2rpm
# :description: |-
# this is a custom description
#
# it can be multiline
# ## used by gem2rpm
# :license: MIT or Ruby
# ## used by gem2rpm and gem_packages
# :version_suffix: -x_y
# ## used by gem2rpm and gem_packages
# :disable_docs: true
# ## used by gem2rpm
# :disable_automatic_rdoc_dep: true
# ## used by gem2rpm
# :preamble: |-
# BuildRequires: foobar
# Requires: foobar
# ## used by gem2rpm
# :patches:
# foo.patch: -p1
# bar.patch:
# ## used by gem2rpm
:sources:
# - foo.desktop
# - bar.desktop
# :gem_install_args: '....'
# ## used by gem2rpm
# :pre_install: |-
# %if 0%{?use_system_libev}
# export USE_VENDORED_LIBEV="no"
# %endif
# ## used by gem2rpm
# :post_install: |-
# # delete custom files here or do other fancy stuff
# install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse
# ## used by gem2rpm
# :testsuite_command: |-
# (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test)
# ## used by gem2rpm
# :filelist: |-
# /usr/bin/gem2rpm-opensuse
# ## used by gem2rpm
# :scripts:
# :post: |-
# /bin/echo foo
# ## used by gem_packages
# :main:
# :preamble: |-
# Requires: util-linux
# Recommends: pwgen
# :filelist: |-
# /usr/bin/gem2rpm-opensuse
# ## used by gem_packages
# :custom:
# apache:
# :preamble: |-
# Requires: .....
# :filelist: |-
# /etc/apache2/conf.d/passenger.conf
# :summary: Custom summary is optional
# :description: |-
# Custom description is optional
#
# bar
# :post: |-
# /bin/echo foo
#
++++++ net-ssh-multi-1.2.0.gem -> net-ssh-multi-1.2.1.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGES.txt new/CHANGES.txt
--- old/CHANGES.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/CHANGES.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +1,10 @@
+=== 1.2.1 / 11 Apr 2015
+
+* Fix two problems with :concurrent_connections option (#4) [sersut]
+* Replaced test-unit with minitest [juliandunn]
+
+
=== 1.2.0 / 06 Feb 2013
* Added public cert. All gem releases are now signed. See INSTALL in readme.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Rakefile new/Rakefile
--- old/Rakefile 1970-01-01 01:00:00.000000000 +0100
+++ new/Rakefile 1970-01-01 01:00:00.000000000 +0100
@@ -26,7 +26,7 @@
s.add_dependency 'net-ssh', ">=2.6.5"
s.add_dependency 'net-ssh-gateway', ">=1.2.0"
- s.add_development_dependency 'test-unit'
+ s.add_development_dependency 'minitest'
s.add_development_dependency 'mocha'
s.license = "MIT"
Files old/data.tar.gz.sig and new/data.tar.gz.sig differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/net/ssh/multi/server.rb
new/lib/net/ssh/multi/server.rb
--- old/lib/net/ssh/multi/server.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/net/ssh/multi/server.rb 1970-01-01 01:00:00.000000000 +0100
@@ -140,8 +140,9 @@
# Returns +true+ if the session has been opened, and the session is
currently
# busy (as defined by Net::SSH::Connection::Session#busy?).
+ # Also returns false if the server has failed to connect.
def busy?(include_invisible=false)
- session && session.busy?(include_invisible)
+ !failed? && session && session.busy?(include_invisible)
end
# Closes this server's session. If the session has not yet been opened,
@@ -228,4 +229,4 @@
session.postprocess(listeners & readers, listeners & writers)
end
end
-end; end; end
\ No newline at end of file
+end; end; end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/net/ssh/multi/session.rb
new/lib/net/ssh/multi/session.rb
--- old/lib/net/ssh/multi/session.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/net/ssh/multi/session.rb 1970-01-01 01:00:00.000000000 +0100
@@ -476,7 +476,12 @@
return connection
end
- @open_connections += 1
+ # Only increment the open_connections count if the connection
+ # is not being forced. Incase of a force, it will already be
+ # incremented.
+ if !force
+ @open_connections += 1
+ end
end
begin
@@ -542,6 +547,10 @@
count = concurrent_connections ? (concurrent_connections -
open_connections) : @pending_sessions.length
count.times do
session = @pending_sessions.pop or break
+ # Increment the open_connections count here to prevent
+ # creation of connection thread again before that is
+ # incremented by the thread.
+ @session_mutex.synchronize { @open_connections += 1 }
@connect_threads << Thread.new do
session.replace_with(next_session(session.server, true))
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/net/ssh/multi/version.rb
new/lib/net/ssh/multi/version.rb
--- old/lib/net/ssh/multi/version.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/net/ssh/multi/version.rb 1970-01-01 01:00:00.000000000 +0100
@@ -10,7 +10,7 @@
MINOR = 2
# The tiny component of the library's version
- TINY = 0
+ TINY = 1
# The library's version as a Version instance
CURRENT = new(MAJOR, MINOR, TINY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 1970-01-01 01:00:00.000000000 +0100
+++ new/metadata 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: net-ssh-multi
version: !ruby/object:Gem::Version
- version: 1.2.0
+ version: 1.2.1
prerelease:
platform: ruby
authors:
@@ -38,7 +38,7 @@
MVhNUThCTTJKejBYb1BhblBlMzU0K2xXd2pwa1JLYkZvdy9aYlFIY0NMQ3Ey
NCtONmI2ZwpkZ0tmTkR6d2lEcHFDQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
LS0tLS0K
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: net-ssh
@@ -73,7 +73,7 @@
- !ruby/object:Gem::Version
version: 1.2.0
- !ruby/object:Gem::Dependency
- name: test-unit
+ name: minitest
requirement: !ruby/object:Gem::Requirement
none: false
requirements:
@@ -157,7 +157,7 @@
version: '0'
requirements: []
rubyforge_project: net-ssh-multi
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
signing_key:
specification_version: 3
summary: Control multiple Net::SSH connections via a single interface.
Files old/metadata.gz.sig and new/metadata.gz.sig differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/net-ssh-multi.gemspec new/net-ssh-multi.gemspec
--- old/net-ssh-multi.gemspec 1970-01-01 01:00:00.000000000 +0100
+++ new/net-ssh-multi.gemspec 1970-01-01 01:00:00.000000000 +0100
@@ -5,12 +5,12 @@
Gem::Specification.new do |s|
s.name = "net-ssh-multi"
- s.version = "1.2.0"
+ s.version = "1.2.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to?
:required_rubygems_version=
s.authors = ["Jamis Buck", "Delano Mandelbaum"]
s.cert_chain = ["gem-public_cert.pem"]
- s.date = "2013-02-06"
+ s.date = "2015-04-11"
s.description = "Control multiple Net::SSH connections via a single
interface."
s.email = "[email protected]"
s.extra_rdoc_files = [
@@ -47,7 +47,7 @@
s.licenses = ["MIT"]
s.require_paths = ["lib"]
s.rubyforge_project = "net-ssh-multi"
- s.rubygems_version = "1.8.25"
+ s.rubygems_version = "1.8.23"
s.signing_key = "/mnt/gem/gem-private_key.pem"
s.summary = "Control multiple Net::SSH connections via a single interface."
@@ -57,18 +57,18 @@
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<net-ssh>, [">= 2.6.5"])
s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.2.0"])
- s.add_development_dependency(%q<test-unit>, [">= 0"])
+ s.add_development_dependency(%q<minitest>, [">= 0"])
s.add_development_dependency(%q<mocha>, [">= 0"])
else
s.add_dependency(%q<net-ssh>, [">= 2.6.5"])
s.add_dependency(%q<net-ssh-gateway>, [">= 1.2.0"])
- s.add_dependency(%q<test-unit>, [">= 0"])
+ s.add_dependency(%q<minitest>, [">= 0"])
s.add_dependency(%q<mocha>, [">= 0"])
end
else
s.add_dependency(%q<net-ssh>, [">= 2.6.5"])
s.add_dependency(%q<net-ssh-gateway>, [">= 1.2.0"])
- s.add_dependency(%q<test-unit>, [">= 0"])
+ s.add_dependency(%q<minitest>, [">= 0"])
s.add_dependency(%q<mocha>, [">= 0"])
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/channel_test.rb new/test/channel_test.rb
--- old/test/channel_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/test/channel_test.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
require 'common'
require 'net/ssh/multi/channel'
-class ChannelTest < Test::Unit::TestCase
+class ChannelTest < Minitest::Test
def test_each_should_iterate_over_each_component_channel
channels = [c1 = mock('channel'), c2 = mock('channel'), c3 =
mock('channel')]
channel = Net::SSH::Multi::Channel.new(mock('session'), channels)
@@ -149,4 +149,4 @@
end
end
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/common.rb new/test/common.rb
--- old/test/common.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/test/common.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +1,9 @@
-require 'test/unit'
-require 'mocha'
\ No newline at end of file
+require 'minitest/autorun'
+require 'mocha/setup'
+
+if Minitest.const_defined?('Test')
+ # We're on Minitest 5+. Nothing to do here.
+else
+ # Minitest 4 doesn't have Minitest::Test yet.
+ Minitest::Test = MiniTest::Unit::TestCase
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/multi_test.rb new/test/multi_test.rb
--- old/test/multi_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/test/multi_test.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
require 'common'
require 'net/ssh/multi'
-class MultiTest < Test::Unit::TestCase
+class MultiTest < Minitest::Test
def test_start_with_block_should_yield_session_and_then_close
Net::SSH::Multi::Session.any_instance.expects(:loop)
Net::SSH::Multi::Session.any_instance.expects(:close)
@@ -17,4 +17,4 @@
Net::SSH::Multi::Session.any_instance.expects(:close).never
assert_instance_of Net::SSH::Multi::Session, Net::SSH::Multi.start
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/server_test.rb new/test/server_test.rb
--- old/test/server_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/test/server_test.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
require 'common'
require 'net/ssh/multi/server'
-class ServerTest < Test::Unit::TestCase
+class ServerTest < Minitest::Test
def setup
@master = stub('multi-session', :default_user => "bob")
end
@@ -50,7 +50,7 @@
s1 = server('user@host1:1234')
s2 = server('user@host2:1234')
assert !s1.eql?(s2)
- assert_not_equal s1.hash, s2.hash
+ refute_equal s1.hash, s2.hash
assert s1 != s2
end
@@ -58,7 +58,7 @@
s1 = server('user@host:1234')
s2 = server('user@host:1235')
assert !s1.eql?(s2)
- assert_not_equal s1.hash, s2.hash
+ refute_equal s1.hash, s2.hash
assert s1 != s2
end
@@ -66,7 +66,7 @@
s1 = server('user1@host:1234')
s2 = server('user2@host:1234')
assert !s1.eql?(s2)
- assert_not_equal s1.hash, s2.hash
+ refute_equal s1.hash, s2.hash
assert s1 != s2
end
@@ -112,7 +112,7 @@
end
def test_close_channels_when_session_is_not_open_should_not_do_anything
- assert_nothing_raised { server('host').close_channels }
+ server('host').close_channels
end
def
test_close_channels_when_session_is_open_should_iterate_over_open_channels_and_close_them
@@ -127,7 +127,7 @@
end
def test_close_when_session_is_not_open_should_not_do_anything
- assert_nothing_raised { server('host').close }
+ server('host').close
end
def test_close_when_session_is_open_should_close_session
@@ -253,4 +253,4 @@
@master.expects(:next_session).with(server).returns(session)
return session
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/session_actions_test.rb
new/test/session_actions_test.rb
--- old/test/session_actions_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/test/session_actions_test.rb 1970-01-01 01:00:00.000000000 +0100
@@ -2,7 +2,7 @@
require 'net/ssh/multi/server'
require 'net/ssh/multi/session_actions'
-class SessionActionsTest < Test::Unit::TestCase
+class SessionActionsTest < Minitest::Test
class SessionActionsContainer
include Net::SSH::Multi::SessionActions
@@ -125,4 +125,4 @@
assert_equal 127, c[:exit_status]
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/session_test.rb new/test/session_test.rb
--- old/test/session_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/test/session_test.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
require 'common'
require 'net/ssh/multi/session'
-class SessionTest < Test::Unit::TestCase
+class SessionTest < Minitest::Test
def setup
@session = Net::SSH::Multi::Session.new
end
@@ -198,4 +198,4 @@
IO.expects(:select).with([:a, :b, :c], [:a, :c], nil, 5).returns([[:b,
:c], [:a, :c]])
@session.process(5)
end
-end
\ No newline at end of file
+end
