gem-patch 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8184438e8bca43220120c8d713c90c563bfcfd4
-  data.tar.gz: 7f0602aa71171948d2e6bfa09f037fd819406d9a
+  metadata.gz: 5669ae6006115b0c89acbbc4f98c9e761f041bd9
+  data.tar.gz: 19f8c702ec9ff3b55fc7c2da9a26b3ad53b9707e
 SHA512:
-  metadata.gz: 5a4c0e65496e12db4179f0dccd295392f6ea96e16385fb6a8e9749e3f0513e34bcc8d3fafc4166078d6c0ca54dec0fcb3331d1fcb5d41a12ed288d9137c2e492
-  data.tar.gz: 302768e47f9212575d9830f2fb11d14313dc0658be3fb184038f074c41b0611ddac5046f5a2eb2a08e32f74cc3f0cf8ec6bc102267415e6e2f7cc6061bcf134a
+  metadata.gz: bffd06b0d82ecf682c0ad35f9bd91d2dbbb419d8f9600ee1bfb1c63baa335173cc07cc3e4d636217948c481199b3a80f69aeb3b6b86f743401e84d31fd28c1d0
+  data.tar.gz: 240d800db645308f36b8eeb37d7c7947c0701276bb353087813aecf0953ef29bcb3b1be5fd0966038adf221c5cdca0da081c79ce9ec6d3748e8283966829433e

data/README.md

@@ -30,6 +30,8 @@ On Fedora you can use YUM:
 | --dry-run | | Print the results from patching, but do not change any files. |
 | --verbose | | Print additional info and STDOUT from `patch` command. |
 
+For versions higher than 0.1.4 `--dry-run` switch behaviour has been changed and it's not the same as in original `patch` command. Instead, `gem-patch` lets `patch` command modify files, but doesn't override the gem to be patched nor the output file at the end. This way we can easily use dry run also for patches involving more diffs changing each other.
+
 ## Requirements
 
 This version is build for both RubyGems 1.8  and RubyGems 2.0.

data/lib/rubygems/patcher.rb

@@ -39,7 +39,7 @@ class Gem::Patcher
     build_patched_gem
 
     options[:outfile] ||= File.join(@output_dir, @package.spec.file_name)
-    FileUtils.mv((File.join @target_dir, @package.spec.file_name), options[:outfile])
+    FileUtils.mv((File.join @target_dir, @package.spec.file_name), options[:outfile]) unless options[:dry_run]
 
     # Return the path to the patched gem
     options[:outfile]
@@ -48,14 +48,13 @@ class Gem::Patcher
   def apply_patch(patch, options)
     options[:strip] ||= 1
     options[:fuzz]  ||= 2
-    dry_run = '--dry-run' if options[:dry_run]
     
     patch_path = File.expand_path(patch)
     info 'Path to the patch to apply: ' + patch_path
 
     # Apply the patch by calling 'patch -pNUMBER < patch'
     Dir.chdir @target_dir do
-      IO.popen("patch --verbose -p#{options[:strip]} --fuzz=#{options[:fuzz]} #{dry_run} < #{patch_path} 2>&1") do |out|
+      IO.popen("patch --verbose -p#{options[:strip]} --fuzz=#{options[:fuzz]} < #{patch_path} 2>&1") do |out|
         std = out.readlines
         out.close
         info std
@@ -81,6 +80,11 @@ class Gem::Patcher
     end
   end
 
+  # Return output lines
+  def output
+    @output
+  end
+
   private
 
   def extract_gem

data/rakefile.rb

@@ -4,7 +4,7 @@ require 'rdoc/task'
 
 gemspec = Gem::Specification.new do |s|
   s.name     = "gem-patch"
-  s.version  = "0.1.4"
+  s.version  = "0.1.5"
   s.platform = Gem::Platform::RUBY
   s.summary     = "RubyGems plugin for patching gems."
   s.description = <<-EOF

data/test/rubygems/test_gem_patch.rb

@@ -20,7 +20,7 @@ class TestGemPatch < Gem::TestCase
 
   def test_dry_run
     @options[:dry_run] = true
