piston 1.3.2 → 1.3.3

data/CHANGELOG

@@ -1,5 +1,9 @@
 *SVN*
 
+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.
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'rake/testtask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
+require 'spec/rake/spectask'
 require File.join(File.dirname(__FILE__), 'lib', 'piston', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -14,15 +14,10 @@ RELEASE_NAME  = "REL #{PKG_VERSION}"
 RUBY_FORGE_PROJECT = "piston"
 RUBY_FORGE_USER    = "fbos"
 
-task :default => :test
-Rake::TestTask.new { |t|
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-  t.warning = false
-}
+task :default => :specs
 
 # Create compressed packages
-dist_dirs = [ "lib", "test"]
+dist_dirs = [ "lib", "spec"]
 
 spec = Gem::Specification.new do |s|
   s.name = PKG_NAME
@@ -34,7 +29,7 @@ spec = Gem::Specification.new do |s|
   s.executables = ["piston"]
   s.default_executable = "piston"
 
-  s.files = [ "CHANGELOG", "README", "LICENSE", "Rakefile" ] + FileList["{contrib,bin,test,lib}/**/*"].to_a
+  s.files = [ "CHANGELOG", "README", "LICENSE", "Rakefile" ] + FileList["{contrib,bin,spec,lib}/**/*"].to_a
 
   s.require_path = 'lib'
   s.has_rdoc = false
@@ -61,3 +56,8 @@ task :release => [ :package ] do
     system(release_command)
   end
 end
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('specs') do |t|
+  t.spec_files = FileList['specs/**/*.rb']
+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.2/lib/piston.rb $
-# $Id: piston.rb 86 2007-03-01 16:33:06Z fbos $
+# $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 $
 
 require 'yaml'
 require 'uri'
@@ -31,8 +31,10 @@ Dir[File.join(PISTON_ROOT, 'core_ext', '*.rb')].each do |file|
 end
 
 require "piston/version"
-require File.join(PISTON_ROOT, "transat", "parser")
-require File.join(PISTON_ROOT, 'piston', 'command')
+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

data/lib/piston/command.rb

@@ -1,3 +1,5 @@
+require "piston"
+
 module Piston
   # The base class which all commands subclass to obtain services from.
   class Command
@@ -8,23 +10,17 @@ module Piston
 
     def initialize(non_options, options)
       @args = non_options
-      options.each do |option, value|
-        self.send("#{option}=", value)
-      end
-    end
 
-    # Execute this command.  The arguments are pre-processed to expand any
-    # wildcards using Dir#[].  This is because the Windows shell does not
-    # know it should expand wildcards before calling an executable.
-    def execute(args)
       # Because the Windows shell does not process wildcards, we must do it
       # here ourselves
-      args.map do |arg|
+      @args.collect! do |arg|
         next arg unless arg =~ /[*?]/
         Dir[arg]
       end
 
-      run(args.flatten)
+      options.each do |option, value|
+        self.send("#{option}=", value)
+      end
     end
 
     # Run a Subversion command using the shell.  If the Subversion command

data/lib/piston/command_error.rb

@@ -1,3 +1,5 @@
+require "piston"
+
 module Piston
   # Raised whenever an argument is not correct during processing.
   class CommandError < ArgumentError; end

data/lib/piston/commands/convert.rb

@@ -1,4 +1,6 @@
-require 'piston/commands/import'
+require "piston"
+require "piston/command"
+require "piston/commands/import"
 
 module Piston
   module Commands
@@ -21,15 +23,15 @@ module Piston
           externals.each_line do |external|
             external.chomp!
             next if external.empty?
-            next skip_no_match(external) unless external =~ /^([^ ]+)\s+(?:-r(\d+)\s+)?(.*)$/
+            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}' is not a directory" unless File.directory?(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}' has local modifications.  Revert before trying again." unless status.empty?
+              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)
@@ -40,11 +42,11 @@ module Piston
 
           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 = 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([repos, local_dir])
+            import.run
             logging_stream.puts
           end
         end

data/lib/piston/commands/import.rb

@@ -1,3 +1,6 @@
+require "piston"
+require "piston/command"
+
 module Piston
   module Commands
     class Import < Piston::Command

data/lib/piston/commands/lock.rb

@@ -1,3 +1,6 @@
+require "piston"
+require "piston/command"
+
 module Piston
   module Commands
     class Lock < Piston::Command

data/lib/piston/commands/status.rb

@@ -1,3 +1,5 @@
+require "piston"
+require "piston/command"
 require 'pp'
 
 module Piston

data/lib/piston/commands/switch.rb

@@ -1,3 +1,6 @@
+require "piston"
+require "piston/command"
+
 module Piston
   module Commands
     class Switch < Piston::Command
@@ -33,15 +36,13 @@ module Piston
         local_revision = local_revision.succ
 
         new_info = YAML::load(svn(:info, new_repos))
-        raise Piston::CommandError unless uuid == new_info['Repository UUID']
+        raise Piston::CommandError, "Switching repositories is not supported at this time\nYou initially imported from #{uuid}, but are now importing from #{new_info['Repository UUID']}" unless uuid == new_info['Repository UUID']
 
         logging_stream.puts "  Fetching remote repository's latest revision and UUID"
         info = YAML::load(svn(:info, "#{repos}@#{remote_revision}"))
         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 = new_info['Last Changed Rev'].to_i
-        return skip(dir, "unchanged from revision #{remote_revision}", false) if remote_revision == new_remote_rev
-
         revisions = (remote_revision .. (revision || new_remote_rev))
 
         logging_stream.puts "  Restoring remote repository to known state at r#{revisions.first}"

data/lib/piston/commands/unlock.rb

@@ -1,3 +1,6 @@
+require "piston"
+require "piston/command"
+
 module Piston
   module Commands
     class Unlock < Piston::Command

data/lib/piston/commands/update.rb

@@ -1,3 +1,5 @@
+require "piston"
+require "piston/command"
 require 'find'
 
 module Piston

data/lib/piston/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
-date: 2007-03-09 00:00:00 -05:00
+  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
@@ -36,15 +36,10 @@ files:
 - contrib/piston
 - bin/piston
 - lib/core_ext
-- lib/piston
-- lib/transat
-- lib/piston.rb
 - lib/core_ext/string.rb
 - lib/core_ext/range.rb
+- lib/piston
 - lib/piston/commands
-- lib/piston/command.rb
-- lib/piston/command_error.rb
-- lib/piston/version.rb
 - lib/piston/commands/convert.rb
 - lib/piston/commands/switch.rb
 - lib/piston/commands/update.rb
@@ -52,7 +47,12 @@ files:
 - lib/piston/commands/lock.rb
 - lib/piston/commands/import.rb
 - lib/piston/commands/unlock.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: []
 
 rdoc_options: []