piston 2.0.7 → 2.0.8

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 0
-:patch: 7
+:patch: 8
 :major: 2
+:minor: 0
+:build: 

data/features/import_to_git.feature

@@ -46,7 +46,22 @@ Feature: Import remote repository into a Git repository
     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 I committed
+    When I check the status
+    Then I should see an empty status report for "libcalc"
+
+    When I check the status with "--show-updates"
+    Then I should see an empty status report for "libcalc"
+
+    Given a file named libfix.rb with content "a\nb\nc" in remote libcalc project
+    When I check the status
+    Then I should see an empty status report for "libcalc"
+
+    When I check the status with "--show-updates"
+    Then I should see a change for "libcalc"
+    And I should see a remote change for "libcalc"
+
+  Scenario: Importing into a specific folder when the parent folder 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

data/features/step_definitions/repository.rb

@@ -1,3 +1,9 @@
+# Git's UI changes between revisions...  Have to support more formats, or
+# maybe find a better way to determine what's going on
+#
+# TODO: Maybe use Grit to determine repository validity?
+GIT_COMMIT_RE = /Created (?:initial )?commit [a-fA-F0-9]+|\[[-\w]+ (?:\(root-commit\) )?[a-fA-F0-9]{7,40}\]/
+
 Given /^a newly created Git project$/ do
   @wcdir = Tmpdir.where(:wc)
   @wcdir.mkpath
@@ -6,7 +12,7 @@ Given /^a newly created Git project$/ do
     touch :README
     git :add, "."
     @stdout = git :commit, "--message", "first commit"
-    @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+    @stdout.should =~ GIT_COMMIT_RE
   end
 end
 
@@ -26,7 +32,7 @@ Given /^a remote Git project named (\w+)$/ do |name|
     touch :README
     git :add, "."
     @stdout = git :commit, "--message", "initial commit"
-    @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+    @stdout.should =~ GIT_COMMIT_RE
   end
 end
 
@@ -50,7 +56,7 @@ Given /^a file named ([^\s]+) was deleted in remote (\w+) project$/ do |filename
     if (@remotewcdir + ".git").directory? then
       git :rm, filename
       @stdout = git :commit, "--message", "removing #{filename}"
-      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+      @stdout.should =~ GIT_COMMIT_RE
     else
       svn :rm, filename
       @stdout = svn :commit, "--message", "removing #{filename}"
@@ -66,7 +72,7 @@ Given /^a file named ([^\s]+) with content "([^"]+)" in remote (\w+) project$/ d
     if (@remotewcdir + ".git").directory? then
       git :add, "."
       @stdout = git :commit, "--message", "adding #{filename}"
-      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]/
+      @stdout.should =~ GIT_COMMIT_RE
     else
       svn :add, filename
       @stdout = svn :commit, "--message", "adding #{filename}"
@@ -80,7 +86,7 @@ Given /^a file named ([^\s]+) was renamed to ([^\s]+) in remote (\w+) project$/
     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]/
+      @stdout.should =~ GIT_COMMIT_RE
     else
       svn :mv, from, to
       @stdout = svn :commit, "--message", "moved #{from} to #{to}"
@@ -96,7 +102,7 @@ Given /^a file named ([^\s]+) was updated with "([^"]+)" in remote (\w+) project
     if (@remotewcdir + ".git").directory? then
       git :add, "."
       @stdout = git :commit, "--message", "updating #{filename}"
-      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]/
+      @stdout.should =~ GIT_COMMIT_RE
     else
       @stdout = svn :commit, "--message", "updating #{filename}"
       @stdout.should =~ /Committed revision \d+/
@@ -111,7 +117,7 @@ Given /^I changed ([\w\/.]+) to "([^"]+)"$/ do |filename, content|
     if (@wcdir + ".git").directory? then
       git :add, "."
       @stdout = git :commit, "--message", "adding #{filename}"
-      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]/
+      @stdout.should =~ GIT_COMMIT_RE
     else
       @stdout = svn :commit, "--message", "adding #{filename}"
       @stdout.should =~ /Committed revision \d+/
@@ -126,7 +132,7 @@ Given /^an existing ([\w\/]+) folder$/ do |name|
     Dir.chdir(@wcdir) do
       git :add, "."
       @stdout = git :commit, "--message", "registered #{name}/"
-      @stdout.should =~ /Created (?:initial )?commit [a-fA-F0-9]+/
+      @stdout.should =~ GIT_COMMIT_RE
     end
   else
     svn :mkdir, @wcdir + name
@@ -158,7 +164,7 @@ 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]+/
+      @stdout.should =~ GIT_COMMIT_RE
     end
   else
     @stdout = svn(:commit, "--message", "commit", @wcdir)
@@ -233,3 +239,28 @@ When /^I import the "([^\"]+)" branch of ([^ ]+)(?: into ([\w\/]+))?$/ do |branc
     STDERR.puts @stdout if $DEBUG
   end
 end
+
+When /^I check the status(?: with "([^"]+)")?$/ do |args|
+  Dir.chdir(@wcdir) do
+    cmd = "#{Tmpdir.piston} status --verbose 5"
+    cmd << " #{args}" if args
+    STDERR.puts cmd.inspect if $DEBUG
+    @stdout = `#{cmd}`
+    STDERR.puts @stdout if $DEBUG
+  end
+end
+
+Then /^I should see an empty status report for "([^"]+)"$/ do |project|
+  @stdout.should =~ /^\s+(?:\/private)?#{Regexp.escape(@wcdir + project)} \(file:\/\/#{Regexp.escape(@remotereposdir)}\)/
+end
+
+Then /^I should see a (?:(local|remote) )?change for "([^\"]*)"$/ do |local_remote, project|
+  case local_remote
+  when nil, ""
+    @stdout.should =~ /^[ M]{2}\s+(?:\/private)?#{Regexp.escape(@wcdir + project)} \(file:\/\/#{Regexp.escape(@remotereposdir)}\)/
+  when "local"
+    @stdout.should =~ /^M \s+(?:\/private)?#{Regexp.escape(@wcdir + project)} \(file:\/\/#{Regexp.escape(@remotereposdir)}\)/
+  when "remote"
+    @stdout.should =~ /^ M\s+(?:\/private)?#{Regexp.escape(@wcdir + project)} \(file:\/\/#{Regexp.escape(@remotereposdir)}\)/
+  end
+end

data/features/support/env.rb

@@ -1,4 +1,3 @@
-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"

data/lib/piston/cli.rb

@@ -1,5 +1,5 @@
 require "log4r"
-require "activesupport"
+require "active_support"
 require "piston/version"
 require "optparse"
 

data/lib/piston/commands/status.rb

@@ -6,30 +6,19 @@ module Piston
       def run(wcdir)
         # Get the working copy handler to search pistonized folders inside it
         handler = guess_wc(wcdir).class
-        
-        # First, find the list of pistonized folders
-        repos = Hash.new
-        Pathname.glob(wcdir + '**/.piston.yml') do |path|
-          repos[path.dirname] = Hash.new
-        end
+        props   = Hash.new
 
-        # Then, get their properties
-        repos.each_pair do |path, props|
-          logger.debug {"Get info of #{path}"}
-          working_copy = handler.new(path)
-          working_copy.validate!
-          props.update(working_copy.info)
-          props[:locally_modified] = 'M' if working_copy.locally_modified
-          props[:remotely_modified] = 'M' if show_updates and working_copy.remotely_modified
-        end
+        # Then, get that repository's properties
+        logger.debug {"Get info of #{wcdir}"}
+        working_copy = handler.new(wcdir)
+        working_copy.validate!
+        props.update(working_copy.info)
+        props[:locally_modified]  = 'M' if working_copy.locally_modified
+        props[:remotely_modified] = 'M' if show_updates && working_copy.remotely_modified
 
         # Display the results
-        repos.each_pair do |path, props|
-          printf "%1s%1s %6s %s (%s)\n", props[:locally_modified],
-              props[:remotely_modified], props["lock"] ? 'locked' : '', path, props["repository_url"]
-        end
-
-        puts "No pistonized folders found in #{wcdir}" if repos.empty?
+        printf "%1s%1s %6s %s (%s)\n", props[:locally_modified],
+          props[:remotely_modified], props["lock"] ? 'locked' : '', wcdir.to_s, props["repository_url"]
       end
 
       def show_updates
@@ -37,7 +26,9 @@ module Piston
       end
 
 			def start(*args)
-				args.flatten.map {|d| Pathname.new(d).expand_path}.each do |wcdir|
+        paths = args.flatten.map {|d| Pathname.new(d).expand_path}
+        paths = find_local_piston_folders if paths.empty?
+        paths.each do |wcdir|
 					begin
 						run(wcdir)
 					rescue Piston::WorkingCopy::NotWorkingCopy
@@ -45,6 +36,12 @@ module Piston
 					end
 				end
 			end
+
+      private
+
+      def find_local_piston_folders
+        Pathname.glob(Pathname.new(Dir.pwd) + '**/.piston.yml').map {|path| path + ".."}.map(&:expand_path)
+      end
     end
   end
 end

data/lib/piston/git/working_copy.rb

@@ -80,7 +80,11 @@ module Piston
 
       def rename(renamed)
         Dir.chdir(path) do
-          renamed.each { |from, to| git(:mv, from, to) }
+          renamed.each do |from, to|
+            target = path + File.dirname(to)
+            target.mkpath unless target.exist?
+            git(:mv, from, to)
+          end
         end
       end
 

data/piston.gemspec

@@ -1,21 +1,22 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{piston}
-  s.version = "2.0.7"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francois Beausoleil"]
-  s.date = %q{2009-10-22}
+  s.date = %q{2010-01-12}
   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"
+    "README.txt",
+     "TODO"
   ]
   s.files = [
     ".gitignore",
@@ -183,3 +184,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.0.0"])
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors: 
 - Francois Beausoleil
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -04:00
+date: 2010-01-12 00:00:00 -05:00
 default_executable: piston
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ extensions: []
 
 extra_rdoc_files: 
 - README.txt
+- TODO
 files: 
 - .gitignore
 - History.txt