piston 2.0.6 → 2.0.7

data/Rakefile

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'rake'
+
 Dir["tasks/**/*.rake"].each { |rake| load rake }
 
 begin
@@ -18,8 +21,9 @@ begin
     s.add_runtime_dependency "log4r", ">= 1.0.5"
     s.add_runtime_dependency "activesupport", ">= 2.0.0"
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
 task :default => :test

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 6
+:patch: 7
 :major: 2

data/lib/piston/git/working_copy.rb

@@ -74,7 +74,7 @@ module Piston
 
       def delete(deleted)
         Dir.chdir(path) do
-          deleted.each { |item| git(:rm, item) }
+          deleted.each { |item| git(:rm, "-r", item) }
         end
       end
 

data/lib/piston/working_copy.rb

@@ -269,36 +269,6 @@ module Piston
       end
     end
 
-    def diff
-      tmpdir = temp_dir_name
-      begin
-        logger.info {"Checking out the repository at #{revision.revision}"}
-        revision = repository.at(:head)
-        revision.checkout_to(tmpdir)
-
-        excludes = (['.piston.yml'] + exclude_for_diff + revision.exclude_for_diff).uniq.collect {|pattern| "--exclude=#{pattern}"}.join ' '
-        system("diff -urN #{excludes} '#{tmpdir}' '#{path}'")
-      ensure
-        logger.debug {"Removing temporary directory: #{tmpdir}"}
-        tmpdir.rmtree rescue nil
-      end
-    end
-
-    def diff
-      tmpdir = temp_dir_name
-      begin
-        logger.info {"Checking out the repository at #{revision.revision}"}
-        revision = repository.at(:head)
-        revision.checkout_to(tmpdir)
-
-        excludes = (['.piston.yml'] + exclude_for_diff + revision.exclude_for_diff).uniq.collect {|pattern| "--exclude=#{pattern}"}.join ' '
-        system("diff -urN #{excludes} '#{tmpdir}' '#{path}'")
-      ensure
-        logger.debug {"Removing temporary directory: #{tmpdir}"}
-        tmpdir.rmtree rescue nil
-      end
-    end
-
     def temp_dir_name
       path.parent + ".#{path.basename}.tmp"
     end

data/piston.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{piston}
-  s.version = "2.0.6"
+  s.version = "2.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francois Beausoleil"]
-  s.date = %q{2009-08-01}
+  s.date = %q{2009-10-22}
   s.default_executable = %q{piston}
   s.description = %q{Piston makes it easy to merge vendor branches into your own repository, without worrying about which revisions were grabbed or not.  Piston will also keep your local changes in addition to the remote changes.}
   s.email = %q{francois@teksol.info}
@@ -109,11 +112,12 @@ Gem::Specification.new do |s|
      "test/unit/working_copy/test_validate.rb",
      "tmp/.gitignore"
   ]
+  s.has_rdoc = false
   s.homepage = %q{http://francois.github.com/piston}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{piston}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ease your vendor branch management worries}
   s.test_files = [
     "test/integration_helpers.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors: 
 - Francois Beausoleil
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-01 00:00:00 -04:00
+date: 2009-10-22 00:00:00 -04:00
 default_executable: piston
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: piston
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ease your vendor branch management worries