piston 1.4.0 → 2.0.1

data/History.txt

@@ -0,0 +1,24 @@
+== 2.0.1 2009-04-01
+
+* Finished testing on Ruby 1.9.1.
+* Released new website.
+
+== 1.9.5 2008-11-12
+
+* Merged everything that was relevant from the community.
+* Thanks to scambra for fixing many problems with piston update.
+
+== 1.9.4
+
+* Thanks to scambra for fixing lock/unlock errors.
+* Thanks to Geoffrey Grosenbach (topfunky), piston has a gemspec for use on GitHub.
+* Thanks to Brian Takita (btakita), piston update with a Git repository works!
+* Thanks to mattknox and scambra for manifest updates.
+* Thanks to Marcos Tapajós (tapajos) for many small improvements.
+
+== 1.9.3 2008-06-03
+
+* Import git branches using --revision origin/BRANCH_NAME, or a tag
+  using --revision TAG_NAME, or even a specific commit using
+  --revision COMMIT_ID.  In fact, use a committish and you'll be fine,
+  even HEAD^3.

data/License.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2006-2008 François 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.

data/Manifest.txt

@@ -0,0 +1,109 @@
+.gitignore
+bin/piston
+config/hoe.rb
+config/requirements.rb
+features/import_to_git.feature
+features/import_to_svn.feature
+features/step_definitions/repository.rb
+features/support/env.rb
+features/support/svn.rb
+features/update_to_git.feature
+features/update_to_svn.feature
+History.txt
+lib/piston/cli.rb
+lib/piston/commands/base.rb
+lib/piston/commands/convert.rb
+lib/piston/commands/import.rb
+lib/piston/commands/info.rb
+lib/piston/commands/lock_unlock.rb
+lib/piston/commands/status.rb
+lib/piston/commands/update.rb
+lib/piston/commands/upgrade.rb
+lib/piston/commands.rb
+lib/piston/git/client.rb
+lib/piston/git/commit.rb
+lib/piston/git/repository.rb
+lib/piston/git/working_copy.rb
+lib/piston/git.rb
+lib/piston/repository.rb
+lib/piston/revision.rb
+lib/piston/svn/client.rb
+lib/piston/svn/repository.rb
+lib/piston/svn/revision.rb
+lib/piston/svn/working_copy.rb
+lib/piston/svn.rb
+lib/piston/version.rb
+lib/piston/working_copy.rb
+lib/piston.rb
+lib/subclass_responsibility_error.rb
+License.txt
+log/.gitignore
+Manifest.txt
+piston.gemspec
+Rakefile
+README.txt
+samples/common.rb
+samples/import_git_git.rb
+samples/import_git_svn.rb
+samples/import_svn_git.rb
+samples/import_svn_svn.rb
+script/destroy
+script/generate
+script/txt2html
+setup.rb
+tasks/deployment.rake
+tasks/environment.rake
+tasks/manifest.rake
+tasks/samples.rake
+tasks/test.rake
+tasks/website.rake
+test/integration/test_git_git.rb
+test/integration/test_git_svn.rb
+test/integration/test_import_svn_git.rb
+test/integration/test_svn_svn.rb
+test/integration_helpers.rb
+test/spec_suite.rb
+test/test_helper.rb
+test/unit/git/commit/test_checkout.rb
+test/unit/git/commit/test_each.rb
+test/unit/git/commit/test_rememberance.rb
+test/unit/git/commit/test_validation.rb
+test/unit/git/repository/test_at.rb
+test/unit/git/repository/test_basename.rb
+test/unit/git/repository/test_branchanme.rb
+test/unit/git/repository/test_guessing.rb
+test/unit/git/working_copy/test_copying.rb
+test/unit/git/working_copy/test_creation.rb
+test/unit/git/working_copy/test_existence.rb
+test/unit/git/working_copy/test_finalization.rb
+test/unit/git/working_copy/test_guessing.rb
+test/unit/git/working_copy/test_rememberance.rb
+test/unit/svn/repository/test_at.rb
+test/unit/svn/repository/test_basename.rb
+test/unit/svn/repository/test_guessing.rb
+test/unit/svn/revision/test_checkout.rb
+test/unit/svn/revision/test_each.rb
+test/unit/svn/revision/test_rememberance.rb
+test/unit/svn/revision/test_validation.rb
+test/unit/svn/working_copy/test_copying.rb
+test/unit/svn/working_copy/test_creation.rb
+test/unit/svn/working_copy/test_existence.rb
+test/unit/svn/working_copy/test_externals.rb
+test/unit/svn/working_copy/test_finalization.rb
+test/unit/svn/working_copy/test_guessing.rb
+test/unit/svn/working_copy/test_rememberance.rb
+test/unit/test_info.rb
+test/unit/test_lock_unlock.rb
+test/unit/test_repository.rb
+test/unit/test_revision.rb
+test/unit/working_copy/test_guessing.rb
+test/unit/working_copy/test_info.rb
+test/unit/working_copy/test_rememberance.rb
+test/unit/working_copy/test_validate.rb
+tmp/.gitignore
+TODO
+website/index.html
+website/index.txt
+website/javascripts/rounded_corners_lite.inc.js
+website/stylesheets/screen.css
+website/template.rhtml

