Hello community, here is the log from the commit of package rubygem-sprockets for openSUSE:Factory checked in at 2015-09-03 18:04:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-sprockets (Old) and /work/SRC/openSUSE:Factory/.rubygem-sprockets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-sprockets" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-sprockets/rubygem-sprockets.changes 2015-08-27 08:57:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-sprockets.new/rubygem-sprockets.changes 2015-09-03 18:12:31.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 2 04:31:50 UTC 2015 - [email protected] + +- updated to version 3.3.4 + see installed CHANGELOG.md + + **3.3.4** (September 1, 2015) + + * Relative cache contents now work with windows. + +------------------------------------------------------------------- Old: ---- sprockets-3.3.3.gem New: ---- sprockets-3.3.4.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-sprockets.spec ++++++ --- /var/tmp/diff_new_pack.mBpvSU/_old 2015-09-03 18:12:32.000000000 +0200 +++ /var/tmp/diff_new_pack.mBpvSU/_new 2015-09-03 18:12:32.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-sprockets -Version: 3.3.3 +Version: 3.3.4 Release: 0 %define mod_name sprockets %define mod_full_name %{mod_name}-%{version} ++++++ sprockets-3.3.3.gem -> sprockets-3.3.4.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2015-08-21 23:07:31.000000000 +0200 +++ new/CHANGELOG.md 2015-09-01 21:23:13.000000000 +0200 @@ -1,3 +1,7 @@ +**3.3.4** (September 1, 2015) + +* Relative cache contents now work with windows. + **3.3.3** (August 21, 2015) * Remove more absolute paths from cache contents. Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/unloaded_asset.rb new/lib/sprockets/unloaded_asset.rb --- old/lib/sprockets/unloaded_asset.rb 2015-08-21 23:07:31.000000000 +0200 +++ new/lib/sprockets/unloaded_asset.rb 2015-09-01 21:23:13.000000000 +0200 @@ -19,7 +19,7 @@ # # Returns UnloadedAsset. def initialize(uri, env) - @uri = uri + @uri = uri.to_s @env = env @compressed_path = URITar.new(uri, env).compressed_path @params = nil # lazy loaded diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/uri_tar.rb new/lib/sprockets/uri_tar.rb --- old/lib/sprockets/uri_tar.rb 2015-08-21 23:07:31.000000000 +0200 +++ new/lib/sprockets/uri_tar.rb 2015-09-01 21:23:13.000000000 +0200 @@ -1,3 +1,5 @@ +require 'sprockets/path_utils' + module Sprockets # Internal: used to "expand" and "compress" values for storage class URITar @@ -10,6 +12,7 @@ def initialize(uri, env) @root = env.root @env = env + uri = uri.to_s if uri.include?("://".freeze) uri_array = uri.split("://".freeze) @scheme = uri_array.shift @@ -34,6 +37,15 @@ scheme + compressed_path end + # Internal: Tells us if we are using an absolute path + # + # Nix* systems start with a `/` like /Users/schneems. + # Windows systems start with a drive letter than colon and slash + # like C:/Schneems. + def absolute_path? + PathUtils.absolute_path?(path) + end + # Internal: Convert a "compressed" uri to an absolute path # # If a uri is inside of the environment's root it will not @@ -47,12 +59,17 @@ # # Returns String def expand - if path.start_with?("/".freeze) + if absolute_path? # Stored path was absolute, don't add root scheme + path else - # Stored path was relative, add root - scheme + File.join(root, path) + if scheme.empty? + File.join(root, path) + else + # We always want to return an absolute uri, + # make sure the path starts with a slash. + scheme + File.join("/".freeze, root, path) + end end end @@ -66,7 +83,14 @@ # # Returns String def compressed_path - if compressed_path = @env.split_subpath(root, path) + # windows + if [email protected]_with?("/".freeze) && path.start_with?("/".freeze) + consistent_root = "/".freeze + @root + else + consistent_root = @root + end + + if compressed_path = PathUtils.split_subpath(consistent_root, path) compressed_path else path diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sprockets/version.rb new/lib/sprockets/version.rb --- old/lib/sprockets/version.rb 2015-08-21 23:07:31.000000000 +0200 +++ new/lib/sprockets/version.rb 2015-09-01 21:23:13.000000000 +0200 @@ -1,3 +1,3 @@ module Sprockets - VERSION = "3.3.3" + VERSION = "3.3.4" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-08-21 23:07:31.000000000 +0200 +++ new/metadata 2015-09-01 21:23:13.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: sprockets version: !ruby/object:Gem::Version - version: 3.3.3 + version: 3.3.4 platform: ruby authors: - Sam Stephenson @@ -9,7 +9,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2015-08-21 00:00:00.000000000 Z +date: 2015-09-01 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rack
