octopolo 1.11.4 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e70977bd6b03c5de1bb204ed0608e25e22ad1bcc
-  data.tar.gz: dbc6d49bba8692b7c0b8d2daacb45f14745b873e
+SHA256:
+  metadata.gz: '0282df5e557fc60fc1ba3c327481fb19d7dbc345783b489b2b94f56bd0b663d9'
+  data.tar.gz: a6dc8e635242a0f9414e410d7ac1afede799868788852aab207465498cb114d7
 SHA512:
-  metadata.gz: 4740ec9f9521944b03ac676570508cc18cebd27971003f9982a193f8ef934462070249a184604b4dafd84ee8653b658740fdde6d4791d334106f22d3ff55271f
-  data.tar.gz: 6543f339626cff2ab7a6af8f61fe5abbc4cfe4ff1738aa68eaed51f1932982739dbe549f195fe2fcfcd929dabf56572baad2650a831a9fae850622b4abc217f5
+  metadata.gz: 042ab96b2a9e518338c28dd9898221486e84de0c41fde51c700c20e881c2e601723a64104dd1f9184614f73e9b82833b91384513bf3afdd3a450e82efff20d03
+  data.tar.gz: 97913a3a1f5c3af9d4e978c9ee3dba4a286f4c43caa6faeae65a6ea73b865b6d79f89ca2e84cfdea3848137f0311401f641d4ce4b69776811a442788cd1416d8

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p648
+2.6.5

data/.soyuz.yml

@@ -1,10 +1,10 @@
 defaults:
   deploy_cmd: gem push *.gem
   before_deploy_cmds:
-    - /usr/local/bin/op tag-release
-    - sed -i "" -e "s/\".*/\"$(git tag | sed s/v// | sort -n -t. -k1,1 -k2,2 -k3,3 | tail -1)\"/" lib/octopolo/version.rb
-    - git add  lib/octopolo/version.rb
-    - git commit -m "Version Bump" && git push
+#    - /usr/local/bin/op tag-release
+#    - sed -i "" -e "s/\".*/\"$(git tag | sed s/v// | sort -n -t. -k1,1 -k2,2 -k3,3 | tail -1)\"/" lib/octopolo/version.rb
+#    - git add  lib/octopolo/version.rb
+#    - git commit -m "Version Bump" && git push
     - gem build octopolo.gemspec
   after_deploy_cmds:
     - rm *.gem

data/CHANGELOG.markdown

@@ -1,3 +1,4 @@
+#### v1.12.0
 #### v1.11.4
 * IS-12227 Upgrade octokit
 

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'guard', '~>2.5.0'
 gemspec
-

data/bin/octopolo

@@ -0,0 +1 @@
+bin/op

data/lib/octopolo/commands/pull_request.rb

@@ -3,6 +3,9 @@ command 'pull-request' do |c|
   c.desc "Branch to create the pull request against"
   c.flag [:d, :dest, :destination], :arg_name => "destination_branch", :default_value => Octopolo.config.deploy_branch
 
+  c.desc "Pass --sd to skip creating this pull request as a draft"
+  c.switch %i[sd skip-draft], :arg_name => "skip-draft"
+
   c.desc "Pass -x to skip the prompt and infer from branch. Expects the branch to be in this format: JIRA-123_describe_pr OR JIRA_123_describe_pr"
   c.switch [:x, :expedite], :arg_name => "expedite"
 

data/lib/octopolo/github/pull_request_creator.rb

@@ -22,7 +22,14 @@ module Octopolo
       # Returns an array with the first element being the pull request's
       # number, the second being a Mash of the response from GitHub's API
       def perform
-        result = GitHub.create_pull_request(repo_name, destination_branch, source_branch, title, body)
+        result = GitHub.create_pull_request(
+          repo_name,
+          destination_branch,
+          source_branch,
+          title,
+          body,
+          {draft: draft}
+        )
         # capture the information
         self.number = result.number
         self.data = result