data/{README → README.txt}

@@ -3,6 +3,8 @@ 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.
 
+Piston is Ruby 1.9.1 compatible.
+
 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.
@@ -22,11 +24,22 @@ inside the cylinder."  Piston forces the content of a remote repository
 location back into our own.
 
 
+= Notes on 2.0
+
+In the 1.0 era, Piston was exclusively geared towards Subversion repositories.
+In early 2008, Git gained a lot of popularity among Ruby and Rails coders.
+Piston was rewritten during that period to allow many repositories and working
+copies to be used together.
+
+The documentation still refers to Subversion throughout, but 2.0 allows any
+repository to be used with any working copy.
+
+
 = Installation
 
 Nothing could be simpler:
 
- $ gem install --include-dependencies piston
+ $ gem install piston
 
 
 = Usage
@@ -123,12 +136,3 @@ repository than the one we checked out from originally.
 * <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

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 2
+:minor: 0
+:patch: 1

data/bin/piston

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
+require "piston"
 
-begin
-  require 'rubygems'
-rescue LoadError
-  # no rubygems to load, so we fail silently
-end
-
-require 'piston'
-PistonCommandLineProcessor.parse_and_execute
+# Chain to the real command-line client
+require "piston/cli"

data/lib/piston/cli.rb

@@ -0,0 +1,121 @@
+require "log4r"
+require "activesupport"
+require "piston/version"
+require "optparse"
+
+module Piston
+  class Cli
+    def self.start(args=ARGV)
+      options = {:lock => false, :force => false, :dry_run => false, :quiet => false, :verbose => 0}
+      opts = OptionParser.new do |opts|
+        opts.banner  = "Usage: piston COMMAND [options]"
+        opts.version = Piston::VERSION::STRING
+
+        # Many!!!
+        opts.on("-r", "--revision REVISION", "Revision to operate on") do |r|
+          options[:revision] = r.to_i
+        end
+
+        opts.on("--commit TREEISH", "Commit to operate on") do |c|
+          options[:commit] = c
+        end
+
+        # Import
+        opts.on("--repository-type TYPE", [:git, :svn], "Force selection of a repository handler (git or svn)") do |type|
+          options[:repository_type] = type
+        end
+
+        # Import, Update and Switch
+        opts.on("--lock", "Lock down the revision against mass-updates") do
+          options[:lock] = true
+        end
+
+        opts.on("--show-updates", "Query the remote repository for out-of-dateness information") do
+          options[:show_updates] = true
+        end
+
+        # All
+        opts.on("--force", "Force the operation to go ahead") do
+          options[:force] = true
+        end
+
+        opts.on("--dry-run", "Run but do not change anything") do
+          options[:dry_run] = true
+        end
+
+        opts.on("-q", "--quiet", "Operate silently") do
+          options[:quiet] = true
+        end
+
+        opts.on("-v", "--verbose [LEVEL]", ("0".."5").to_a, "Increase verbosity (default 0)") do |level|
+          options[:verbose] = level.to_i || 1
+        end
+      end
+      opts.parse!(args)
+
+      if args.empty?
+        puts opts.help
+        exit 0
+      end
+
+      if options.has_key?(:revision) && options.has_key?(:commit) then
+        raise ArgumentError, "Only one of --revision or --commit can be given.  Received both."
+      end
+
+      configure_logging(options)
+      command = Piston::Commands.const_get(args.shift.classify).new(options)
+      command.start(*args)
+    end
+
+    def self.configure_logging(options)
+      Log4r::Logger.root.level = Log4r::DEBUG
+
+      case options[:verbose]
+      when 0
+        main_level = Log4r::INFO
+        handler_level = Log4r::WARN
+        client_level = Log4r::WARN
+        client_out_level = Log4r::WARN
+        stdout_level = Log4r::INFO
+      when 1
+        main_level = Log4r::DEBUG
+        handler_level = Log4r::INFO
+        client_level = Log4r::WARN
+        client_out_level = Log4r::WARN
+        stdout_level = Log4r::DEBUG
+      when 2
+        main_level = Log4r::DEBUG
+        handler_level = Log4r::DEBUG
+        client_level = Log4r::INFO
+        client_out_level = Log4r::WARN
+        stdout_level = Log4r::DEBUG
+      when 3
+        main_level = Log4r::DEBUG
+        handler_level = Log4r::DEBUG
+        client_level = Log4r::DEBUG
+        client_out_level = Log4r::INFO
+        stdout_level = Log4r::DEBUG
+      when 4, 5
+        main_level = Log4r::DEBUG
+        handler_level = Log4r::DEBUG
+        client_level = Log4r::DEBUG
+        client_out_level = Log4r::DEBUG
+        stdout_level = Log4r::DEBUG
+      else
+        raise ArgumentError, "Did not expect verbosity to be outside 0..5: #{options[:verbose]}"
+      end
+
+      Log4r::Logger.new("main", main_level)
+      Log4r::Logger.new("handler", handler_level)
+      Log4r::Logger.new("handler::client", client_level)
+      Log4r::Logger.new("handler::client::out", client_out_level)
+
+      Log4r::StdoutOutputter.new("stdout", :level => stdout_level)
+
+      Log4r::Logger["main"].add "stdout"
+      Log4r::Logger["handler"].add "stdout"
+    end
+  end
+end
+
+Piston::Cli.start

data/lib/piston/commands/base.rb

@@ -0,0 +1,44 @@
+module Piston
+  module Commands
+    class Base
+      class << self
+        def logger
+          @@logger ||= Log4r::Logger["main"]
+        end
+      end
+
+      attr_reader :options
+
+      def initialize(options={})
+        @options = options
+        logger.debug {"#{self.class.name} with options #{options.inspect}"}
+      end
+
+      def verbose
+        @options[:verbose]
+      end
+
+      def force
+        @options[:force]
+      end
+
+      def quiet
+        @options[:quiet]
+      end
+
+      def logger
+        self.class.logger
+      end
+      
+      def guess_wc(wcdir)
+        Piston::WorkingCopy.guess(wcdir)
+      end
+      
+      def working_copy!(wcdir)
+        wc = guess_wc(wcdir)
+        wc.validate!
+        wc
+      end
+    end
+  end
+end

data/lib/piston/commands/convert.rb

@@ -1,80 +1,32 @@
-require "piston"
-require "piston/command"
-require "piston/commands/import"
+require "piston/commands/base"
 
 module Piston
   module Commands
-    class Convert < Piston::Command
-      def run
-        if args.empty? then
-          svn(:propget, '--recursive', 'svn:externals').each_line do |line|
-            next unless line =~ /^([^ ]+)\s-\s/
-            args << $1
+    class Convert < Piston::Commands::Base
+      attr_reader :options
+
+      def run(targets)
+        targets = Array.new unless targets
+        wc = Piston::Svn::WorkingCopy.new(Dir.pwd)
+        importer = Piston::Commands::Import.new(options)
+        returning(Array.new) do |conversions|
+          wc.externals.each_pair do |dir, args|
+            next unless targets.empty? || targets.detect {|target| dir.to_s.include?(target.to_s) }
+            conversions << dir
+
+            logger.info "Importing #{dir.relative_path_from(wc.path)} from #{args[:url]}"
+            importer.run(args[:url], args[:revision], dir)
           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\s*(\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.inspect} is not a directory" unless File.directory?(local_dir)
-              status = svn(:status, local_dir)
-              raise Piston::CommandError, "#{local_dir.inspect} has local modifications:\n#{status}\nYour must revert or commit 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([repos, local_dir], {})
-            import.revision = revision
-            import.verbose, import.quiet, import.logging_stream =  self.verbose, self.quiet, self.logging_stream
-            import.lock = lock
-            import.run
-            logging_stream.puts
-          end
+          wc.remove_external_references(*targets)
         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
-        <<EOF
-usage: convert [DIR [...]]
-
-  Converts folders which have the svn:externals property set to Piston managed 
-  folders.
-EOF
-      end
-    end
-  end
+			def start(*args)
+				targets = args.flatten.map {|d| Pathname.new(d).expand_path}
+				run(targets)
+				puts "#{targets.length} directories converted"
+			end
+		end
+	end
 end

data/lib/piston/commands/diff.rb

@@ -1,55 +1,23 @@
-require "piston"
-require "piston/command"
-require 'find'
+require "piston/commands/base"
 
 module Piston
   module Commands
-    class Diff < Piston::Command
+    class Diff < Piston::Commands::Base
       def run
-        (args.empty? ? find_targets : args).each do |dir|
-          diff dir
-        end
+        working_copy = working_copy!(options[:wcdir])
+        working_copy.diff
       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
+			def start(*args)
+				args.flatten.map {|d| Pathname.new(d).expand_path}.each do |wcdir|
+					begin
+						options[:wcdir] = wcdir
+						run
+					rescue Piston::WorkingCopy::NotWorkingCopy
+						puts "#{wcdir} is not a working copy"
+					end
+				end
+			end
     end
   end
 end