Hello community, here is the log from the commit of package rubygem-spring for openSUSE:Factory checked in at 2015-02-16 22:12:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-spring (Old) and /work/SRC/openSUSE:Factory/.rubygem-spring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-spring" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-spring/rubygem-spring.changes 2015-02-13 08:35:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-spring.new/rubygem-spring.changes 2015-02-16 22:12:36.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 15 05:30:10 UTC 2015 - [email protected] + +- updated to version 1.3.2 + +------------------------------------------------------------------- Old: ---- spring-1.3.1.gem New: ---- spring-1.3.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-spring.spec ++++++ --- /var/tmp/diff_new_pack.Q37izu/_old 2015-02-16 22:12:36.000000000 +0100 +++ /var/tmp/diff_new_pack.Q37izu/_new 2015-02-16 22:12:36.000000000 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-spring -Version: 1.3.1 +Version: 1.3.2 Release: 0 %define mod_name spring %define mod_full_name %{mod_name}-%{version} ++++++ spring-1.3.1.gem -> spring-1.3.2.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2015-02-09 22:35:20.000000000 +0100 +++ new/CHANGELOG.md 2015-02-14 12:12:45.000000000 +0100 @@ -1,3 +1,8 @@ +## 1.3.2 + +* Fix another problem with gems bundled from git repositories. This + affected chruby and RVM users, and possibly others. See #383. + ## 1.3.1 * Fix a problem with gems bundled from a git repository, where the Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/spring/client/binstub.rb new/lib/spring/client/binstub.rb --- old/lib/spring/client/binstub.rb 2015-02-09 22:35:20.000000000 +0100 +++ new/lib/spring/client/binstub.rb 2015-02-14 12:12:45.000000000 +0100 @@ -29,18 +29,15 @@ SPRING = <<'CODE' #!/usr/bin/env ruby -# This file loads spring without using Bundler, in order to be fast -# It gets overwritten when you run the `spring binstub` command +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. unless defined?(Spring) require "rubygems" require "bundler" if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m) - ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR) - ENV["GEM_HOME"] = nil - Gem.paths = ENV - + Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s } gem "spring", match[1] require "spring/binstub" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/spring/client/run.rb new/lib/spring/client/run.rb --- old/lib/spring/client/run.rb 2015-02-09 22:35:20.000000000 +0100 +++ new/lib/spring/client/run.rb 2015-02-14 12:12:45.000000000 +0100 @@ -1,5 +1,6 @@ require "rbconfig" require "socket" +require "bundler" module Spring module Client @@ -64,10 +65,8 @@ def boot_server env.socket_path.unlink if env.socket_path.exist? - # The GEM_HOME handling is to work around a problem with spring binstubs - # generated prior to 1.3.0. pid = Process.spawn( - ENV["GEM_HOME"] == "" ? { "GEM_HOME" => nil } : {}, + gem_env, "ruby", "-r", "spring/server", "-e", "Spring::Server.boot" @@ -80,6 +79,16 @@ end end + def gem_env + bundle = Bundler.bundle_path.to_s + paths = ENV["GEM_PATH"].to_s.split(File::PATH_SEPARATOR) + + { + "GEM_PATH" => [bundle, *paths].join(File::PATH_SEPARATOR), + "GEM_HOME" => bundle + } + end + def stop_server server.close @server = nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/spring/version.rb new/lib/spring/version.rb --- old/lib/spring/version.rb 2015-02-09 22:35:20.000000000 +0100 +++ new/lib/spring/version.rb 2015-02-14 12:12:45.000000000 +0100 @@ -1,3 +1,3 @@ module Spring - VERSION = "1.3.1" + VERSION = "1.3.2" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-02-09 22:35:20.000000000 +0100 +++ new/metadata 2015-02-14 12:12:45.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: spring version: !ruby/object:Gem::Version - version: 1.3.1 + version: 1.3.2 platform: ruby authors: - Jon Leighton autorequire: bindir: bin cert_chain: [] -date: 2015-02-09 00:00:00.000000000 Z +date: 2015-02-14 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: activesupport -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
