rubygems-update 2.4.5 → 2.4.6

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -0,0 +1,305 @@
+require 'rubygems/test_case'
+require 'rubygems/request_set'
+require 'rubygems/request_set/lockfile'
+require 'rubygems/request_set/lockfile/tokenizer'
+require 'rubygems/request_set/lockfile/parser'
+
+class TestGemRequestSetLockfileTokenizer < Gem::TestCase
+  def setup
+    super
+
+    @gem_deps_file = 'gem.deps.rb'
+    @lock_file = File.expand_path "#{@gem_deps_file}.lock"
+  end
+
+  def test_peek
+    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new "\n"
+
+    assert_equal :newline, tokenizer.peek.first
+
+    assert_equal :newline, tokenizer.next_token.first
+
+    assert_equal [:EOF], tokenizer.peek
+  end
+
+  def test_skip
+    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new "\n"
+
+    refute_predicate tokenizer, :empty?
+
+    tokenizer.skip :newline
+
+    assert_empty tokenizer
+  end
+
+  def test_token_pos
+    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new ''
+    assert_equal [5, 0], tokenizer.token_pos(5)
+
+    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new '', nil, 1, 2
+    assert_equal [3, 1], tokenizer.token_pos(5)
+  end
+
+  def test_tokenize
+    write_lockfile <<-LOCKFILE
+GEM
+  remote: #{@gem_repo}
+  specs:
+    a (2)
+      b (= 2)
+      c (!= 3)
+      d (> 4)
+      e (< 5)
+      f (>= 6)
+      g (<= 7)
+      h (~> 8)
+
+PLATFORMS
+  #{Gem::Platform::RUBY}
+
+DEPENDENCIES
+  a
+    LOCKFILE
+
+    expected = [
+      [:section,     'GEM',                0,  0],
+      [:newline,     nil,                  3,  0],
+
+      [:entry,       'remote',             2,  1],
+      [:text,        @gem_repo,           10,  1],
+      [:newline,     nil,                 34,  1],
+
+      [:entry,       'specs',              2,  2],
+      [:newline,     nil,                  8,  2],
+
+      [:text,        'a',                  4,  3],
+      [:l_paren,     nil,                  6,  3],
+      [:text,        '2',                  7,  3],
+      [:r_paren,     nil,                  8,  3],
+      [:newline,     nil,                  9,  3],
+
+      [:text,        'b',                  6,  4],
+      [:l_paren,     nil,                  8,  4],
+      [:requirement, '=',                  9,  4],
+      [:text,        '2',                 11,  4],
+      [:r_paren,     nil,                 12,  4],
+      [:newline,     nil,                 13,  4],
+
+      [:text,        'c',                  6,  5],
+      [:l_paren,     nil,                  8,  5],
+      [:requirement, '!=',                 9,  5],
+      [:text,        '3',                 12,  5],
+      [:r_paren,     nil,                 13,  5],
+      [:newline,     nil,                 14,  5],
+
+      [:text,        'd',                  6,  6],
+      [:l_paren,     nil,                  8,  6],
+      [:requirement, '>',                  9,  6],
+      [:text,        '4',                 11,  6],
+      [:r_paren,     nil,                 12,  6],
+      [:newline,     nil,                 13,  6],
+
+      [:text,        'e',                  6,  7],
+      [:l_paren,     nil,                  8,  7],
+      [:requirement, '<',                  9,  7],
+      [:text,        '5',                 11,  7],
+      [:r_paren,     nil,                 12,  7],
+      [:newline,     nil,                 13,  7],
+
+      [:text,        'f',                  6,  8],
+      [:l_paren,     nil,                  8,  8],
+      [:requirement, '>=',                 9,  8],
+      [:text,        '6',                 12,  8],
+      [:r_paren,     nil,                 13,  8],
+      [:newline,     nil,                 14,  8],
+
+      [:text,        'g',                  6,  9],
+      [:l_paren,     nil,                  8,  9],
+      [:requirement, '<=',                 9,  9],
+      [:text,        '7',                 12,  9],
+      [:r_paren,     nil,                 13,  9],
+      [:newline,     nil,                 14,  9],
+
+      [:text,        'h',                  6, 10],
+      [:l_paren,     nil,                  8, 10],
+      [:requirement, '~>',                 9, 10],
+      [:text,        '8',                 12, 10],
+      [:r_paren,     nil,                 13, 10],
+      [:newline,     nil,                 14, 10],
+
+      [:newline,     nil,                  0, 11],
+
+      [:section,     'PLATFORMS',          0, 12],
+      [:newline,     nil,                  9, 12],
+
+      [:text,        Gem::Platform::RUBY,  2, 13],
+      [:newline,     nil,                  6, 13],
+
+      [:newline,     nil,                  0, 14],
+
+      [:section,     'DEPENDENCIES',       0, 15],
+      [:newline,     nil,                 12, 15],
+
+      [:text,        'a',                  2, 16],
+      [:newline,     nil,                  3, 16],
+    ]
+
+    assert_equal expected, tokenize_lockfile
+  end
+
+  def test_tokenize_capitals
+    write_lockfile <<-LOCKFILE
+GEM
+  remote: #{@gem_repo}
+  specs:
+    Ab (2)
+
+PLATFORMS
+  #{Gem::Platform::RUBY}
+
+DEPENDENCIES
+  Ab
+    LOCKFILE
+
+    expected = [
+      [:section, 'GEM',                0, 0],
+      [:newline, nil,                  3, 0],
+      [:entry,   'remote',             2, 1],
+      [:text,    @gem_repo,           10, 1],
+      [:newline, nil,                 34, 1],
+      [:entry,   'specs',              2, 2],
+      [:newline, nil,                  8, 2],
+      [:text,    'Ab',                 4, 3],
+      [:l_paren, nil,                  7, 3],
+      [:text,    '2',                  8, 3],
+      [:r_paren, nil,                  9, 3],
+      [:newline, nil,                 10, 3],
+      [:newline, nil,                  0, 4],
+      [:section, 'PLATFORMS',          0, 5],
+      [:newline, nil,                  9, 5],
+      [:text,    Gem::Platform::RUBY,  2, 6],
+      [:newline, nil,                  6, 6],
+      [:newline, nil,                  0, 7],
+      [:section, 'DEPENDENCIES',       0, 8],
+      [:newline, nil,                 12, 8],
+      [:text,    'Ab',                 2, 9],
+      [:newline, nil,                  4, 9],
+    ]
+
+    assert_equal expected, tokenize_lockfile
+  end
+
+  def test_tokenize_conflict_markers
+    write_lockfile '<<<<<<<'
+
+    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
+      tokenize_lockfile
+    end
+
+    assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
+                 e.message
+
+    write_lockfile '|||||||'
+
+    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
+      tokenize_lockfile
+    end
+
+    assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
+                 e.message
+
+    write_lockfile '======='
+
+    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
+      tokenize_lockfile
+    end
+
+    assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
+                 e.message
+
+    write_lockfile '>>>>>>>'
+
+    e = assert_raises Gem::RequestSet::Lockfile::ParseError do
+      tokenize_lockfile
+    end
+
+    assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
+                 e.message
+  end
+
+  def test_tokenize_git
+    write_lockfile <<-LOCKFILE
+DEPENDENCIES
+  a!
+    LOCKFILE
+
+    expected = [
+      [:section, 'DEPENDENCIES',  0,  0],
+      [:newline, nil,            12,  0],
+
+      [:text,    'a',             2,  1],
+      [:bang,    nil,             3,  1],
+      [:newline, nil,             4,  1],
+    ]
+
+    assert_equal expected, tokenize_lockfile
+  end
+
+  def test_tokenize_multiple
+    write_lockfile <<-LOCKFILE
+GEM
+  remote: #{@gem_repo}
+  specs:
+    a (2)
+      b (~> 3.0, >= 3.0.1)
+    LOCKFILE
+
+    expected = [
+      [:section,     'GEM',      0,  0],
+      [:newline,     nil,        3,  0],
+
+      [:entry,       'remote',   2,  1],
+      [:text,        @gem_repo, 10,  1],
+      [:newline,     nil,       34,  1],
+
+      [:entry,       'specs',    2,  2],
+      [:newline,     nil,        8,  2],
+
+      [:text,        'a',        4,  3],
+      [:l_paren,     nil,        6,  3],
+      [:text,        '2',        7,  3],
+      [:r_paren,     nil,        8,  3],
+      [:newline,     nil,        9,  3],
+
+      [:text,        'b',        6,  4],
+      [:l_paren,     nil,        8,  4],
+      [:requirement, '~>',       9,  4],
+      [:text,        '3.0',     12,  4],
+      [:comma,       nil,       15,  4],
+      [:requirement, '>=',      17,  4],
+      [:text,        '3.0.1',   20,  4],
+      [:r_paren,     nil,       25,  4],
+      [:newline,     nil,       26,  4],
+    ]
+
+    assert_equal expected, tokenize_lockfile
+  end
+
+  def test_unget
+    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new "\n"
+    tokenizer.unshift :token
+    parser = tokenizer.make_parser nil, nil
+
+    assert_equal :token, parser.get
+  end
+
+  def write_lockfile lockfile
+    open @lock_file, 'w' do |io|
+      io.write lockfile
+    end
+  end
+
+  def tokenize_lockfile
+    Gem::RequestSet::Lockfile::Tokenizer.from_file(@lock_file).to_a
+  end
+end

