piston 2.0.8 → 2.0.9

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 8
+:patch: 9
 :major: 2
-:minor: 0
 :build: 
+:minor: 0

data/lib/piston/git/commit.rb

@@ -63,8 +63,10 @@ module Piston
         Dir.chdir(@dir) do
           logger.debug {"Saving old changes before updating"}
           git(:commit, '-a', '-m', 'old changes')
-          logger.debug {"Merging old changes with #{commit}"}
-          git(:merge, '--squash', commit)
+          target = commit
+          target = "origin/#{target}" unless target.include?("/") || target =~ /^[a-f\d]+$/i
+          logger.debug {"Merging old changes with #{target}"}
+          git(:merge, '--squash', target)
           output = git(:status)
           added = output.scan(/new file:\s+(.*)$/).flatten
           deleted = output.scan(/deleted:\s+(.*)$/).flatten
@@ -75,7 +77,10 @@ module Piston
 
       def remember_values
         # find last commit for +commit+ if it wasn't checked out
-        @sha1 = git('ls-remote', repository.url, commit).match(/\w+/)[0] unless @sha1
+        unless @sha1
+          out = git('ls-remote', repository.url, commit).match(/\w+/)
+          @sha1 = out[0] unless out.nil?
+        end
         # if ls-remote returns nothing, +commit+ must be a commit, not a branch
         @sha1 = commit unless @sha1
         { Piston::Git::COMMIT => @sha1, Piston::Git::BRANCH => commit }

data/lib/piston/revision.rb

@@ -60,7 +60,7 @@ module Piston
       raise ArgumentError, "Revision #{revision} of #{repository.url} was never checked out -- can't iterate over files" unless @dir
 
       Pathname.new(abspath).dirname.mkpath
-      FileUtils.cp(@dir + relpath, abspath)
+      FileUtils.copy_entry(@dir + relpath, abspath) unless abspath.symlink?
     end
 
     # Copies +abspath+ (an absolute path) to +relpath+ (relative to ourselves).
@@ -69,7 +69,7 @@ module Piston
 
       target = @dir + relpath
       Pathname.new(target).dirname.mkpath
-      FileUtils.cp(abspath, target)
+      FileUtils.copy_entry(abspath, target) unless abspath.symlink?
     end
 
     def remotely_modified

data/lib/piston/svn/revision.rb

@@ -106,7 +106,11 @@ module Piston
 
       private
       def relative_paths(paths)
-        paths.map { |item| Pathname.new(item).relative_path_from(@dir) }
+        # Paths taken from svn will come with backslashes. We must make sure the argument to
+        # Pathname#relative_path_from uses the same kind of slash, otherwise we get an
+        # "ArgumentError: different prefix..." error
+        rel_dir = RUBY_PLATFORM =~ /mswin/ ? Pathname.new(@dir.to_s.gsub(/\//, '\\')) : @dir
+        paths.map { |item| Pathname.new(item).relative_path_from(rel_dir) }
       end
     end
   end

data/lib/piston/svn/working_copy.rb

@@ -79,7 +79,7 @@ module Piston
         added.each do |item|
           target = path + item
           target.mkdir unless target.exist?
-          svn(:add, target)
+          svn(:add, '--parents', target)
         end
       end
 
@@ -91,7 +91,7 @@ module Piston
 
       def rename(renamed)
         renamed.each do |from, to|
-          svn(:mv, path + from, path + to)
+          svn(:mv, '--parents', path + from, path + to)
         end
       end
 

data/piston.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{piston}
-  s.version = "2.0.8"
+  s.version = "2.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francois Beausoleil"]
-  s.date = %q{2010-01-12}
+  s.date = %q{2010-08-04}
   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}
@@ -113,12 +113,11 @@ 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.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ease your vendor branch management worries}
   s.test_files = [
     "test/integration_helpers.rb",
@@ -166,7 +165,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<cucumber>, [">= 0.1.16"])
       s.add_runtime_dependency(%q<main>, [">= 2.8.3"])
       s.add_runtime_dependency(%q<log4r>, [">= 1.0.5"])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 2.0.8
+  hash: 29
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 9
+  version: 2.0.9
 platform: ruby
 authors: 
 - Francois Beausoleil
@@ -9,49 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -05:00
+date: 2010-08-04 00:00:00 -04:00
 default_executable: piston
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 1
+        - 16
         version: 0.1.16
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: main
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 2
+        - 8
+        - 3
         version: 2.8.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: log4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 0
+        - 5
         version: 1.0.5
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: 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.
 email: francois@teksol.info
 executables: 
@@ -155,7 +185,7 @@ files:
 - test/unit/working_copy/test_rememberance.rb
 - test/unit/working_copy/test_validate.rb
 - tmp/.gitignore
-has_rdoc: false
+has_rdoc: true
 homepage: http://francois.github.com/piston
 licenses: []
 
@@ -165,21 +195,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: piston
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ease your vendor branch management worries