git-topic 0.1.6.2 → 0.1.6.3

data/Rakefile

@@ -79,9 +79,26 @@ task 'version:write:build' do
   File.open( "VERSION.yml", "w" ){|f| f.puts YAML::dump( v )}
 end
 
+task 'version:bump:build' do
+  y = YAML::load_file( "VERSION.yml" )
+  v = {
+    :major => 0, :minor => 0, :patch => 0, :build => 0
+  }
+  v.merge!( y ) if y.is_a? Hash
+
+  raise "Can't bump build: not a number" unless v[:build].is_a? Numeric
+  v[ :build ] += 1
+
+  v.each{|k,v| ENV[ k.to_s.upcase ] = v.to_s}
+  Rake::Task["version:write"].invoke
+end
+
+
 desc "Run all specs."
 task :spec do
-  sh "bundle exec rspec spec"
+  # Jeweler messes up specs by polluting ENV
+  ENV.keys.grep( /git/i ).each{|k| ENV.delete k }
+  sh "rspec spec"
 end
 
 

data/VERSION.yml

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

data/bin/git-topic

@@ -17,7 +17,6 @@ module GitTopic
       [h[:major], h[:minor], h[:patch], h[:build]].compact.join( "." )
     end
   }.call
-  GlobalOptKeys = [ :verbose, :help, :verbose_given, :version ]
 
   class << self
     def run

data/git-topic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-topic}
-  s.version = "0.1.6.2"
+  s.version = "0.1.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David J. Hamilton"]

data/lib/git_topic.rb

@@ -13,6 +13,8 @@ module GitTopic
   include GitTopic::Git
   include GitTopic::Naming
 
+  GlobalOptKeys = [ :verbose, :help, :verbose_given, :version ]
+
 
   class << self
 
@@ -167,7 +169,7 @@ module GitTopic
 
       rem_review_branch   = find_remote_review_branch( topic ).gsub( %r{^origin/}, '' )
       git [
-        "push origin :#{rem_review_branch}",
+        "push origin master :#{rem_review_branch}",
         "branch -d #{local_review_branch}"
       ]
     end

data/spec/git_topic_spec.rb

@@ -15,7 +15,7 @@ describe GitTopic do
     FileUtils.rm_rf   './tmp'
     FileUtils.mkdir   './tmp'
 
-    %w(fresh in-progress dirty origin).each do |repo|
+    %w(fresh in-progress origin).each do |repo|
       FileUtils.cp_r "spec/template/#{repo}",   './tmp'
 
       # set template branches to their proper name (i.e. matching @user)
@@ -42,6 +42,13 @@ describe GitTopic do
 
   # helpers # {{{
 
+  def use_repo( repo )
+    Dir.chdir( repo )
+    # Exit if e.g. GIT_DIR is set
+    raise "Spec error" unless `git rev-parse --git-dir`.chomp == '.git'
+  end
+
+
   def git_branch
     all_branches    = `git branch --no-color`.split( "\n" )
     current_branch  = all_branches.find{|b| b =~ /^\*/}
@@ -53,6 +60,10 @@ describe GitTopic do
     `git rev-parse HEAD`.chomp
   end
 
+  def git_origin_master
+    `git rev-parse origin/master`.chomp
+  end
+
   def git_config( key )
     `git config #{key}`.chomp
   end
@@ -85,7 +96,7 @@ describe GitTopic do
   describe "#work_on" do
 
     describe "in fresh" do
-      before( :each ) { Dir.chdir( 'fresh' )}
+      before( :each ) { use_repo( 'fresh' )}
       after( :each )  { Dir.chdir( '..' )}
 
       it "
@@ -108,7 +119,7 @@ describe GitTopic do
 
     describe "in in-progress" do
 
-      before( :each ) { Dir.chdir( 'in-progress' )}
+      before( :each ) { use_repo( 'in-progress' )}
       after( :each )  { Dir.chdir( '..' )}
 
 
@@ -139,7 +150,7 @@ describe GitTopic do
 
     describe "in in-progress" do
 
-      before( :each ) { Dir.chdir 'in-progress' }
+      before( :each ) { use_repo 'in-progress' }
       after( :each )  { Dir.chdir '..' }
 
       describe "without an argument" do
@@ -181,7 +192,7 @@ describe GitTopic do
 
     describe "with pending review branches" do
 
-      before( :each ) { Dir.chdir 'in-progress' }
+      before( :each ) { use_repo 'in-progress' }
       after( :each )  { Dir.chdir '..' }
 
 
@@ -207,7 +218,7 @@ describe GitTopic do
     end
 
     describe "passed the --prepended flag" do
-      before( :each ) { Dir.chdir 'in-progress' }
+      before( :each ) { use_repo 'in-progress' }
       after( :each )  { Dir.chdir '..' }
 
       it "should invoke git status before producing its output" do
@@ -221,7 +232,7 @@ describe GitTopic do
   describe "#review" do
 
     describe "with no review branches" do
-      before( :each ) { Dir.chdir 'fresh' }
+      before( :each ) { use_repo 'fresh' }
       after( :each )  { Dir.chdir '..' }
 
       it "should report that there is nothing to do" do
@@ -235,7 +246,7 @@ describe GitTopic do
     end
 
     describe "with some review branches" do
-      before( :each ) { Dir.chdir 'in-progress' }
+      before( :each ) { use_repo 'in-progress' }
       after( :each )  { Dir.chdir '..' }
 
       it "
@@ -279,7 +290,7 @@ describe GitTopic do
 
     describe "while on a review branch" do
       before( :each ) do
-        Dir.chdir 'in-progress'
+        use_repo 'in-progress'
         GitTopic.review 'user24601/zombie-basic'
       end
       after( :each ) { Dir.chdir '..' }
@@ -297,13 +308,14 @@ describe GitTopic do
           git_remote_branches.should_not  include( 'review/user24601/zombie-basic' )
 
           git_head.should                 == '0ce06c616769768f09f5e629cfcc68eabe3dee81'
+          git_origin_master.should        == '0ce06c616769768f09f5e629cfcc68eabe3dee81'
         end
       end
     end
 
     describe "while on a review branch that does not FF" do
       before( :each ) do
-        Dir.chdir 'in-progress'
+        use_repo 'in-progress'
         system "
           git checkout master > /dev/null 2> /dev/null && 
           git merge wip/prevent-ff > /dev/null 2> /dev/null
@@ -325,7 +337,7 @@ describe GitTopic do
     end
 
     describe "while not on a review branch" do
-      before( :each ) { Dir.chdir 'in-progress' }
+      before( :each ) { use_repo 'in-progress' }
       after( :each ) { Dir.chdir '..' }
 
       it "should fail" do
@@ -339,7 +351,7 @@ describe GitTopic do
 
     describe "while on a review branch" do
       before( :each ) do
-        Dir.chdir 'in-progress'
+        use_repo 'in-progress'
         GitTopic.review 'user24601/zombie-basic'
       end
       after( :each ) { Dir.chdir '..' }
@@ -361,7 +373,7 @@ describe GitTopic do
     end
     
     describe "while not on a review branch" do
-      before( :each ) { Dir.chdir 'in-progress' }
+      before( :each ) { use_repo 'in-progress' }
       after( :each ) { Dir.chdir '..' }
 
       it "should fail" do

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 6
-  - 2
-  version: 0.1.6.2
+  - 3
+  version: 0.1.6.3
 platform: ruby
 authors: 
 - David J. Hamilton