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: bbe403e1aa9c
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ce686dd1486
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Feb 3, 2015

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    22a49ea View commit details
  2. Copy the full SHA
    87fa3ad View commit details
  3. Fixed Kernel#inspect.

    brixen committed Feb 3, 2015
    Copy the full SHA
    2ce686d View commit details
Showing with 18 additions and 12 deletions.
  1. +1 −1 kernel/common/kernel.rb
  2. +1 −1 rakelib/install.rake
  3. +7 −6 rakelib/package.rake
  4. +4 −4 rakelib/package.rb
  5. +5 −0 spec/ruby/core/kernel/inspect_spec.rb
2 changes: 1 addition & 1 deletion kernel/common/kernel.rb
Original file line number Diff line number Diff line change
@@ -383,7 +383,7 @@ def inspect
ivars = __instance_variables__

if ivars.empty?
return Rubinius::Type.infect prefix, self
return Rubinius::Type.infect "#{prefix}>", self
end

# Otherwise, if it's already been inspected, return the ...
2 changes: 1 addition & 1 deletion rakelib/install.rake
Original file line number Diff line number Diff line change
@@ -292,7 +292,7 @@ appropriate command to elevate permissions (eg su, sudo).
STDOUT.puts <<-EOM
--------
Successfully installed Rubinius #{BUILD_CONFIG[:version]}
Successfully installed Rubinius #{release_revision.first}
Add '#{BUILD_CONFIG[:prefixdir]}#{BUILD_CONFIG[:bindir]}' to your PATH. Available commands are:
13 changes: 7 additions & 6 deletions rakelib/package.rake
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
require 'rakelib/release'
require 'rakelib/package'
require 'date'


namespace :package do

desc "Create a release tarball from the source"
task :tar do
archive = "rubinius-#{BUILD_CONFIG[:version]}.tar.bz2"
archive = "rubinius-#{rbx_version}.tar.bz2"
files = "{ git ls-files; ls .revision; ls vendor/cache/*.gem; }"
prefix = "-s '|^|rubinius-#{BUILD_CONFIG[:version]}/|'"
prefix = "-s '|^|rubinius-#{rbx_version}/|'"
sh "#{files} | sort | uniq | tar -c #{prefix} -T - -f - | bzip2 > #{archive}"

write_md5_digest_file archive
@@ -34,7 +36,7 @@ namespace :package do

desc "Build a general Linux Heroku binary package"
task :heroku do
heroku_package = "ruby-#{BUILD_CONFIG[:ruby_version]}-rbx-#{BUILD_CONFIG[:version]}"
heroku_package = "ruby-#{BUILD_CONFIG[:ruby_version]}-rbx-#{rbx_version}"

sh "rake package:binary_builder RBX_BINARY_PACKAGE=#{heroku_package} " \
"RBX_BINARY_PREFIX=/app/vendor/#{heroku_package}"
@@ -43,10 +45,9 @@ namespace :package do
desc "Build a binary package for Homebrew"
task :homebrew do
ENV["LDFLAGS"] = "-Wl,-macosx_version_min,10.8"
version = BUILD_CONFIG[:version]
homebrew_package = "rubinius-#{version}"
homebrew_package = "rubinius-#{rbx_version}"
prefix = "/#{homebrew_package}"
lib = "lib/rubinius/#{version}"
lib = "lib/rubinius/#{rbx_version}"
config = "'--bindir=#{prefix}/bin --appdir=#{prefix}/#{lib} " \
"--includedir=#{prefix}/include/rubinius " \
"--gemsdir=#{prefix}/#{lib}/gems " \
8 changes: 4 additions & 4 deletions rakelib/package.rb
Original file line number Diff line number Diff line change
@@ -21,6 +21,10 @@ def write_sha1_digest_file(filename)
puts "Computed SHA1 to #{digest_file}"
end

def rbx_version
release_revision.first
end

class RubiniusPackager
attr_writer :prefix, :root, :bin, :config, :archive, :package

@@ -33,10 +37,6 @@ def initialize(options={})
@package = options[:package]
end

def rbx_version
BUILD_CONFIG[:version]
end

# passed verbatim to --prefix
def prefix
default = "/rubinius/#{rbx_version}"
5 changes: 5 additions & 0 deletions spec/ruby/core/kernel/inspect_spec.rb
Original file line number Diff line number Diff line change
@@ -23,4 +23,9 @@

obj.inspect.should == inspected
end

it "returns a String with the object class and object_id encoded" do
obj = Object.new
obj.inspect.should =~ /^#<Object:0x[0-9a-f]+>$/
end
end