francois-piston 2.0.5 → 2.0.6

data/History.txt

@@ -1,3 +1,14 @@
+== 2.0.6 2009-08-01
+
+* Fixed a couple of bugs:
+  - Chris Gibson: When forcing the repository type, Piston would break because
+                  it called #downcase on a Symbol. 1bcc16bf8 
+  - Terry Heath:  Subversion's --non-interactive would prevent OS X's keychain
+                  from kicking in. 93d9a957
+  - Florian Aßmann: In certain cases, the revision would be a String, and
+                    other times it would be an Integer.  Normalize before
+                    comparing. 40c0bc4e
+
 == 2.0.4 2009-07-20
 
 * Enable git support to work with more versions of Git by specifying th

data/VERSION.yml

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

data/lib/piston/commands/import.rb

@@ -12,7 +12,7 @@ module Piston
       def select_repository(repository_url)
         if repository_type then
           logger.info {"Forced repository type to #{repository_type}"}
-          repository_class_name = "Piston::#{repository_type.downcase.capitalize}::Repository"
+          repository_class_name = "Piston::#{repository_type.to_s.downcase.capitalize}::Repository"
           repository_class = repository_class_name.constantize
           repository_class.new(repository_url)
         else

data/lib/piston/git/working_copy.rb

@@ -55,11 +55,11 @@ module Piston
       end
 
       def after_remember(path)
-        Dir.chdir(self.path) { git(:add, "-f", path.relative_path_from(self.path)) }
+        Dir.chdir(self.path) { git(:add, "--force", path.relative_path_from(self.path)) }
       end
 
       def finalize
-        Dir.chdir(path) { git(:add, "-f", ".") }
+        Dir.chdir(path) { git(:add, "--force", ".") }
       end
 
       def add(added)

data/lib/piston/svn/revision.rb

@@ -26,7 +26,7 @@ module Piston
         if answer =~ /Checked out revision (\d+)[.]/ then
           if revision == "HEAD" then
             @revision = $1.to_i
-          elsif revision != $1.to_i then
+          elsif revision.to_i != $1.to_i then
             raise InvalidRevision, "Did not get the revision I wanted to checkout.  Subversion checked out #{$1}, I wanted #{revision}"
           end
         else
@@ -37,7 +37,7 @@ module Piston
       def update_to(revision)
         raise ArgumentError, "Revision #{self.revision} of #{repository.url} was never checked out -- can't update" unless @dir
         
-        answer = svn(:update, "--non-interactive", "--revision", revision, @dir)
+        answer = svn(:update, "--revision", revision, @dir)
         if answer =~ /(Updated to|At) revision (\d+)[.]/ then
           if revision == "HEAD" then
             @revision = $2.to_i

data/lib/piston/svn/working_copy.rb

@@ -102,7 +102,7 @@ module Piston
 
       def merge_local_changes(revision)
         logger.debug {"Update to #{revision} in order to merge local changes"}
-        svn(:update, "--non-interactive", path)
+        svn(:update, path)
       end
 
       def status(subpath=nil)

data/piston.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{piston}
-  s.version = "2.0.5"
+  s.version = "2.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francois Beausoleil"]
-  s.date = %q{2009-07-21}
+  s.date = %q{2009-08-01}
   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}

data/test/unit/git/working_copy/test_finalization.rb

@@ -9,7 +9,7 @@ class Piston::Git::TestGitWorkingCopyFinalization < Piston::TestCase
 
   def test_finalize_adds_path_to_git
     Dir.expects(:chdir).with(@wcdir).yields
-    @wc.expects(:git).with(:add, ".")
+    @wc.expects(:git).with(:add, "--force", ".")
     @wc.finalize
   end
 end

data/test/unit/svn/revision/test_checkout.rb

@@ -16,8 +16,8 @@ class Piston::Svn::TestSvnRevisionCheckout < Piston::TestCase
   end
 
   def test_specific_revision_checkout_to_path
-    rev = new_revision(1231)
-    rev.expects(:svn).with(:checkout, "--revision", 1231, @repos.url, @wcdir).returns("Checked out revision 1231.")
+    rev = new_revision('1231')
+    rev.expects(:svn).with(:checkout, "--revision", '1231', @repos.url, @wcdir).returns("Checked out revision 1231.")
     rev.checkout_to(@wcdir)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: francois-piston
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - Francois Beausoleil
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -07:00
+date: 2009-08-01 00:00:00 -07:00
 default_executable: piston
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,6 +156,7 @@ files:
 - tmp/.gitignore
 has_rdoc: false
 homepage: http://francois.github.com/piston
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: piston
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ease your vendor branch management worries