piston 1.3.3 → 1.4.0

data/CHANGELOG

@@ -1,5 +1,12 @@
 *SVN*
 
+2008-02-07 1.4.0
+* New piston diff subcommand, implemented by Graeme Mathieson.
+  http://rubyforge.org/tracker/index.php?func=detail&aid=17116&group_id=2105&atid=8179
+* Per http://rubyforge.org/tracker/?func=detail&atid=8179&aid=10717&group_id=2105
+  Don't set LC_ALL, but set LANGUAGE so that repositories with foreign
+  characters can be used.  Thanks go to Per Wigren.
+
 2007-03-22 1.3.3
 * Repaired problems with import subcommand.  Wrote specifications to prevent
   the same failure mode again.

data/lib/piston/command.rb

@@ -37,7 +37,7 @@ module Piston
       command = "svn #{args.join(' ')}"
       logging_stream.puts command if verbose
       return if dry_run
-      ENV['LC_ALL'] = 'C'
+      ENV['LANGUAGE'] = 'en_US'
       result = `#{command}`
       logging_stream.puts result if verbose
       raise "Command #{command} resulted in an error:\n\n#{result}" unless $?.exitstatus.zero?
@@ -48,5 +48,21 @@ module Piston
     def logging_stream
       @logging_stream ||= $stdout
     end
+
+    def skip(dir, msg, header=true)
+      logging_stream.print "Skipping '#{dir}': " if header
+      logging_stream.puts msg
+    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
+
   end
 end

data/lib/piston/commands/diff.rb

@@ -0,0 +1,55 @@
+require "piston"
+require "piston/command"
+require 'find'
+
+module Piston
+  module Commands
+    class Diff < Piston::Command
+      def run
+        (args.empty? ? find_targets : args).each do |dir|
+          diff dir
+        end
+      end
+
+      def diff(dir)
+        return unless File.directory?(dir)
+        logging_stream.puts "Processing '#{dir}'..."
+        repos = svn(:propget, Piston::ROOT, dir).chomp
+        uuid = svn(:propget, Piston::UUID, dir).chomp
+        remote_revision = svn(:propget, Piston::REMOTE_REV, dir).chomp.to_i
+
+        logging_stream.puts "  Fetching remote repository's latest revision and UUID"
+        info = YAML::load(svn(:info, repos))
+        return skip(dir, "Repository UUID changed\n  Expected #{uuid}\n  Found    #{info['Repository UUID']}\n  Repository: #{repos}") unless uuid == info['Repository UUID']
+
+        logging_stream.puts "  Checking out repository at revision #{remote_revision}"
+        svn :checkout, '--ignore-externals', '--quiet', '--revision', remote_revision, repos, dir.tmp
+
+        puts run_diff(dir.tmp, dir)
+
+        logging_stream.puts "  Removing temporary files / folders"
+        FileUtils.rm_rf dir.tmp
+
+      end
+
+      def run_diff(dir1, dir2)
+        `diff -urN --exclude=.svn #{dir1} #{dir2}`
+      end
+
+      def self.help
+        "Shows the differences between the local repository and the pristine upstream"
+      end
+
+      def self.detailed_help
+        <<EOF
+usage: diff [DIR [...]]
+
+  This operation has the effect of producing a diff between the pristine upstream
+  (at the last updated revision) and your local version.  In other words, it
+  gives you the changes you have made in your repository that have not been
+  incorporated upstream.
+EOF
+      end
+    end
+  end
+end

data/lib/piston/commands/update.rb

@@ -11,16 +11,6 @@ module Piston
         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)
         return unless File.directory?(dir)
         return skip(dir, "locked") unless svn(:propget, Piston::LOCKED, dir) == ''
@@ -114,11 +104,6 @@ module Piston
         FileUtils.cp(File.join(dir.tmp, file), File.join(dir, file))
       end
 
-      def skip(dir, msg, header=true)
-        logging_stream.print "Skipping '#{dir}': " if header
-        logging_stream.puts msg
-      end
-
       def self.help
         "Updates all or specified folders to the latest revision"
       end

data/lib/piston/version.rb

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

data/lib/piston.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# $HeadURL: svn+ssh://fbos@rubyforge.org/var/svn/piston/tags/1.3.3/lib/piston.rb $
-# $Id: piston.rb 93 2007-03-13 19:41:08Z fbos $
+# $HeadURL: svn+ssh://rubyforge.org/var/svn/piston/tags/1.4.0/lib/piston.rb $
+# $Id: piston.rb 139 2008-02-07 15:28:24Z fbos $
 
 require 'yaml'
 require 'uri'
@@ -61,6 +61,7 @@ PistonCommandLineProcessor = Transat::Parser.new do
 
   command :switch, Piston::Commands::Switch, :valid_options => %w(lock dry_run force revision quiet verbose)
   command :update, Piston::Commands::Update, :valid_options => %w(lock dry_run force revision quiet verbose)
+  command :diff,   Piston::Commands::Diff,   :valid_options => %w(lock dry_run force revision quiet verbose)
   command :import, Piston::Commands::Import, :valid_options => %w(lock dry_run force revision quiet verbose)
   command :convert, Piston::Commands::Convert, :valid_options => %w(lock verbose dry_run)
   command :unlock, Piston::Commands::Unlock, :valid_options => %w(force dry_run verbose)

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
-date: 2007-03-22 00:00:00 -04:00
-summary: Piston is a utility that enables merge tracking of remote repositories.
-require_paths: 
-- lib
-email: francois@teksol.info
-homepage: http://piston.rubyforge.org/
-rubyforge_project: piston
-description: This is similar to svn:externals, except you have a local copy of the files, which you can modify at will.  As long as the changes are mergeable, you should have no problems.
-autorequire: 
-default_executable: piston
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
+  version: 1.4.0
+platform: ""
 authors: 
 - Francois Beausoleil
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-08 00:00:00 -05:00
+default_executable: piston
+dependencies: []
+
+description: This is similar to svn:externals, except you have a local copy of the files, which you can modify at will.  As long as the changes are mergeable, you should have no problems.
+email: francois@teksol.info
+executables: 
+- piston
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - CHANGELOG
 - README
@@ -38,32 +31,47 @@ files:
 - lib/core_ext
 - lib/core_ext/string.rb
 - lib/core_ext/range.rb
+- lib/transat
+- lib/transat/parser.rb
 - lib/piston
 - lib/piston/commands
-- lib/piston/commands/convert.rb
-- lib/piston/commands/switch.rb
-- lib/piston/commands/update.rb
-- lib/piston/commands/status.rb
+- lib/piston/commands/diff.rb
 - lib/piston/commands/lock.rb
+- lib/piston/commands/convert.rb
 - lib/piston/commands/import.rb
 - lib/piston/commands/unlock.rb
+- lib/piston/commands/update.rb
+- lib/piston/commands/status.rb
+- lib/piston/commands/switch.rb
+- lib/piston/command_error.rb
 - lib/piston/command.rb
 - lib/piston/version.rb
-- lib/piston/command_error.rb
-- lib/transat
-- lib/transat/parser.rb
 - lib/piston.rb
-test_files: []
-
+has_rdoc: false
+homepage: http://piston.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- piston
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: piston
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: Piston is a utility that enables merge tracking of remote repositories.
+test_files: []