rubygems-update 1.8.21 → 1.8.22

data/.travis.yml

@@ -0,0 +1,14 @@
+before_script:
+  - gem install minitest
+  - gem install rdoc
+  - gem install hoe
+  - gem install hoe-seattlerb
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+notifications:
+  email:
+    - drbrain@segment7.net
+    - evan+notify@phx.io

data/History.txt

@@ -1,5 +1,14 @@
 # coding: UTF-8
 
+=== 1.8.22 / 2012-04-13
+
+* 4 bug fixes:
+
+  * Workaround for psych/syck YAML date parsing issue
+  * Don't trust the encoding of ARGV. Fixes #307
+  * Quiet default warnings about missing spec variables
+  * Read a binary file properly (windows fix)
+
 === 1.8.21 / 2012-03-22
 
 * 2 bug fixes:

data/Manifest.txt

@@ -1,5 +1,6 @@
 .autotest
 .document
+.travis.yml
 History.txt
 LICENSE.txt
 MIT.txt

data/Rakefile

@@ -56,7 +56,7 @@ hoe = Hoe.spec 'rubygems-update' do
     rdoc_options << "--title=RubyGems #{self.version} Documentation"
   end
 
-  self.rsync_args += " --no-p"
+  self.rsync_args += " --no-p -O"
 
   # FIX: this exists because update --system installs the gem and
   # doesn't uninstall it. It should uninstall or better, not install
@@ -226,10 +226,11 @@ task "git:newchangelog" do
   now   = Time.new.strftime "%Y-%m-%d"
 
   changes = `#{cmd}`.split(/\|\|\|/).each_slice(3).map do |msg, author, email|
-    msg.split(/\n/).reject { |s| s.empty? }
+    c = msg.split(/\n/).reject { |s| s.empty? }
+    c.empty? ? nil : c.first
   end
 
-  changes = changes.flatten
+  changes = changes.flatten.compact
 
   next if changes.empty?
 

data/lib/rubygems.rb

@@ -112,6 +112,7 @@ require "rubygems/deprecate"
 # * Daniel Berger      -- djberg96(at)gmail.com
 # * Phil Hagelberg     -- technomancy(at)gmail.com
 # * Ryan Davis         -- ryand-ruby(at)zenspider.com
+# * Evan Phoenix       -- evan@phx.io
 #
 # (If your name is missing, PLEASE let us know!)
 #
@@ -120,7 +121,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.21'
+  VERSION = '1.8.22'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the

data/lib/rubygems/installer.rb

@@ -466,9 +466,13 @@ require 'rubygems'
 
 version = "#{Gem::Requirement.default}"
 
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\\A_(.*)_\\z/
+    version = $1
+    ARGV.shift
+  end
 end
 
 gem '#{spec.name}', version

data/lib/rubygems/installer_test_case.rb

@@ -118,7 +118,9 @@ class Gem::InstallerTestCase < Gem::TestCase
       FileUtils.mkdir_p 'bin'
       FileUtils.mkdir_p 'lib'
       FileUtils.mkdir_p File.join('ext', 'a')
-      File.open File.join('bin', 'executable'), 'w' do |f| f.puts '1' end
+      File.open File.join('bin', 'executable'), 'w' do |f|
+        f.puts "raise 'ran executable'"
+      end
       File.open File.join('lib', 'code.rb'), 'w' do |f| f.puts '1' end
       File.open File.join('ext', 'a', 'mkrf_conf.rb'), 'w' do |f|
         f << <<-EOF

data/lib/rubygems/specification.rb

@@ -1002,6 +1002,12 @@ class Gem::Specification
             when String then
               if /\A(\d{4})-(\d{2})-(\d{2})\Z/ =~ date then
                 Time.utc($1.to_i, $2.to_i, $3.to_i)
+
+              # Workaround for where the date format output from psych isn't
+              # parsed as a Time object by syck and thus comes through as a
+              # string.
+              elsif /\A(\d{4})-(\d{2})-(\d{2}) \d{2}:\d{2}:\d{2}\.\d+?Z\z/ =~ date then
+                Time.utc($1.to_i, $2.to_i, $3.to_i)
               else
                 raise(Gem::InvalidSpecificationException,
                       "invalid date format in specification: #{date.inspect}")
