papa 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29c3cafcfd5212f7d354e02cb1877aece9e90097
-  data.tar.gz: fcef6587e224a9c6681f801af755f86012f49e5c
+  metadata.gz: 67520d68cdc9b5dc51e12158774c9a56a2fbeaa4
+  data.tar.gz: c725d388086c5cb945f46aac6f1bbdb8ff8e3692
 SHA512:
-  metadata.gz: ea5bed3fe00376c47612c38a57cde14cbcd7667137f62c716a6a9006d2ab53fd851f24cd29c22ad0bdaca9c2111d9fcf61aa30de8612ef339c979abe602d7c68
-  data.tar.gz: f56b5d6c01acc1490b0d68bd7b336d17f30f688d8caf8c3a6cd799b69082cbb823c76659747e1519672ad2b4692a0d71e2e56079c33d89520d3d81f80e09686c
+  metadata.gz: 425913e88b97ebefc37f86f58f85d1d0770f2869395367dfa5e9e8eb31a79255f1fcf1a2e65f5b7147cf5bd4bab9e110037605e9bf94b27940764de0cf96ff98
+  data.tar.gz: ff3452e93ff53ff102e1627da9dcbaaf423a1571841d2c6d064ebd36758c0731e3f5a149c318ec0e834fc7fa3e692c26d4a89e5139d259b4bf4de0c4b9572848

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 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
+* Changed integration branch naming scheme to include seconds in the branch name.
+
 ## 0.4.1
 * Check whether build branch exists before prompting vi
 * Add preceeding newlines in vi prompt

data/README.md

@@ -22,37 +22,21 @@ $ gem install papa
 
 That's it, you're ready to go!
 
-## Commands
+## Usage
+
+Detailed information about what these commands do can be found in [USAGE.md](https://github.com/b-ggs/papa/blob/master/USAGE.md).
 
 ### `papa release`
 
 #### Starting a release branch
 
-This will create a new release branch based on the current `develop` branch. The release branch will be pushed to origin.
-
-```
-$ papa release start -v, --version=VERSION
-```
-
-###### Sample Usage:
-
 ```
 $ papa release start -v 17.12.0
 ```
 
 #### Adding feature branches to a release branch
 
-This will rebase all new feature branches from the release branch and then subsequently merge the updated feature branch into the release branch. The updated release branch will be pushed to origin.
-
-```
-$ papa release add -v, --version=VERSION [-b, --feature-branches=one two three]
-```
-
-If `--feature-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 `--feature-branches`:
+If you want to specify the feature branches using `-b`:
 
 ```
 $ papa release add -v 17.12.0 -b feature/1 feature/2 feature/3
@@ -66,14 +50,6 @@ $ papa release add -v 17.12.0
 
 #### Finishing a release branch
 
-The finished release branch will be merged to `master` and `develop`. The updated `master` and `develop` branches will be pushed to origin.
-
-```
-$ papa release finish -v, --version=VERSION
-```
-
-##### Sample Usage:
-
 ```
 $ papa release finish -v 17.12.0
 ```
@@ -82,31 +58,14 @@ $ papa release finish -v 17.12.0
 
 #### Starting a hotfix branch
 
-This will create a new hotfix branch based on the current `master` branch. The hotfix branch will be pushed to origin.
-
-```
-$ papa hotfix start -v, --version=VERSION
-```
-
-###### Sample Usage:
-
 ```
 $ papa hotfix start -v 17.12.0
 ```
 
 #### Adding bugfix branches to a hotfix branch
 
-This will rebase all new bugfix branches from the hotfix branch and then subsequently merge the updated bugfix branch into the release branch. The updated release branch will be pushed to origin.
-
-```
-$ 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:
-
-If you want to specify the bugfix branches using `--bugfix-branches`:
+If you want to specify the bugfix branches using `-b`:
 
 ```
 $ papa hotfix add -v 17.12.0 -b bugfix/1 bugfix/2 bugfix/3
@@ -120,62 +79,26 @@ $ papa hotfix add -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.
-
-```
-$ papa release hotfix -v, --version=VERSION
-```
-
-##### Sample Usage:
-
 ```
 $ papa release hotfix -v 17.12.0
 ```
 
 ### `papa integration`
 
-#### 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.
-
-```
-$ papa integration start -b, --base-branch=BASE_BRANCH
-```
-
-##### Sample Usage:
+#### Starting and deploying an integration branch
 
 ```
-$ papa integration start -b develop
-```
-
-### `papa deploy`
-
-#### Deploying a new environment
-
-This will create a new environment using `larga`.
-
-```
-$ papa deploy -b, --branch=BRANCH [-h, --hostname=HOSTNAME]
-```
-
-##### Sample Usage:
-
-```
-$ papa deploy -b feature/dunder-mifflin-this-is-pam
+$ papa integration start -b feature/dunder-mifflin-this-is-pam
 ```
 
 If you want to specify a hostname for this environment:
 
 ```
-$ papa deploy -b feature/we-were-on-a-break -h ross-and-rachel
+$ papa integration start -b feature/we-were-on-a-break -h ross-and-rachel
 ```
 
 ### `papa sandbox`
 
-#### Generating a new sandbox
-
-This will generate a git repository that you can use to test out `papa`.
-
 ```
 $ papa sandbox generate
 ```

data/USAGE.md

@@ -0,0 +1,149 @@
+# Usage
+
+## Contents
+
+* [papa release](#papa-release)
+* [papa hotfix](#papa-hotfix)
+* [papa integration](#papa-integration)
+* [papa deploy](#papa-deploy)
+* [papa sandbox](#papa-sandbox)
+
+## `papa release`
+
+### Starting a release branch
+
+This will create a new release branch based on the current `develop` branch. The release branch will be pushed to origin.
+
+```
+$ papa release start -v, --version=VERSION
+```
+
+#### Sample Usage:
+
+```
+$ papa release start -v 17.12.0
+```
+
+### Adding feature branches to a release branch
+
+This will rebase all new feature branches from the release branch and then subsequently merge the updated feature branch into the release branch. The updated release branch will be pushed to origin.
+
+```
+$ papa release add -v, --version=VERSION [-b, --feature-branches=one two three]
+```
+
+If `--feature-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 `--feature-branches`:
+
+```
+$ papa release add -v 17.12.0 -b feature/1 feature/2 feature/3
+```
+
+If you want to use vi to specify the feature branches:
+
+```
+$ papa release add -v 17.12.0
+```
+
+### Finishing a release branch
+
+The finished release branch will be merged to `master` and `develop`. The updated `master` and `develop` branches will be pushed to origin.
+
+```
+$ papa release finish -v, --version=VERSION
+```
+
+#### Sample Usage:
+
+```
+$ papa release finish -v 17.12.0
+```
+
+## `papa hotfix`
+
+### Starting a hotfix branch
+
+This will create a new hotfix branch based on the current `master` branch. The hotfix branch will be pushed to origin.
+
+```
+$ papa hotfix start -v, --version=VERSION
+```
+
+##### Sample Usage:
+
+```
+$ papa hotfix start -v 17.12.0
+```
+
+### Adding bugfix branches to a hotfix branch
+
+This will rebase all new bugfix branches from the hotfix branch and then subsequently merge the updated bugfix branch into the release branch. The updated release branch will be pushed to origin.
+
+```
+$ 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:
+
+If you want to specify the bugfix branches using `--bugfix-branches`:
+
+```
+$ papa hotfix add -v 17.12.0 -b bugfix/1 bugfix/2 bugfix/3
+```
+
+If you want to use vi to specify the bugfix branches:
+
+```
+$ papa hotfix add -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.
+
+```
+$ papa release hotfix -v, --version=VERSION
+```
+
+#### Sample Usage:
+
+```
+$ papa release hotfix -v 17.12.0
+```
+
+## `papa integration`
+
+### Starting and deploying 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.
+
+```
+$ papa integration start -b, --base-branch=BASE_BRANCH [-h, --hostname=HOSTNAME]
+```
+
+#### Sample Usage:
+
+```
+$ papa integration start -b feature/dunder-mifflin-this-is-pam
+```
+
+If you want to specify a hostname for this environment:
+
+```
+$ papa integration start -b feature/we-were-on-a-break -h ross-and-rachel
+```
+
+## `papa sandbox`
+
+### Generating a new sandbox
+
+This will generate a git repository that you can use to test out `papa`.
+
+```
+$ papa sandbox generate
+```

data/lib/papa/cli/integration.rb

@@ -1,13 +1,17 @@
 module Papa
   module CLI
     class Integration < Thor
-      desc 'start', 'Start an integration branch'
+      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
       def start
         base_branch = options[:base_branch]
+        hostname = options[:hostname]
+        skip_larga = options.has_key?('skip_larga')
 
         require 'papa/task/integration/start'
-        Task::Integration::Start.new(base_branch: base_branch).run
+        Task::Integration::Start.new(base_branch: base_branch, hostname: hostname, skip_larga: skip_larga).run
       end
     end
   end

data/lib/papa/cli/main.rb

@@ -15,18 +15,6 @@ module Papa
       desc 'integration [COMMAND]', 'Perform actions on integration branches'
       subcommand 'integration', CLI::Integration
 
-      desc 'deploy', 'Deploy a branch with larga'
-      option :branch, aliases: '-b', required: true
-      option :hostname, aliases: '-h'
-      def deploy
-        require 'papa/task/deploy'
-
-        branch = options[:branch]
-        hostname = options[:hostname]
-
-        Task::Deploy.new(branch: branch, hostname: hostname).run
-      end
-
       desc 'sandbox [COMMAND]', 'Test out papa in a sandboxed git environment'
       subcommand 'sandbox', CLI::Sandbox
     end

data/lib/papa/command/larga/deploy.rb

@@ -17,7 +17,7 @@ module Papa
         end
 
         def failed?
-          stdout.include? 'Cowardly refusing'
+          stdout.include?('Cowardly refusing') || stdout.include?('Error')
         end
 
         def failure_message
@@ -46,7 +46,7 @@ module Papa
           hostname = @options[:hostname]
 
           options = []
-          options << '-action deploy'
+          options << '-action build'
           options << "-branch #{branch}"
           options << "-lifespan #{lifespan}"
           options << "-protection #{protection}"

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

@@ -1,20 +1,53 @@
 require 'papa/task/common/start'
+require 'papa/command/larga/type'
+require 'papa/command/larga/deploy'
 require 'date'
 
 module Papa
   module Task
     module Integration
       class Start < Common::Start
-        def initialize(base_branch:)
+        def initialize(base_branch:, hostname:, skip_larga:)
           @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
+        end
+
         private
 
         def generate_integration_branch_name
-          "integration/#{DateTime.now.strftime('%y.%m.%d.%H.%M').gsub('.0', '.')}"
+          "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.'
         end
       end
     end

data/lib/papa/version.rb

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

data/papa.gemspec

@@ -28,6 +28,7 @@ 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.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - boggs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -110,6 +110,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- USAGE.md
 - exe/papa
 - lib/papa.rb
 - lib/papa/cli/hotfix.rb
@@ -142,7 +143,6 @@ files:
 - lib/papa/task/common/add.rb
 - lib/papa/task/common/finish.rb
 - lib/papa/task/common/start.rb
-- lib/papa/task/deploy.rb
 - lib/papa/task/hotfix/add.rb
 - lib/papa/task/hotfix/finish.rb
 - lib/papa/task/hotfix/start.rb

data/lib/papa/task/deploy.rb

@@ -1,38 +0,0 @@
-require 'papa/command/larga/type'
-require 'papa/command/larga/deploy'
-require 'papa/runner'
-
-module Papa
-  module Task
-    class Deploy
-      def initialize(options = {})
-        @options = options
-      end
-
-      def run
-        queue = [
-          Command::Larga::Type.new,
-          Command::Larga::Deploy.new(@options)
-        ]
-        runner = Runner.new(queue)
-
-        if runner.run
-          success_message
-        else
-          failure_message
-          exit 1
-        end
-      end
-
-      private
-
-      def success_message
-        Helper::Output.success 'Successfully deployed larga instance.'
-      end
-
-      def failure_message
-        Helper::Output.failure 'There was a problem deploying larga instance.'
-      end
-    end
-  end
-end