--- /dev/null
+++ b/History.txt
@@ -0,0 +1,81 @@
+*SVN*
+
+* New Piston2
+
+2007-06-28 branches/piston1 -- NEVER RELEASED
+* 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.
+
+2007-03-09 1.3.2
+* piston switch had a bad constant access which caused failures.
+
+2007-03-09 1.3.1
+* piston switch would fail if the branch from which we are reading had been
+  deleted.
+* piston switch had a major bug.  It did not update the piston:root property
+  to remember the new repository root.  Reported and fixed by Graeme
+  Mathieson.
+* piston switch errors out early if not provided with the right arguments.
+  Thanks to Graeme Mathieson for the info and patch.
+* New internal command parser.  No visible external changes.
+
+2007-01-22 1.3.0
+* Piston status shows the revision number of locked repositories.  Thanks to
+  Chris Wanstrath <http://errtheblog.com/>.
+* New piston switch subcommand to switch repository locations.  Thanks to
+  Greg Spurrier for the prompt which resulted in finally implementing this.
+
+2006-11-20 1.2.1
+* Import subcommand would fail with a "svn: Explicit target required
+  ('vendor/rails' interpreted as prop value)" error.  This was a minor
+  error in the import code.  Reported by Daniel N.
+* The import subcommand could import another revision than what was intended,
+  if HEAD was updated while the import is in progress.
+
+2006-11-17 1.2.0
+* New status subcommand.  Shows M if locally or remotely modified. Applies to
+  one, many, all folders.  This subcommand *requires* the use of a Subversion
+  1.2.0 client.  Thanks to Chris Wanstrath for the inspiration.  His Rake
+  tasks are available at http://errtheblog.com/post/38.
+* Minor patch by Miguel Ibero Carreras to make Subversion always use the
+  C locale, instead of the current one.  This allows Piston to be used
+  with internationalized versions of Subversion.  David Bittencourt later
+  reported the same problem.  Thanks!
+* Better handle how update finds it's latest local revision to prevent
+  conflicts.  If you had never locally changed your vendor repositories,
+  this fix will change nothing for you.  This helps prevent local conflicts
+  if you had ever applied a local patch.
+  *CAVEAT*: See the release announcement at
+            http://blog.teksol.info/articles/2006/11/17/piston-1-2-0-status-better-update
+            for a required local operation.
+
+2006-08-30 1.1.1
+* Add contrib/piston [Michael Schuerig]
+* Non-recursively add the root directory of the managed folder then set Piston
+  properties before adding the contents of the managed folder.  This is to
+  help ease work along if an inconsistent EOL is encountered during the
+  import.  The user can finish the import by svn add'ing the rest of the
+  folder until all files are added.  Piston properties will already have been
+  set.
+
+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.
+* Require the parent working copy path be at HEAD before importing / updating.
+* Don't do unnecessary merges if the file had not changed prior to the update.
+* During the update, if adding a folder, do an svn mkdir instead of a cp_r.
+
+2006-08-24 1.0.0
+* Initial version

--- /dev/null
+++ b/License.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2006 Francois Beausoleil <francois@teksol.info>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

--- /dev/null
+++ b/Manifest.txt
@@ -0,0 +1,16 @@
+History.txt
+License.txt
+Manifest.txt
+README.txt
+Rakefile
+lib/piston.rb
+lib/piston/version.rb
+scripts/txt2html
+setup.rb
+spec/helper.rb_spec
+spec/piston.rb_spec
+website/index.html
+website/index.txt
+website/javascripts/rounded_corners_lite.inc.js
+website/stylesheets/screen.css
+website/template.rhtml

