Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d56ef8ee10cd
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 925e90bd6d3c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 2, 2015

  1. Copy the full SHA
    61893fe View commit details
  2. Ignore patch when getting release date from last commit.

    If the patch has non-US-ASCII characters, the Regexp matching the date blows up.
    Rather than mucking with ridiculous Regexp encodings, we ignore the unneeded patch.
    brixen committed Dec 2, 2015
    Copy the full SHA
    925e90b View commit details
Showing with 15 additions and 11 deletions.
  1. +1 −1 rakelib/release.rb
  2. +14 −10 spec/ruby/core/dir/pwd_spec.rb
2 changes: 1 addition & 1 deletion rakelib/release.rb
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ def release_revision

def release_date
if git_directory
m = `git show --format="%ci" HEAD`.match(/^(\d+-\d+-\d+)/)
m = `git show --no-patch --format="%ci" HEAD`.match(/^(\d+-\d+-\d+)/)
date = m[1]
end

24 changes: 14 additions & 10 deletions spec/ruby/core/dir/pwd_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- encoding: utf-8 -*-
require File.expand_path('../../../spec_helper', __FILE__)
require File.expand_path('../fixtures/common', __FILE__)
require File.expand_path('../shared/pwd', __FILE__)
@@ -12,19 +13,22 @@
end

it_behaves_like :dir_pwd, :pwd
end

it "correctly displays dirs with unicode characters in them" do
DirSpecs.clear_dirs
describe "Dir.pwd" do
before :all do
@name = tmp("あ")
end

begin
str = [0xe9].pack 'U' #Unicode é
Dir.mkdir str
File.exist?(str).should == true
after :all do
rm_r @name
end

it "correctly displays dirs with unicode characters in them" do
Dir.mkdir @name

old_pwd = Dir.pwd
Dir.chdir(str) { Dir.pwd.force_encoding('UTF-8').should == File.join(old_pwd, str) }
ensure
DirSpecs.clear_dirs
Dir.chdir @name do
Dir.pwd.should == @name
end
end
end