-    
+
     gemfile = bake_testing_gem
 
     patches = []
@@ -37,6 +37,25 @@ class TestGemPatch < Gem::TestCase
     # Still the same
     assert_equal original_file, file_contents('foo.rb')
   end
+
+  ##
+  # Test dry run should allow modification of the same file
+  # unlike original --dry-run switch in system patch command
+
+  def test_dry_run
+    @options[:dry_run] = true
+
+    gemfile = bake_testing_gem
+
+    patches = []
+    patches << bake_change_same_file_patch
+
+    # Creates new patched gem in @gems_dir
+    patcher = Gem::Patcher.new(gemfile, @gems_dir)
+    patched_gem = patcher.patch_with(patches, @options)
+
+    assert_equal 0, /\ASuccesfully patched with.*/ =~ patcher.output.join(' ')
+  end
   
   ##
   # Test using outfile for output
@@ -103,7 +122,7 @@ class TestGemPatch < Gem::TestCase
     package = Gem::Package.new patched_gem
     package.extract_files @gems_dir
 
-    assert_equal patched_file, file_contents('foo.rb')
+    assert_equal patched_file_with_fuzz, file_contents('foo.rb')
   end
 
   ##
@@ -204,12 +223,22 @@ class TestGemPatch < Gem::TestCase
 
     patch_path
   end
+
+  def bake_change_same_file_patch
+    patch_path = File.join(@gems_dir, 'change_same_file.patch')
+
+    File.open(patch_path, 'w') do |f|
+      f.write change_same_file_patch
+    end
+
+    patch_path
+  end
   
   def bake_change_file_with_fuzz_patch
     patch_path = File.join(@gems_dir, 'change_file_with_fuzz.patch')
 
     File.open(patch_path, 'w') do |f|
-      f.write change_file_patch
+      f.write change_file_with_fuzz_patch
     end
 
     patch_path
@@ -334,6 +363,16 @@ class TestGemPatch < Gem::TestCase
     EOF
   end
 
+  def patched_file_with_fuzz
+    <<-EOF
+      module Foo
+        def bar
+          'Patched'
+        end
+      end
+    EOF
+  end
+
   def change_file_patch
     <<-EOF
       diff -u a/lib/foo.rb b/lib/foo.rb
@@ -351,14 +390,14 @@ class TestGemPatch < Gem::TestCase
             end
     EOF
   end
-  
-  def change_file_with_fuzz_patch
+
+  def change_same_file_patch
     <<-EOF
       diff -u a/lib/foo.rb b/lib/foo.rb
-      --- a/lib/foo.rb 
+      --- a/lib/foo.rb
       +++ b/lib/foo.rb
       @@ -1,6 +1,8 @@
-             module FooBar
+             module Foo
       -        def bar
       -          'Original'
       +        class Bar
@@ -367,6 +406,37 @@ class TestGemPatch < Gem::TestCase
       +          end
                end
             end
+
+      diff -u a/lib/foo.rb b/lib/foo.rb
+      --- a/lib/foo.rb
+      +++ b/lib/foo.rb
+      @@ -1,8 +1,8 @@
+             module Foo
+      -        class Bar
+      -          def foo_bar
+      -            'Patched'
+      -          end
+      +        class NewBar
+      +          def new_foo_bar
+      +            'Patched'
+      +          end
+               end
+            end
+    EOF
+  end
+  
+  def change_file_with_fuzz_patch
+    <<-EOF
+      diff -u a/lib/foo.rb b/lib/foo.rb
+      --- a/lib/foo.rb 
+      +++ b/lib/foo.rb
+      @@ -100,5 +100,5 @@
+             module Foo
+               def bar_bar
+      -          'Original'
+      +          'Patched'
+               end
+             end
     EOF
   end
 
@@ -410,4 +480,4 @@ class TestGemPatch < Gem::TestCase
       -      end
     EOF
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-patch
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Josef Stribny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies: []
 description: |2
                       `gem-patch` is a RubyGems plugin that helps to patch gems without manually opening and rebuilding them.
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: RubyGems plugin for patching gems.