data/test/rubygems/test_gem_requirement.rb

@@ -347,6 +347,16 @@ class TestGemRequirement < Gem::TestCase
     refute_satisfied_by "1.0.0.1",     "= 1.0"
   end
 
+  def test_hash_with_multiple_versions
+    r1 = req('1.0', '2.0')
+    r2 = req('2.0', '1.0')
+    assert_equal r1.hash, r2.hash
+
+    r1 = req('1.0', '2.0').tap { |r| r.concat(['3.0']) }
+    r2 = req('3.0', '1.0').tap { |r| r.concat(['2.0']) }
+    assert_equal r1.hash, r2.hash
+  end
+
   # Assert that two requirements are equal. Handles Gem::Requirements,
   # strings, arrays, numbers, and versions.
 

data/test/rubygems/test_gem_specification.rb

@@ -1080,6 +1080,12 @@ dependencies: []
     assert_equal %w[true gem_name], gem.dependencies.map { |dep| dep.name }
   end
 
+  def test_add_dependency_from_existing_dependency
+    dep  = Gem::Dependency.new("existing_dep", Gem::Requirement.new('> 1'), :runtime)
+    spec = Gem::Specification.new { |s| s.add_dependency dep }
+    assert_equal dep, spec.dependencies.first
+  end
+
   def test_add_dependency_with_type_explicit
     gem = util_spec "awesome", "1.0" do |awesome|
       awesome.add_development_dependency "monkey"
