octopolo 1.9.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 99207cf6d908d02747dfa354364fcb7a5489c4d1
-  data.tar.gz: 2becf7b4837964d9f40aa460ec65d42674e801b0
+SHA256:
+  metadata.gz: '0282df5e557fc60fc1ba3c327481fb19d7dbc345783b489b2b94f56bd0b663d9'
+  data.tar.gz: a6dc8e635242a0f9414e410d7ac1afede799868788852aab207465498cb114d7
 SHA512:
-  metadata.gz: 314f19aacdd2ee12e72717812eea2d7f864f3de87c216b75011843a32e83fadd2ac0c74c0a6dd71ba71357e7b82426c6aed33ad1129e09f0b4a86d7d67f7c438
-  data.tar.gz: e29c63d641279110743350e2a1bc5808f7addb32144f2ef5f13c1f73820f19884744ccd3226748ab9aa85dd8e967976f3d16ac5ebbcc4b8abb212c2aa829febb
+  metadata.gz: 042ab96b2a9e518338c28dd9898221486e84de0c41fde51c700c20e881c2e601723a64104dd1f9184614f73e9b82833b91384513bf3afdd3a450e82efff20d03
+  data.tar.gz: 97913a3a1f5c3af9d4e978c9ee3dba4a286f4c43caa6faeae65a6ea73b865b6d79f89ca2e84cfdea3848137f0311401f641d4ce4b69776811a442788cd1416d8

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+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,23 @@
+#### v1.12.0
+#### v1.11.4
+* IS-12227 Upgrade octokit
+
+  > Emma Sax: Sean Griffin, production-status-check[bot]: https://github.com/sportngin/octopolo/pull/140
+
+#### v1.11.3
+#### v1.11.2
+* Fix bug where op tag-release on repo with no releases breaks
+
+  > Emma Sax: production-status-check[bot]: https://github.com/sportngin/octopolo/pull/139
+
+#### v1.11.1
+* Make expedite's branch form more flexible
+
+  > Emma Sax: production-status-check[bot]: https://github.com/sportngin/octopolo/pull/135
+
+#### v1.11.0
+#### v1.10.0
+#### v1.9.1
 #### v1.10.0
 #### v1.9.0
 #### v1.8.1

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,7 +3,10 @@ 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 -x to skip the prompt and infer from branch. Expects the branch to be in this format: JIRA-123_describe_pr"
+  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"
 
   c.desc "Use $EDITOR to update PR description before creating"

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/jira/story_commenter.rb

@@ -26,7 +26,7 @@ module Octopolo
         begin
           issue.comments.add(comment)
         rescue => e
-          puts "Error: Failed to comment on Jira Issue #{issue_id}" 
+          puts "Error: Failed to comment on Jira Issue. \nException: #{e}"
         end
       end
     end

data/lib/octopolo/scripts/pull_request.rb

@@ -29,9 +29,9 @@ module Octopolo
         GitHub.connect do
 
           if options[:expedite]
-            infer_questionaire
+            infer_questionnaire
           else
-            ask_questionaire
+            ask_questionnaire
           end
 
           create_pull_request
@@ -43,7 +43,7 @@ module Octopolo
       end
 
       # Private: Ask questions to create a pull request
-      def ask_questionaire
+      def ask_questionnaire
         alert_reserved_and_exit if git.reserved_branch?
         announce
         ask_title
@@ -51,25 +51,30 @@ module Octopolo
         ask_pivotal_ids if config.use_pivotal_tracker
         ask_jira_ids if config.use_jira
       end
-      private :ask_questionaire
+      private :ask_questionnaire
 
-      def infer_questionaire
+      def infer_questionnaire
         alert_reserved_and_exit if git.reserved_branch?
         check_branch_format
         branch_arr = git.current_branch.split('_')
         issue = branch_arr[0].upcase
-        descr = branch_arr[1..-1].join(' ')
+        if issue.include?('-')
+          descr = branch_arr[1..-1].join(' ')
+        else
+          issue = "#{issue}-#{branch_arr[1]}"
+          descr = branch_arr[2..-1].join(' ')
+        end
 
-        self.title = "#{issue} #{descr}"
+        self.title = "#{issue} #{descr.capitalize}"
         self.pivotal_ids = [issue] if config.use_pivotal_tracker
         self.jira_ids = [issue] if config.use_jira
       end
-      private :infer_questionaire
+      private :infer_questionnaire
 
       def check_branch_format
-        return if /.*-\d+_.*/ =~ git.current_branch
+        return if (/[a-zA-Z]+-\d+_.*/ =~ git.current_branch || /[a-zA-Z]+_\d+_.*/ =~ git.current_branch)
 
-        cli.say "Branch must match format like 'iss-123_describe_branch' to expedite"
+        cli.say "Branch must match format like 'iss-123_describe_branch' or 'iss_123_describe_branch' to expedite"
         exit 1
       end
       private :check_branch_format
@@ -105,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/semver_tag_scrubber.rb

@@ -12,9 +12,17 @@ module Octopolo
     private
 
     def self.scrub_via_regexp(tag, regexp)
-      result = tag.match(regexp)[0]
-      tag.gsub!(regexp, '')
-      result
+      begin
+        result = tag.match(regexp)[0]
+        tag.gsub!(regexp, '')
+        result
+      rescue Exception => e
+        if e.message.include?("match' for nil:NilClass")
+          puts 'You are creating the first GitHub release for this repository.'
+        else
+          puts "Error finding existing GitHub release(s): #{e.message}"
+        end
+      end
     end
 
   end

