francois-piston 2.0.5 → 2.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,14 @@
1
+ == 2.0.6 2009-08-01
2
+
3
+ * Fixed a couple of bugs:
4
+ - Chris Gibson: When forcing the repository type, Piston would break because
5
+ it called #downcase on a Symbol. 1bcc16bf8
6
+ - Terry Heath: Subversion's --non-interactive would prevent OS X's keychain
7
+ from kicking in. 93d9a957
8
+ - Florian Aßmann: In certain cases, the revision would be a String, and
9
+ other times it would be an Integer. Normalize before
10
+ comparing. 40c0bc4e
11
+
1
12
  == 2.0.4 2009-07-20
2
13
 
3
14
  * Enable git support to work with more versions of Git by specifying th
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :minor: 0
3
- :patch: 5
3
+ :patch: 6
4
4
  :major: 2
@@ -12,7 +12,7 @@ module Piston
12
12
  def select_repository(repository_url)
13
13
  if repository_type then
14
14
  logger.info {"Forced repository type to #{repository_type}"}
15
- repository_class_name = "Piston::#{repository_type.downcase.capitalize}::Repository"
15
+ repository_class_name = "Piston::#{repository_type.to_s.downcase.capitalize}::Repository"
16
16
  repository_class = repository_class_name.constantize
17
17
  repository_class.new(repository_url)
18
18
  else
@@ -55,11 +55,11 @@ module Piston
55
55
  end
56
56
 
57
57
  def after_remember(path)
58
- Dir.chdir(self.path) { git(:add, "-f", path.relative_path_from(self.path)) }
58
+ Dir.chdir(self.path) { git(:add, "--force", path.relative_path_from(self.path)) }
59
59
  end
60
60
 
61
61
  def finalize
62
- Dir.chdir(path) { git(:add, "-f", ".") }
62
+ Dir.chdir(path) { git(:add, "--force", ".") }
63
63
  end
64
64
 
65
65
  def add(added)
@@ -26,7 +26,7 @@ module Piston
26
26
  if answer =~ /Checked out revision (\d+)[.]/ then
27
27
  if revision == "HEAD" then
28
28
  @revision = $1.to_i
29
- elsif revision != $1.to_i then
29
+ elsif revision.to_i != $1.to_i then
30
30
  raise InvalidRevision, "Did not get the revision I wanted to checkout. Subversion checked out #{$1}, I wanted #{revision}"
31
31
  end
32
32
  else
@@ -37,7 +37,7 @@ module Piston
37
37
  def update_to(revision)
38
38
  raise ArgumentError, "Revision #{self.revision} of #{repository.url} was never checked out -- can't update" unless @dir
39
39
 
40
- answer = svn(:update, "--non-interactive", "--revision", revision, @dir)
40
+ answer = svn(:update, "--revision", revision, @dir)
41
41
  if answer =~ /(Updated to|At) revision (\d+)[.]/ then
42
42
  if revision == "HEAD" then
43
43
  @revision = $2.to_i
@@ -102,7 +102,7 @@ module Piston
102
102
 
103
103
  def merge_local_changes(revision)
104
104
  logger.debug {"Update to #{revision} in order to merge local changes"}
105
- svn(:update, "--non-interactive", path)
105
+ svn(:update, path)
106
106
  end
107
107
 
108
108
  def status(subpath=nil)
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{piston}
5
- s.version = "2.0.5"
5
+ s.version = "2.0.6"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Francois Beausoleil"]
9
- s.date = %q{2009-07-21}
9
+ s.date = %q{2009-08-01}
10
10
  s.default_executable = %q{piston}
11
11
  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.}
12
12
  s.email = %q{francois@teksol.info}
@@ -9,7 +9,7 @@ class Piston::Git::TestGitWorkingCopyFinalization < Piston::TestCase
9
9
 
10
10
  def test_finalize_adds_path_to_git
11
11
  Dir.expects(:chdir).with(@wcdir).yields
12
- @wc.expects(:git).with(:add, ".")
12
+ @wc.expects(:git).with(:add, "--force", ".")
13
13
  @wc.finalize
14
14
  end
15
15
  end
@@ -16,8 +16,8 @@ class Piston::Svn::TestSvnRevisionCheckout < Piston::TestCase
16
16
  end
17
17
 
18
18
  def test_specific_revision_checkout_to_path
19
- rev = new_revision(1231)
20
- rev.expects(:svn).with(:checkout, "--revision", 1231, @repos.url, @wcdir).returns("Checked out revision 1231.")
19
+ rev = new_revision('1231')
20
+ rev.expects(:svn).with(:checkout, "--revision", '1231', @repos.url, @wcdir).returns("Checked out revision 1231.")
21
21
  rev.checkout_to(@wcdir)
22
22
  end
23
23
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: francois-piston
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.5
4
+ version: 2.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Francois Beausoleil
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-07-21 00:00:00 -07:00
12
+ date: 2009-08-01 00:00:00 -07:00
13
13
  default_executable: piston
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -156,6 +156,7 @@ files:
156
156
  - tmp/.gitignore
157
157
  has_rdoc: false
158
158
  homepage: http://francois.github.com/piston
159
+ licenses:
159
160
  post_install_message:
160
161
  rdoc_options:
161
162
  - --charset=UTF-8
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
176
177
  requirements: []
177
178
 
178
179
  rubyforge_project: piston
179
- rubygems_version: 1.2.0
180
+ rubygems_version: 1.3.5
180
181
  signing_key:
181
182
  specification_version: 3
182
183
  summary: Ease your vendor branch management worries