gem-compare 0.0.7 → 1.2.0

data/test/gemfiles/lorem-0.0.3/README.md

@@ -0,0 +1,29 @@
+# Lorem
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'lorem'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install lorem
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/lorem/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/test/gemfiles/lorem-0.0.3/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+

data/test/gemfiles/lorem-0.0.3/bin/lorem

@@ -0,0 +1,3 @@
+#!/usr/bin/ruby
+
+puts 'Lorem Executable!'

data/test/gemfiles/lorem-0.0.3/lib/lorem/utils.rb

@@ -0,0 +1,7 @@
+def check_something
+
+end
+
+def make_something
+
+end

data/test/gemfiles/lorem-0.0.3/lib/lorem/version.rb

@@ -0,0 +1,3 @@
+module Lorem
+  VERSION = "0.0.3"
+end

data/test/gemfiles/lorem-0.0.3/lib/lorem.rb

@@ -0,0 +1,11 @@
+require "lorem/version"
+
+module Lorem
+  def hello_world
+    puts 'Hello World'
+  end
+
+  def new_method
+    raise 'needs to be implemented'
+  end
+end

data/test/gemfiles/lorem-0.0.3/lorem.gemspec

@@ -0,0 +1,25 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'lorem/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "lorem"
+  spec.version       = Lorem::VERSION
+  spec.authors       = ["Josef Stribny"]
+  spec.email         = ["jstribny@redhat.com"]
+  spec.summary       = "lorem is a gem for testing gem-compare"
+  spec.description   = "lorem changes a lot so we can test gem-compare a lot"
+  spec.homepage      = "http://lorem.lorem"
+  spec.license       = "GPLv2"
+
+  spec.files         = ["lorem.gemspec", "bin/lorem", "CHANGELOG.md", "Gemfile", "Rakefile", "LICENSE.txt", "README.md"] +
+                       Dir.glob("lib/**/*")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "rails", ">= 4.0.0"
+  spec.add_development_dependency "bundler", "~> 1.0"
+  spec.add_development_dependency "rake", ">= 10.0.0"
+end

data/test/gemfiles/lorem-0.0.4/CHANGELOG.md

@@ -0,0 +1,21 @@
+lorem 0.0.4
+===========
+
+- change summary and description
+- make bin/lorem really executable
+- bump dependencies
+
+lorem 0.0.3
+===========
+
+- add homepage
+- add some lib files
+- add an executable file
+- change dependencies in gemspec and Gemfile
+
+lorem 0.0.2
+===========
+
+- add changelog file
+- change license to GPLv2
+- add new method to lib/lorem.rb

data/test/gemfiles/lorem-0.0.4/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in lorem.gemspec
+gemspec
+
+gem 'minitest', '5.0.0'

data/test/gemfiles/lorem-0.0.4/LICENSE.txt

@@ -0,0 +1,3 @@
+Copyright (c) 2014 Josef Stribny
+
+You can use this library under GPLv2 conditions.

data/test/gemfiles/lorem-0.0.4/README.md

@@ -0,0 +1,29 @@
+# Lorem
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'lorem'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install lorem
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/lorem/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/test/gemfiles/lorem-0.0.4/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+

data/test/gemfiles/lorem-0.0.4/bin/lorem

@@ -0,0 +1,3 @@
+#!/usr/bin/ruby
+
+puts 'Lorem Executable!'

data/test/gemfiles/lorem-0.0.4/lib/lorem/utils.rb

@@ -0,0 +1,7 @@
+def check_something
+
+end
+
+def make_something
+
+end

data/test/gemfiles/lorem-0.0.4/lib/lorem/version.rb

@@ -0,0 +1,3 @@
+module Lorem
+  VERSION = "0.0.4"
+end

data/test/gemfiles/lorem-0.0.4/lib/lorem.rb

@@ -0,0 +1,11 @@
+require "lorem/version"
+
+module Lorem
+  def hello_world
+    puts 'Hello World'
+  end
+
+  def new_method
+    raise 'needs to be implemented'
+  end
+end

data/test/gemfiles/lorem-0.0.4/lorem.gemspec