data/lib/octopolo/version.rb

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

data/octopolo.gemspec

@@ -18,18 +18,16 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'gli', '~> 2.13'
   gem.add_dependency 'hashie', '~> 1.2'
-  gem.add_dependency 'octokit', '~> 4.0'
+  gem.add_dependency 'octokit', '~> 4.18'
   gem.add_dependency 'public_suffix', '~> 2.0' # Lock down to 2.x for Ruby 2.0 compatibility.
   gem.add_dependency 'highline', '~> 1.6'
   gem.add_dependency 'pivotal-tracker', '~> 0.5'
-  gem.add_dependency 'jiralicious', '~> 0.4'
+  gem.add_dependency 'jiralicious', '~> 0.5'
   gem.add_dependency 'semantic', '~> 1.3'
   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

@@ -45,7 +45,7 @@ module Octopolo
       context "#execute" do
         it "if connected to GitHub, asks some questions, creates the pull request, and opens it" do
           GitHub.should_receive(:connect).and_yield
-          expect(subject).to receive(:ask_questionaire)
+          expect(subject).to receive(:ask_questionnaire)
           expect(subject).to receive(:create_pull_request)
           expect(subject).to receive(:update_pivotal)
           expect(subject).to receive(:update_jira)
@@ -61,7 +61,7 @@ module Octopolo
         end
       end
 
-      context "#ask_questionaire" do
+      context "#ask_questionnaire" do
         it "asks appropriate questions to create a pull request" do
           expect(subject).to receive(:announce)
           expect(subject).to receive(:ask_title)
@@ -69,7 +69,7 @@ module Octopolo
           expect(subject).to receive(:ask_jira_ids)
           expect(subject).to receive(:ask_labels)
 
-          subject.send(:ask_questionaire)
+          subject.send(:ask_questionnaire)
         end
 
         context "when checking for staging branch" do
@@ -85,7 +85,7 @@ module Octopolo
 
             subject.should_receive(:alert_reserved_and_exit)
 
-            subject.send(:ask_questionaire)
+            subject.send(:ask_questionnaire)
           end
 
           it "should not ask if the branch is not staging" do
@@ -93,7 +93,7 @@ module Octopolo
 
             subject.should_not_receive(:alert_reserved_and_exit)
 
-            subject.send(:ask_questionaire)
+            subject.send(:ask_questionnaire)
           end
         end
       end
@@ -101,13 +101,23 @@ module Octopolo
       context "#expedite" do
         subject { PullRequest.new(nil, { expedite: true }) }
 
-        context 'good format' do
+        context 'good format 1' do
           let(:current_branch) { 'abc-123_so_fast'}
 
           it 'likes the issue-123_blah branch format' do
-            subject.send(:infer_questionaire)
+            subject.send(:infer_questionnaire)
             expect(subject.jira_ids).to eq(['ABC-123'])
-            expect(subject.title).to eq('ABC-123 so fast')
+            expect(subject.title).to eq('ABC-123 So fast')
+          end
+        end
+
+        context 'good format 2' do
+          let(:current_branch) { 'abc_123_so_fast'}
+
+          it 'likes the issue-123_blah branch format' do
+            subject.send(:infer_questionnaire)
+            expect(subject.jira_ids).to eq(['ABC-123'])
+            expect(subject.title).to eq('ABC-123 So fast')
           end
         end
 
@@ -117,7 +127,7 @@ module Octopolo
           it 'does not like other branch format' do
             subject.git.stub(:reserved_branch?).and_return false
             cli.should_receive(:say)
-            expect { subject.send(:infer_questionaire) }.to raise_error(SystemExit)
+            expect { subject.send(:infer_questionnaire) }.to raise_error(SystemExit)
           end
         end
 
@@ -125,7 +135,7 @@ module Octopolo
           subject.git.stub(:reserved_branch?).and_return true
           subject.should_receive(:alert_reserved_and_exit).and_call_original
           cli.should_receive(:say)
-          expect { subject.send(:infer_questionaire) }.to raise_error(SystemExit)
+          expect { subject.send(:infer_questionnaire) }.to raise_error(SystemExit)
         end
       end
 
@@ -224,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

data/spec/octopolo/semver_tag_scrubber_spec.rb

@@ -27,5 +27,21 @@ module Octopolo
       end
     end
 
+    describe 'scrub_via_regexp' do
+      let(:regexp) { /[a-z]*\z/i }
+      let(:tag) { '0.1.1' }
+
+      it 'should return a string' do
+        expect(SemverTagScrubber.scrub_via_regexp(tag, regexp)).to be_a(String)
+      end
+
+      it 'should not raise an error if the tag does not exist' do
+        expect{ SemverTagScrubber.scrub_via_regexp(nil, regexp) }.not_to raise_error(NoMethodError)
+      end
+
+      it 'should return nil if there was no tag' do
+        expect(SemverTagScrubber.scrub_via_regexp(nil, regexp)).to eq(nil)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Patrick Byrne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.18'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -152,20 +152,6 @@ dependencies:
     - - "~>"
       - !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
@@ -180,20 +166,6 @@ dependencies:
     - - "~>"
       - !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
@@ -388,8 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+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)