papa 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67520d68cdc9b5dc51e12158774c9a56a2fbeaa4
-  data.tar.gz: c725d388086c5cb945f46aac6f1bbdb8ff8e3692
+  metadata.gz: 148db42da7efd02693c120d2bdc5c30eee785ff2
+  data.tar.gz: 4bbc65502f1104de6529462428844b6af31756cc
 SHA512:
-  metadata.gz: 425913e88b97ebefc37f86f58f85d1d0770f2869395367dfa5e9e8eb31a79255f1fcf1a2e65f5b7147cf5bd4bab9e110037605e9bf94b27940764de0cf96ff98
-  data.tar.gz: ff3452e93ff53ff102e1627da9dcbaaf423a1571841d2c6d064ebd36758c0731e3f5a149c318ec0e834fc7fa3e692c26d4a89e5139d259b4bf4de0c4b9572848
+  metadata.gz: 77c15709988cfa6287d21c4fff43e99bb325a1ccc75b77fa48efcd8d089edd84db804fdd35afc992505c73eb8fcdc0c8f4183ca51538b61a1cb1c8dc7bf3ab0f
+  data.tar.gz: 0eb00148472bd74162d8b4b13cee2bc22a7a8265fa01c8ed8b82f453e7418b0f403c8a6ed7524874179ef4c86a3f8f7d514ee6493562297ca5fbd66d5de1084e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.0
+* Added `papa hotfix deploy`
+* Edited `papa integration start` to only start a new branch and not deploy to an environment.
+* Added `papa integration add` and `papa integration deploy`
+* Edited tasks so that they only run `git fetch` once
+
 ## 0.5.0
 * Deprecated `papa deploy`. Deployment will be triggered during `papa integration start`.
 * Simplified README.md and moved detailed command information into USAGE.md

data/README.md

@@ -77,6 +77,12 @@ If you want to use vi to specify the bugfix branches:
 $ papa hotfix add -v 17.12.0
 ```
 
+#### Deploying a hotfix branch to a hotfix environment
+
+```
+$ papa hotfix deploy -v 17.12.0
+```
+
 #### Finishing a hotfix branch
 
 ```
@@ -85,16 +91,30 @@ $ papa release hotfix -v 17.12.0
 
 ### `papa integration`
 
-#### Starting and deploying an integration branch
+#### Starting an integration branch
+
+```
+$ papa integration start -f develop
+```
+
+#### Adding branches to an integration branch
+
+If you want to specify the feature branches using `-b`:
+
+```
+$ papa integration add -v 17.12.0 -b feature/1 feature/2 feature/3
+```
+
+If you want to use vi to specify the feature branches:
 
 ```
-$ papa integration start -b feature/dunder-mifflin-this-is-pam
+$ papa integration add -v 17.12.0
 ```
 
-If you want to specify a hostname for this environment:
+#### Deploying an integration branch to an integration environment
 
 ```
-$ papa integration start -b feature/we-were-on-a-break -h ross-and-rachel
+$ papa integration deploy -v 17.12.7.18.20.30
 ```
 
 ### `papa sandbox`

data/USAGE.md

@@ -72,7 +72,7 @@ This will create a new hotfix branch based on the current `master` branch. The h
 $ papa hotfix start -v, --version=VERSION
 ```
 
-##### Sample Usage:
+#### Sample Usage:
 
 ```
 $ papa hotfix start -v 17.12.0
@@ -88,7 +88,7 @@ $ papa hotfix add -v, --version=VERSION [-b, --bugfix-branches=one two three]
 
 If `--bugfix-branches` is not specified, it will prompt a vi session where you can enter the branch names separated by line breaks.
 
-##### Sample Usage:
+#### Sample Usage:
 
 If you want to specify the bugfix branches using `--bugfix-branches`:
 
@@ -102,6 +102,20 @@ If you want to use vi to specify the bugfix branches:
 $ papa hotfix add -v 17.12.0
 ```
 
+### Deploying a hotfix branch to a hotfix environment
+
+This will deploy the specified hotfix branch to a hotfix environment.
+
+```
+$ papa hotfix deploy -v, --version=VERSION
+```
+
+#### Sample Usage:
+
+```
+$ papa hotfix deploy -v 17.12.0
+```
+
 ### Finishing a hotfix branch
 
 The finished hotfix branch will be merged to `master` and `develop`. The updated `master` and `develop` branches will be pushed to origin.
@@ -118,24 +132,56 @@ $ papa release hotfix -v 17.12.0
 
 ## `papa integration`
 
-### Starting and deploying an integration branch
+#### Starting an integration branch
 
-This will create a new integration branch based on the specified base branch. The integration branch will be pushed to origin. The new branch will then be deployed to Larga.
+This will create a new integration branch based on the specified base branch.
 
 ```
-$ papa integration start -b, --base-branch=BASE_BRANCH [-h, --hostname=HOSTNAME]
+$ papa integration start -f, --base-branch=BASE_BRANCH
 ```
 
 #### Sample Usage:
 
 ```
-$ papa integration start -b feature/dunder-mifflin-this-is-pam
+$ papa integration start -f feature/dunder-mifflin-this-is-pam
 ```
 
-If you want to specify a hostname for this environment:
+### Adding branches to an integration branch
+
+This will rebase all branches from the integration branch (but will not push them to origin unlike hotfix and release!) and then subsequently merge the updated bugfix branch into the integration branch. The updated integration branch will be pushed to origin.
+
+```
+$ papa integration add -v, --version=VERSION [-b, --branches=one two three]
+```
+
+If `--branches` is not specified, it will prompt a vi session where you can enter the branch names separated by line breaks.
+
+#### Sample Usage:
+
+If you want to specify the feature branches using `-b`:
+
+```
+$ papa integration add -v 17.12.0 -b feature/1 feature/2 feature/3
+```
+
+If you want to use vi to specify the feature branches:
+
+```
+$ papa integration add -v 17.12.0
+```
+
+### Deploying an integration branch to an integration environment
+
+This will deploy the specified integration branch to an integration environment.
+
+```
+$ papa integration deploy -v, --version=VERSION
+```
+
+#### Sample Usage:
 
 ```
-$ papa integration start -b feature/we-were-on-a-break -h ross-and-rachel
+$ papa integration deploy -v 17.12.7.18.20.30
 ```
 
 ## `papa sandbox`

data/lib/papa/cli/hotfix.rb

@@ -7,7 +7,7 @@ module Papa
         version = options[:version]
 
         require 'papa/task/hotfix/start'
-        Task::Hotfix::Start.new(version: version).run
+        Task::Hotfix::Start.new(version).run
       end
 
       desc 'add', 'Add bugfix branches to a hotfix branch'
@@ -18,7 +18,15 @@ module Papa
         bugfix_branches = options[:bugfix_branches] || []
 
         require 'papa/task/hotfix/add'
-        Task::Hotfix::Add.new(version: version, bugfix_branches: bugfix_branches).run
+        Task::Hotfix::Add.new(version, bugfix_branches).run
+      end
+
+      desc 'deploy', 'Deploy the hotfix branch to hotfix.indinerocorp.com'
+      option :version, aliases: '-v', required: true
+      def deploy
+        version = options[:version]
+        require 'papa/task/hotfix/deploy'
+        Task::Hotfix::Deploy.new(version).run
       end
 
       desc 'finish', 'Merge the hotfix branch to the base branches'
@@ -29,7 +37,7 @@ module Papa
         additional_branches = options[:additional_branches]
 
         require 'papa/task/hotfix/finish'
-        Task::Hotfix::Finish.new(version: version, additional_branches: additional_branches).run
+        Task::Hotfix::Finish.new(version, additional_branches).run
       end
     end
   end

data/lib/papa/cli/integration.rb

@@ -1,17 +1,35 @@
 module Papa
   module CLI
     class Integration < Thor
-      desc 'start', 'Start an integration branch and deploy it to Larga'
-      option :base_branch, aliases: '-b', required: true
-      option :hostname, aliases: '-h'
-      option :skip_larga
+      desc 'start', 'Start an integration branch'
+      option :base_branch, aliases: ['-b', '-f'], required: true
+      option :override_branch_name
       def start
         base_branch = options[:base_branch]
-        hostname = options[:hostname]
-        skip_larga = options.has_key?('skip_larga')
+        task_options = { override_branch_name: options[:override_branch_name] }
 
         require 'papa/task/integration/start'
-        Task::Integration::Start.new(base_branch: base_branch, hostname: hostname, skip_larga: skip_larga).run
+        Task::Integration::Start.new(base_branch, task_options).run
+      end
+
+      desc 'add', 'Add branches to a integration branch'
+      option :version, aliases: '-v', required: true
+      option :branches, aliases: '-b', type: :array
+      def add
+        version = options[:version]
+        branches = options[:branches] || []
+
+        require 'papa/task/integration/add'
+        Task::Integration::Add.new(version, branches).run
+      end
+
+      desc 'deploy', 'Deploy the integration branch to integration.indinerocorp.com'
+      option :version, aliases: '-v', required: true
+      def deploy
+        version = options[:version]
+
+        require 'papa/task/integration/deploy'
+        Task::Integration::Deploy.new(version).run
       end
     end
   end

data/lib/papa/cli/release.rb

@@ -7,7 +7,7 @@ module Papa
         version = options[:version]
 
         require 'papa/task/release/start'
-        Task::Release::Start.new(version: version).run
+        Task::Release::Start.new(version).run
       end
 
       desc 'add', 'Add feature branches to a release branch'
@@ -18,7 +18,7 @@ module Papa
         feature_branches = options[:feature_branches] || []
 
         require 'papa/task/release/add'
-        Task::Release::Add.new(version: version, feature_branches: feature_branches).run
+        Task::Release::Add.new(version, feature_branches).run
       end
 
       desc 'finish', 'Merge the release branch to master and develop'
@@ -27,7 +27,7 @@ module Papa
         version = options[:version]
 
         require 'papa/task/release/finish'
-        Task::Release::Finish.new(version: version).run
+        Task::Release::Finish.new(version).run
       end
     end
   end

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

@@ -27,18 +27,7 @@ module Papa
 
           @branches.each_with_index do |branch, index|
             Helper::Output.stdout "Adding branch #{branch.bold} (#{index + 1} of #{@branches.count})..."
-            queue = [
-              Command::Git::Fetch.new('origin'),
-              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::PushForce.new('origin', branch),
-              Command::Git::Checkout.new(@build_branch),
-              Command::Git::Merge.new(branch),
-              Command::Git::Push.new('origin', @build_branch)
-            ]
-            runner = Runner.new(queue)
+            runner = Runner.new(queue(branch))
 
             if runner.run
               @success_branches << branch
@@ -52,13 +41,9 @@ module Papa
             end
           end
 
-          success_message
-          failure_message
+          success_and_failure_messages
 
-          if success
-            success_cleanup
-          else
-            failure_cleanup
+          if !success
             exit 1
           end
         end
@@ -76,6 +61,20 @@ module Papa
           exit 1
         end
 
+        def queue(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::PushForce.new('origin', branch),
+            Command::Git::Checkout.new(@build_branch),
+            Command::Git::Merge.new(branch),
+            Command::Git::BranchDelete.new(branch),
+            Command::Git::Push.new('origin', @build_branch)
+          ]
+        end
+
         def check_if_branches_are_given
           return unless @branches.empty?
           require 'papa/helper/vi'
@@ -83,6 +82,11 @@ module Papa
           @branches = vi_file_helper.run
         end
 
+        def success_and_failure_messages
+          success_message
+          failure_message
+        end
+
         def success_message
           return if @success_branches.empty?
           Helper::Output.success "Successfully added these branches to #{@build_branch}:\n"
@@ -112,14 +116,6 @@ module Papa
 
           Helper::Output.failure_info info
         end
-
-        def success_cleanup
-          queue = @branches.map { |branch| Command::Git::BranchDelete.new(branch) }
-          Runner.new(queue).run
-        end
-
-        def failure_cleanup
-        end
       end
     end
   end

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

@@ -0,0 +1,56 @@
+require 'papa/helper/output'
+require 'papa/command/larga/type'
+require 'papa/command/larga/deploy'
+require 'papa/runner'
+
+module Papa
+  module Task
+    module Common
+      class Deploy
+        def run
+          @build_branch ||= "#{@build_type}/#{@version}"
+
+          runner = Runner.new(queue)
+
+          if runner.run
+            success_message
+          else
+            failure_message
+            exit 1
+          end
+        end
+
+        private
+
+        def queue
+          [
+            Command::Larga::Type.new,
+            Command::Larga::Deploy.new(deploy_options)
+          ]
+        end
+
+        def deploy_options
+          {
+            branch: @build_branch,
+            hostname: @hostname
+          }
+        end
+
+        def success_message
+          Helper::Output.success 'Successfully deployed larga instance.'
+          info = ''
+          info << "  Branch: #{@build_branch}\n"
+          info << "  URL: https://#{@hostname}.indinerocorp.com\n"
+          Helper::Output.success_info info
+        end
+
+        def failure_message
+          Helper::Output.failure 'There was a problem deploying larga instance.'
+          info = ''
+          info << "  Branch: #{@build_branch}\n"
+          Helper::Output.failure_info info
+        end
+      end
+    end
+  end
+end

data/lib/papa/task/common/finish.rb

@@ -14,22 +14,13 @@ module Papa
         def run
           @build_branch ||= "#{@build_type}/#{@version}"
 
+          check_if_build_branch_exists
+
           success = true
           @success_branches = []
 
           @base_branches.each do |branch|
-            queue = [
-              Command::Git::Fetch.new('origin'),
-              Command::Git::Checkout.new(@build_branch),
-              Command::Git::Checkout.new(branch),
-              Command::Git::Merge.new(@build_branch),
-              Command::Git::Push.new('origin', branch)
-            ]
-            if @tag_name && branch == 'master'
-              queue << Command::Git::Tag.new(@tag_name)
-              queue << Command::Git::TagPush.new('origin', @tag_name)
-            end
-            runner = Runner.new(queue)
+            runner = Runner.new(queue(branch))
 
             if runner.run
               @success_branches << branch
@@ -38,9 +29,9 @@ module Papa
             end
           end
 
-          success_message if !@success_branches.empty?
-
-          if !success
+          if success
+            success_message
+          else
             failure_message
             exit 1
           end
@@ -48,6 +39,31 @@ module Papa
 
         private
 
+        def check_if_build_branch_exists
+          queue = [
+            Command::Git::Fetch.new('origin'),
+            Command::Git::Checkout.new(@build_branch)
+          ]
+          runner = Runner.new(queue)
+          return if runner.run
+          Helper::Output.failure 'Build branch does not exist.'
+          exit 1
+        end
+
+        def queue(branch)
+          queue = [
+            Command::Git::Checkout.new(@build_branch),
+            Command::Git::Checkout.new(branch),
+            Command::Git::Merge.new(@build_branch),
+            Command::Git::Push.new('origin', branch)
+          ]
+          if @tag_name && branch == 'master'
+            queue << Command::Git::Tag.new(@tag_name)
+            queue << Command::Git::TagPush.new('origin', @tag_name)
+          end
+          queue
+        end
+
         def success_message
           Helper::Output.success "Successfully merged #{@build_branch} to these branches:\n"
           info = ''

data/lib/papa/task/common/start.rb

@@ -12,13 +12,6 @@ module Papa
         def run
           @build_branch ||= "#{@build_type}/#{@version}"
 
-          queue = [
-            Command::Git::Fetch.new('origin'),
-            Command::Git::Checkout.new(@base_branch),
-            Command::Git::Branch.new(@build_branch),
-            Command::Git::Checkout.new(@build_branch),
-            Command::Git::Push.new('origin', @build_branch)
-          ]
           runner = Runner.new(queue)
 
           if runner.run
@@ -31,6 +24,16 @@ module Papa
 
         private
 
+        def queue
+          [
+            Command::Git::Fetch.new('origin'),
+            Command::Git::Checkout.new(@base_branch),
+            Command::Git::Branch.new(@build_branch),
+            Command::Git::Checkout.new(@build_branch),
+            Command::Git::Push.new('origin', @build_branch)
+          ]
+        end
+
         def success_message
           Helper::Output.success "Successfully started new #{@build_type} branch #{@build_branch}"
         end

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

@@ -4,7 +4,7 @@ module Papa
   module Task
     module Hotfix
       class Add < Common::Add
-        def initialize(version:, bugfix_branches:)
+        def initialize(version, bugfix_branches)
           @build_type = 'hotfix'
           @version = version
           @branches = bugfix_branches

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

@@ -0,0 +1,15 @@
+require 'papa/task/common/deploy'
+
+module Papa
+  module Task
+    module Hotfix
+      class Deploy < Common::Deploy
+        def initialize(version)
+          @build_type = 'hotfix'
+          @version = version
+          @hostname = 'hotfix'
+        end
+      end
+    end
+  end
+end

data/lib/papa/task/hotfix/finish.rb

@@ -4,7 +4,7 @@ module Papa
   module Task
     module Hotfix
       class Finish < Common::Finish
-        def initialize(version:, additional_branches:)
+        def initialize(version, additional_branches)
           @build_type = 'hotfix'
           @version = version
           additional_branches ||= []

data/lib/papa/task/hotfix/start.rb

@@ -4,7 +4,7 @@ module Papa
   module Task
     module Hotfix
       class Start < Common::Start
-        def initialize(version:)
+        def initialize(version)
           @build_type = 'hotfix'
           @base_branch = 'master'
           @version = version

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

@@ -0,0 +1,29 @@
+require 'papa/task/common/add'
+
+module Papa
+  module Task
+    module Integration
+      class Add < Common::Add
+        def initialize(version, branches)
+          @build_type = 'integration'
+          @version = version
+          @branches = branches
+        end
+
+        def queue(branch)
+          [
+            Command::Git::Fetch.new('origin'),
+            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::Merge.new(branch),
+            Command::Git::BranchDelete.new(branch),
+            Command::Git::Push.new('origin', @build_branch)
+          ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+require 'papa/task/common/deploy'
+
+module Papa
+  module Task
+    module Integration
+      class Deploy < Common::Deploy
+        def initialize(version)
+          @build_type = 'integration'
+          @version = version
+          @hostname = 'integration'
+        end
+      end
+    end
+  end
+end

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

@@ -7,47 +7,16 @@ module Papa
   module Task
     module Integration
       class Start < Common::Start
-        def initialize(base_branch:, hostname:, skip_larga:)
+        def initialize(base_branch, options = {})
           @build_type = 'integration'
           @base_branch = base_branch
-          @hostname = hostname
-          @skip_larga = skip_larga
-          @build_branch = generate_integration_branch_name
-        end
-
-        def run
-          super
-          return if @skip_larga
-          deploy_options = {
-            branch: @build_branch,
-            hostname: @hostname
-          }
-          queue = [
-            Command::Larga::Type.new,
-            Command::Larga::Deploy.new(deploy_options)
-          ]
-          runner = Runner.new(queue)
-
-          if runner.run
-            success_message_integration
-          else
-            failure_message_integration
-            exit 1
-          end
+          @build_branch = "#{@build_type}/#{options[:override_branch_name] || generate_integration_timestamp}"
         end
 
         private
 
-        def generate_integration_branch_name
-          "integration/#{DateTime.now.strftime('%y.%m.%d.%H.%M.%S').gsub('.0', '.')}"
-        end
-
-        def success_message_integration
-          Helper::Output.success 'Successfully deployed larga instance.'
-        end
-
-        def failure_message_integration
-          Helper::Output.failure 'There was a problem deploying larga instance.'
+        def generate_integration_timestamp
+          DateTime.now.strftime('%y.%m.%d.%H.%M.%S').gsub('.0', '.')
         end
       end
     end

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

@@ -4,7 +4,7 @@ module Papa
   module Task
     module Release
       class Add < Common::Add
-        def initialize(version:, feature_branches:)
+        def initialize(version, feature_branches)
           @build_type = "release"
           @version = version
           @branches = feature_branches

data/lib/papa/task/release/finish.rb

@@ -4,7 +4,7 @@ module Papa
   module Task
     module Release
       class Finish < Common::Finish
-        def initialize(version:)
+        def initialize(version)
           @build_type = 'release'
           @version = version
           @tag_name = version

data/lib/papa/task/release/start.rb

@@ -4,7 +4,7 @@ module Papa
   module Task
     module Release
       class Start < Common::Start
-        def initialize(version:)
+        def initialize(version)
           @build_type = 'release'
           @base_branch = 'develop'
           @version = version

data/lib/papa/version.rb

@@ -1,3 +1,3 @@
 module Papa
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/papa.gemspec

@@ -28,7 +28,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-byebug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - boggs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,34 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Helper gem for inDinero's git workflow
 email:
 - hello@boggs.xyz
@@ -141,11 +113,15 @@ files:
 - lib/papa/runner.rb
 - lib/papa/string.rb
 - lib/papa/task/common/add.rb
+- lib/papa/task/common/deploy.rb
 - lib/papa/task/common/finish.rb
 - lib/papa/task/common/start.rb
 - lib/papa/task/hotfix/add.rb
+- lib/papa/task/hotfix/deploy.rb
 - lib/papa/task/hotfix/finish.rb
 - lib/papa/task/hotfix/start.rb
+- lib/papa/task/integration/add.rb
+- lib/papa/task/integration/deploy.rb
 - lib/papa/task/integration/start.rb
 - lib/papa/task/release/add.rb
 - lib/papa/task/release/finish.rb