hoe-seattlerb 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.1 / 2013-05-10
+
+* 1 bug fix:
+
+  * Make perforce releases more resilient to working on different branch dirs
+
 === 1.3.0 / 2013-04-09
 
 * 3 minor enhancements:

data/lib/hoe/perforce.rb

@@ -48,17 +48,20 @@ module Hoe::Perforce
 
     desc "branch the project from dev to version dir"
     task :branch do
+      original_dir = File.basename(Dir.pwd)
+
       Dir.chdir ".."
 
-      target_dir = File.directory?(version) ? version : "dev"
-      branching  = target_dir == "dev"
+      target_dir = File.directory?(version) ? version : original_dir
+      branching  = target_dir == original_dir
       pkg = File.basename(Dir.pwd)
 
       begin
-        p4_integrate "dev", version if branching
+        p4_integrate original_dir, version if branching
         validate_manifest_file version
         p4_submit "Branching #{pkg} to version #{version}" if branching
       rescue => e
+        warn e
         p4_revert version
         raise e
       end
@@ -144,8 +147,8 @@ module Hoe::Perforce
   # Branch a release from +from+ to +to+.
 
   def p4_integrate from, to
-    opened = `p4 opened ... 2>&1`
-    raise "You have files open" unless opened =~ /file\(s\) not opened/
+    opened = `p4 opened #{from}/... #{to}/... 2>&1`
+    raise "You have files open" if opened =~ /\/\/[^#]+#\d+/
     p4sh "p4 integrate #{from}/... #{to}/..."
   end
 

data/lib/hoe/seattlerb.rb

@@ -7,7 +7,7 @@ class Hoe; end # :nodoc: stfu rdoc... *sigh*
 # pull in other default plugins.
 
 module Hoe::Seattlerb
-  VERSION = "1.3.0" # :nodoc:
+  VERSION = "1.3.1" # :nodoc:
 
   ##
   # Define seattlerb's rdoc location.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe-seattlerb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-04-10 00:00:00 Z
+date: 2013-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -46,11 +46,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
-        - 4
-        - 7
-        version: "4.7"
+        - 5
+        - 0
+        version: "5.0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 3
-        - 5
-        version: "3.5"
+        - 6
+        version: "3.6"
   type: :development
   version_requirements: *id003
 description: |-