@@ -1378,7 +1384,7 @@ class Gem::Specification
         val = other_spec.instance_variable_get(name)
         if val then
           instance_variable_set name, val.dup
-        else
+        elsif Gem.configuration.really_verbose
           warn "WARNING: #{full_name} has an invalid nil value for #{name}"
         end
       rescue TypeError

data/test/rubygems/test_gem_installer.rb

@@ -35,9 +35,13 @@ require 'rubygems'
 
 version = \">= 0\"
 
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\\A_(.*)_\\z/
+    version = $1
+    ARGV.shift
+  end
 end
 
 gem 'a', version
@@ -669,6 +673,95 @@ load Gem.bin_path('a', 'executable', version)
     assert_same @installer, @pre_install_hook_arg
   end
 
+  def test_install_creates_working_binstub
+    Dir.mkdir util_inst_bindir
+    util_setup_gem
+    util_clear_gems
+
+    @installer.wrappers = true
+
+    gemdir = File.join @gemhome, 'gems', @spec.full_name
+
+    @newspec = nil
+    build_rake_in do
+      use_ui @ui do
+        @newspec = @installer.install
+      end
+    end
+
+    exe = File.join gemdir, 'bin', 'executable'
+
+    e = assert_raises RuntimeError do
+      instance_eval File.read(exe)
+    end
+
+    assert_match(/ran executable/, e.message)
+  end
+
+  def test_install_creates_binstub_that_understand_version
+    Dir.mkdir util_inst_bindir
+    util_setup_gem
+    util_clear_gems
+
+    @installer.wrappers = true
+
+    @newspec = nil
+    build_rake_in do
+      use_ui @ui do
+        @newspec = @installer.install
+      end
+    end
+
+    exe = File.join @gemhome, 'bin', 'executable'
+
+    ARGV.unshift "_3.0_"
+
+    begin
+      Gem::Specification.reset
+
+      e = assert_raises Gem::LoadError do
+        instance_eval File.read(exe)
+      end
+    ensure
+      ARGV.shift if ARGV.first == "_3.0_"
+    end
+
+    assert_match(/\(= 3\.0\)/, e.message)
+  end
+
+  def test_install_creates_binstub_that_dont_trust_encoding
+    skip unless "".respond_to?(:force_encoding)
+
+    Dir.mkdir util_inst_bindir
+    util_setup_gem
+    util_clear_gems
+
+    @installer.wrappers = true
+
+    @newspec = nil
+    build_rake_in do
+      use_ui @ui do
+        @newspec = @installer.install
+      end
+    end
+
+    exe = File.join @gemhome, 'bin', 'executable'
+
+    ARGV.unshift "\xE4pfel".force_encoding("UTF-8")
+
+    begin
+      Gem::Specification.reset
+
+      e = assert_raises RuntimeError do
+        instance_eval File.read(exe)
+      end
+    ensure
+      ARGV.shift if ARGV.first == "\xE4pfel"
+    end
+
+    assert_match(/ran executable/, e.message)
+  end
+
   def test_install_with_no_prior_files
     Dir.mkdir util_inst_bindir
     util_clear_gems

data/test/rubygems/test_gem_specification.rb

@@ -411,7 +411,7 @@ dependencies: []
   def test_handles_private_null_type
     path = File.join DATA_PATH, "null-type.gemspec.rz"
 
-    data = Marshal.load Gem.inflate(File.read(path))
+    data = Marshal.load Gem.inflate(Gem.read_binary(path))
 
     assert_equal nil, data.rubyforge_project
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 8
-  - 21
-  version: 1.8.21
+  - 22
+  version: 1.8.22
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 Z
+date: 2012-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -25,14 +25,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 27
         segments: 
         - 2
-        - 11
-        - 3
-        version: 2.11.3
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -183,6 +182,7 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .document
+- .travis.yml
 - History.txt
 - LICENSE.txt
 - MIT.txt
@@ -387,7 +387,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.21 Documentation
+- --title=RubyGems 1.8.22 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -413,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.8.20
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby