git-topic 0.2.2 → 0.2.3

data/VERSION.yml

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

data/bin/git-topic-completion

@@ -24,12 +24,13 @@ module GitTopic::Completion
       end.compact
     end
 
-    def my_reject_review_and_local_wip_branches
+    def my_reject_review_and_all_wip_branches
       branches.map do |b|
         b =~ %r{^(wip)/#{user}/(.*)}                      ||
         b =~ %r{^remotes/origin/(rejected)/#{user}/(.*)}  ||
         b =~ %r{^remotes/origin/(review)/#{user}/(.*)}
-        suggestion = [$1,$2].compact.join("/")
+        b =~ %r{^remotes/origin/(wip)/(\S*?)/(.*)}
+        suggestion = [$1,($2 unless $2 == user), $3].compact.join("/")
         suggestion unless suggestion.strip.empty?
       end.compact
     end
@@ -44,7 +45,7 @@ module GitTopic::Completion
         when "done"
           # nothing
         when "work-on"
-          my_reject_review_and_local_wip_branches
+          my_reject_review_and_all_wip_branches
         when "review"
           others_review_branches
         end || []

data/lib/git_topic/naming.rb

@@ -10,8 +10,11 @@ module GitTopic::Naming
       "backup/#{user}/#{strip_namespace topic}"
     end
 
-    def wip_branch( topic )
-      "wip/#{user}/#{strip_namespace topic}"
+    def wip_branch( ref )
+      parts     = topic_parts( ref )
+      wip_user  = parts[:user] || user
+      topic     = parts[:topic]
+      "wip/#{wip_user}/#{topic}"
     end
 
     def rejected_branch( topic )
@@ -62,9 +65,10 @@ module GitTopic::Naming
       parts = ref.split( '/' )
       case parts.size
       when 3
-        _, p[:user], p[:topic] = parts
+        p[:namespace], p[:user], p[:topic] = parts
       when 2
-        p[:user], p[:topic] = parts
+        first_part = (parts.first =~ /(wip|review|rejected)/) ? :namespace : :user
+        p[ first_part ], p[:topic] = parts
       when 1
         p[:topic] = parts.first
       else

data/spec/git_topic_status_spec.rb

@@ -31,7 +31,9 @@ describe GitTopic do
 
         @output.clear
         GitTopic.status
-        @output.should_not              =~ %r{ninja-basic}
+        @output.should                  =~ %r{^\s*(#.*)}m
+        status_output                   = $1
+        status_output.should_not        =~ %r{ninja-basic}
       end
 
       it "

data/spec/git_topic_work_on_spec.rb

@@ -7,9 +7,7 @@ describe GitTopic do
 
     share_examples_for "#work_on general cases" do
 
-      it "
-        should trim namespaces from args and output a warning
-      ".oneline do
+      it "should trim namespaces for a user's wip branch".oneline do
 
         git_branch.should_not                   == "wip/#{@user}/topic"
         GitTopic.work_on "wip/#{@user}/topic"
@@ -62,6 +60,14 @@ describe GitTopic do
 
       it_should_behave_like "#work_on general cases"
 
+
+      it "should trim namespaces for a different user's wip branch" do
+
+        git_branch.should_not                   == "wip/user24601/pirates-with-hooks"
+        GitTopic.work_on "wip/user24601/pirates-with-hooks"
+        git_branch.should                       == "wip/user24601/pirates-with-hooks"
+      end
+
       it "should switch to (rather than create) an existing topic branch" do
         git_branches.should include( "wip/#{@user}/zombie-basic" )
         lambda{ GitTopic.work_on  'zombie-basic' }.should_not raise_error

data/spec/spec_helper.rb

@@ -113,8 +113,12 @@ Rspec.configure do |c|
     $stdout.stub!( :write ) { |*args| @output.<<( *args )}
     $stderr.stub!( :write ) { |*args| @err.<<( *args )}
   end
-
   c.after( :each ) { Dir.chdir @starting_dir }
+
+
+  c.before( :each ) do
+    GitTopic::global_opts[:verbose] = true
+  end
 end
 
 

data/spec/template/origin/refs/heads/wip/user24601/pirates-with-hooks

@@ -0,0 +1 @@
+331d827fd47fb234af54e3a4bbf8c6705e9116cc

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - David J. Hamilton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -07:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -261,6 +261,7 @@ files:
 - spec/template/origin/refs/heads/wip/USER/pirates-advanced
 - spec/template/origin/refs/heads/wip/USER/zombie-basic
 - spec/template/origin/refs/heads/wip/prevent-ff
+- spec/template/origin/refs/heads/wip/user24601/pirates-with-hooks
 - bin/git-topic
 - bin/git-topic-completion
 has_rdoc: true