@@ -0,0 +1,25 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'lorem/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "lorem"
+  spec.version       = Lorem::VERSION
+  spec.authors       = ["Josef Stribny"]
+  spec.email         = ["jstribny@redhat.com"]
+  spec.summary       = "lorem is a gem for testing gem-compare plugin"
+  spec.description   = "lorem changes a lot so we can test gem-compare plugin a lot"
+  spec.homepage      = "http://lorem.lorem"
+  spec.license       = "GPLv2"
+
+  spec.files         = ["lorem.gemspec", "bin/lorem", "CHANGELOG.md", "Gemfile", "Rakefile", "LICENSE.txt", "README.md"] +
+                       Dir.glob("lib/**/*")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "rails", ">= 4.1.0"
+  spec.add_development_dependency "bundler", "~> 1.1"
+  spec.add_development_dependency "rake", ">= 10.0.0"
+end

data/test/rubygems/comparator/test_dir_utils.rb

@@ -7,14 +7,14 @@ class TestDirUtils < TestGemModule
     file2 = File.join(@v002, 'bin/lorem')
     file3 = File.join(@v003, 'bin/lorem')
     assert_equal 'require "lorem/version"', Gem::Comparator::DirUtils.file_first_line(file1)
-    assert_equal nil, Gem::Comparator::DirUtils.file_first_line(file2)
+    assert_nil Gem::Comparator::DirUtils.file_first_line(file2)
     assert_equal '#!/usr/bin/ruby', Gem::Comparator::DirUtils.file_first_line(file3)
   end
 
   def test_file_has_shebang?
     file1 = File.join(@v003, 'lib/lorem.rb')
     file2 = File.join(@v004, 'bin/lorem')
-    assert_equal nil, Gem::Comparator::DirUtils.file_has_shebang?(file1)
+    assert_nil Gem::Comparator::DirUtils.file_has_shebang?(file1)
     assert_equal 0, Gem::Comparator::DirUtils.file_has_shebang?(file2)
   end
 
@@ -26,17 +26,10 @@ class TestDirUtils < TestGemModule
     assert_equal false, Gem::Comparator::DirUtils.files_same_first_line?(file1, file3)
   end
 
-  def test_file_permissions
-    file1 = File.join(@v001, 'lib/lorem.rb')
-    file2 = File.join(@v004, 'bin/lorem')
-    assert_equal '100664', Gem::Comparator::DirUtils.file_permissions(file1)
-    assert_equal '100775', Gem::Comparator::DirUtils.file_permissions(file2)
-  end
-
   def test_gem_bin_file
     file1 = File.join(@v001, 'lib/lorem.rb')
     file2 = File.join(@v004, 'bin/lorem')
-    assert_equal nil, Gem::Comparator::DirUtils.gem_bin_file?(file1)
+    assert_nil Gem::Comparator::DirUtils.gem_bin_file?(file1)
     assert_equal 0, Gem::Comparator::DirUtils.gem_bin_file?(file2)
   end
 

data/test/rubygems/comparator/test_file_list_comparator.rb

@@ -5,13 +5,14 @@ class TestFileListComparator < TestGemComparator
   def test_files_comparison
     assert_equal 'DIFFERENT files:', @report['files'].header.data
     assert_equal '0.0.1->0.0.2:', @report['files'].lines(1)
-    assert_equal "CHANGELOG.md", @report['files']['0.0.1->0.0.2']['added'].lines(1)
+    assert_equal "CHANGELOG.md +6/-0", @report['files']['0.0.1->0.0.2']['added'].lines(1)
     assert_equal [], @report['files']['0.0.1->0.0.2']['deleted'].messages
     assert_equal [], @report['files']['0.0.1->0.0.2']['updated'].messages
-    assert_equal "bin/lorem", @report['files']['0.0.2->0.0.3']['added'].lines(1)
-    assert_equal "(!) Unexpected permissions: 100664", @report['files']['0.0.2->0.0.3']['added'].lines(2).strip
-    assert_equal "(!) File is not executable", @report['files']['0.0.2->0.0.3']['added'].lines(3).strip
-    assert_equal "(!) Shebang found: #!/usr/bin/ruby", @report['files']['0.0.2->0.0.3']['added'].lines(4).strip
+    assert_equal "bin/lorem +3/-0", @report['files']['0.0.2->0.0.3']['added'].lines(1)
+    assert_equal "(!) File is not executable", @report['files']['0.0.2->0.0.3']['added'].lines(2).strip
+    assert_equal "(!) Shebang found: #!/usr/bin/ruby", @report['files']['0.0.2->0.0.3']['added'].lines(3).strip
+    assert_equal "lib/lorem/utils.rb +7/-0", @report['files']['0.0.2->0.0.3']['added'].lines(4).strip
+    assert_nil @report['files']['0.0.2->0.0.3']['added'].lines(6)
     assert_equal [], @report['files']['0.0.2->0.0.3']['deleted'].messages
     assert_equal [], @report['files']['0.0.2->0.0.3']['updated'].messages
     assert_equal [], @report['files']['0.0.3->0.0.4']['added'].messages