--- /dev/null
+++ b/README.txt
@@ -0,0 +1,134 @@
+Piston is a utility that eases vendor branch management.
+This is similar to <tt>svn:externals</tt>, 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.
+
+This tool has a similar purpose than svnmerge.py which you can find in the
+contrib/client-side folder of the main Subversion repository at
+http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py.
+The main difference is that Piston is designed to work with remote
+repositories.  Another tool you might want to look at, SVK, which you can find
+at http://svk.elixus.org/.
+
+From Wikipedia's Piston page (http://en.wikipedia.org/wiki/Piston):
+  In general, a piston is a sliding plug that fits closely inside the bore
+  of a cylinder.
+
+  Its purpose is either to change the volume enclosed by the cylinder, or
+  to exert a force on a fluid inside the cylinder.
+
+For this utility, I retain the second meaning, "to exert a force on a fluid
+inside the cylinder."  Piston forces the content of a remote repository
+location back into our own.
+
+
+= Installation
+
+Nothing could be simpler:
+
+ $ gem install --include-dependencies piston
+
+
+= Usage
+
+First, you need to import the remote repository location:
+
+ $ piston import http://dev.rubyonrails.org/svn/rails/trunk vendor/rails
+ Exported r4720 from 'http://dev.rubyonrails.org/svn/rails/trunk' to 'vendor/rails'
+
+ $ svn commit -m "Importing local copy of Rails"
+
+When you want to get the latest changes from the remote repository location:
+
+ $ piston update vendor/rails
+ Updated 'vendor/rails' to r4720.
+
+ $ svn commit -m "Updates vendor/rails to the latest revision"
+
+You can prevent a local Piston-managed folder from updating by using the
++lock+ subcommand:
+
+ $ piston lock vendor/rails
+ 'vendor/rails' locked at r4720.
+
+When you want to update again, you unlock:
+
+ $ piston unlock vendor/rails
+ 'vendor/rails' unlocked.
+
+If the branch you are following moves, you should use the switch subcommand:
+
+ $ piston import http://dev.rubyonrails.org/svn/rails/branches/1-2-pre-release vendor/rails
+ $ svn commit vendor/rails
+
+ # Vendor branch is renamed, let's follow it
+ $ piston switch http://dev.rubyonrails.org/svn/rails/branches/1-2-stable vendor/rails
+
+
+= Contributions
+
+== Bash Shell Completion Script
+
+Michael Schuerig contributed a Bash shell completion script.  You should copy
++contrib/piston+ from your gem repository to the appropriate folder.  Michael
+said:
+
+  I've put together a bash completion function for piston. On Debian, I
+  just put it in /etc/bash_completion.d, alternatively, the contents can
+  be copied to ~/.bash_completion. I don't know how things are organized
+  on other Unix/Linux systems.
+
+
+= Caveats
+
+== Speed
+
+This tool is SLOW.  The update process particularly so.  I use a brute force
+approach.  Subversion cannot merge from remote repositories, so instead I
+checkout the folder at the initial revision, and then run svn update and
+parse the results of that to determine what changes have occured.
+
+If a local copy of a file was changed, it's changes will be merged back in.
+If that introduces a conflict, Piston will not detect it.  The commit will be
+rejected by Subversion anyway.
+
+== Copies / Renames
+
+Piston *does not* track copies.  Since Subversion does renames in two
+phases (copy + delete), that is what Piston does.
+
+== Local Operations Only
+
+Piston only works if you have a working copy.  It also never commits your
+working copy directly.  You are responsible for reviewing the changes and
+applying any pending fixes.
+
+== Remote Repository UUID
+
+Piston caches the remote repository UUID, allowing it to know if the remote
+repos is still the same.  Piston refuses to work against a different
+repository than the one we checked out from originally.
+
+
+= Subversion Properties Used
+
+* <tt>piston:uuid</tt>: The remote repository's UUID, which we always confirm
+  before doing any operations.
+* <tt>piston:root</tt>: The repository root URL from which this Piston folder
+  was exported from.
+* <tt>piston:remote-revision</tt>: The <tt>Last Changed Rev</tt> of the remote
+  repository.
+* <tt>piston:local-revision</tt>: The <tt>Last Changed Rev</tt> of the Piston
+  managed folder, to enable us to know if we need to do any merging.
+* <tt>piston:locked</tt>: The revision at which this folder is locked.  If
+  this property is set and non-blank, Piston will skip the folder with
+  an appropriate message.
+
+
+= Dependencies
+
+Piston depends on the following libraries:
+
+* yaml
+* uri
+* fileutils

--- a/Rakefile
+++ b/Rakefile
@@ -1,63 +1,139 @@
 require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rake/packagetask'
 require 'rake/gempackagetask'
+require 'rake/rdoctask'
 require 'rake/contrib/rubyforgepublisher'
-require 'spec/rake/spectask'
-require File.join(File.dirname(__FILE__), 'lib', 'piston', 'version')
+require 'fileutils'
+require 'hoe'
+begin
+  require 'spec/rake/spectask'
+rescue LoadError
+  puts 'To use rspec for testing you must install rspec gem:'
+  puts '$ sudo gem install rspec'
+  exit
+end
 
-PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-PKG_NAME      = 'piston'
-PKG_VERSION   = Piston::VERSION::STRING + PKG_BUILD
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+include FileUtils
+require File.join(File.dirname(__FILE__), 'lib', 'piston', 'version')
 
-RELEASE_NAME  = "REL #{PKG_VERSION}"
+AUTHOR = 'Francois Beausoleil'  # can also be an array of Authors
+EMAIL = "francois@teksol.info"
+DESCRIPTION = "description of gem"
+GEM_NAME = 'piston' # what ppl will type to install your gem
 
-RUBY_FORGE_PROJECT = "piston"
-RUBY_FORGE_USER    = "fbos"
+@config_file = "~/.rubyforge/user-config.yml"
+@config = nil
+def rubyforge_username
+  unless @config
+    begin
+      @config = YAML.load(File.read(File.expand_path(@config_file)))
+    rescue
+      puts <<-EOS
+ERROR: No rubyforge config file found: #{@config_file}"
+Run 'rubyforge setup' to prepare your env for access to Rubyforge
+ - See http://newgem.rubyforge.org/rubyforge.html for more details
+      EOS
+      exit
+    end
+  end
+  @rubyforge_username ||= @config["username"]
+end
 
-task :default => :specs
+RUBYFORGE_PROJECT = 'piston' # The unix name for your project
+HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
+DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 
-# Create compressed packages
-dist_dirs = [ "lib", "spec"]
+NAME = "piston"
+REV = nil 
+# UNCOMMENT IF REQUIRED: 
+# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
+VERS = Piston::VERSION::STRING + (REV ? ".#{REV}" : "")
+CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
+RDOC_OPTS = ['--quiet', '--title', 'piston documentation',
+    "--opname", "index.html",
+    "--line-numbers", 
+    "--main", "README",
+    "--inline-source"]
 
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = "Piston is a utility that enables merge tracking of remote repositories."
-  s.description = %q{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.}
+class Hoe
+  def extra_deps 
+    @extra_deps.reject { |x| Array(x).first == 'hoe' } 
+  end 
+end
 
-  s.bindir = "bin"                               # Use these for applications.
-  s.executables = ["piston"]
-  s.default_executable = "piston"
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+hoe = Hoe.new(GEM_NAME, VERS) do |p|
+  p.author = AUTHOR 
+  p.description = DESCRIPTION
+  p.email = EMAIL
+  p.summary = DESCRIPTION
+  p.url = HOMEPATH
+  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
+  p.test_globs = ["test/**/test_*.rb"]
+  p.clean_globs |= CLEAN  #An array of file patterns to delete on clean.
+  
+  # == Optional
+  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+end
 
-  s.files = [ "CHANGELOG", "README", "LICENSE", "Rakefile" ] + FileList["{contrib,bin,spec,lib}/**/*"].to_a
+CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
+PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
+hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
 