@@ -30,6 +37,13 @@ module Octopolo
         raise CannotCreate, e.message
       end
 
+      # Public: Draft Pull request
+      #
+      # Returns a boolean that marks the PR a draft PR
+      def draft
+        !options[:skip_draft]
+      end
+
       # Public: Branch to merge the pull request into
       #
       # Returns a String with the branch name
@@ -51,7 +65,6 @@ module Octopolo
         Renderer::PULL_REQUEST_BODY
       end
 
-
       # Public: Temporary file for body editing
       #
       # Returns Name of temporary file

data/lib/octopolo/scripts/pull_request.rb

@@ -110,7 +110,8 @@ module Octopolo
           source_branch: git.current_branch,
           pivotal_ids: pivotal_ids,
           jira_ids: jira_ids,
-          editor: options[:editor]
+          editor: options[:editor],
+          skip_draft: options[:"skip-draft"]
         }
       end
       private :pull_request_attributes

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "1.11.4"
+  VERSION = "1.12.0"
 end

data/octopolo.gemspec

@@ -27,9 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'nokogiri-happymapper', '~> 0.6.0' # Lock down to 0.6.x for Ruby 2.0 compatibility.
 
   gem.add_development_dependency 'rake', '~> 10.1'
-  gem.add_development_dependency 'bundler', '~> 1.16'
   gem.add_development_dependency 'rspec', '~> 2.99'
-  gem.add_development_dependency 'guard', '~> 2.6'
   gem.add_development_dependency 'guard-rspec', '~> 4.3'
   gem.add_development_dependency 'hitimes', '~> 1.2.6'
   gem.add_development_dependency 'octopolo-plugin-example', '~> 0'

data/spec/octopolo/github/pull_request_creator_spec.rb

@@ -46,7 +46,9 @@ module Octopolo
         end
 
         it "generates the pull request with the given details and retains the information" do
-          GitHub.should_receive(:create_pull_request).with(repo_name, destination_branch, source_branch, title, body) { data }
+          GitHub.should_receive(:create_pull_request).with(
+            repo_name, destination_branch, source_branch, title, body, {draft: true}
+          ) { data }
           creator.perform.should == data
           creator.number.should == data.number
           creator.data.should == data

data/spec/octopolo/scripts/pull_request_spec.rb

@@ -234,7 +234,8 @@ module Octopolo
             source_branch: git.current_branch,
             pivotal_ids: subject.pivotal_ids,
             jira_ids: subject.jira_ids,
-            editor: nil
+            editor: nil,
+            skip_draft: nil
           }
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 1.11.4
+  version: 1.12.0
 platform: ruby
 authors:
 - Patrick Byrne
@@ -10,230 +10,202 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.18'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: jiralicious
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri-happymapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.99'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
   name: hitimes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: octopolo-plugin-example
   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: A set of GitHub workflow scripts.
@@ -247,12 +219,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .octopolo.yml
-- .ruby-gemset
-- .ruby-version
-- .soyuz.yml
-- .travis.yml
+- ".gitignore"
+- ".octopolo.yml"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".soyuz.yml"
+- ".travis.yml"
 - CHANGELOG.markdown
 - Gemfile
 - Guardfile
@@ -379,17 +351,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A set of GitHub workflow scripts to provide a smooth development process

data/bin/octopolo

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'gli'
-require_relative '../lib/octopolo'
-
-include GLI::App
-
-program_desc 'GitHub workflow scripts. From the Ngineers at Sport Ngin.'
-version Octopolo::VERSION
-
-autocomplete_commands false
-wrap_help_text :verbatim
-
-program_long_desc """
-DOCUMENTATION
-    For documentation and help in setting up your configuration files,
-    see Octopolo's GitHub repo: https://github.com/sportngin/octopolo
-"""
-
-commands_from File.expand_path(File.dirname(__FILE__) + '/../lib/octopolo/commands')
-
-exit run(ARGV)