data/test/rubygems/comparator/test_gemfile_comparator.rb

@@ -8,7 +8,7 @@ class TestGemfileComparator < TestGemComparator
     assert_equal [], @report['gemfiles']['0.0.2->0.0.3'].messages
     assert_equal [], @report['gemfiles']['0.0.3->0.0.4']['added'].messages
     assert_equal '* Deleted', @report['gemfiles']['0.0.3->0.0.4'].lines(1)
-    assert_equal ['appraisal [">= 0"]'], @report['gemfiles']['0.0.3->0.0.4']['deleted'].lines(1)
+    assert_equal ['appraisal [">= 0"] (runtime)'], @report['gemfiles']['0.0.3->0.0.4']['deleted'].lines(1)
     assert_equal ['minitest from: [">= 0"] to: ["= 5.0.0"]'], @report['gemfiles']['0.0.3->0.0.4']['updated'].lines(1)
   end
 end

data/test/rubygems/comparator/test_monitor.rb

@@ -14,12 +14,82 @@ class TestMonitor < TestGemModule
     assert_equal '++++', Gem::Comparator::Monitor.compact_files_diff(file1, file2)
   end
 
+  def test_files_added_diff
+    file1 = nil
+    file2 = File.join(@v003, 'lib/lorem/utils.rb')
+    diff = Gem::Comparator::Monitor.files_diff(file1, file2)
+    expected_diff = <<~EOF
+      @@ -0,0 +1,7 @@
+      +def check_something
+      +
+      +end
+      +
+      +def make_something
+      +
+      +end
+    EOF
+    assert_equal expected_diff, diff.split(/\n/, 3)[2]
+  end
+
+  def test_files_diff
+    file1 = File.join(@v001, 'lib/lorem.rb')
+    file2 = File.join(@v002, 'lib/lorem.rb')
+    diff = Gem::Comparator::Monitor.files_diff(file1, file2)
+    expected_diff = <<~EOF
+      @@ -6,0 +7,4 @@
+      +
+      +  def new_method
+      +    raise 'needs to be implemented'
+      +  end
+    EOF
+    assert_equal expected_diff, diff.split(/\n/, 3)[2]
+  end
+
   def test_files_permissions_changes
     file1 = File.join(@v003, 'bin/lorem')
     file2 = File.join(@v004, 'bin/lorem')
     assert_equal '(!) New permissions: 100664 -> 100775', Gem::Comparator::Monitor.files_permissions_changes(file1, file2).strip 
   end
 
+  def test_files_permissions_changes_ignores_group_writable_added
+    file1 = Tempfile.new
+    file2 = Tempfile.new
+    begin
+      File.chmod(0644, file1)
+      File.chmod(0664, file2)
+      assert_equal '', Gem::Comparator::Monitor.files_permissions_changes(file1.path, file2.path, true)
+    ensure
+      file1.unlink
+      file2.unlink
+    end
+  end
+
+  def test_files_permissions_changes_ignores_group_writable_other_changes
+    file1 = Tempfile.new
+    file2 = Tempfile.new
+    begin
+      File.chmod(0644, file1)
+      File.chmod(0660, file2)
+      assert_equal '  (!) New permissions: 100644 -> 100660', Gem::Comparator::Monitor.files_permissions_changes(file1.path, file2.path, true)
+    ensure
+      file1.unlink
+      file2.unlink
+    end
+  end
+
+  def test_files_permissions_changes_ignores_group_writable_removed
+    file1 = Tempfile.new
+    file2 = Tempfile.new
+    begin
+      File.chmod(0664, file1)
+      File.chmod(0644, file2)
+      assert_equal '', Gem::Comparator::Monitor.files_permissions_changes(file1.path, file2.path, true)
+    ensure
+      file1.unlink
+      file2.unlink
+    end
+  end
+
   def test_new_file_permissions
     file1 = File.join(@v004, 'bin/lorem')
     file2 = File.join(@v004, 'lib/lorem.rb')