-  s.require_path = 'lib'
-  s.has_rdoc = false
+desc 'Generate website files'
+task :website_generate do
+  Dir['website/**/*.txt'].each do |txt|
+    sh %{ ruby scripts/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
+  end
+end
 
-  s.author = "Francois Beausoleil"
-  s.email = "francois@teksol.info"
-  s.homepage = "http://piston.rubyforge.org/"
-  s.rubyforge_project = "piston"
+desc 'Upload website files to rubyforge'
+task :website_upload do
+  host = "#{rubyforge_username}@rubyforge.org"
+  remote_dir = "/var/www/gforge-projects/#{PATH}/"
+  local_dir = 'website'
+  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
 end
 
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
+desc 'Generate and upload website files'
+task :website => [:website_generate, :website_upload, :publish_docs]
+
+desc 'Release the website and new gem version'
+task :deploy => [:check_version, :website, :release] do
+  puts "Remember to create SVN tag:"
+  puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
+    "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
+  puts "Suggested comment:"
+  puts "Tagging release #{CHANGES}"
 end
 
-desc "Publish the release files to RubyForge."
-task :release => [ :package ] do
-  `rubyforge login`
+desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
+task :local_deploy => [:website_generate, :install_gem]
 
-  for ext in %w( gem tgz zip )
-    release_command = "rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}"
-    puts release_command
-    system(release_command)
+task :check_version do
+  unless ENV['VERSION']
+    puts 'Must pass a VERSION=x.y.z release version'
+    exit
+  end
+  unless ENV['VERSION'] == VERS
+    puts "Please update your version.rb to match the release version, currently #{VERS}"
+    exit
   end
 end
 
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('specs') do |t|
-  t.spec_files = FileList['specs/**/*.rb']
+desc "Run the specs under spec/"
+Spec::Rake::SpecTask.new do |t|
+  t.libs << File.dirname(__FILE__) + "/lib"
+  t.spec_opts = ['--options', "spec/spec.opts"]
+  t.spec_files = FileList['spec/*_spec.rb']
 end
+
+desc "Default task is to run specs"
+task :default => :spec
+

--- a/lib/piston.rb
+++ b/lib/piston.rb
@@ -1,69 +1,4 @@
-# Copyright (c) 2006 Francois Beausoleil <francois@teksol.info>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# $HeadURL$
-# $Id$
-
-require 'yaml'
-require 'uri'
-require 'fileutils'
-
-PISTON_ROOT = File.dirname(__FILE__)
-Dir[File.join(PISTON_ROOT, 'core_ext', '*.rb')].each do |file|
-  require file
-end
-
-require "piston/version"
-require "piston/command"
-require "piston/command_error"
-
-require "transat/parser"
-Dir[File.join(PISTON_ROOT, "piston", "commands", "*.rb")].each do |file|
-  require file.gsub(PISTON_ROOT, "")[1..-4]
-end
-
 module Piston
-  ROOT        = "piston:root"
-  UUID        = "piston:uuid"
-  REMOTE_REV  = "piston:remote-revision"
-  LOCAL_REV   = "piston:local-revision"
-  LOCKED      = "piston:locked"
 end
 
-PistonCommandLineProcessor = Transat::Parser.new do
-  program_name "Piston"
-  version [Piston::VERSION::STRING]
-
-  option :verbose, :short => :v, :default => true, :message => "Show subversion commands and results as they are executed"
-  option :quiet, :short => :q, :default => false, :message => "Do not output any messages except errors"
-  option :revision, :short => :r, :param_name => "REVISION", :type => :int
-  option :show_updates, :short => :u, :message => "Query the remote repository for out of dateness information"
-  option :lock, :short => :l, :message => "Close down and lock the imported directory from further changes"
-  option :dry_run, :message => "Does not actually execute any commands"
-  option :force, :message => "Force the command to run, even if Piston thinks it would cause a problem"
-
-  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 :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)
-  command :lock, Piston::Commands::Lock, :valid_options => %w(force dry_run revision verbose)
-  command :status, Piston::Commands::Status, :valid_options => %w(show_updates verbose)
-end
+require 'piston/version'

--- /dev/null
+++ b/lib/piston/repository.rb
@@ -0,0 +1,66 @@
+require "piston/subversion_client"
+require "fileutils"
+require "yaml"
+require "uri"
+
+module Piston
+  # Represents a Subversion repository located somewhere in the ether.
+  class Repository
+    include Piston::SubversionClient
+
+    class RepositoryError < RuntimeError; end
+    class DirectoryAlreadyExists < RepositoryError
+      def initialize(dir)
+        super "Directory #{dir.inspect} already exists"
+      end
+    end
+
+    class NoCreateOnRemoteRepositoryUrl < RepositoryError
+      def initialize(url)
+        super "URL #{url.inspect} is remote -- cannot create there"
+      end
+    end
+
+    attr_reader :url
+
+    def initialize(url)
+      case url
+      when String
+        @url = url
+      when URI
+        @url = url.to_s
+      else
+        raise ArgumentError, "Expected either a String or a URI, got a #{url.class.name}"
+      end
+    end
+
+    def local_path
+      @url.to_s["file://".length .. -1]
+    end
+
+    def youngest
+      self.info["Revision"].to_i
+    end
+
+    def uuid
+      self.info["Repository UUID"]
+    end
+
+    def info
+      @info ||= YAML.load(svn(:info, self.url))
+    end
+
+    # Uses svnadmin to create a repository if this repository's is a file: URL.
+    def create!
+      raise NoCreateOnRemoteRepositoryUrl.new(self.url) unless self.url =~ %r{\Afile://}
+      log {"Want to create repository at #{self.local_path.inspect}"}
+      repos_parent_dir = File.expand_path(self.local_path + "/..")
+
+      FileUtils.mkdir_p(repos_parent_dir)
+      raise DirectoryAlreadyExists.new(self.local_path) if File.directory?(self.local_path)
+
+      svnadmin :create, local_path
+      self
+    end
+  end
+end