piston 2.0.2 → 2.0.3

data/.gitignore

@@ -0,0 +1,9 @@
+*.swp
+*.log
+pkg
+*.iml
+*.ipr
+*.iws
+.config
+InstalledFiles
+*.gem

data/History.txt

@@ -1,3 +1,7 @@
+== 2.0.2 2009-04-07
+
+* Fixed a bug in the command line parser that was interpreting status as statu.
+
 == 2.0.1 2009-04-01
 
 * Finished testing on Ruby 1.9.1.

data/Rakefile

@@ -0,0 +1,25 @@
+Dir["tasks/**/*.rake"].each { |rake| load rake }
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name              = "piston"
+    s.summary           = "Ease your vendor branch management worries"
+    s.email             = "francois@teksol.info"
+    s.homepage          = "http://francois.github.com/piston"
+    s.description       = "Piston makes it easy to merge vendor branches into your own repository, without worrying about which revisions were grabbed or not.  Piston will also keep your local changes in addition to the remote changes."
+    s.authors           = "Francois Beausoleil"
+    s.has_rdoc          = false
+    s.rubyforge_project = "piston"
+
+    s.add_development_dependency "cucumber", ">= 0.1.16"
+
+    s.add_runtime_dependency "main", ">= 2.8.3"
+    s.add_runtime_dependency "log4r", ">= 1.0.5"
+    s.add_runtime_dependency "activesupport", ">= 2.0.0"
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+task :default => :test

data/TODO

@@ -0,0 +1,6 @@
+= Integration tests to verify
+
+* Port conflicts in temporary checkout directory to working copy:
+It detects and marks conflicts with changes after last update. But when some changes, which were made before last update, conflict when merging in temporary directory, file is merged correctly but conflicts are not marked
+In Piston 1.x old changes were lost, even without conflicts
+* Force addition of Git repositories, because the files might be ignored in .gitignore

data/VERSION.yml

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

data/features/import_to_git.feature

@@ -0,0 +1,56 @@
+
+Feature: Import remote repository into a Git repository
+  In order to speed up deployments and to only deploy code that's been tested tested
+  A developer
+  Wants to import remote repositories
+  So that he is protected from inadvertent updates
+
+  Scenario: Importing from a Git repository
+    Given a newly created Git project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    When I import libcalc
+    Then I should see a successful import message from Piston
+    And I should find a libcalc folder
+    And I should find a libcalc/libcalc.rb file
+    And I should find a libcalc/.piston.yml file
+
+  Scenario: Importing from a Git repository to a named folder
+    Given a newly created Git project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    And an existing vendor folder
+    When I import libcalc into vendor/libcalc
+    Then I should see a successful import message from Piston
+    And I should find a vendor/libcalc folder
+    And I should find a vendor/libcalc/libcalc.rb file
+    And I should find a vendor/libcalc/.piston.yml file
+
+  Scenario: Importing from a Subversion repository
+    Given a newly created Git project
+    And a remote Subversion project named libcalc
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    When I import libcalc
+    Then I should see a successful import message from Piston
+    And I should find a libcalc folder
+    And I should find a libcalc/libcalc.rb file
+    And I should find a libcalc/.piston.yml file
+
+  Scenario: Importing from a classic Subversion project layout automatically uses project's name and not trunk for the local folder name
+    Given a newly created Git project
+    And a remote Subversion project named libcalc using the classic layout
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    When I import libcalc/trunk
+    Then I should see a successful import message from Piston
+    And I should find a libcalc folder
+    And I should find a libcalc/libcalc.rb file
+    And I should find a libcalc/.piston.yml file
+
+  Scenario: Importing into a specific folder when the parent folders doesn't exist succeeds
+    Given a newly created Git project
+    And a remote Subversion project named libcalc using the classic layout
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    When I import libcalc/trunk into vendor/libcalc
+    And I should see a successful import message from Piston
+    And I should find a vendor/libcalc folder
+    And I should find a vendor/libcalc/libcalc.rb file

data/features/import_to_svn.feature

@@ -0,0 +1,54 @@
+Feature: Import remote repository into a Subversion repository
+  In order to speed up deployments and to only deploy code that's been tested tested
+  A developer
+  Wants to import remote repositories
+  So that he is protected from inadvertent updates
+
+  Scenario: Importing from a Git repository
+    Given a newly created Subversion project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    When I import libcalc
+    Then I should see a successful import message from Piston
+    And I should find a libcalc folder
+    And I should find a libcalc/libcalc.rb file
+    And I should find a libcalc/.piston.yml file
+
+  Scenario: Importing from a Git repository to a named folder
+    Given a newly created Subversion project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    And an existing vendor folder
+    When I import libcalc into vendor/libcalc
+    Then I should see a successful import message from Piston
+    And I should find a vendor/libcalc folder
+    And I should find a vendor/libcalc/libcalc.rb file
+    And I should find a vendor/libcalc/.piston.yml file
+
+  Scenario: Importing from a Subversion repository
+    Given a newly created Subversion project
+    And a remote Subversion project named libcalc
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    When I import libcalc
+    Then I should see a successful import message from Piston
+    And I should find a libcalc folder
+    And I should find a libcalc/libcalc.rb file
+    And I should find a libcalc/.piston.yml file
+
+  Scenario: Importing from a classic Subversion project layout automatically uses project's name and not trunk for the local folder name
+    Given a newly created Subversion project
+    And a remote Subversion project named libcalc using the classic layout
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    When I import libcalc/trunk
+    Then I should see a successful import message from Piston
+    And I should find a libcalc folder
+    And I should find a libcalc/libcalc.rb file
+    And I should find a libcalc/.piston.yml file
+
+  Scenario: Importing into a specific folder bails if the parent folders doesn't exist
+    Given a newly created Subversion project
+    And a remote Subversion project named libcalc using the classic layout
+    And a file named libcalc.rb with content "a\nb\nc" in remote libcalc project
+    When I import libcalc/trunk into vendor/libcalc
+    Then I should see "Folder .*/vendor/libcalc could not be created.  Is .*/vendor a working copy\? \(Tip: svn mkdir it\)"
+    And I should not find a vendor/libcalc folder

data/features/step_definitions/repository.rb

