piston 1.0.1 → 1.1.0

data/CHANGELOG

@@ -1,5 +1,12 @@
 *SVN*
 
+2006-08-26 1.1.0
+* New 'convert' subcommand converts existing svn:externals to Piston managed
+  folders.  Thanks to Dan Kubb for the idea.
+* update now recursively finds the folders to process.  It bases it's search
+  on the presence or absence of the piston:root property.
+* Changed lock and unlock messages to be more detailed.
+
 2006-08-24 1.0.1
 * Corrected minor bug where the core extensions were in core_ext/core_ext
   instead of being in core_ext.

data/lib/piston/command.rb

@@ -2,7 +2,7 @@ module Piston
   # The base class which all commands subclass to obtain services from.
   class Command
     attr_accessor :revision, :dry_run, :quiet, :verbose, :force, :lock,
-                  :logging_stream
+                  :recursive, :logging_stream
 
     # Execute this command.  The arguments are pre-processed to expand any
     # wildcards using Dir#[].  This is because the Windows shell does not

data/lib/piston/commands/convert.rb

@@ -0,0 +1,88 @@
+require 'piston/commands/import'
+
+module Piston
+  module Commands
+    class Convert < Piston::Command
+      def run(args)
+        if args.empty? then
+          svn(:propget, '--recursive', 'svn:externals').each_line do |line|
+            next unless line =~ /^([^ ]+)\s-\s/
+            args << $1
+          end
+        end
+
+        return logging_stream.puts("No svn:externals defined in this folder or any of it's subfolders") if args.empty?
+
+        args.each do |dir|
+          externals = svn(:propget, 'svn:externals', dir)
+          next skip_no_externals(dir) if externals.chomp.empty?
+
+          operations = Array.new
+          externals.each_line do |external|
+            external.chomp!
+            next if external.empty?
+            next skip_no_match(external) unless external =~ /^([^ ]+)\s+(?:-r(\d+)\s+)?(.*)$/
+
+            local, revision, repos = $1, $2, $3
+            lock = true if revision
+            local_dir = File.join(dir, local)
+            if File.exists?(local_dir)
+              raise Piston::CommandError, "'#{local_dir}' is not a directory" unless File.directory?(local_dir)
+              status = svn(:status, local_dir)
+              raise Piston::CommandError, "'#{local_dir}' has local modifications.  Revert before trying again." unless status.empty?
+              info = YAML::load(svn(:info, local_dir))
+              revision = info['Last Changed Rev'] unless revision
+              FileUtils.rm_rf(local_dir)
+            end
+
+            operations << [local_dir, revision, repos, lock]
+          end
+
+          operations.each do |local_dir, revision, repos, lock|
+            logging_stream.puts "Importing '#{repos}' to #{local_dir} (-r #{revision || 'HEAD'}#{' locked' if lock})"
+            import = Piston::Commands::Import.new
+            import.revision = revision
+            import.verbose, import.quiet, import.logging_stream =  self.verbose, self.quiet, self.logging_stream
+            import.lock = lock
+            import.run([repos, local_dir])
+            logging_stream.puts
+          end
+        end
+
+        svn :propdel, 'svn:externals', *args
+        logging_stream.puts "Done converting existing svn:externals to Piston"
+      end
+
+      def skip_no_externals(dir)
+        logging_stream.puts "Skipping '#{dir}' - no svn:externals definition"
+      end
+
+      def skip_no_match(external)
+        logging_stream.puts "#{external.inspect} did not match Regexp"
+      end
+
+      def self.help
+        "Converts existing svn:externals into Piston managed folders"
+      end
+
+      def self.detailed_help(stream)
+        stream.puts <<EOF
+convert: #{help}
+usage: convert [DIR [...]]
+
+  Converts folders which have the svn:externals property set to Piston managed 
+  folders.
+
+  Valid options:
+      --verbose             : Show Subversion commands and results as they
+                              are executed
+
+EOF
+      end
+
+      def self.aliases
+        %w(convert)
+      end
+    end
+  end
+end

data/lib/piston/commands/import.rb

@@ -15,8 +15,8 @@ module Piston
         end
 
         my_info = YAML::load(svn(:info, File.join(dir, '..')))
-	my_revision = YAML::load(svn(:info, my_info['URL']))['Revision']
-	raise Piston::CommandError, "#{File.expand_path(File.join(dir, '..'))} is out of date - run svn update" unless my_info['Revision'] == my_revision
+        my_revision = YAML::load(svn(:info, my_info['URL']))['Revision']
+        raise Piston::CommandError, "#{File.expand_path(File.join(dir, '..'))} is out of date - run svn update" unless my_info['Revision'] == my_revision
 
         info = YAML::load(svn(:info, repos))
         options = [:export]

data/lib/piston/commands/lock.rb

@@ -7,13 +7,12 @@ module Piston
         args.each do |dir|
           remote_rev = svn(:propget, Piston::REMOTE_REV, dir).chomp.to_i
           svn :propset, Piston::LOCKED, remote_rev, dir
+          logging_stream.puts "'#{dir}' locked at revision #{remote_rev}"
         end
-
-        logging_stream.puts "Locked #{args.size} folder(s)"
       end
 
       def self.help
-        "Lock one or more folders to a specific revision"
+        "Lock one or more folders to their current revision"
       end
 
       def self.detailed_help(stream)

data/lib/piston/commands/unlock.rb