@@ -1856,8 +1862,8 @@ dependencies: []
     @ext.require_paths = 'lib'
 
     expected = [
-      @ext.extension_dir,
       File.join(@gemhome, 'gems', @ext.original_name, 'lib'),
+      @ext.extension_dir,
     ]
 
     assert_equal expected, @ext.full_require_paths

data/test/rubygems/test_gem_stub_specification.rb

@@ -65,8 +65,8 @@ class TestStubSpecification < Gem::TestCase
     stub = stub_with_extension
 
     expected = [
-      stub.extension_dir,
       File.join(stub.full_gem_path, 'lib'),
+      stub.extension_dir,
     ]
 
     assert_equal expected, stub.full_require_paths

data/test/rubygems/test_gem_uninstaller.rb

@@ -385,7 +385,7 @@ create_makefile '#{@spec.name}'
     assert_match %r!Successfully uninstalled q-1!, lines.last
   end
 
-  def test_uninstall_only_lists_unsatified_deps
+  def test_uninstall_only_lists_unsatisfied_deps
     quick_gem 'r', '1' do |s| s.add_dependency 'q', '~> 1.0' end
     quick_gem 'x', '1' do |s| s.add_dependency 'q', '= 1.0'  end
     quick_gem 'q', '1.0'
@@ -409,7 +409,7 @@ create_makefile '#{@spec.name}'
     assert_match %r!Successfully uninstalled q-1.0!, lines.last
   end
 
-  def test_uninstall_doesnt_prompt_when_other_gem_satifies_requirement
+  def test_uninstall_doesnt_prompt_when_other_gem_satisfies_requirement
     quick_gem 'r', '1' do |s| s.add_dependency 'q', '~> 1.0' end
     quick_gem 'q', '1.0'
     quick_gem 'q', '1.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -262,6 +262,8 @@ files:
 - lib/rubygems/request_set.rb
 - lib/rubygems/request_set/gem_dependency_api.rb
 - lib/rubygems/request_set/lockfile.rb
+- lib/rubygems/request_set/lockfile/parser.rb
+- lib/rubygems/request_set/lockfile/tokenizer.rb
 - lib/rubygems/requirement.rb
 - lib/rubygems/resolver.rb
 - lib/rubygems/resolver/activation_request.rb
@@ -450,6 +452,8 @@ files:
 - test/rubygems/test_gem_request_set.rb
 - test/rubygems/test_gem_request_set_gem_dependency_api.rb
 - test/rubygems/test_gem_request_set_lockfile.rb
+- test/rubygems/test_gem_request_set_lockfile_parser.rb
+- test/rubygems/test_gem_request_set_lockfile_tokenizer.rb
 - test/rubygems/test_gem_requirement.rb
 - test/rubygems/test_gem_resolver.rb
 - test/rubygems/test_gem_resolver_activation_request.rb
@@ -609,6 +613,8 @@ test_files:
 - test/rubygems/test_gem_request_set.rb
 - test/rubygems/test_gem_request_set_gem_dependency_api.rb
 - test/rubygems/test_gem_request_set_lockfile.rb
+- test/rubygems/test_gem_request_set_lockfile_parser.rb
+- test/rubygems/test_gem_request_set_lockfile_tokenizer.rb
 - test/rubygems/test_gem_requirement.rb
 - test/rubygems/test_gem_resolver.rb
 - test/rubygems/test_gem_resolver_activation_request.rb