socialcast-git-extensions 3.0.9 → 3.1.0

data/lib/socialcast-git-extensions/cli.rb

@@ -35,12 +35,15 @@ module Socialcast
         branch = current_branch
         repo = current_repo
         url = create_pull_request token, branch, repo, description
+        say "Pull request created: #{url}"
 
         short_description = description.split("\n").first(5).join("\n")
-        review_message = ["@SocialcastDevelopers #reviewrequest for #{branch} #scgitx", short_description, changelog_summary(branch)].join("\n\n")
+        review_message = ["#reviewrequest for #{branch} #scgitx", "/cc @SocialcastDevelopers", short_description, changelog_summary(branch)].join("\n\n")
         post review_message, :url => url, :message_type => 'review_request'
       end
 
+      # TODO: use --no-edit to skip merge messages
+      # TODO: use pull --rebase to skip merge commit
       desc 'update', 'Update the current branch with latest changes from the remote feature branch and master'
       def update
         branch = current_branch
@@ -64,7 +67,7 @@ module Socialcast
         say "Deleting branches that have been merged into "
         say Socialcast::Gitx::BASE_BRANCH, :green
         branches(:merged => true, :remote => true).each do |branch|
-          run_cmd "grb rm #{branch}" unless aggregate_branch?(branch)
+          run_cmd "git push origin --delete #{branch}" unless aggregate_branch?(branch)
         end
         branches(:merged => true).each do |branch|
           run_cmd "git branch -d #{branch}" unless aggregate_branch?(branch)
@@ -73,8 +76,7 @@ module Socialcast
 
       desc 'track', 'set the current branch to track the remote branch with the same name'
       def track
-        branch = current_branch
-        run_cmd "git branch --set-upstream #{branch} origin/#{branch}"
+        track_branch current_branch
       end
 
       desc 'start', 'start a new git branch with latest changes from master'
@@ -100,7 +102,7 @@ module Socialcast
 
       desc 'share', 'Share the current branch in the remote repository'
       def share
-        run_cmd "grb publish #{current_branch}"
+        share_branch current_branch
       end
 
       desc 'integrate', 'integrate the current branch into one of the aggregate development branches'
@@ -129,11 +131,12 @@ module Socialcast
         good_branch = default_good_branch if good_branch.length == 0
         good_branch = "last_known_good_#{good_branch}" unless good_branch.starts_with?('last_known_good_')
 
-        removed_branches = reset_branch(bad_branch, good_branch)
-        reset_branch("last_known_good_#{bad_branch}", good_branch)
+        removed_branches = nuke_branch(bad_branch, good_branch)
+        nuke_branch("last_known_good_#{bad_branch}", good_branch)
 
         message_parts = []
         message_parts << "#worklog resetting #{bad_branch} branch to #{good_branch} #scgitx"
+        message_parts << "/cc @SocialcastDevelopers"
         if removed_branches.any?
           message_parts << ""
           message_parts << "the following branches were affected:"

data/lib/socialcast-git-extensions/git.rb

@@ -42,7 +42,7 @@ module Socialcast
       # reset the specified branch to the same set of commits as the destination branch
       # reverts commits on aggregate branches back to a known good state
       # returns list of branches that were removed
-      def reset_branch(branch, head_branch)
+      def nuke_branch(branch, head_branch)
         return [] if branch == head_branch
         raise "Only aggregate branches are allowed to be reset: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(branch)
         say "Resetting "
@@ -56,12 +56,22 @@ module Socialcast
         run_cmd "git branch -D #{branch}" rescue nil
         run_cmd "git push origin --delete #{branch}" rescue nil
         run_cmd "git checkout -b #{branch}"
-        run_cmd "grb publish #{branch}"
+        share_branch branch
         run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
 
         removed_branches
       end
 
+      # share the local branch in the remote repo
+      def share_branch(branch)
+        run_cmd "git push origin #{branch}"
+        track_branch branch
+      end
+
+      def track_branch(branch)
+        run_cmd "git branch --set-upstream #{branch} origin/#{branch}"
+      end
+
       # integrate a branch into a destination aggregate branch
       # blow away the local aggregate branch to ensure pulling into most recent "clean" branch
       def integrate_branch(branch, destination_branch)
@@ -81,8 +91,8 @@ module Socialcast
       # nuke local branch and pull fresh version from remote repo
       def refresh_branch_from_remote(destination_branch)
         run_cmd "git branch -D #{destination_branch}" rescue nil
+        run_cmd "git fetch origin"
         run_cmd "git checkout #{destination_branch}"
-        run_cmd "git pull origin #{destination_branch}"
       end
 
       def aggregate_branch?(branch)

data/lib/socialcast-git-extensions/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.0.9"
+    VERSION = "3.1.0"
   end
 end

data/socialcast-git-extensions.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "socialcast-git-extensions"
 
   s.add_runtime_dependency(%q<grit>, [">= 0"])
-  s.add_runtime_dependency(%q<git_remote_branch>, [">= 0"])
   s.add_runtime_dependency(%q<socialcast>, [">= 1.1.4"])
   s.add_runtime_dependency(%q<rest-client>, [">= 1.4.0"])
   s.add_runtime_dependency(%q<json_pure>, [">= 0"])

data/spec/cli_spec.rb

@@ -47,8 +47,8 @@ describe Socialcast::Gitx::CLI do
           "git pull origin master",
           "git push origin HEAD",
           "git branch -D prototype",
+          "git fetch origin",
           "git checkout prototype",
-          "git pull origin prototype",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
@@ -68,8 +68,8 @@ describe Socialcast::Gitx::CLI do
           "git pull origin master",
           "git push origin HEAD",
           "git branch -D prototype",
+          "git fetch origin",
           "git checkout prototype",
-          "git pull origin prototype",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
@@ -89,14 +89,14 @@ describe Socialcast::Gitx::CLI do
           "git pull origin master",
           "git push origin HEAD",
           "git branch -D staging",
+          "git fetch origin",
           "git checkout staging",
-          "git pull origin staging",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
           "git branch -D prototype",
+          "git fetch origin",
           "git checkout prototype",
-          "git pull origin prototype",
           "git pull . staging",
           "git push origin HEAD",
           "git checkout staging",
@@ -140,8 +140,8 @@ describe Socialcast::Gitx::CLI do
           "git pull . FOO",
           "git push origin HEAD",
           "git branch -D staging",
+          "git fetch origin",
           "git checkout staging",
-          "git pull origin staging",
           "git pull . master",
           "git push origin HEAD",
           "git checkout master",
@@ -159,7 +159,7 @@ describe Socialcast::Gitx::CLI do
         prototype_branches = %w( dev-foo dev-bar )
         master_branches = %w( dev-foo )
         Socialcast::Gitx::CLI.any_instance.should_receive(:branches).and_return(prototype_branches, master_branches, prototype_branches, master_branches)
-        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog resetting prototype branch to last_known_good_master #scgitx\n\nthe following branches were affected:\n* dev-bar")
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog resetting prototype branch to last_known_good_master #scgitx\n/cc @SocialcastDevelopers\n\nthe following branches were affected:\n* dev-bar")
         Socialcast::Gitx::CLI.start ['nuke', 'prototype', '--destination', 'master']
       end
       it 'should publish message into socialcast' do end # see expectations
@@ -167,21 +167,23 @@ describe Socialcast::Gitx::CLI do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout master",
           "git branch -D last_known_good_master",
+          "git fetch origin",
           "git checkout last_known_good_master",
-          "git pull origin last_known_good_master",
           "git branch -D prototype",
           "git push origin --delete prototype",
           "git checkout -b prototype",
-          "grb publish prototype",
+          "git push origin prototype",
+          "git branch --set-upstream prototype origin/prototype",
           "git checkout master",
           "git checkout master",
           "git branch -D last_known_good_master",
+          "git fetch origin",
           "git checkout last_known_good_master",
-          "git pull origin last_known_good_master",
           "git branch -D last_known_good_prototype",
           "git push origin --delete last_known_good_prototype",
           "git checkout -b last_known_good_prototype",
-          "grb publish last_known_good_prototype",
+          "git push origin last_known_good_prototype",
+          "git branch --set-upstream last_known_good_prototype origin/last_known_good_prototype",
           "git checkout master"
         ]
       end
@@ -194,12 +196,13 @@ describe Socialcast::Gitx::CLI do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout master",
           "git branch -D last_known_good_staging",
+          "git fetch origin",
           "git checkout last_known_good_staging",
-          "git pull origin last_known_good_staging",
           "git branch -D staging",
           "git push origin --delete staging",
           "git checkout -b staging",
-          "grb publish staging",
+          "git push origin staging",
+          "git branch --set-upstream staging origin/staging",
           "git checkout master"
         ]
       end
@@ -213,12 +216,13 @@ describe Socialcast::Gitx::CLI do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout master",
           "git branch -D last_known_good_prototype",
+          "git fetch origin",
           "git checkout last_known_good_prototype",
-          "git pull origin last_known_good_prototype",
           "git branch -D prototype",
           "git push origin --delete prototype",
           "git checkout -b prototype",
-          "grb publish prototype",
+          "git push origin prototype",
+          "git branch --set-upstream prototype origin/prototype",
           "git checkout master"
         ]
       end
@@ -232,21 +236,23 @@ describe Socialcast::Gitx::CLI do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout master",
           "git branch -D last_known_good_master",
+          "git fetch origin",
           "git checkout last_known_good_master",
-          "git pull origin last_known_good_master",
           "git branch -D prototype",
           "git push origin --delete prototype",
           "git checkout -b prototype",
-          "grb publish prototype",
+          "git push origin prototype",
+          "git branch --set-upstream prototype origin/prototype",
           "git checkout master",
           "git checkout master",
           "git branch -D last_known_good_master",
+          "git fetch origin",
           "git checkout last_known_good_master",
-          "git pull origin last_known_good_master",
           "git branch -D last_known_good_prototype",
           "git push origin --delete last_known_good_prototype",
           "git checkout -b last_known_good_prototype",
-          "grb publish last_known_good_prototype",
+          "git push origin last_known_good_prototype",
+          "git branch --set-upstream last_known_good_prototype origin/last_known_good_prototype",
           "git checkout master"
         ]
       end
@@ -267,7 +273,7 @@ describe Socialcast::Gitx::CLI do
         stub_request(:post, "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls").
           to_return(:status => 200, :body => %q({"html_url": "http://github.com/repo/project/pulls/1"}), :headers => {})
 
-        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("@SocialcastDevelopers #reviewrequest for FOO #scgitx\n\ntesting\n\n", :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request')
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#reviewrequest for FOO #scgitx\n\n/cc @SocialcastDevelopers\n\ntesting\n\n", :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request')
         Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing']
       end
       it 'should create github pull request' do end # see expectations
@@ -292,14 +298,14 @@ describe Socialcast::Gitx::CLI do
         "git pull origin master",
         "git push origin HEAD",
         "git branch -D staging",
+        "git fetch origin",
         "git checkout staging",
-        "git pull origin staging",
         "git pull . FOO",
         "git push origin HEAD",
         "git checkout FOO",
         "git branch -D prototype",
+        "git fetch origin",
         "git checkout prototype",
-        "git pull origin prototype",
         "git pull . staging",
         "git push origin HEAD",
         "git checkout staging",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: git_remote_branch
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: socialcast
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 841044908944222691
+      hash: -204662035920604822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 841044908944222691
+      hash: -204662035920604822
 requirements: []
 rubyforge_project: socialcast-git-extensions
 rubygems_version: 1.8.24