socialcast-git-extensions 3.1.29 → 3.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a79f2c472e34c9de110dc2c4c5b3de219b28c61
-  data.tar.gz: b6bd3bbc36b8b27190d24ca79083cf902baeb4f6
+  metadata.gz: 6ee33b5c6b4680a49b08ed584e37b99eac0e0525
+  data.tar.gz: 332fc9991fe7c5bd3487e709ed5d3ae88e73ee73
 SHA512:
-  metadata.gz: 2a4a5a14c98877756c9dde689cb23ae87657ae2ad272756d554e04f45bc7be1afb0282535cf34432c8d69e014a9a3c6afa2465621bf3a1b78a2d085b2513b159
-  data.tar.gz: ef03eaae3f57a4235d9ad3d69c3c42cab64797f6f3b341ec4706d4f6c862f4ba5eb0e38ddd012bd43199ca1e8e1df369dde1543a81be349ca7790c5fe001e1dd
+  metadata.gz: 424a2c4f6bffd7feb7dc5318f40eb872129abe5275e176e472d9fd910e888409369057b319348e60299da29e7315d9fa39069092b95819efcfefcdfab28e03df
+  data.tar.gz: d809541caf8928acda45bb390db32e857f5ca6789c91b167ccd332021f57ccc27b9df25611fb4c6c31d3cac6c40736ecfe745199f41b26c503f1cd93b6facc40

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.3
+ruby-2.2.2

data/config/scgitx.yml

@@ -21,4 +21,8 @@ base_branch: master
 staging_branch: staging
 prototype_branch: prototype
 
+aggregate_branches:
+  - prototype
+  - qa
+
 enforce_staging_before_release: true

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

@@ -104,7 +104,7 @@ module Socialcast
       end
 
       def track_branch(branch)
-        run_cmd "git branch --set-upstream #{branch} origin/#{branch}"
+        run_cmd "git branch -u #{branch} origin/#{branch}"
       end
 
       # integrate a branch into a destination aggregate branch
@@ -225,7 +225,7 @@ module Socialcast
       end
 
       def aggregate_branches
-        @aggregate_branches ||= [staging_branch, prototype_branch]
+        @aggregate_branches ||= ((config['aggregate_branches'] || []) + [staging_branch, prototype_branch]).uniq
       end
 
       def reserved_branches

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.29"
+    VERSION = "3.1.30"
   end
 end

data/socialcast-git-extensions.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rake', '~> 10.3'
   s.add_development_dependency 'rspec', '~> 3.0.0'
   s.add_development_dependency 'pry', '~>  0.9.12.6'
-  s.add_development_dependency 'webmock', '~> 1.18.0'
+  s.add_development_dependency 'webmock', '~> 1.21'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/cli_spec.rb

@@ -23,6 +23,7 @@ describe Socialcast::Gitx::CLI do
     end
 
     Socialcast::Gitx::CLI.stubbed_executed_commands = []
+    allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:say)
     allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:current_branch).and_return('FOO')
     allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:current_user).and_return('wireframe')
     allow(Socialcast::CommandLine).to receive(:credentials).and_return(:domain => 'testdomain', :user => 'testuser', :password => 'testpassword', :scgitx_token => 'faketoken')
@@ -370,40 +371,6 @@ describe Socialcast::Gitx::CLI do
   end
 
   describe '#nuke' do
-    context 'when target branch == prototype and --destination == master' do
-      before do
-        prototype_branches = %w( dev-foo dev-bar dev-baz )
-        master_branches = %w( dev-foo )
-        expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).and_return(prototype_branches, master_branches, prototype_branches, master_branches)
-        stub_message "#worklog resetting prototype branch to last_known_good_master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers\n\nThe following branches were affected:\n* dev-bar\n* dev-baz"
-        Socialcast::Gitx::CLI.start ['nuke', 'prototype', '--destination', 'master']
-      end
-      it 'should publish message into socialcast' do end # see expectations
-      it 'should run expected commands' do
-        expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([
-          "git checkout master",
-          "git branch -D last_known_good_master",
-          "git fetch origin",
-          "git checkout last_known_good_master",
-          "git branch -D prototype",
-          "git push origin --delete prototype",
-          "git checkout -b 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 branch -D last_known_good_prototype",
-          "git push origin --delete last_known_good_prototype",
-          "git checkout -b 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
-    end
     context 'when target branch == staging and --destination == last_known_good_staging' do
       before do
         stub_message "#worklog resetting staging branch to last_known_good_staging in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
@@ -420,39 +387,39 @@ describe Socialcast::Gitx::CLI do
           "git push origin --delete staging",
           "git checkout -b staging",
           "git push origin staging",
-          "git branch --set-upstream staging origin/staging",
+          "git branch -u staging origin/staging",
           "git checkout master"
         ])
       end
     end
-    context 'when target branch == prototype and destination prompt == nil' do
+    context 'when target branch == qa and destination prompt == nil and using custom aggregate_branches config' do
       before do
-        stub_message "#worklog resetting prototype branch to last_known_good_prototype in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
-
+        stub_message "#worklog resetting qa branch to last_known_good_qa in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
+        allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:config).and_return( { 'aggregate_branches' => ['staging', 'qa'] })
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:ask).and_return('')
-        Socialcast::Gitx::CLI.start ['nuke', 'prototype']
+        Socialcast::Gitx::CLI.start ['nuke', 'qa']
       end
-      it 'defaults to last_known_good_prototype and should run expected commands' do
+      it 'defaults to last_known_good_qa and should run expected commands' do
         expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([
           "git checkout master",
-          "git branch -D last_known_good_prototype",
+          "git branch -D last_known_good_qa",
           "git fetch origin",
-          "git checkout last_known_good_prototype",
-          "git branch -D prototype",
-          "git push origin --delete prototype",
-          "git checkout -b prototype",
-          "git push origin prototype",
-          "git branch --set-upstream prototype origin/prototype",
+          "git checkout last_known_good_qa",
+          "git branch -D qa",
+          "git push origin --delete qa",
+          "git checkout -b qa",
+          "git push origin qa",
+          "git branch -u qa origin/qa",
           "git checkout master"
         ])
       end
     end
-    context 'when target branch == prototype and destination prompt = master' do
+    context 'when target branch == qa and destination prompt = master and using custom aggregate_branches config' do
       before do
-        stub_message "#worklog resetting prototype branch to last_known_good_master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
-
+        stub_message "#worklog resetting qa branch to last_known_good_master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
+        allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:config).and_return( { 'aggregate_branches' => ['staging', 'qa'] })
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:ask).and_return('master')
-        Socialcast::Gitx::CLI.start ['nuke', 'prototype']
+        Socialcast::Gitx::CLI.start ['nuke', 'qa']
       end
       it 'should run expected commands' do
         expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([
@@ -460,32 +427,30 @@ describe Socialcast::Gitx::CLI do
           "git branch -D last_known_good_master",
           "git fetch origin",
           "git checkout last_known_good_master",
-          "git branch -D prototype",
-          "git push origin --delete prototype",
-          "git checkout -b prototype",
-          "git push origin prototype",
-          "git branch --set-upstream prototype origin/prototype",
+          "git branch -D qa",
+          "git push origin --delete qa",
+          "git checkout -b qa",
+          "git push origin qa",
+          "git branch -u qa origin/qa",
           "git checkout master",
           "git checkout master",
           "git branch -D last_known_good_master",
           "git fetch origin",
           "git checkout 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",
-          "git push origin last_known_good_prototype",
-          "git branch --set-upstream last_known_good_prototype origin/last_known_good_prototype",
+          "git branch -D last_known_good_qa",
+          "git push origin --delete last_known_good_qa",
+          "git checkout -b last_known_good_qa",
+          "git push origin last_known_good_qa",
+          "git branch -u last_known_good_qa origin/last_known_good_qa",
           "git checkout master"
         ])
       end
     end
-    context 'when target branch != staging || prototype' do
-      it 'should raise error' do
-        expect {
-          expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:ask).and_return('master')
-          Socialcast::Gitx::CLI.start ['nuke', 'asdfasdf']
-        }.to raise_error(/Only aggregate branches are allowed to be reset/)
-      end
+    it 'raises an error when target branch is not an aggregate branch' do
+      expect {
+        expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:ask).and_return('master')
+        Socialcast::Gitx::CLI.start ['nuke', 'asdfasdf']
+      }.to raise_error(/Only aggregate branches are allowed to be reset/)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.29
+  version: 3.1.30
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.21'
 description: GIT it done!
 email:
 - ryan@socialcast.com
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: git extension scripts for socialcast workflow