@@ -4,7 +4,9 @@ module Piston
       def run(args)
         raise Piston::CommandError, "No targets to run against" if args.empty?
         svn :propdel, Piston::LOCKED, *args
-        logging_stream.puts "Unlocked #{args.size} folder(s)"
+        args.each do |dir|
+          logging_stream.puts "Unlocked '#{dir}'"
+        end
       end
 
       def self.help

data/lib/piston/commands/update.rb

@@ -1,17 +1,29 @@
+require 'find'
+
 module Piston
   module Commands
     class Update < Piston::Command
       def run(args)
-        args.each do |dir|
+        (args.empty? ? find_targets : args).each do |dir|
           update dir
         end
       end
 
+      def find_targets
+        targets = Array.new
+        svn(:propget, '--recursive', Piston::ROOT).each_line do |line|
+          next unless line =~ /^([^ ]+)\s-\s.*$/
+          targets << $1
+        end
+
+        targets
+      end
+
       def update(dir)
-        next unless File.directory?(dir)
-        next skip(dir, "locked") unless svn(:propget, LOCKED, dir) == ''
+        return unless File.directory?(dir)
+        return skip(dir, "locked") unless svn(:propget, LOCKED, dir) == ''
         status = svn :status, '--show-updates', dir
-        next skip(dir, "pending updates -- run \"svn update #{dir}\"") if status.split("\n").size > 1
+        return skip(dir, "pending updates -- run \"svn update #{dir}\"") if status.split("\n").size > 1
 
         logging_stream.print "Processing '#{dir}'...  "
         repos = svn(:propget, Piston::ROOT, dir).chomp
@@ -20,10 +32,10 @@ module Piston
         local_revision = svn(:propget, Piston::LOCAL_REV, dir).chomp.to_i
 
         info = YAML::load(svn(:info, repos))
-        next skip(dir, "Repository UUID changed\n  Expected #{uuid}\n  Found    #{info['Repository UUID']}\n  Repository: #{repos}") unless uuid == info['Repository UUID']
+        return skip(dir, "Repository UUID changed\n  Expected #{uuid}\n  Found    #{info['Repository UUID']}\n  Repository: #{repos}") unless uuid == info['Repository UUID']
 
         new_remote_rev = info['Last Changed Rev'].to_i
-        next skip(dir, "unchanged from revision #{remote_revision}") if remote_revision == new_remote_rev
+        return skip(dir, "unchanged from revision #{remote_revision}", false) if remote_revision == new_remote_rev
 
         info = YAML::load(svn(:info, File.join(dir, '..')))
         new_local_rev = info['Revision']
@@ -41,11 +53,11 @@ module Piston
           case op
           when 'A'
             if File.directory?(File.join(dir.tmp, file)) then
-	      svn :mkdir, File.join(dir, file)
-	    else
+              svn :mkdir, File.join(dir, file)
+            else
               copy(dir, file)
               svn :add, '--force', File.join(dir, file)
-	    end
+            end
           when 'D'
             svn :remove, '--force', File.join(dir, file)
           else
@@ -55,11 +67,11 @@ module Piston
         end
 
         merges.each do |file|
-	  begin
+          begin
             svn :merge, '--quiet', '--revision', (local_revision.succ .. new_local_rev).to_svn, File.join(dir, file), File.join(dir, file)
-	  rescue RuntimeError
-	    next if $!.message =~ /Unable to find repository location for/
-	  end
+          rescue RuntimeError
+            next if $!.message =~ /Unable to find repository location for/
+          end
         end unless local_revision.succ == new_local_rev
 
         FileUtils.rm_rf dir.tmp
@@ -68,25 +80,26 @@ module Piston
         svn :propset, Piston::LOCAL_REV, new_local_rev, dir
         svn :propset, Piston::LOCKED, revisions.last, dir if lock
 
-        logging_stream.puts "Updated to #{revisions.last} (#{changes} changed files)"
+        logging_stream.puts "Updated to #{revisions.last} (#{changes} changes)"
       end
 
       def copy(dir, file)
         FileUtils.cp(File.join(dir.tmp, file), File.join(dir, file))
       end
 
-      def skip(dir, msg)
-        logging_stream.puts "Skipping '#{dir}': #{msg}"
+      def skip(dir, msg, header=true)
+        logging_stream.print "Skipping '#{dir}': " if header
+        logging_stream.puts msg
       end
 
       def self.help
-        "Updates one or more folders to the latest revision"
+        "Updates all or specified folders to the latest revision"
       end
 
       def self.detailed_help(stream)
         stream.puts <<EOF
 update: #{help}
-usage: update DIR [...]
+usage: update [DIR [...]]
 
   This operation has the effect of downloading all remote changes back to our
   working copy.  If any local modifications were done, they will be preserved.

data/lib/piston/ui/command_line.rb

@@ -67,3 +67,5 @@ module Piston
     end
   end
 end
+
+Piston::Ui::CommandLine.start if $0 == __FILE__

data/lib/piston/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2006-08-25 00:00:00 +00:00
+  version: 1.1.0
+date: 2006-08-27 00:00:00 +00:00
 summary: Piston is a utility that enables merge tracking of remote repositories.
 require_paths: 
 - lib
@@ -49,6 +49,7 @@ files:
 - lib/piston/commands/lock.rb
 - lib/piston/commands/import.rb
 - lib/piston/commands/unlock.rb
+- lib/piston/commands/convert.rb
 - lib/piston/ui/command_line.rb
 test_files: []