piston 2.0.3 → 2.0.4

data/History.txt

@@ -1,3 +1,8 @@
+== 2.0.4 2009-07-20
+
+* Enable git support to work with more versions of Git by specifying th
+  remote's name when checking out the branch.
+
 == 2.0.2 2009-04-07
 
 * Fixed a bug in the command line parser that was interpreting status as statu.

data/VERSION.yml

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

data/features/import_to_git.feature

@@ -51,6 +51,20 @@ Feature: Import remote repository into a Git repository
     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
+    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
+
+  Scenario: Import from a branch
+    Given a newly created Git project
+    And a remote Git project named rails
+    And a file named rails.rb with content "a\n" in remote rails project
+    And a branch on the rails project named "2-3-stable"
+    And a file named 2-3-README with content "Rails 2.3\n" in remote rails project
+    When I import the "2-3-stable" branch of rails
+    Then I should see "2-3-stable"
+    And I should see a successful import message from Piston
+    And I should find a rails folder
+    And I should find a rails/rails.rb file
+    And I should find a rails/2-3-README file
+    And I should find a rails/.piston.yml file

data/features/step_definitions/repository.rb

@@ -172,7 +172,7 @@ Then /^I should see "([^"]+)"(\s+debug)?$/ do |regexp, debug|
   @stdout.should =~ re
 end
 
-Then /^I should( not)? find a ([\w+\/]+) folder$/ do |not_find, name|
+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
@@ -182,7 +182,7 @@ Then /^I should( not)? find a ([\w+\/]+) folder$/ do |not_find, name|
   end
 end
 
-Then /^I should (not )?find a ([.\w+\/]+) file$/ do |not_find, name|
+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
@@ -192,7 +192,7 @@ Then /^I should (not )?find a ([.\w+\/]+) file$/ do |not_find, name|
   end
 end
 
-Then /^I should find "([^"]+)" in ([\w\/.]+)$/ do |content, path|
+Then /^I should find "([^"]+)" in ([-\w\/.]+)$/ do |content, path|
   File.read(@wcdir + path).should =~ Regexp.new(content, Regexp::MULTILINE + Regexp::IGNORECASE)
 end
 
@@ -211,3 +211,25 @@ Then /^I should see a successful update message from Piston$/ do
     @stdout.should =~ /Updated .*\/libcalc to revision \d+/
   end
 end
+
+Given /^a branch on the ([^ ]+) project named "([^\"]*)"$/ do |project, branch|
+  Dir.chdir(@remotewcdir) do
+    if (@remotewcdir + ".git").directory? then
+      git :checkout, "-b", branch
+			@stdout = git :branch
+      @stdout.should =~ /^\*\s+#{branch}/
+    else
+			pending
+    end
+  end
+end
+
+When /^I import the "([^\"]+)" branch of ([^ ]+)(?: into ([\w\/]+))?$/ do |branch, project, into|
+  Dir.chdir(@wcdir) do
+    cmd = "#{Tmpdir.piston} import --verbose 5 --commit #{branch} file://#{@remotereposdir} 2>&1"
+    cmd << " #{into}" if into
+    STDERR.puts cmd.inspect if $DEBUG
+    @stdout = `#{cmd}`
+    STDERR.puts @stdout if $DEBUG
+  end
+end

data/lib/piston/git/commit.rb

@@ -49,6 +49,8 @@ module Piston
         super
         git(:clone, repository.url, @dir)
         Dir.chdir(@dir) do
+          target = commit
+          target = "origin/#{target}" unless target.include?("/") || target =~ /^[a-f\d]+$/i
           git(:checkout, "-b", branch_name, commit)
           response = git(:log, "-n", "1")
           @sha1 = $1 if response =~ /commit\s+([a-f\d]{40})/i

data/lib/piston/git/working_copy.rb

@@ -55,18 +55,19 @@ module Piston
       end
 
       def after_remember(path)
-        Dir.chdir(self.path) { git(:add, path.relative_path_from(self.path)) }
+        Dir.chdir(self.path) { git(:add, "-f", path.relative_path_from(self.path)) }
       end
 
       def finalize
-        Dir.chdir(path) { git(:add, ".") }
+        Dir.chdir(path) { git(:add, "-f", ".") }
       end
 
       def add(added)
         Dir.chdir(path) do
           added.each do |item|
-            item.mkdir unless item.exist?
-            git(:add, item)
+            target = path + item
+            target.mkdir unless target.exist?
+            git(:add, "-f", item)
           end
         end
       end

data/piston.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{piston}
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francois Beausoleil"]
-  s.date = %q{2009-07-17}
+  s.date = %q{2009-07-20}
   s.default_executable = %q{piston}
   s.description = %q{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.email = %q{francois@teksol.info}
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
     ".gitignore",
      "History.txt",
      "License.txt",
-     "Manifest.txt",
      "README.txt",
      "Rakefile",
      "TODO",
@@ -67,8 +66,6 @@ Gem::Specification.new do |s|
      "script/txt2html",
      "setup.rb",
      "tasks/environment.rake",
-     "tasks/features.rake",
-     "tasks/manifest.rake",
      "tasks/test.rake",
      "tasks/website.rake",
      "test/integration_helpers.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Francois Beausoleil
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-17 00:00:00 -04:00
+date: 2009-07-20 00:00:00 -04:00
 default_executable: piston
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,6 @@ files:
 - .gitignore
 - History.txt
 - License.txt
-- Manifest.txt
 - README.txt
 - Rakefile
 - TODO
@@ -113,8 +112,6 @@ files:
 - script/txt2html
 - setup.rb
 - tasks/environment.rake
-- tasks/features.rake
-- tasks/manifest.rake
 - tasks/test.rake
 - tasks/website.rake
 - test/integration_helpers.rb

data/Manifest.txt

@@ -1,109 +0,0 @@
-.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/tasks/features.rake

@@ -1,6 +0,0 @@
-require "cucumber/rake/task"
-
-Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--no-source"
-  t.feature_list  = FileList["features/*.feature"]
-end

data/tasks/manifest.rake

@@ -1,4 +0,0 @@
-desc "Refreshes the manifest: use this instead of manifest:refresh"
-task :manifest do
-  sh "find . -type f | grep -v ./.git/ | grep -v -e '\.log$' | sed -e 's!^\./!!' > Manifest.txt"
-end