perforce 0.5.0 → 1.0.0

data/lib/perforce.rb

@@ -163,11 +163,11 @@ class Perforce
   def root
     dir = run(*%w(client -o)).first["Root"]
     if CYGWIN
-      unix_dir = Util.unix_path(dir)
-      if dir != unix_dir
-        add_unix_root
-      end
-      unix_dir
+      Util.unix_path(dir).tap { |unix_dir|
+        if dir != unix_dir
+          add_unix_root
+        end
+      }
     else
       dir
     end
@@ -198,13 +198,28 @@ class Perforce
   #
   # Change working directory (locally and remotely).
   #
+  # If a block is given, the original working directory is restored
+  # when the block exits.  (Behavior is like Dir.chdir.)
+  #
   def chdir(dir)
     previous_dir = File.expand_path(".")
-    Dir.chdir(dir) {
+
+    Dir.chdir(dir)
+    begin
       @p4.cwd = File.expand_path(".")
-      yield
-    }
-    @p4.cwd = previous_dir
+    rescue
+      Dir.chdir(previous_dir)
+      raise
+    end
+
+    if block_given?
+      begin
+        yield dir
+      ensure
+        Dir.chdir(previous_dir)
+        @p4.cwd = previous_dir
+      end
+    end
   end
 
   #
@@ -231,8 +246,9 @@ class Perforce
     if CYGWIN
       begin
         go.call
-      rescue P4Exception
-        if @p4.connected?
+      rescue P4Exception => exception
+        if @p4.connected? and
+            exception.message =~ %r!not under client\'s root!
           # maybe unix root is not present; try again
           add_unix_root
           go.call

data/perforce.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new { |t| 
   t.name = "perforce"
-  t.version = "0.5.0"
+  t.version = "1.0.0"
   t.summary = "Streamlined wrapper for p4ruby"
   t.author = "James M. Lawrence"
   t.email = "quixoticsycophant@gmail.com"

data/test/test_main.rb

@@ -1,6 +1,12 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+
+begin
+  require 'perforce'
+rescue LoadError
+  require 'rubygems'
+  require 'perforce'
+end
 
-require 'rubygems'
-require 'perforce'
 require 'pp'
 
 def report(desc)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: perforce
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-07 00:00:00 -04:00
+date: 2008-09-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency