papa 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d3673db02cd16b804010fa3df5884f1b2e97d33e8a3dca2609af7eb0a20614a
-  data.tar.gz: 5cf1be5f8044e36c2dfe57cf573234ca2922a0a476cb635e75762488687832c9
+  metadata.gz: 285f47870177f6ef71e7bc121621a2435fd2f1dab19ebd9e7691fa90203a135c
+  data.tar.gz: fc85b82f7e2bf51e784fa3b7ea660d31650e7b808798169ab63843e8c3b9aac8
 SHA512:
-  metadata.gz: 2e00a8b49144a6f15b5cb7ffc569238b977c08e0277b9731c3f0a7e8403d8e2e083a864b05a44f82efa0bdf680f23832e8cdce48f158b569aaed685ff846312b
-  data.tar.gz: 4832a8e1f7547d96469f6a1d8f7be71479d53df9235717e6f2ee7e87c3f41cc7c36e2b100f4644547b3be8d271719d8e256af5b8076594675a7f1f02840ab15b
+  metadata.gz: 2422f3bae3108b7d6afc44d1879da26f34132b8c28821b4b70591e2db1259771d6a1ccc490e0b6d4eecff96344d1e30df228ca3310dde2fa9e245d319657ae11
+  data.tar.gz: 13586d90a60695d0fe5c66a51ec2278ce225b92011edcf220424106e225cc540b30872aba891aeddf9345a36ec5b55265c5c340439c5211d0c53dad2eb29eb24

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.1
+* Add ability to specify subdomain/hostname when deploying integration branches
+* Fetch only once when adding feature or bugfix branches to an integration branch
+
 ## 0.7.0
 * All output will be logged to a log file in the current working directory
 * Properly determine whether to build or redeploy an integration or hotfix environment

data/README.md

@@ -6,21 +6,21 @@ Helper tool for inDinero's git workflow. Ako ang papa mo.
 
 * [Getting Started](#getting-started)
 * [Commands](#commands)
-	* [papa release](#papa-release)
-	  * [start](#starting-a-release-branch)
-	  * [add](#adding-feature-branches-to-a-release-branch)
-	  * [finish](#finishing-a-release-branch)
-	* [papa hotfix](#papa-hotfix)
-	  * [start](#starting-a-hotfix-branch)
-	  * [add](#adding-bugfix-branches-to-a-hotfix-branch)
-	  * [deploy](#deploying-a-hotfix-branch-to-a-hotfix-environment)
-	  * [finish](#finishing-a-hotfix-branch)
-	* [papa integration](#papa-integration)
-	  * [start](#starting-an-integration-branch)
-	  * [add](#adding-branches-to-an-integration-branch)
-	  * [deploy](#deploying-an-integration-branch-to-an-integration-environment)
-	* [papa sandbox](#papa-sandbox)
-	  * [generate](#papa-sandbox)
+  * [papa release](#papa-release)
+    * [start](#starting-a-release-branch)
+    * [add](#adding-feature-branches-to-a-release-branch)
+    * [finish](#finishing-a-release-branch)
+  * [papa hotfix](#papa-hotfix)
+    * [start](#starting-a-hotfix-branch)
+    * [add](#adding-bugfix-branches-to-a-hotfix-branch)
+    * [deploy](#deploying-a-hotfix-branch-to-a-hotfix-environment)
+    * [finish](#finishing-a-hotfix-branch)
+  * [papa integration](#papa-integration)
+    * [start](#starting-an-integration-branch)
+    * [add](#adding-branches-to-an-integration-branch)
+    * [deploy](#deploying-an-integration-branch-to-an-integration-environment)
+  * [papa sandbox](#papa-sandbox)
+    * [generate](#papa-sandbox)
 
 ## Getting Started
 
@@ -109,6 +109,8 @@ $ papa hotfix deploy -v 17.12.0
 $ papa hotfix finish -v 17.12.0
 ```
 
+If the hotfix branch will also be merged to a release branch:
+
 ```
 $ papa hotfix finish -v 17.12.0 -b release/17.11.0
 ```
@@ -141,6 +143,12 @@ $ papa integration add -v 17.12.0
 $ papa integration deploy -v 17.12.7.18.20.30
 ```
 
+If you want to specify a different subdomain for the environment:
+
+```
+$ papa integration deploy -v 17.12.7.18.20.30 -s diomar
+```
+
 ### `papa sandbox`
 
 ```

data/USAGE.md

@@ -183,7 +183,7 @@ $ papa integration add -v 17.12.0
 This will deploy the specified integration branch to an integration environment.
 
 ```
-$ papa integration deploy -v, --version=VERSION
+$ papa integration deploy -v, --version=VERSION [-s, --subdomain=SUBDOMAIN]
 ```
 
 #### Sample Usage:
@@ -192,6 +192,13 @@ $ papa integration deploy -v, --version=VERSION
 $ papa integration deploy -v 17.12.7.18.20.30
 ```
 
+If you want to specify a different subdomain for the environment:
+
+```
+$ papa integration deploy -v 17.12.7.18.20.30 -s diomar
+```
+
+
 ## `papa sandbox`
 
 ### Generating a new sandbox

data/lib/papa/cli/integration.rb

@@ -23,13 +23,17 @@ module Papa
         Task::Integration::Add.new(version, branches).run
       end
 
-      desc 'deploy', 'Deploy the integration branch to integration.indinerocorp.com'
+      desc 'deploy', 'Deploy the integration branch to SUBDOMAIN.indinerocorp.com'
       option :version, aliases: '-v', required: true
+      option :subdomain, aliases: '-s'
       def deploy
         version = options[:version]
+        # Renamed to subdomain because `-h` is already assigned to `papa integration help`.
+        # Will still be referred to as `hostname` from here onwards.
+        hostname = options[:subdomain]
 
         require 'papa/task/integration/deploy'
-        Task::Integration::Deploy.new(version).run
+        Task::Integration::Deploy.new(version, hostname).run
       end
     end
   end

data/lib/papa/command/slack/send_message.rb

@@ -20,7 +20,7 @@ module Papa
         def payload
           url = "https://#{@hostname}.indinerocorp.com"
           {
-            'text' => "<!channel> Deployment to <#{url}|#{@build_type}> #{@action}."
+            'text' => "<!channel> Deployment to <#{url}|#{@hostname}> #{@action}."
           }
         end
 

data/lib/papa/task/integration/add.rb

@@ -13,15 +13,14 @@ module Papa
 
         def queue(branch)
           [
-            Command::Git::Fetch.new('origin'),
-            Command::Git::Checkout.new(@build_branch),
+            Command::Git::Checkout.new(build_branch),
             Command::Git::Checkout.new(branch),
             Command::Git::ResetHard.new('origin', branch),
-            Command::Git::Rebase.new(@build_branch),
-            Command::Git::Checkout.new(@build_branch),
+            Command::Git::Rebase.new(build_branch),
+            Command::Git::Checkout.new(build_branch),
             Command::Git::Merge.new(branch),
             Command::Git::BranchDelete.new(branch),
-            Command::Git::Push.new('origin', @build_branch)
+            Command::Git::Push.new('origin', build_branch)
           ]
         end
       end

data/lib/papa/task/integration/deploy.rb

@@ -4,10 +4,10 @@ module Papa
   module Task
     module Integration
       class Deploy < Common::Deploy
-        def initialize(version)
+        def initialize(version, hostname)
           @build_type = 'integration'
           @version = version
-          @hostname = 'integration'
+          @hostname = hostname || 'integration'
           super()
         end
       end

data/lib/papa/version.rb

@@ -1,3 +1,3 @@
 module Papa
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papa
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - boggs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor