gem-patch 0.1.1 → 0.1.2

data/LICENCE

@@ -0,0 +1,20 @@
+Copyright (c) Josef Strzibny.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -6,13 +6,24 @@ A RubyGems plugin that patches gems.
 
 `gem-patch` is a RubyGems plugin that helps to patch gems without manually opening and rebuilding them. It opens a given .gem file, extracts it, patches it with system `patch` command, clones its spec, updates the file list and builds the patched gem.
 
+## Installation
+
+Run:
+`gem install gem-patch`
+
 ## Usage
 
 `gem patch [options] name-version.gem PATCH [PATCH ...]`
 
-Optionally with `-pNUMBER` or `--strip=NUMBER` option that sets the file name strip count to NUMBER
-(same options as for `patch` command on Linux machines).
+Options:
+
+`-pNUMBER` or `--strip=NUMBER` sets the file name strip count to NUMBER (same options as for `patch` command on Linux machines).
+`--verbose` prints additional info and STDOUT from `patch` command
 
 ## Requirements
 
 This version is build for both RubyGems 1.8  and RubyGems 2.0.
+
+## Copyright
+
+See LICENCE

data/README.rdoc

@@ -6,13 +6,20 @@ A RubyGems plugin that patches gems.
 
 `gem-patch` is a RubyGems plugin that helps to patch gems without manually opening and rebuilding them. It opens a given .gem file, extracts it, patches it with system `patch` command, clones its spec, updates the file list and builds the patched gem.
 
+== Installation
+
+Run:
+`gem install gem-patch`
+
 == Usage
 
 `gem patch [options] name-version.gem PATCH [PATCH ...]`
 
-Optionally with `-pNUMBER` or `--strip=NUMBER` option that sets the file name strip count to NUMBER
-(same options as for `patch` command on Linux machines).
+Options:
+
+`-pNUMBER` or `--strip=NUMBER` sets the file name strip count to NUMBER (same options as for `patch` command on Linux machines).
+`--verbose` prints additional info and STDOUT from `patch` command
 
 == Requirements
 
-This version is build for RubyGems 2.0.a, a branch for RubyGems 1.8 is also available.
+This version is build for RubyGems 2.0.a, a branch for RubyGems 1.8 is also available.

data/lib/rubygems/commands/patch_command.rb

@@ -50,5 +50,6 @@ class Gem::Commands::PatchCommand < Gem::Command
 
     patcher = Gem::Patcher.new(gemfile, options[:output])
     patcher.patch_with(patches, options[:strip]) 
+    patcher.print_results
   end
 end

data/lib/rubygems/patcher.rb

@@ -25,6 +25,8 @@ class Gem::Patcher
   # Patch the gem, move the new patched gem to the working directory and return the path
 
   def patch_with(patches, strip_number)
+    @output = []
+
     check_patch_command_is_installed
     extract_gem
 
@@ -36,15 +38,11 @@ class Gem::Patcher
 
     build_patched_gem
 
-    # Move the newly generated gem to the working directory
-    gem_file = IO.read(File.join @target_dir, @package.spec.file_name)
-
-    File.open(File.join(@output_dir, @package.spec.file_name), 'w') do |f|
-      f.write gem_file
-    end
+    new_gem_path = File.join(@output_dir, @package.spec.file_name)
+    FileUtils.mv((File.join @target_dir, @package.spec.file_name), new_gem_path)
 
     # Return the path to the patched gem
-    File.join @output_dir, "#{@package.spec.file_name}"
+    new_gem_path
   end
 
   def apply_patch(patch, strip_number)
@@ -53,14 +51,32 @@ class Gem::Patcher
 
     # Apply the patch by calling 'patch -pNUMBER < patch'
     Dir.chdir @target_dir do
-      if system("patch --verbose -p#{strip_number} < #{patch_path}")
-        info 'Succesfully patched by ' + patch
-      else
-        info 'Error: Unable to patch with ' + patch
+      IO.popen("patch --verbose -p#{strip_number} < #{patch_path} 2>&1") do |out|
+        std = out.readlines
+        out.close
+        info std
+
+        unless $?.nil?
+          if $?.exitstatus == 0
+            @output << "Succesfully patched with #{patch}"
+          else
+            @output << "Error: Unable to patch with #{patch}."
+
+            unless Gem.configuration.really_verbose
+              @output << "Run gem patch with --verbose option to swich to verbose mode."
+            end
+          end
+        end
       end
     end
   end
 
+  def print_results
+    @output.each do |msg|
+      say msg 
+    end
+  end
+
   private
 
   def extract_gem
@@ -83,7 +99,7 @@ class Gem::Patcher
   end
 
   def info(msg)
-    say msg if Gem.configuration.verbose
+    say msg if Gem.configuration.really_verbose
   end
 
   def files_in_gem
@@ -121,7 +137,9 @@ class Gem::Patcher
   end
 
   def check_patch_command_is_installed
-    unless system("patch --version")
+    result = IO.popen('patch --version') 
+    
+    unless /^patch\s\d\.\d\./.match result.readlines[0]
       raise PatchCommandMissing, 'Calling `patch` command failed. Do you have it installed?'
     end
   end

data/rakefile.rb

@@ -4,7 +4,7 @@ require 'rdoc/task'
 
 gemspec = Gem::Specification.new do |s|
   s.name     = "gem-patch"
-  s.version  = "0.1.1"
+  s.version  = "0.1.2"
   s.platform = Gem::Platform::RUBY
   s.summary     = "RubyGems plugin for patching gems."
   s.description = <<-EOF
@@ -12,12 +12,13 @@ gemspec = Gem::Specification.new do |s|
                     It opens a given .gem file, extracts it, patches it with system `patch` command,
                     clones its spec, updates the file list and builds the patched gem.
                   EOF
+  s.homepage = "http://github.com/strzibny/gem-patch"
   s.licenses = ["MIT"]
   s.author   = "Josef Stribny"
   s.email    = "jstribny@redhat.com"
   s.required_ruby_version     = ">= 1.8.7"
   s.required_rubygems_version = ">= 1.8.0"
-  s.files = FileList["README.md", "README.rdoc", "rakefile.rb",
+  s.files = FileList["README.md", "README.rdoc", "LICENCE", "rakefile.rb",
                       "lib/**/*.rb", "test/**/test*.rb"]
 end
 
@@ -35,4 +36,4 @@ Rake::TestTask.new('test') do |t|
   t.verbose = true
 end
 
-task :default => [:test]
+task :default => [:test]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-patch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies: []
 description: ! "                    `gem-patch` is a RubyGems plugin that helps to
   patch gems without manually opening and rebuilding them.\n                    It
@@ -23,6 +23,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - README.rdoc
+- LICENCE
 - rakefile.rb
 - lib/rubygems_plugin.rb
 - lib/rubygems/package-1.8.rb
@@ -30,7 +31,7 @@ files:
 - lib/rubygems/commands/patch_command.rb
 - test/rubygems/test_gem_patch.rb
 - test/rubygems/test_gem_commands_patch_command.rb
-homepage: 
+homepage: http://github.com/strzibny/gem-patch
 licenses:
 - MIT
 post_install_message: