socialcast-git-extensions 3.0.0.pre → 3.0.0.pre2

data/Rakefile

@@ -1,10 +1,6 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-task :default => :test
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec

data/lib/socialcast-git-extensions.rb

@@ -6,6 +6,9 @@ require 'socialcast-git-extensions/github'
 
 module Socialcast
   module Gitx
+    BASE_BRANCH = 'master'
+
+    private
     # execute a shell command and raise an error if non-zero exit code is returned
     def run_cmd(cmd)
       say "\n> "

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

@@ -9,7 +9,6 @@ module Socialcast
       include Socialcast::Gitx::Git
       include Socialcast::Gitx::Github
 
-      BASE_BRANCH = 'master'
       PULL_REQUEST_DESCRIPTION = "\n\n" + <<-EOS.dedent
         # Describe your pull request
         # Use GitHub flavored Markdown http://github.github.com/github-flavored-markdown/
@@ -49,21 +48,21 @@ module Socialcast
         say 'updating '
         say "#{branch} ", :green
         say "to have most recent changes from "
-        say BASE_BRANCH, :green
+        say Socialcast::Gitx::BASE_BRANCH, :green
 
         run_cmd "git pull origin #{branch}" rescue nil
-        run_cmd "git pull origin #{BASE_BRANCH}"
+        run_cmd "git pull origin #{Socialcast::Gitx::BASE_BRANCH}"
         run_cmd 'git push origin HEAD'
         run_cmd 'git remote prune origin'
       end
 
       desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
       def cleanup
-        run_cmd "git checkout #{BASE_BRANCH}"
+        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
         run_cmd "git pull"
 
         say "Deleting branches that have been merged into "
-        say BASE_BRANCH, :green
+        say Socialcast::Gitx::BASE_BRANCH, :green
         branches(:merged => true).each do |branch|
           run_cmd "git branch -d #{branch}"
         end
@@ -92,7 +91,7 @@ module Socialcast
           end
         end
 
-        run_cmd "git checkout #{BASE_BRANCH}"
+        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
         run_cmd 'git pull'
         run_cmd "git checkout -b #{branch_name}"
 
@@ -105,23 +104,27 @@ module Socialcast
       end
 
       desc 'integrate', 'integrate the current branch into one of the aggregate development branches'
-      def integrate(target_branch)
+      def integrate(target_branch = 'prototype')
         branch = current_branch
 
         update
         integrate_branch(branch, target_branch)
-        integrate_branch(branch, 'prototype') if target_branch == 'staging'
+        integrate_branch(target_branch, 'prototype') if target_branch == 'staging'
+        run_cmd "git checkout #{branch}"
 
         post "#worklog integrating #{branch} into #{target_branch} #scgitx"
       end
 
       desc 'nuke', 'nuke the specified aggregate branch and reset it to a known good state'
-      def nuke(bad_branch, good_branch='last_known_good_master')
+      method_option :destination, :type => :string, :aliases => '-d', :desc => 'destination branch to reset to'
+      def nuke(bad_branch)
+        good_branch = options[:destination] || ask("What branch do you want to reset #{bad_branch} to? (default: #{Socialcast::Gitx::BASE_BRANCH})")
+        good_branch = Socialcast::Gitx::BASE_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)
+        reset_branch("last_known_good_#{bad_branch}", good_branch) unless "last_known_good_#{bad_branch}" == good_branch
 
-        post "#worklog resetting #{branch} branch to #{good_branch} #scgitx\n\nthe following branches were affected:\n#{removed_branches.map{|b| '* ' + b}.join("\n") }"
+        post "#worklog resetting #{bad_branch} branch to #{good_branch} #scgitx\n\nthe following branches were affected:\n#{removed_branches.map{|b| '* ' + b}.join("\n") }"
       end
 
       desc 'release', 'release the current branch to production'
@@ -132,20 +135,19 @@ module Socialcast
         return unless yes?("Release #{branch} to production? (y/n)", :green)
 
         update
-        integrate branch, 'master'
-        integrate branch, 'staging'
-        run_cmd "git checkout #{BASE_BRANCH}"
+        integrate_branch branch, Socialcast::Gitx::BASE_BRANCH
+        invoke :integrate, ['staging']
+        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
         run_cmd "grb rm #{branch}"
 
-        share "#worklog releasing #{branch} to production #scgitx"
+        post "#worklog releasing #{branch} to production #scgitx"
       end
 
-
       private
 
       # build a summary of changes
       def changelog_summary(branch)
-        changes = `git diff --stat origin/#{BASE_BRANCH}...#{branch}`.split("\n")
+        changes = `git diff --stat origin/#{Socialcast::Gitx::BASE_BRANCH}...#{branch}`.split("\n")
         stats = changes.pop
         if changes.length > 5
           dirs = changes.map do |file_change|

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

@@ -5,6 +5,7 @@ module Socialcast
     module Git
       RESERVED_BRANCHES = %w{ HEAD master staging prototype next_release }
 
+      private
       def assert_not_protected_branch!(branch, action)
         raise "Cannot #{action} reserved branch" if RESERVED_BRANCHES.include?(branch) || aggregate_branch?(branch)
       end
@@ -61,9 +62,9 @@ module Socialcast
       end
 
       # integrate a branch into a destination aggregate branch
-      def integrate_branch(branch, destination_branch = 'staging')
-        assert_not_protected_branch!(branch, 'integrate')
-        raise "Only aggregate branches are allowed for integration: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(destination_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
         say "Integrating "
         say "#{branch} ", :green
         say "into "

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

@@ -5,6 +5,7 @@ require 'socialcast'
 module Socialcast
   module Gitx
     module Github
+      private
       # request github authorization token
       # store the token in ~/.socialcast/credentials.yml for future reuse
       # @see http://developer.github.com/v3/oauth/#scopes
@@ -30,11 +31,11 @@ module Socialcast
 
       # @see http://developer.github.com/v3/pulls/
       def create_pull_request(token, branch, repo, body)
-        payload = {:title => branch, :base => 'master', :head => branch, :body => body}.to_json
+        payload = {:title => branch, :base => Socialcast::Gitx::BASE_BRANCH, :head => branch, :body => body}.to_json
         say "Creating pull request for "
         say "#{branch} ", :green
         say "against "
-        say "master ", :green
+        say "#{Socialcast::Gitx::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

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.0.0.pre"
+    VERSION = "3.0.0.pre2"
   end
 end

data/socialcast-git-extensions.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<json_pure>, [">= 0"])
   s.add_runtime_dependency(%q<thor>, [">= 0"])
   s.add_development_dependency(%q<rake>, ["0.9.2.2"])
-  s.add_development_dependency(%q<shoulda>, ["2.11.3"])
+  s.add_development_dependency "rspec", '>= 2.11.0'
+  s.add_development_dependency "pry", '>= 0'
+  s.add_development_dependency "webmock", '>= 0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/cli_spec.rb

@@ -0,0 +1,263 @@
+require 'spec_helper'
+
+describe Socialcast::Gitx::CLI do
+  # stub methods on cli
+  class Socialcast::Gitx::CLI
+    class << self
+      attr_accessor :stubbed_executed_commands
+    end
+    private
+    # stub out command execution and record commands for test inspection
+    def run_cmd(cmd)
+      self.class.stubbed_executed_commands << cmd
+    end
+  end
+
+  before do
+    Socialcast::Gitx::CLI.stubbed_executed_commands = []
+    Socialcast::Gitx::CLI.any_instance.stub(:current_branch).and_return('FOO')
+    Socialcast::Gitx::CLI.any_instance.stub(:post)
+  end
+
+  describe '#update' do
+    before do
+      @script = Socialcast::Gitx::CLI.new
+      @script.invoke :update
+    end
+    it 'should run expected commands' do
+      Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+        'git pull origin FOO',
+        'git pull origin master',
+        'git push origin HEAD',
+        'git remote prune origin'
+      ]
+    end
+  end
+
+  describe '#integrate' do
+    context 'when target branch is ommitted' do
+      before do
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :integrate
+      end
+      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 remote prune origin",
+          "git remote prune origin",
+          "git checkout prototype",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git checkout FOO",
+          "git checkout FOO"
+        ]
+      end
+    end
+    context 'when target branch == prototype' do
+      before do
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :integrate, ['prototype']
+      end
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git pull origin FOO",
+          "git pull origin master",
+          "git push origin HEAD",
+          "git remote prune origin",
+          "git remote prune origin",
+          "git checkout prototype",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git checkout FOO",
+          "git checkout FOO"
+        ]
+      end
+    end
+    context 'when target branch == staging' do
+      before do
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :integrate, ['staging']
+      end
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git pull origin FOO",
+          "git pull origin master",
+          "git push origin HEAD",
+          "git remote prune origin",
+          "git remote prune origin",
+          "git checkout staging",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git checkout FOO",
+          "git remote prune origin",
+          "git checkout prototype",
+          "git pull . staging",
+          "git push origin HEAD",
+          "git checkout staging",
+          "git checkout FOO"
+        ]
+      end
+    end
+    context 'when target branch != staging || prototype' do
+      it 'should raise an error' do
+        @script = Socialcast::Gitx::CLI.new
+        lambda { @script.invoke :integrate, ['asdfasdf'] }.should raise_error(/Only aggregate branches are allowed for integration/)
+      end
+    end
+  end
+
+  describe '#release' do
+    context 'when user rejects release' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(false)
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :release
+      end
+      it 'should run no commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == []
+      end
+    end
+    context 'when user confirms release' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :release
+      end
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git pull origin FOO",
+          "git pull origin master",
+          "git push origin HEAD",
+          "git remote prune origin",
+          "git remote prune origin",
+          "git checkout master",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git checkout FOO",
+          "git pull origin FOO",
+          "git pull origin master",
+          "git push origin HEAD",
+          "git remote prune origin",
+          "git remote prune origin",
+          "git checkout staging",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git checkout FOO",
+          "git remote prune origin",
+          "git checkout prototype",
+          "git pull . staging",
+          "git push origin HEAD",
+          "git checkout staging",
+          "git checkout FOO",
+          "git checkout master",
+          "grb rm FOO"
+        ]
+      end
+    end
+  end
+
+  describe '#nuke' do
+    context 'when target branch == prototype and --destination == master' do
+      before do
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :nuke, ['prototype'], {:destination => 'master'}
+      end
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git checkout last_known_good_master",
+          "git pull",
+          "git branch -D prototype",
+          "git push origin :prototype",
+          "git checkout -b prototype",
+          "grb publish prototype",
+          "git checkout last_known_good_master",
+          "git checkout last_known_good_master",
+          "git pull",
+          "git branch -D last_known_good_prototype",
+          "git push origin :last_known_good_prototype",
+          "git checkout -b last_known_good_prototype",
+          "grb publish last_known_good_prototype",
+          "git checkout last_known_good_master"
+        ]
+      end
+    end
+    context 'when target branch == staging and --destination == last_known_good_staging' do
+      before do
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :nuke, ['staging'], {:destination => 'last_known_good_staging'}
+      end
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git checkout last_known_good_staging",
+          "git pull",
+          "git branch -D staging",
+          "git push origin :staging",
+          "git checkout -b staging",
+          "grb publish staging",
+          "git checkout last_known_good_staging",
+        ]
+      end
+    end
+    context 'when target branch == prototype and destination prompt == nil' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:ask).and_return('')
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :nuke, ['prototype']
+      end
+      it 'defaults to master and should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git checkout last_known_good_master",
+          "git pull",
+          "git branch -D prototype",
+          "git push origin :prototype",
+          "git checkout -b prototype",
+          "grb publish prototype",
+          "git checkout last_known_good_master",
+          "git checkout last_known_good_master",
+          "git pull",
+          "git branch -D last_known_good_prototype",
+          "git push origin :last_known_good_prototype",
+          "git checkout -b last_known_good_prototype",
+          "grb publish last_known_good_prototype",
+          "git checkout last_known_good_master"
+        ]
+      end
+    end
+    context 'when target branch == prototype and destination prompt = master' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:ask).and_return('master')
+        @script = Socialcast::Gitx::CLI.new
+        @script.invoke :nuke, ['prototype']
+      end
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git checkout last_known_good_master",
+          "git pull",
+          "git branch -D prototype",
+          "git push origin :prototype",
+          "git checkout -b prototype",
+          "grb publish prototype",
+          "git checkout last_known_good_master",
+          "git checkout last_known_good_master",
+          "git pull",
+          "git branch -D last_known_good_prototype",
+          "git push origin :last_known_good_prototype",
+          "git checkout -b last_known_good_prototype",
+          "grb publish last_known_good_prototype",
+          "git checkout last_known_good_master"
+        ]
+      end
+    end
+    context 'when target branch != staging || prototype' do
+      it 'should raise error' do
+        lambda {
+          Socialcast::Gitx::CLI.any_instance.should_receive(:ask).and_return('master')
+          @script = Socialcast::Gitx::CLI.new
+          @script.invoke :nuke, ['asdfasdf']
+        }.should raise_error /Only aggregate branches are allowed to be reset/
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec/mocks'
+require 'webmock/rspec'
+require 'pry'
+RSpec::Mocks::setup(Object.new)
+
+require 'socialcast-git-extensions/cli'
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+
+  def capture_with_status(stream)
+    exit_status = 0
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      begin
+        yield
+      rescue SystemExit => system_exit # catch any exit calls
+        exit_status = system_exit.status
+      end
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+    return result, exit_status
+  end
+
+  def remove_directories(*names)
+    project_dir = Pathname.new(Dir.pwd)
+    names.each do |name|
+      FileUtils.rm_rf(project_dir.join(name)) if FileTest.exists?(project_dir.join(name))
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre
+  version: 3.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -124,21 +124,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.2.2
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: GIT it done!
 email:
 - ryan@socialcast.com
@@ -180,8 +212,8 @@ files:
 - lib/socialcast-git-extensions/string_ext.rb
 - lib/socialcast-git-extensions/version.rb
 - socialcast-git-extensions.gemspec
-- test/helper.rb
-- test/test_socialcast-git-extensions.rb
+- spec/cli_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/socialcast/socialcast-git-extensions
 licenses: []
 post_install_message: 
@@ -196,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2945626375834761242
+      hash: -4402162274573639000
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,5 +242,5 @@ signing_key:
 specification_version: 3
 summary: git extension scripts for socialcast workflow
 test_files:
-- test/helper.rb
-- test/test_socialcast-git-extensions.rb
+- spec/cli_spec.rb
+- spec/spec_helper.rb

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'socialcast-git-extensions'
-
-class Test::Unit::TestCase
-end

data/test/test_socialcast-git-extensions.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestSocialcastGitExtensions < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end