socialcast-git-extensions 4.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1597af4201f51193d8caa155e504dd2c1a1708df
-  data.tar.gz: 3998e46534810aa2ab2245faaa69bdaf728a9e60
+  metadata.gz: 4bc6ddeb7dc4a008086a125a36f8e41242f6c0cb
+  data.tar.gz: 4144c6da4a7fc0b38f1a18efa4dead920de68cd9
 SHA512:
-  metadata.gz: e80849b35dd2a830a8d555565f75084cac88d7abec267e1e98822f412ca5daaea88c6ad8a34b64b86f085f7797533d59d8022a0fcc2626c5fb6a0ae7a73ba302
-  data.tar.gz: 5bbd8a91ebff3c6952a0237e64a31d8712ada4af78a79c5bf520dd8616bb8d87f679bb952dcc7cae660660660b490c6463de2fb9e0a02d31d61999131da2f5d0
+  metadata.gz: cf54c40fa5b923c43d17f82232f2e89c057f60e8f68fe7aafde4fedb36ab69dd2ff42b183806e0bb4cd17555634d985369a034b78746fb662a2ed07eaf57c702
+  data.tar.gz: f8aa58e2599a37f1aab1225cffd3556dabcc81ae385a8a32ca765bdd19ed83a39ee25a98b3a13ef7b527f6c1ea629108157a58d06cb25917a6871c557b805d8f

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

@@ -250,9 +250,8 @@ module Socialcast
         end
       end
 
-      desc 'promote', '(DEPRECATED) promote the current branch into staging'
+      desc 'promote', 'integrate the current branch into staging'
       def promote
-        say "DEPRECATED: Use `git integrate #{staging_branch}` instead", :red
         integrate staging_branch
       end
 
@@ -312,6 +311,7 @@ module Socialcast
         run_cmd "git pull . #{branch}"
         run_cmd "git push origin HEAD"
         integrate_branch(base_branch, staging_branch)
+        integrate_branch(base_branch, prototype_branch)
         cleanup
 
         unless use_pr_comments?

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "4.0"
+    VERSION = "4.0.1"
   end
 end

data/spec/cli_spec.rb

@@ -247,6 +247,12 @@ describe Socialcast::Gitx::CLI do
             "git checkout staging",
             "git pull . master",
             "git push origin HEAD",
+            "git checkout master",
+            "git branch -D prototype",
+            "git fetch origin",
+            "git checkout prototype",
+            "git pull . master",
+            "git push origin HEAD",
             "git checkout master"
           ])
         end
@@ -303,6 +309,12 @@ describe Socialcast::Gitx::CLI do
             "git checkout staging",
             "git pull . master",
             "git push origin HEAD",
+            "git checkout master",
+            "git branch -D prototype",
+            "git fetch origin",
+            "git checkout prototype",
+            "git pull . master",
+            "git push origin HEAD",
             "git checkout master"
           ])
         end
@@ -351,6 +363,12 @@ describe Socialcast::Gitx::CLI do
           "git checkout staging",
           "git pull . special-master",
           "git push origin HEAD",
+          "git checkout special-master",
+          "git branch -D prototype",
+          "git fetch origin",
+          "git checkout prototype",
+          "git pull . special-master",
+          "git push origin HEAD",
           "git checkout special-master"
         ])
       end
@@ -389,6 +407,12 @@ describe Socialcast::Gitx::CLI do
           "git checkout staging",
           "git pull . special-master",
           "git push origin HEAD",
+          "git checkout special-master",
+          "git branch -D prototype",
+          "git fetch origin",
+          "git checkout prototype",
+          "git pull . special-master",
+          "git push origin HEAD",
           "git checkout special-master"
         ])
       end
@@ -428,6 +452,12 @@ describe Socialcast::Gitx::CLI do
           "git checkout staging",
           "git pull . special-master",
           "git push origin HEAD",
+          "git checkout special-master",
+          "git branch -D prototype",
+          "git fetch origin",
+          "git checkout prototype",
+          "git pull . special-master",
+          "git push origin HEAD",
           "git checkout special-master"
         ])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: '4.0'
+  version: 4.0.1
 platform: ruby
 authors:
 - Socialcast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged