socialcast-git-extensions 3.1.24 → 3.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37d095475a120df4785586167bed1e1a02d33ba3
-  data.tar.gz: 05f528bbf77ff776c39d5055b2308a9e5edb7adb
+  metadata.gz: 9bef743036ae096b672baa387db056922567daaa
+  data.tar.gz: ed82bd91d889331d71b010786476186f1357ae1c
 SHA512:
-  metadata.gz: 611680354aebd1374cbbd6792461a6ee69f2738358db014804587db8af3d55c8f856975b7c91c8581d6a5471d856341bf81c958885044a2dc519e42a9926e014
-  data.tar.gz: 2169efa6a7ec64c577b96c4dc7f8619ee75f1b12d27db44b4aea995d563252d43653756097e04ab32c3c9dceb83f1c83a94f8485bf294924991b8bf8094c929b
+  metadata.gz: 2f89c0952bfd6317142c929fe44786eac10df193955afd945184c80a472f8a2fc7f00d48924ec60a420ea0ebf8e197f7462a779b1901c6da53be1cb400bdc008
+  data.tar.gz: 00c83cd3101131844d45b684b59b9e7534ec85a8e59c3ebb48286dd444997293f17f8086295b0e94d2b7702625b2f5095a9afe82657f78df4d07a52150c1c7c6

data/config/scgitx.yml

@@ -20,3 +20,5 @@ specialty_reviewers:
 base_branch: master
 staging_branch: staging
 prototype_branch: prototype
+
+enforce_staging_before_release: true

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

@@ -236,7 +236,10 @@ module Socialcast
       def release
         branch = current_branch
         assert_not_protected_branch!(branch, 'release')
-        assert_in_last_known_good_staging(branch)
+
+        if enforce_staging_before_release?
+          assert_in_last_known_good_staging(branch)
+        end
 
         return unless yes?("Release #{branch} to production? (y/n)", :green)
 
@@ -262,6 +265,10 @@ module Socialcast
         config['developer_group'] || 'SocialcastDevelopers'
       end
 
+      def enforce_staging_before_release?
+        !!config['enforce_staging_before_release']
+      end
+
       # post a message in socialcast
       # skip sharing message if CLI quiet option is present
       def post(message, params = {})

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.24"
+    VERSION = "3.1.25"
   end
 end

data/spec/cli_spec.rb

@@ -152,7 +152,8 @@ describe Socialcast::Gitx::CLI do
   describe '#release' do
     let(:branches_in_last_known_good_staging) { ['FOO'] }
     before do
-      expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).with(:remote => true, :merged => true).and_return(branches_in_last_known_good_staging)
+      allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:enforce_staging_before_release?).and_return(true)
+      allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).with(:remote => true, :merged => true).and_return(branches_in_last_known_good_staging)
     end
 
     context 'when user rejects release' do
@@ -197,12 +198,42 @@ describe Socialcast::Gitx::CLI do
     end
 
     context 'when the branch is not in last_known_good_staging' do
-      let(:branches_in_last_known_good_staging) { ['another-branch'] }
-      before do
-        expect_any_instance_of(Socialcast::Gitx::CLI).not_to receive(:yes?)
+      context 'and enforce_staging_before_release = true' do
+        let(:branches_in_last_known_good_staging) { ['another-branch'] }
+        before do
+          expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:enforce_staging_before_release?).and_return(true)
+          expect_any_instance_of(Socialcast::Gitx::CLI).not_to receive(:yes?)
+        end
+        it 'prevents the release of the branch' do
+          expect { Socialcast::Gitx::CLI.start ['release'] }.to raise_error(RuntimeError, 'Cannot release FOO unless it has already been promoted separately to staging and the build has passed.')
+        end
       end
-      it 'prevents the release of the branch' do
-        expect { Socialcast::Gitx::CLI.start ['release'] }.to raise_error(RuntimeError, 'Cannot release FOO unless it has already been promoted separately to staging and the build has passed.')
+      context 'and enforce_staging_before_release = false' do
+        let(:branches_in_last_known_good_staging) { ['another-branch'] }
+        before do
+          stub_message "#worklog releasing FOO to master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
+          expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:enforce_staging_before_release?).and_return(false)
+          expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:yes?).and_return(true)
+          expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:cleanup)
+          Socialcast::Gitx::CLI.start ['release']
+        end
+        it 'should run expected commands' do
+          expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([
+            "git pull origin FOO",
+            "git pull origin master",
+            "git push origin HEAD",
+            "git checkout master",
+            "git pull origin master",
+            "git pull . FOO",
+            "git push origin HEAD",
+            "git branch -D staging",
+            "git fetch origin",
+            "git checkout staging",
+            "git pull . master",
+            "git push origin HEAD",
+            "git checkout master"
+          ])
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.24
+  version: 3.1.25
 platform: ruby
 authors:
 - Ryan Sonnek