@@ -0,0 +1,213 @@
+Given /^a newly created Git project$/ do
+  @wcdir = Tmpdir.where(:wc)
+  @wcdir.mkpath
+  Dir.chdir(@wcdir) do
+    git :init
+    touch :README
+    git :add, "."
+    @stdout = git :commit, "--message", "first commit"
+    @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+  end
+end
+
+Given /^a newly created Subversion project$/ do
+  @reposdir = Tmpdir.where(:repos)
+  @reposdir.mkpath
+  svnadmin :create, @reposdir 
+  @wcdir = Tmpdir.where(:wc)
+  svn :checkout, "file:///#{@reposdir}", @wcdir
+end
+
+Given /^a remote Git project named (\w+)$/ do |name|
+  @remotewcdir = @remotereposdir = Tmpdir.where("remote/#{name}.git")
+  @remotereposdir.mkpath
+  Dir.chdir(@remotereposdir) do
+    git :init
+    touch :README
+    git :add, "."
+    @stdout = git :commit, "--message", "initial commit"
+    @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+  end
+end
+
+Given /^a remote Subversion project named (\w+)( using the classic layout)?$/ do |name, classic|
+  @remotereposdir = Tmpdir.where("remote/repos/#{name}")
+  @remotereposdir.mkpath
+  svnadmin :create, @remotereposdir
+  @remotewcdir = Tmpdir.where("remote/wc/#{name}")
+  svn :checkout, "file:///#{@remotereposdir}", @remotewcdir
+  if classic then
+    svn :mkdir, @remotewcdir + "trunk", @remotewcdir + "branches", @remotewcdir + "tags"
+    @stdout = svn :commit, "--message", "classic layout", @remotewcdir
+    @stdout.should =~ /Committed revision \d+/
+    @remotewcdir    = @remotewcdir + "trunk"
+    @remotereposdir = @remotereposdir + "trunk"
+  end
+end
+ 
+Given /^a file named ([^\s]+) was deleted in remote (\w+) project$/ do |filename, project|
+  Dir.chdir(@remotewcdir) do
+    if (@remotewcdir + ".git").directory? then
+      git :rm, filename
+      @stdout = git :commit, "--message", "removing #{filename}"
+      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+    else
+      svn :rm, filename
+      @stdout = svn :commit, "--message", "removing #{filename}"
+      @stdout.should =~ /Committed revision \d+/
+    end
+  end
+end
+
+Given /^a file named ([^\s]+) with content "([^"]+)" in remote (\w+) project$/ do |filename, content, project|
+  content.gsub!("\\n", "\n")
+  File.open(@remotewcdir + filename, "w+") {|io| io.puts(content)}
+  Dir.chdir(@remotewcdir) do
+    if (@remotewcdir + ".git").directory? then
+      git :add, "."
+      @stdout = git :commit, "--message", "adding #{filename}"
+      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]/
+    else
+      svn :add, filename
+      @stdout = svn :commit, "--message", "adding #{filename}"
+      @stdout.should =~ /Committed revision \d+/
+    end
+  end
+end
+
+Given /^a file named ([^\s]+) was renamed to ([^\s]+) in remote (\w+) project$/ do |from, to, project|
+  Dir.chdir(@remotewcdir) do
+    if (@remotewcdir + ".git").directory? then
+      git :mv, from, to
+      @stdout = git :commit, "--message", "moved #{from} to #{to}"
+      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]/
+    else
+      svn :mv, from, to
+      @stdout = svn :commit, "--message", "moved #{from} to #{to}"
+      @stdout.should =~ /Committed revision \d+/
+    end
+  end
+end
+
+Given /^a file named ([^\s]+) was updated with "([^"]+)" in remote (\w+) project$/ do |filename, content, project|
+  content.gsub!("\\n", "\n")
+  File.open(@remotewcdir + filename, "w+") {|io| io.puts(content)}
+  Dir.chdir(@remotewcdir) do
+    if (@remotewcdir + ".git").directory? then
+      git :add, "."
+      @stdout = git :commit, "--message", "updating #{filename}"
+      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]/
+    else
+      @stdout = svn :commit, "--message", "updating #{filename}"
+      @stdout.should =~ /Committed revision \d+/
+    end
+  end
+end
+
+Given /^I changed ([\w\/.]+) to "([^"]+)"$/ do |filename, content|
+  content.gsub!("\\n", "\n")
+  File.open(@wcdir + filename, "w+") {|io| io.puts(content)}
+  Dir.chdir(@wcdir) do
+    if (@wcdir + ".git").directory? then
+      git :add, "."
+      @stdout = git :commit, "--message", "adding #{filename}"
+      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]/
+    else
+      @stdout = svn :commit, "--message", "adding #{filename}"
+      @stdout.should =~ /Committed revision \d+/
+    end
+  end
+end
+
+Given /^an existing ([\w\/]+) folder$/ do |name|
+  if (@wcdir + ".git").directory? then
+    (@wcdir + "vendor").mkpath
+    touch(@wcdir + "vendor/.gitignore")
+    Dir.chdir(@wcdir) do
+      git :add, "."
+      @stdout = git :commit, "--message", "registered #{name}/"
+      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+    end
+  else
+    svn :mkdir, @wcdir + name
+    @stdout = svn :commit, "--message", "creating #{name}", @wcdir
+    @stdout.should =~ /Committed revision \d+/
+  end
+end
+
+When /^I import(?:ed)? ([\w\/]+)(?: into ([\w\/]+))?$/ do |project, into|
+  Dir.chdir(@wcdir) do
+    cmd = "#{Tmpdir.piston} import --verbose 5 file://#{@remotereposdir} 2>&1"
+    cmd << " #{into}" if into
+    STDERR.puts cmd.inspect if $DEBUG
+    @stdout = `#{cmd}`
+    STDERR.puts @stdout if $DEBUG
+  end
+end
+
+When /^I update(?:ed)? ([\w\/]+)$/ do |path|
+  Dir.chdir(@wcdir) do
+    cmd = "#{Tmpdir.piston} update --verbose 5 #{@wcdir + path}  2>&1"
+    STDERR.puts cmd.inspect if $DEBUG
+    @stdout = `#{cmd}`
+    STDERR.puts @stdout if $DEBUG
+  end
+end
+
+When /^I committed$/ do
+  if (@wcdir + ".git").directory?
+    Dir.chdir(@wcdir) do
+      @stdout = git :commit, "--message", "commit", "--all"
+      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+    end
+  else
+    @stdout = svn(:commit, "--message", "commit", @wcdir)
+    @stdout.should =~ /Committed revision \d+/
+  end
+end
+
+Then /^I should see "([^"]+)"(\s+debug)?$/ do |regexp, debug|
+  re = Regexp.new(regexp, Regexp::IGNORECASE + Regexp::MULTILINE)
+  STDERR.puts @stdout if debug
+  @stdout.should =~ re
+end
+
+Then /^I should( not)? find a ([\w+\/]+) folder$/ do |not_find, name|
+  if not_find then
+    File.exist?(@wcdir + name).should_not be_true
+    File.directory?(@wcdir + name).should_not be_true
+  else
+    File.exist?(@wcdir + name).should be_true
+    File.directory?(@wcdir + name).should be_true
+  end
+end
+
+Then /^I should (not )?find a ([.\w+\/]+) file$/ do |not_find, name|
+  if not_find then
+    File.exist?(@wcdir + name).should be_false
+    File.file?(@wcdir + name).should be_false
+  else
+    File.exist?(@wcdir + name).should be_true
+    File.file?(@wcdir + name).should be_true
+  end
+end
+
+Then /^I should find "([^"]+)" in ([\w\/.]+)$/ do |content, path|
+  File.read(@wcdir + path).should =~ Regexp.new(content, Regexp::MULTILINE + Regexp::IGNORECASE)
+end
+
+Then /^I should see a successful import message from Piston$/ do
+  if (@remotewcdir + ".git").directory? then
+    @stdout.should =~ /Imported commit [\da-f]+ from .*\/\w+.git/
+  else
+    @stdout.should =~ /Imported revision \d+ from .*\/\w+/
+  end
+end
+
+Then /^I should see a successful update message from Piston$/ do
+  if (@remotewcdir + ".git").directory? then
+    @stdout.should =~ /Updated .*\/libcalc to commit [a-fA-F0-9]+/
+  else
+    @stdout.should =~ /Updated .*\/libcalc to revision \d+/
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,27 @@
+require 'cucumber/formatters/unicode' # Comment out this line if you don't want Cucumber Unicode support
+require "pathname"
+require "fileutils"
+require File.dirname(__FILE__) + "/svn"
+require "spec"
+
+class Tmpdir
+  def self.where(subpath=nil)
+    @tmpdir ||= Pathname.new(ENV["TMPDIR"] || ENV["TMP"] || "tmp") + "piston"
+    @tmpdir + subpath.to_s
+  end
+
+  def self.piston
+    return @piston if @piston
+    bin = (Pathname.new(File.dirname(__FILE__)) + "../../bin/piston").realpath
+    lib = (Pathname.new(File.dirname(__FILE__)) + "../../lib").realpath
+    @piston = "ruby -I #{lib} #{bin}"
+  end
+end
+
+STDERR.puts "Removing #{Tmpdir.where}" if $DEBUG
+
+Before do
+  _ = Tmpdir.piston
+  FileUtils.rm_rf(Tmpdir.where, :verbose => $DEBUG)
+  Tmpdir.where.mkpath
+end

