svp 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,11 @@
 [REVISION 20061018]
 
+[NEW] Don't allow update if pending changes on client. Need to fix this at some point!
+
+[NEW] Commit messages more like svn.
+
+[CHANGED] Removed debugging.
+
+[NEW] Added abbreviations.
+
 [NEW] Initial revision.

data/lib/svp/cli.rb

@@ -6,12 +6,30 @@ require 'svp/workspace'
 
 module Svp
   module CLI
+    ABBREVIATIONS = {
+      "ci" => "commit",
+      "co" => "checkout",
+      "cp" => "copy",
+      "del" => "delete",
+      "remove" => "delete",
+      "rm" => "delete",
+      "di" => "diff",
+      "st" => "status",
+      "stat" => "status",
+      "up" => "update",
+      "mv" => "move",
+      "ren" => "move",
+      "rename" => "rename"
+    }
+    
     def self.execute!
       work_dir = ENV["PWD"]
       command = ARGV.first
       args = ARGV[1..-1]
       config = nil
-      
+
+      command = ABBREVIATIONS[command] || command
+
       if command == "version"
         puts "svp, version #{VERSION::STRING}"
         puts "Copyright (c) 2006 RedHill Consulting, Pty. Ltd.  All rights reserved."

data/lib/svp/p4.rb

@@ -13,7 +13,8 @@ module Svp
     end
 
     def initialize(depot_uri, local_dir)
-      @depot_uri, @local_dir = depot_uri, local_dir
+      @depot_uri = depot_uri
+      @local_dir = local_dir
       @client_name = "tmp_#{Socket.gethostname}"
     end
 
@@ -47,15 +48,10 @@ EOS
       @success = false
       begin
         if input
-          print command
-          print "<"
-          print input
           output = IO.popen(command_line(command), 'r+') { |io| io.puts input; io.close_write; io.read }
         else
-          puts command
           output = IO.popen(command_line(command)) { |io| io.read }
         end
-        print output
         output
       ensure
         @success = $?.success?

data/lib/svp/version.rb

@@ -2,7 +2,7 @@ module Svp #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/svp/workspace.rb

@@ -24,6 +24,7 @@ module Svp
       changes = changes(paths)
       remote_exec do |p4|
         changes.each { |change| change.prepare_to_commit(p4) }
+        puts "Transmitting file data ..."
         if p4.submit =~ /^Change (\d+) submitted./
           @revision = $1.to_i
           changes.each { |change| change.commit }
@@ -67,7 +68,10 @@ module Svp
     end
 
     def update(*remove_me)
-      # raise "Local changes may cause conflicts" if !changes.empty?
+      if !changes.empty?
+        puts "Local changes may cause conflicts"
+        return
+      end
 
       remote_exec do |p4|
         p4.changes("-m 1").scan(/^Change (\d+) on/) do |revision|

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: svp
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 date: 2006-10-18 00:00:00 +10:00
 summary: SVN facade for Perforce. Supports offline diff, status, revert. Doesn't require a permanent client configuration.
 require_paths: