hoe-seattlerb 1.3.0 → 1.3.1

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.
Files changed (6) hide show
  1. data.tar.gz.sig +0 -0
  2. data/History.txt +6 -0
  3. data/lib/hoe/perforce.rb +8 -5
  4. data/lib/hoe/seattlerb.rb +1 -1
  5. metadata +11 -11
  6. metadata.gz.sig +0 -0
data.tar.gz.sig CHANGED
Binary file
data/History.txt CHANGED
@@ -1,3 +1,9 @@
1
+ === 1.3.1 / 2013-05-10
2
+
3
+ * 1 bug fix:
4
+
5
+ * Make perforce releases more resilient to working on different branch dirs
6
+
1
7
  === 1.3.0 / 2013-04-09
2
8
 
3
9
  * 3 minor enhancements:
data/lib/hoe/perforce.rb CHANGED
@@ -48,17 +48,20 @@ module Hoe::Perforce
48
48
 
49
49
  desc "branch the project from dev to version dir"
50
50
  task :branch do
51
+ original_dir = File.basename(Dir.pwd)
52
+
51
53
  Dir.chdir ".."
52
54
 
53
- target_dir = File.directory?(version) ? version : "dev"
54
- branching = target_dir == "dev"
55
+ target_dir = File.directory?(version) ? version : original_dir
56
+ branching = target_dir == original_dir
55
57
  pkg = File.basename(Dir.pwd)
56
58
 
57
59
  begin
58
- p4_integrate "dev", version if branching
60
+ p4_integrate original_dir, version if branching
59
61
  validate_manifest_file version
60
62
  p4_submit "Branching #{pkg} to version #{version}" if branching
61
63
  rescue => e
64
+ warn e
62
65
  p4_revert version
63
66
  raise e
64
67
  end
@@ -144,8 +147,8 @@ module Hoe::Perforce
144
147
  # Branch a release from +from+ to +to+.
145
148
 
146
149
  def p4_integrate from, to
147
- opened = `p4 opened ... 2>&1`
148
- raise "You have files open" unless opened =~ /file\(s\) not opened/
150
+ opened = `p4 opened #{from}/... #{to}/... 2>&1`
151
+ raise "You have files open" if opened =~ /\/\/[^#]+#\d+/
149
152
  p4sh "p4 integrate #{from}/... #{to}/..."
150
153
  end
151
154
 
data/lib/hoe/seattlerb.rb CHANGED
@@ -7,7 +7,7 @@ class Hoe; end # :nodoc: stfu rdoc... *sigh*
7
7
  # pull in other default plugins.
8
8
 
9
9
  module Hoe::Seattlerb
10
- VERSION = "1.3.0" # :nodoc:
10
+ VERSION = "1.3.1" # :nodoc:
11
11
 
12
12
  ##
13
13
  # Define seattlerb's rdoc location.
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hoe-seattlerb
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
4
+ hash: 25
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 3
9
- - 0
10
- version: 1.3.0
9
+ - 1
10
+ version: 1.3.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
36
36
  FBHgymkyj/AOSqKRIpXPhjC6
37
37
  -----END CERTIFICATE-----
38
38
 
39
- date: 2013-04-10 00:00:00 Z
39
+ date: 2013-05-10 00:00:00 Z
40
40
  dependencies:
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: minitest
@@ -46,11 +46,11 @@ dependencies:
46
46
  requirements:
47
47
  - - ~>
48
48
  - !ruby/object:Gem::Version
49
- hash: 21
49
+ hash: 31
50
50
  segments:
51
- - 4
52
- - 7
53
- version: "4.7"
51
+ - 5
52
+ - 0
53
+ version: "5.0"
54
54
  type: :development
55
55
  version_requirements: *id001
56
56
  - !ruby/object:Gem::Dependency
@@ -76,11 +76,11 @@ dependencies:
76
76
  requirements:
77
77
  - - ~>
78
78
  - !ruby/object:Gem::Version
79
- hash: 13
79
+ hash: 11
80
80
  segments:
81
81
  - 3
82
- - 5
83
- version: "3.5"
82
+ - 6
83
+ version: "3.6"
84
84
  type: :development
85
85
  version_requirements: *id003
86
86
  description: |-
metadata.gz.sig CHANGED
Binary file