piston 2.0.2 → 2.0.3

data/features/update_to_svn.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 Subversion 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 Subversion 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 Subversion 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 Subversion 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 Subversion 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 Subversion 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 Subversion 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 Subversion 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 Subversion 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 Subversion 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 Subversion 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 Subversion 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

data/lib/piston/commands/lock.rb

@@ -0,0 +1,14 @@
+require "piston/commands/lock_unlock"
+
+module Piston
+  module Commands
+    class Unlock < LockUnlock
+      def start(*args)
+        args.each do |arg|
+          options[:wcdir] = arg
+          run(false)
+        end
+      end
+    end
+  end
+end

data/lib/piston/commands/lock_unlock.rb

@@ -16,11 +16,6 @@ module Piston
         text = lock ? "Locked" : "Unlocked"
         logger.info "#{text} #{working_copy} against automatic updates"
       end
-
-			def start(*args)
-				options[:wcdir] = args.first
-				run(true)
-			end
     end
   end
 end

data/lib/piston/commands/unlock.rb

@@ -0,0 +1,14 @@
+require "piston/commands/lock_unlock"
+
+module Piston
+  module Commands
+    class Lock < LockUnlock
+      def start(*args)
+        args.each do |arg|
+          options[:wcdir] = arg
+          run(true)
+        end
+      end
+    end
+  end
+end

data/lib/piston/git/commit.rb

@@ -85,6 +85,7 @@ module Piston
           Find.prune if path.to_s =~ %r{/[.]git}
           next if @dir == path
           next if File.directory?(path)
+          next if @dir + '.piston.yml' == path
           yield path.relative_path_from(@dir)
         end
       end

data/lib/piston/svn/revision.rb

@@ -66,6 +66,7 @@ module Piston
 
         svn(:ls, "--recursive", @dir).split("\n").each do |relpath|
           next if relpath =~ %r{/$}
+          next if relpath == '.piston.yml'
           yield relpath.chomp
         end
       end

data/piston.gemspec

@@ -0,0 +1,184 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{piston}
+  s.version = "2.0.3"
+
+  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.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}
+  s.executables = ["piston"]
+  s.extra_rdoc_files = [
+    "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "License.txt",
+     "Manifest.txt",
+     "README.txt",
+     "Rakefile",
+     "TODO",
+     "VERSION.yml",
+     "bin/piston",
+     "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",
+     "lib/piston.rb",
+     "lib/piston/cli.rb",
+     "lib/piston/commands.rb",
+     "lib/piston/commands/base.rb",
+     "lib/piston/commands/convert.rb",
+     "lib/piston/commands/diff.rb",
+     "lib/piston/commands/import.rb",
+     "lib/piston/commands/info.rb",
+     "lib/piston/commands/lock.rb",
+     "lib/piston/commands/lock_unlock.rb",
+     "lib/piston/commands/status.rb",
+     "lib/piston/commands/unlock.rb",
+     "lib/piston/commands/update.rb",
+     "lib/piston/commands/upgrade.rb",
+     "lib/piston/git.rb",
+     "lib/piston/git/client.rb",
+     "lib/piston/git/commit.rb",
+     "lib/piston/git/repository.rb",
+     "lib/piston/git/working_copy.rb",
+     "lib/piston/repository.rb",
+     "lib/piston/revision.rb",
+     "lib/piston/svn.rb",
+     "lib/piston/svn/client.rb",
+     "lib/piston/svn/repository.rb",
+     "lib/piston/svn/revision.rb",
+     "lib/piston/svn/working_copy.rb",
+     "lib/piston/version.rb",
+     "lib/piston/working_copy.rb",
+     "lib/subclass_responsibility_error.rb",
+     "log/.gitignore",
+     "piston.gemspec",
+     "script/destroy",
+     "script/generate",
+     "script/txt2html",
+     "setup.rb",
+     "tasks/environment.rake",
+     "tasks/features.rake",
+     "tasks/manifest.rake",
+     "tasks/test.rake",
+     "tasks/website.rake",
+     "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"
+  ]
+  s.homepage = %q{http://francois.github.com/piston}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{piston}
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{Ease your vendor branch management worries}
+  s.test_files = [
+    "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"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<cucumber>, [">= 0.1.16"])
+      s.add_runtime_dependency(%q<main>, [">= 2.8.3"])
+      s.add_runtime_dependency(%q<log4r>, [">= 1.0.5"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
+    else
+      s.add_dependency(%q<cucumber>, [">= 0.1.16"])
+      s.add_dependency(%q<main>, [">= 2.8.3"])
+      s.add_dependency(%q<log4r>, [">= 1.0.5"])
+      s.add_dependency(%q<activesupport>, [">= 2.0.0"])
+    end
+  else
+    s.add_dependency(%q<cucumber>, [">= 0.1.16"])
+    s.add_dependency(%q<main>, [">= 2.8.3"])
+    s.add_dependency(%q<log4r>, [">= 1.0.5"])
+    s.add_dependency(%q<activesupport>, [">= 2.0.0"])
+  end
+end

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)

data/script/txt2html

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+begin
+  require 'newgem'
+rescue LoadError
+  puts "\n\nGenerating the website requires the newgem RubyGem"
+  puts "Install: gem install newgem\n\n"
+  exit(1)
+end
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require File.dirname(__FILE__) + '/../lib/piston/version.rb'
+
+version  = Piston::VERSION::STRING
+download = 'http://rubyforge.org/projects/piston'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1: return 'st'
+    when 2: return 'nd'
+    when 3: return 'rd'
+    else    return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
+  
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)