@@ -27,6 +97,26 @@ class TestMonitor < TestGemModule
     assert_equal '(!) Unexpected permissions: 100664', Gem::Comparator::Monitor.new_file_permissions(file2).strip 
   end
 
+  def test_new_file_permissions_ignore_group_writable
+    file = Tempfile.new
+    begin
+      File.chmod(0664, file)
+      assert_equal '', Gem::Comparator::Monitor.new_file_permissions(file, true)
+    ensure
+      file.unlink
+    end
+  end
+
+  def test_new_file_permissions_ignore_group_writable_unreadable
+    file = Tempfile.new
+    begin
+      File.chmod(0660, file)
+      assert_equal '  (!) Unexpected permissions: 100660', Gem::Comparator::Monitor.new_file_permissions(file.path, true)
+    ensure
+      file.unlink
+    end
+  end
+
   def test_files_executability_changes
     file1 = File.join(@v003, 'bin/lorem')
     file2 = File.join(@v004, 'bin/lorem')

data/test/rubygems/comparator/test_report.rb

@@ -1,7 +1,7 @@
-require 'rubygems/test_case'
+require_relative '../../test_helper'
 require 'rubygems/comparator'
 
-class TestGemComparatorReport < Gem::TestCase
+class TestGemComparatorReport < Minitest::Test
   def setup
     super
     @report = Gem::Comparator::Report.new

data/test/rubygems/comparator/test_spec_comparator.rb

@@ -140,11 +140,6 @@ class TestSpecComparator < TestGemComparator
     assert_equal 'SAME signing_key:', @report['signing_key'].lines(0)
   end
   
-  def test_has_rdoc_comparison
-    assert_equal 'SAME has_rdoc:', @report['has_rdoc'].header.data
-    assert_equal 'SAME has_rdoc:', @report['has_rdoc'].lines(0)
-  end
-  
   def test_date_comparison
     assert_equal 'SAME date:', @report['date'].header.data
     assert_equal 'SAME date:', @report['date'].lines(0)

data/test/rubygems/comparator/test_utils.rb

@@ -1,7 +1,7 @@
-require 'rubygems/test_case'
+require_relative '../../test_helper'
 require 'rubygems/comparator'
 
-class TestGemComparatorUtils < Gem::TestCase
+class TestGemComparatorUtils < Minitest::Test
   def setup
     super
     # This should pull in Gem::Comparator::Utils

data/test/rubygems/test_gem_commands_compare_command.rb

@@ -1,11 +1,16 @@
-require 'rubygems/test_case'
+require_relative '../test_helper'
+require 'rubygems/user_interaction'
+require 'rubygems/mock_gem_ui'
 require 'rubygems/commands/compare_command'
 
-class TestGemCommandsCompareCommand < Gem::TestCase
+class TestGemCommandsCompareCommand < Minitest::Test
+  include Gem::DefaultUserInteraction
+
   def setup
     super
 
     @command = Gem::Commands::CompareCommand.new
+    @ui = Gem::MockGemUi.new
   end
 
   def test_execute_no_gemfile

data/test/test_helper.rb

@@ -1,10 +1,22 @@
-require 'rubygems/test_case'
+require 'minitest/autorun'
 require 'rubygems/comparator'
 
-class TestGemComparator < Gem::TestCase
+# The tests expects these permissions, which isn't the case if you have
+# umask 022 when cloning the repo
+def setup_file_permissions
+  gemfiles_path = File.expand_path('gemfiles', File.dirname(__FILE__))
+  File.chmod(0664, File.join(gemfiles_path, 'lorem-0.0.1', 'lib', 'lorem.rb'))
+  File.chmod(0664, File.join(gemfiles_path, 'lorem-0.0.3', 'bin', 'lorem'))
+  File.chmod(0664, File.join(gemfiles_path, 'lorem-0.0.4', 'lib', 'lorem.rb'))
+  File.chmod(0775, File.join(gemfiles_path, 'lorem-0.0.4', 'bin', 'lorem'))
+end
+
+class TestGemComparator < Minitest::Test
   def setup
     super
 