data/features/support/svn.rb

@@ -0,0 +1,23 @@
+def svnadmin(*args)
+  run(:svnadmin, args)
+end
+
+def svn(*args)
+  run(:svn, args)
+end
+
+def git(*args)
+  run(:git, args)
+end
+
+def touch(*args)
+  run(:touch, args)
+end
+
+def run(program, args)
+  cmd = args.map{|o| o.to_s}.inject([program]) do |memo, arg|
+    memo << (arg.include?(" ") ? %Q("#{arg}") : arg)
+  end
+  STDERR.puts cmd.inspect if $DEBUG
+  `#{cmd.join(" ")}`
+end

data/features/update_to_git.feature

@@ -0,0 +1,137 @@
+Feature: Updating from a remote Subversion repository
+  In order to be on the cutting edge and benefit from bug fixes
+  A developer
+  Wants to update his pistonised repositories
+  So that he keeps abreast of upstream changes
+
+  Scenario: Updating from a Subversion repository when there are no changes
+    Given a newly created Git project
+    And a remote Subversion project named libcalc
+    And I imported libcalc
+    And I committed
+    When I update libcalc
+    Then I should see "Upstream .*/libcalc was unchanged from revision \d+"
+    
+  Scenario: Updating from a Subversion repository when a file was added
+    Given a newly created Git project
+    And a remote Subversion project named libcalc
+    And a file named libcalc.rb with content "a" in remote libcalc project
+    And I imported libcalc
+    And I committed
+    And a file named libcomplex.rb with content "b" in remote libcalc project
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should find a libcalc/libcomplex.rb file
+
+  Scenario: Updating from a Subversion repository when a file was removed
+    Given a newly created Git project
+    And a remote Subversion project named libcalc
+    And a file named libcalc.rb with content "a" in remote libcalc project
+    And I imported libcalc
+    And I committed
+    And a file named libcalc.rb was deleted in remote libcalc project
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should not find a libcalc/libcalc.rb file
+
+  Scenario: Updating from a Subversion repository when a file was updated
+    Given a newly created Git project
+    And a remote Subversion project named libcalc
+    And a file named libcalc.rb with content "a" in remote libcalc project
+    And I imported libcalc
+    And I committed
+    And a file named libcalc.rb was updated with "a\nb\nc" in remote libcalc project
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should find a libcalc/libcalc.rb file
+    And I should find "a\nb\nc" in libcalc/libcalc.rb
+
+  Scenario: Updating from a Subversion repository when a file was moved
+    Given a newly created Git project
+    And a remote Subversion project named libcalc
+    And a file named libcalc.rb with content "a" in remote libcalc project
+    And I imported libcalc
+    And I committed
+    And a file named libcalc.rb was renamed to libcomplex.rb in remote libcalc project
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should not find a libcalc/libcalc.rb file
+    And I should find a libcalc/libcomplex.rb file
+
+  Scenario: Updating from a Git repository when there are no changes
+    Given a newly created Git project
+    And a remote Git project named libcalc
+    And I imported libcalc
+    And I committed
+    When I update libcalc
+    Then I should see "Upstream .*/libcalc.git was unchanged from commit [a-fA-F0-9]+"
+    
+  Scenario: Updating from a Git repository when a file was added
+    Given a newly created Git project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a" in remote libcalc project
+    And I imported libcalc
+    And I committed
+    And a file named libcomplex.rb with content "b" in remote libcalc project
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should find a libcalc/libcomplex.rb file
+
+  Scenario: Updating from a Git repository when a file was removed
+    Given a newly created Git project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a" in remote libcalc project
+    And I imported libcalc
+    And I committed
+    And a file named libcalc.rb was deleted in remote libcalc project
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should not find a libcalc/libcalc.rb file
+
+  Scenario: Updating from a Git repository when a file was updated
+    Given a newly created Git project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a" in remote libcalc project
+    And I imported libcalc
+    And I committed
+    And a file named libcalc.rb was updated with "a\nb\nc" in remote libcalc project
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should find a libcalc/libcalc.rb file
+    And I should find "a\nb\nc" in libcalc/libcalc.rb
+
+  Scenario: Updating from a Git repository when a file was moved
+    Given a newly created Git project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a" in remote libcalc project
+    And I imported libcalc
+    And I committed
+    And a file named libcalc.rb was renamed to libcomplex.rb in remote libcalc project
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should not find a libcalc/libcalc.rb file
+    And I should find a libcalc/libcomplex.rb file
+
+  Scenario: Updating from a Subversion repository when both local and remote changes have occured
+    Given a newly created Git project
+    And a remote Subversion project named libcalc
+    And a file named libcalc.rb with content "a\nb\nc\nd\ne" in remote libcalc project
+    And I imported libcaclc
+    And I committed
+    And a file named libcalc.rb was updated with "a\na\nb\nc\nd\ne" in remote libcalc project
+    And I changed libcalc/libcalc.rb to "a\nb\nc\nd\ne\ne"
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should find "a\na\nb\nc\nd\ne\ne" in libcalc/libcalc.rb
+
+  Scenario: Updating from a Git repository when both local and remote changes have occured
+    Given a newly created Git project
+    And a remote Git project named libcalc
+    And a file named libcalc.rb with content "a\nb\nc\nd\ne" in remote libcalc project
+    And I imported libcaclc
+    And I committed
+    And a file named libcalc.rb was updated with "a\na\nb\nc\nd\ne" in remote libcalc project
+    And I changed libcalc/libcalc.rb to "a\nb\nc\nd\ne\ne"
+    When I update libcalc
+    Then I should see a successful update message from Piston
+    And I should find "a\na\nb\nc\nd\ne\ne" in libcalc/libcalc.rb