svp 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,3 +1,3 @@
-[REVISION 20061015]
+[REVISION 20061018]
 
 [NEW] Initial revision.

data/Rakefile

@@ -11,7 +11,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'svp', 'version')
 
 AUTHOR = "Simon Harris"
 EMAIL = "support@redhillconsulting.com.au"
-DESCRIPTION = "description of gem"
+DESCRIPTION = "SVN facade for Perforce. Supports offline diff, status, revert. Doesn't require a permanent client configuration."
 HOMEPATH = 'http://svp.rubyforge.org'
 BIN_FILES = %w( svp )
 

data/lib/svp/add.rb

@@ -13,7 +13,7 @@ module Svp
       p4.add(@work_file)
     end
 
-    def commit(p4)
+    def commit
       FileUtils.mkdir_p(File.dirname(@base_file))
       FileUtils.cp(@work_file, @base_file)
     end

data/lib/svp/cli.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'uri'
 require 'yaml'
+require 'svp/version'
 require 'svp/workspace'
 
 module Svp
@@ -10,11 +11,17 @@ module Svp
       command = ARGV.first
       args = ARGV[1..-1]
       config = nil
+      
+      if command == "version"
+        puts "svp, version #{VERSION::STRING}"
+        puts "Copyright (c) 2006 RedHill Consulting, Pty. Ltd.  All rights reserved."
+        exit
+      end
 
       if command == "checkout"
         depot_uri = args[0]
         work_dir = File.join(work_dir, args[1] || File.basename(depot_uri))
-        config = { "revision" => 0, "depot_uri" => depot_uri }
+        config = { "revision" => 0, "depot_uri" => depot_uri, "ignores" => [] }
         command = "update"
       end
 
@@ -23,9 +30,10 @@ module Svp
 
       config = YAML::load(IO.read(config_file)) unless config
 
-      workspace = Workspace.new(URI.parse(config["depot_uri"]), work_dir, svp_dir, config["revision"])
-      workspace.send(command.to_sym, args)
+      workspace = Workspace.new(URI.parse(config["depot_uri"]), work_dir, svp_dir, config["revision"], config["ignores"])
+      workspace.send(command.to_sym, *args)
       config["revision"] = workspace.revision
+      config["ignores"] = workspace.ignores
 
       File.open(config_file, "w") { |io| YAML::dump(config, io) }
     end

data/lib/svp/delete.rb

@@ -10,10 +10,11 @@ module Svp
   
     def prepare_to_commit(p4)
       super(p4, "Deleting")
+      p4.sync("-k #{@work_file}")
       p4.delete(@work_file)
     end
 
-    def commit(p4)
+    def commit
       FileUtils.rm_rf(@base_file)
     end
   end

data/lib/svp/modify.rb

@@ -10,10 +10,11 @@ module Svp
 
     def prepare_to_commit(p4)
       super
+      p4.sync("-k #{@work_file}")
       p4.edit(@work_file)
     end
 
-    def commit(p4)
+    def commit
       FileUtils.cp(@work_file, @base_file)
     end
   end

data/lib/svp/p4.rb

@@ -50,11 +50,13 @@ EOS
           print command
           print "<"
           print input
-          IO.popen(command_line(command), 'r+') { |io| io.puts input; io.close_write; io.read }
+          output = IO.popen(command_line(command), 'r+') { |io| io.puts input; io.close_write; io.read }
         else
           puts command
-          IO.popen(command_line(command)) { |io| io.read }
+          output = IO.popen(command_line(command)) { |io| io.read }
         end
+        print output
+        output
       ensure
         @success = $?.success?
       end

data/lib/svp/version.rb

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

data/lib/svp/workspace.rb

@@ -6,13 +6,14 @@ require 'svp/p4'
 
 module Svp
   class Workspace
-    attr_reader :revision
+    attr_reader :revision, :ignores
 
-    def initialize(depot_uri, work_dir, svp_dir, revision)
+    def initialize(depot_uri, work_dir, svp_dir, revision, ignores)
       @depot_uri = depot_uri
       @work_dir = work_dir
       @svp_dir = svp_dir
       @revision = revision
+      @ignores = ignores
       @base_dir = File.join(@svp_dir, "base")
       
       FileUtils.mkdir_p(@work_dir)
@@ -23,9 +24,13 @@ module Svp
       changes = changes(paths)
       remote_exec do |p4|
         changes.each { |change| change.prepare_to_commit(p4) }
-        p4.submit
-        method = p4.success ? :commit : :rollback
-        changes.each { |change| change.send(method, p4) }
+        if p4.submit =~ /^Change (\d+) submitted./
+          @revision = $1.to_i
+          changes.each { |change| change.commit }
+          puts "Committed revision #{@revision}."
+        else
+          changes.each { |change| change.rollback(p4) }
+        end
       end
     end
 
@@ -40,10 +45,15 @@ module Svp
       changes(paths).each { |change| change.diff }
     end
     
+    def ignore(*patterns)
+      patterns.each { |pattern| @ignores << pattern }
+    end
+    
     def info(*remove_me)
-      puts "Depot URL: #{@depot_uri}"
-      puts "Working Directory: #{@work_dir}"
-      puts "Working Revision: #{@revision}"
+      puts "Path: #{@work_dir}"
+      puts "URL: #{@depot_uri}"
+      puts "Revision: #{@revision}"
+      puts "Ignores: #{@ignores.join(', ')}"
     end
 
     def revert(*paths)
@@ -54,7 +64,6 @@ module Svp
       changes(paths).each do |change|
         change.status
       end
-      puts "At revision #{@revision}."
     end
 
     def update(*remove_me)
@@ -64,13 +73,14 @@ module Svp
         p4.changes("-m 1").scan(/^Change (\d+) on/) do |revision|
           revision = revision.first.to_i
           if @revision < revision
-            puts "Updating changes from revision #{@revision} to #{revision}"
             p4.sync("@#{@revision.next},@#{revision}") 
             changes.each { |change| change.commit(p4) }
             @revision = revision
           end
         end
       end
+      
+      puts "At revision #{@revision}."
     end
 
     private
@@ -79,13 +89,14 @@ module Svp
       P4.execute(@depot_uri, @work_dir) { |p4| yield p4 }
     end
     
-    def changes(paths = [""])
+    def changes(*paths)
+      paths = [""] if paths.empty?
       changes = []
     
       paths.each do |path|
         base_path = File.expand_path(File.join(@base_dir, path))
         work_path = File.expand_path(File.join(@work_dir, path))
-    
+        
         `diff -Nqr #{base_path} #{work_path}`.each_line do |line|
           next unless line =~ /^Files (.*?) and (.*?) differ$/
 
@@ -110,7 +121,7 @@ module Svp
     end
     
     def ignored?(file)
-      file =~ /^#{@svp_dir}/
+      file =~ /^#{@svp_dir}/ || @ignores.any? { |pattern| file =~ /^#{File.join(@work_dir, pattern)}/ }
     end
   end
 end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: svp
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 date: 2006-10-18 00:00:00 +10:00
-summary: description of gem
+summary: SVN facade for Perforce. Supports offline diff, status, revert. Doesn't require a permanent client configuration.
 require_paths: 
 - lib
 email: support@redhillconsulting.com.au
 homepage: http://svp.rubyforge.org
 rubyforge_project: 
-description: description of gem
+description: SVN facade for Perforce. Supports offline diff, status, revert. Doesn't require a permanent client configuration.
 autorequire: 
 default_executable: 
 bindir: bin