+    setup_file_permissions
+
     options = { keep_all: true, log_all: true, no_color: true, brief_mode: false }
     versions = ['0.0.1', '0.0.2', '0.0.3', '0.0.4']
 
@@ -19,9 +31,11 @@ class TestGemComparator < Gem::TestCase
   end
 end
 
-class TestGemModule < Gem::TestCase
+class TestGemModule < Minitest::Test
   def setup
     super
+    Rainbow.enabled = false
+    setup_file_permissions
     gemfiles_path = File.expand_path('gemfiles', File.dirname(__FILE__))
     @v001 = File.join(gemfiles_path, 'lorem-0.0.1')
     @v002 = File.join(gemfiles_path, 'lorem-0.0.2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-compare
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Josef Stribny
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +91,45 @@ files:
 - lib/rubygems/comparator/utils.rb
 - lib/rubygems/comparator/version.rb
 - lib/rubygems_plugin.rb
+- test/gemfiles/lorem-0.0.1.gem
+- test/gemfiles/lorem-0.0.1/Gemfile
+- test/gemfiles/lorem-0.0.1/LICENSE.txt
+- test/gemfiles/lorem-0.0.1/README.md
+- test/gemfiles/lorem-0.0.1/Rakefile
+- test/gemfiles/lorem-0.0.1/lib/lorem.rb
+- test/gemfiles/lorem-0.0.1/lib/lorem/version.rb
+- test/gemfiles/lorem-0.0.1/lorem.gemspec
+- test/gemfiles/lorem-0.0.2.gem
+- test/gemfiles/lorem-0.0.2/CHANGELOG.md
+- test/gemfiles/lorem-0.0.2/Gemfile
+- test/gemfiles/lorem-0.0.2/LICENSE.txt
+- test/gemfiles/lorem-0.0.2/README.md
+- test/gemfiles/lorem-0.0.2/Rakefile
+- test/gemfiles/lorem-0.0.2/lib/lorem.rb
+- test/gemfiles/lorem-0.0.2/lib/lorem/version.rb
+- test/gemfiles/lorem-0.0.2/lorem.gemspec
+- test/gemfiles/lorem-0.0.3.gem
+- test/gemfiles/lorem-0.0.3/CHANGELOG.md
+- test/gemfiles/lorem-0.0.3/Gemfile
+- test/gemfiles/lorem-0.0.3/LICENSE.txt
+- test/gemfiles/lorem-0.0.3/README.md
+- test/gemfiles/lorem-0.0.3/Rakefile
+- test/gemfiles/lorem-0.0.3/bin/lorem
+- test/gemfiles/lorem-0.0.3/lib/lorem.rb
+- test/gemfiles/lorem-0.0.3/lib/lorem/utils.rb
+- test/gemfiles/lorem-0.0.3/lib/lorem/version.rb
+- test/gemfiles/lorem-0.0.3/lorem.gemspec
+- test/gemfiles/lorem-0.0.4.gem
+- test/gemfiles/lorem-0.0.4/CHANGELOG.md
+- test/gemfiles/lorem-0.0.4/Gemfile
+- test/gemfiles/lorem-0.0.4/LICENSE.txt
+- test/gemfiles/lorem-0.0.4/README.md
+- test/gemfiles/lorem-0.0.4/Rakefile
+- test/gemfiles/lorem-0.0.4/bin/lorem
+- test/gemfiles/lorem-0.0.4/lib/lorem.rb
+- test/gemfiles/lorem-0.0.4/lib/lorem/utils.rb
+- test/gemfiles/lorem-0.0.4/lib/lorem/version.rb
+- test/gemfiles/lorem-0.0.4/lorem.gemspec
 - test/rubygems/comparator/test_dependency_comparator.rb
 - test/rubygems/comparator/test_dir_utils.rb
 - test/rubygems/comparator/test_file_list_comparator.rb
@@ -119,7 +144,7 @@ homepage: http://github.com/fedora-ruby/gem-compare
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,17 +152,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 3.0.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: RubyGems plugin for comparing gem versions
 test_files: []
-has_rdoc: