socialcast-git-extensions 3.1.5 → 3.1.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmExZmQyNTY0YjJlNWM0ZTg4NTI2OGE5ODZkNTE2NWZiNzAwMzBiYg==
+  data.tar.gz: !binary |-
+    YTM0ZWUzN2Y2NzFjZWQ3MWEzNmNlZjM2YjIxY2NmY2IzZjM1M2I3OA==
+SHA512:
+  metadata.gz: !binary |-
+    YzJkNWRiM2E5YzY4NDNjMGE0MjI5YTUyNTNjNGExMjhkMWM2ZmY3MjliNTQw
+    NTRlZjg2ODY3YTg5ODNiZTAwODBlMTdlY2UxYmY1MWQxN2I4YTU0MTQ1OTRm
+    NDhjMjFiYzIyNWFiYThhNzNmMjg0ZmQxMmY3ZTdkMmUwYWYxMTI=
+  data.tar.gz: !binary |-
+    MzRkZDAxYzk1YmZhNTAyOGVkNDc0ZTIzNjRlZWJlNTc5Zjk4ZWE1MmE4Zjkx
+    ZTJjN2Y5NjM4MjQwMTk3YWVjN2FmMjYwOTAzYzAzYzFiZTE0MTMxNjM4NzI5
+    N2RiZWEzZDcyMTU2NDFhNjU0ZTJlY2NhY2IyYTg0Njg1MDgxNjU=

data/README.rdoc

@@ -2,6 +2,9 @@
 
 = Core Git Extensions
 
+=== Install
+  socialcast authenticate --domain (your domain)
+
 === Options
 * --quiet => supress posting message in Socialcast
 

data/config/scgitx.yml

@@ -4,5 +4,9 @@ review_buddies:
     socialcast_username: VanMiranda
     buddy: wireframe
   wireframe:
-    socialcast_username: RyanSonnek 
+    socialcast_username: RyanSonnek
     buddy: vanm
+
+base_branch: master
+staging_branch: staging
+prototype_branch: prototype

data/lib/socialcast-git-extensions.rb

@@ -6,7 +6,9 @@ require 'socialcast-git-extensions/github'
 
 module Socialcast
   module Gitx
-    BASE_BRANCH = 'master'
+    DEFAULT_BASE_BRANCH = 'master'
+    DEFAULT_STAGING_BRANCH = 'staging'
+    DEFAULT_PROTOTYPE_BRANCH = 'prototype'
 
     private
     # execute a shell command and raise an error if non-zero exit code is returned

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

@@ -56,21 +56,21 @@ module Socialcast
         say 'updating '
         say "#{branch} ", :green
         say "to have most recent changes from "
-        say Socialcast::Gitx::BASE_BRANCH, :green
+        say base_branch, :green
 
         run_cmd "git pull origin #{branch}" rescue nil
-        run_cmd "git pull origin #{Socialcast::Gitx::BASE_BRANCH}"
+        run_cmd "git pull origin #{base_branch}"
         run_cmd 'git push origin HEAD'
       end
 
       desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
       def cleanup
-        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
+        run_cmd "git checkout #{base_branch}"
         run_cmd "git pull"
         run_cmd 'git remote prune origin'
 
         say "Deleting branches that have been merged into "
-        say Socialcast::Gitx::BASE_BRANCH, :green
+        say base_branch, :green
         branches(:merged => true, :remote => true).each do |branch|
           run_cmd "git push origin --delete #{branch}" unless aggregate_branch?(branch)
         end
@@ -98,7 +98,7 @@ module Socialcast
           end
         end
 
-        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
+        run_cmd "git checkout #{base_branch}"
         run_cmd 'git pull'
         run_cmd "git checkout -b #{branch_name}"
 
@@ -111,12 +111,12 @@ module Socialcast
       end
 
       desc 'integrate', 'integrate the current branch into one of the aggregate development branches'
-      def integrate(target_branch = 'prototype')
+      def integrate(target_branch = prototype_branch)
         branch = current_branch
 
         update
         integrate_branch(branch, target_branch)
-        integrate_branch(target_branch, 'prototype') if target_branch == 'staging'
+        integrate_branch(target_branch, prototype_branch) if target_branch == staging_branch
         run_cmd "git checkout #{branch}"
 
         post "#worklog integrating #{branch} into #{target_branch} #scgitx"
@@ -124,8 +124,8 @@ module Socialcast
 
       desc 'promote', '(DEPRECATED) promote the current branch into staging'
       def promote
-        say 'DEPRECATED: Use `git integrate staging` instead', :red
-        integrate 'staging'
+        say "DEPRECATED: Use `git integrate #{staging_branch}` instead", :red
+        integrate staging_branch
       end
 
       desc 'nuke', 'nuke the specified aggregate branch and reset it to a known good state'
@@ -158,14 +158,14 @@ module Socialcast
         return unless yes?("Release #{branch} to production? (y/n)", :green)
 
         update
-        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
-        run_cmd "git pull origin #{Socialcast::Gitx::BASE_BRANCH}"
+        run_cmd "git checkout #{base_branch}"
+        run_cmd "git pull origin #{base_branch}"
         run_cmd "git pull . #{branch}"
         run_cmd "git push origin HEAD"
-        integrate_branch('master', 'staging')
+        integrate_branch(base_branch, staging_branch)
         cleanup
 
-        post "#worklog releasing #{branch} to production #scgitx"
+        post "#worklog releasing #{branch} to #{base_branch} #scgitx"
       end
 
       private

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

@@ -4,12 +4,9 @@ require 'pathname'
 module Socialcast
   module Gitx
     module Git
-      AGGREGATE_BRANCHES = %w{ staging prototype }
-      RESERVED_BRANCHES = %w{ HEAD master next_release } + AGGREGATE_BRANCHES
-
       private
       def assert_not_protected_branch!(branch, action)
-        raise "Cannot #{action} reserved branch" if RESERVED_BRANCHES.include?(branch) || aggregate_branch?(branch)
+        raise "Cannot #{action} reserved branch" if reserved_branches.include?(branch) || aggregate_branch?(branch)
       end
 
       # lookup the current branch of the PWD
@@ -41,7 +38,7 @@ module Socialcast
         output.each do |branch|
           branch = branch.gsub(/\*/, '').strip.split(' ').first
           branch = branch.split('/').last if options[:remote]
-          branches << branch unless RESERVED_BRANCHES.include?(branch)
+          branches << branch unless reserved_branches.include?(branch)
         end
         branches.uniq
       end
@@ -51,20 +48,20 @@ module Socialcast
       # returns list of branches that were removed
       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)
+        raise "Only aggregate branches are allowed to be reset: #{aggregate_branches}" unless aggregate_branch?(branch)
         say "Resetting "
         say "#{branch} ", :green
         say "branch to "
         say head_branch, :green
 
-        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
+        run_cmd "git checkout #{base_branch}"
         refresh_branch_from_remote head_branch
         removed_branches = branches(:remote => true, :merged => "origin/#{branch}") - branches(:remote => true, :merged => "origin/#{head_branch}")
         run_cmd "git branch -D #{branch}" rescue nil
         run_cmd "git push origin --delete #{branch}" rescue nil
         run_cmd "git checkout -b #{branch}"
         share_branch branch
-        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
+        run_cmd "git checkout #{base_branch}"
 
         removed_branches
       end
@@ -83,7 +80,9 @@ module Socialcast
       # blow away the local aggregate branch to ensure pulling into most recent "clean" branch
       def integrate_branch(branch, destination_branch)
         assert_not_protected_branch!(branch, 'integrate') unless aggregate_branch?(destination_branch)
-        raise "Only aggregate branches are allowed for integration: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(destination_branch) || destination_branch == Socialcast::Gitx::BASE_BRANCH
+        unless aggregate_branch?(destination_branch) || [base_branch, Socialcast::Gitx::DEFAULT_BASE_BRANCH].include?(destination_branch)
+          raise "Only aggregate branches are allowed for integration: #{aggregate_branches}"
+        end
         say "Integrating "
         say "#{branch} ", :green
         say "into "
@@ -103,12 +102,12 @@ module Socialcast
       end
 
       def aggregate_branch?(branch)
-        AGGREGATE_BRANCHES.include?(branch) || branch.starts_with?('last_known_good')
+        aggregate_branches.include?(branch) || branch.starts_with?('last_known_good')
       end
 
       # build a summary of changes
       def changelog_summary(branch)
-        changes = `git diff --stat origin/#{Socialcast::Gitx::BASE_BRANCH}...#{branch}`.split("\n")
+        changes = `git diff --stat origin/#{base_branch}...#{branch}`.split("\n")
         stats = changes.pop
         if changes.length > 5
           dirs = changes.map do |file_change|
@@ -157,7 +156,7 @@ module Socialcast
           end
         end
       end
-      
+
       # @returns a [Pathname] for the scgitx.yml Config File
       # from either ENV['SCGITX_CONFIG_PATH'] or default $PWD/config/scgitx.yml
       def config_file
@@ -169,6 +168,26 @@ module Socialcast
       def review_buddies
         config['review_buddies'] || {}
       end
+
+      def base_branch
+        config['base_branch'] || Socialcast::Gitx::DEFAULT_BASE_BRANCH
+      end
+
+      def staging_branch
+        config['staging_branch'] || Socialcast::Gitx::DEFAULT_STAGING_BRANCH
+      end
+
+      def prototype_branch
+        config['prototype_branch'] || Socialcast::Gitx::DEFAULT_PROTOTYPE_BRANCH
+      end
+
+      def aggregate_branches
+        @aggregate_branches ||= [staging_branch, prototype_branch]
+      end
+
+      def reserved_branches
+        @reserved_branches ||= %w{ HEAD next_release } + [base_branch] + aggregate_branches
+      end
     end
   end
 end

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

@@ -33,11 +33,11 @@ module Socialcast
       # returns the url of the created pull request
       # @see http://developer.github.com/v3/pulls/
       def create_pull_request(token, branch, repo, body)
-        payload = {:title => branch, :base => Socialcast::Gitx::BASE_BRANCH, :head => branch, :body => body}.to_json
+        payload = {:title => branch, :base => base_branch, :head => branch, :body => body}.to_json
         say "Creating pull request for "
         say "#{branch} ", :green
         say "against "
-        say "#{Socialcast::Gitx::BASE_BRANCH} ", :green
+        say "#{base_branch} ", :green
         say "in "
         say repo, :green
         response = RestClient::Request.new(:url => "https://api.github.com/repos/#{repo}/pulls", :method => "POST", :payload => payload, :headers => {:accept => :json, :content_type => :json, 'Authorization' => "token #{token}"}).execute
@@ -53,12 +53,12 @@ module Socialcast
         data = JSON.parse e.http_body
         say "Failed to create pull request: #{data['message']}", :red
       end
-      
+
       # @returns [String] socialcast username to assign the review to
       # @returns [nil] when no buddy system configured or user not found
       def socialcast_review_buddy(current_user)
         review_requestor = review_buddies[current_user]
-        
+
         if review_requestor && review_buddies[review_requestor['buddy']]
           review_buddies[review_requestor['buddy']]['socialcast_username']
         end

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.5"
+    VERSION = "3.1.6"
   end
 end

data/spec/cli_spec.rb

@@ -57,6 +57,28 @@ describe Socialcast::Gitx::CLI do
         ]
       end
     end
+    context 'when target branch is ommitted with custom prototype branch' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.stub(:prototype_branch).and_return('special-prototype')
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog integrating FOO into special-prototype #scgitx")
+        Socialcast::Gitx::CLI.start ['integrate']
+      end
+      it 'should post message to socialcast' do end # see expectations
+      it 'should default to prototype' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git pull origin FOO",
+          "git pull origin master",
+          "git push origin HEAD",
+          "git branch -D special-prototype",
+          "git fetch origin",
+          "git checkout special-prototype",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git checkout FOO",
+          "git checkout FOO"
+        ]
+      end
+    end
     context 'when target branch == prototype' do
       before do
         Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog integrating FOO into prototype #scgitx")
@@ -126,7 +148,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when user confirms release' do
       before do
-        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to production #scgitx")
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to master #scgitx")
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
         Socialcast::Gitx::CLI.start ['release']
       end
@@ -152,6 +174,36 @@ describe Socialcast::Gitx::CLI do
         ]
       end
     end
+
+    context 'with alternative base branch' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to special-master #scgitx")
+        Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
+        Socialcast::Gitx::CLI.any_instance.stub(:base_branch).and_return('special-master')
+        Socialcast::Gitx::CLI.start ['release']
+      end
+      it 'should post message to socialcast' do end # see expectations
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git pull origin FOO",
+          "git pull origin special-master",
+          "git push origin HEAD",
+          "git checkout special-master",
+          "git pull origin special-master",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git branch -D staging",
+          "git fetch origin",
+          "git checkout staging",
+          "git pull . special-master",
+          "git push origin HEAD",
+          "git checkout special-master",
+          "git checkout special-master",
+          "git pull",
+          "git remote prune origin"
+        ]
+      end
+    end
   end
 
   describe '#nuke' do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.5
-  prerelease: 
+  version: 3.1.6
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: socialcast
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -203,27 +184,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/socialcast/socialcast-git-extensions
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: git extension scripts for socialcast workflow
 test_files:
 - spec/cli_spec.rb