octopolo 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6a67ceec3847ae82cd909737bf2b46f62158dab
-  data.tar.gz: c4c8486b109e1a402c8cf77ad5af2f7cc4ebb249
+  metadata.gz: 1180ea8ecff06b1794c95afb8691c7577f9223c9
+  data.tar.gz: 1a5a2e430cfb10351f755df6c2614723f72872b8
 SHA512:
-  metadata.gz: 94940d74fb753515939e99b38cd9ab386cff1b78ae1232f4f63a5442df0f30430555202b87f48b7c91d90db1ca48df4af203588fa265b592f35c6f669ed41596
-  data.tar.gz: ea460b23ad0cbb4054936d5cf017480c1e04d1b1227164984b02a9e3f2611466ef555c09bf2d40b43f5e718d1a487a2d9a58780e8953c531e1fe9a69dfde46d2
+  metadata.gz: a21ed3bc2ce58fe993ec7212c78a71bb3598e5e3b88387ff9531ca4d28c467c32c8eb6277dfb1723f0e22a7f13bee03c8b24f5ef57e203ac3f6385ea4ccd5d0d
+  data.tar.gz: 11a8c5346bcd00e22bc3f1a257993aaa736f4d87a1d86c838001da4188b2ff9611dc6c120b4460e8b0eba4ec838a921f972ba36760b5fbb04daf3f353feabb2d

data/.ruby-version

@@ -0,0 +1 @@
+2.2.4

data/CHANGELOG.markdown

@@ -1,3 +1,36 @@
+#### v1.3.0
+* IS-4641-spring-cleaning-jira-bomb
+
+  > newzac: Zach Serre, Carl Allen: https://github.com/sportngin/octopolo/pull/84
+
+* Spring Cleaning IS-4644 Enable use of auto-merging resolver
+
+  > newzac: Carl Allen, Andy Fleener: https://github.com/sportngin/octopolo/pull/83
+
+* Reserved branch warning
+
+  > Mykola, Brian Bergstrom: Matt Krieger: https://github.com/sportngin/octopolo/pull/82
+
+* Exit with a status code of 1. Could also use abort, I guess
+
+  > AJ Stuyvenberg: Brian Bergstrom: https://github.com/sportngin/octopolo/pull/81
+
+* Don't raise on missing config file
+
+  > Chris Arcand: Andy Fleener, Pete Anderson: https://github.com/sportngin/octopolo/pull/80
+
+* Remove unwanted CLI output from tests
+
+  > Chris Arcand: : https://github.com/sportngin/octopolo/pull/79
+
+* Use an rbenv/chruby compatible ruby-version
+
+  > Chris Arcand: Andy Fleener: https://github.com/sportngin/octopolo/pull/78
+
+* Remove and ignore .DS_Store
+
+  > Chris Arcand: : https://github.com/sportngin/octopolo/pull/77
+
 #### v1.2.1
 #### v1.2.0
 * View PR in Browser

data/README.markdown

@@ -47,6 +47,10 @@ another named branch) into your current branch.
 
     sync-branch
     sync-branch some-other-branch
+#### Automatic Merge Conflict Resolution
+
+Optionally you can add the line `merge_resolver: <path/to/script>` to the `.octopolo.yml` to
+have Octopolo try to resolve conflicts automatically via a script upon merge failure.
 
 #### Review Changes In Releases
 

data/lib/octopolo/config.rb

@@ -44,6 +44,10 @@ module Octopolo
       @github_repo || raise(MissingRequiredAttribute, "GitHub Repo is required")
     end
 
+    def merge_resolver
+      @merge_resolver 
+    end
+
     def user_notifications
       if [NilClass, Array, String].include?(@user_notifications.class)
         Array(@user_notifications) if @user_notifications

data/lib/octopolo/git.rb

@@ -6,6 +6,8 @@ module Octopolo
     NO_BRANCH = "(no branch)"
     DEFAULT_DIRTY_MESSAGE = "Your Git index is not clean. Commit, stash, or otherwise clean up the index before continuing."
     DIRTY_CONFIRM_MESSAGE = "Your Git index is not clean. Do you want to continue?"
+    RESERVED_BRANCH_MESSAGE = "Please choose another name for your new branch."
+    RESERVED_BRANCH_CONFIRM_MESSAGE = "Your new branch may be misidentified as a reserved branch based on its name. Do you want to continue?"
     # we use date-based tags, so look for anything starting with a 4-digit year
     RELEASE_TAG_FILTER = /^\d{4}.*/
     RECENT_TAG_LIMIT = 9
@@ -17,6 +19,11 @@ module Octopolo
     STAGING_PREFIX = "staging"
     QAREADY_PREFIX = "qaready"
 
+    # To check if the new branch's name starts with one of these
+    RESERVED_BRANCH_PREFIXES = [ DEPLOYABLE_PREFIX, STAGING_PREFIX, QAREADY_PREFIX ]
+
+    @resolver_used = nil
+
     include CLIWrapper
     extend CLIWrapper # add class-level .cli and .cli= methods
 
@@ -64,8 +71,8 @@ module Octopolo
     # Public: Determine if current_branch is reserved
     #
     # Returnsa boolean value
-    def self.reserved_branch?
-      !(current_branch =~ /^(?:#{Git::STAGING_PREFIX}|#{Git::DEPLOYABLE_PREFIX}|#{Git::QAREADY_PREFIX})/).nil?
+    def self.reserved_branch?(branch=current_branch)
+      !(branch =~ /^(?:#{Git::RESERVED_BRANCH_PREFIXES.join('|')})/).nil?
     end
 
     # Public: Check out the given branch name
@@ -114,6 +121,7 @@ module Octopolo
         yield
       else
         alert_dirty_index message
+        exit 1
       end
     end
 
@@ -126,11 +134,30 @@ module Octopolo
       raise DirtyIndex
     end
 
+    def self.alert_reserved_branch(message)
+      cli.say " "
+      cli.say message
+      cli.say " "
+      cli.say "Here's the list of the reserved branch prefixes:"
+      cli.say RESERVED_BRANCH_PREFIXES.join(" ")
+      cli.say " "
+      raise ReservedBranch
+    end    
+
     # Public: Merge the given remote branch into the current branch
     def self.merge(branch_name)
       Git.if_clean do
         Git.fetch
         perform "merge --no-ff origin/#{branch_name}", :ignore_non_zero => true
+        unless Git.clean?
+          if @resolver_used.nil? && Octopolo.config.merge_resolver
+            %x(#{Octopolo.config.merge_resolver})
+            @resolver_used = true
+            if Git.clean?
+              merge(branch_name)
+            end
+          end
+        end
         raise MergeFailed unless Git.clean?
         Git.push
       end
@@ -279,5 +306,6 @@ module Octopolo
     MergeFailed = Class.new(StandardError)
     NoBranchOfType = Class.new(StandardError)
     DirtyIndex = Class.new(StandardError)
+    ReservedBranch = Class.new(StandardError)
   end
 end

data/lib/octopolo/jira/story_commenter.rb

@@ -14,12 +14,20 @@ module Octopolo
           jira_config.password = config.jira_password
           jira_config.uri = config.jira_url
         end
-        self.issue =  Jiralicious::Issue.find issue_id
+        begin
+          self.issue =  Jiralicious::Issue.find issue_id
+        rescue => e
+           puts "Error: Invalid Jira Issue #{issue_id}" 
+        end
         self.comment = comment
       end
 
       def perform
-        issue.comments.add(comment)
+        begin
+          issue.comments.add(comment)
+        rescue => e
+          puts "Error: Failed to comment on Jira Issue #{issue_id}" 
+        end
       end
     end
   end

data/lib/octopolo/scripts/new_branch.rb

@@ -6,6 +6,7 @@ module Octopolo
     class NewBranch
       include ConfigWrapper
       include GitWrapper
+      include CLIWrapper
 
       attr_accessor :new_branch_name
       attr_accessor :source_branch_name
@@ -22,7 +23,13 @@ module Octopolo
       # Public: Perform the script
       def execute
         raise ArgumentError unless new_branch_name
-        git.new_branch(new_branch_name, source_branch_name)
+        if !git.reserved_branch?(new_branch_name) || cli.ask_boolean(Git::RESERVED_BRANCH_CONFIRM_MESSAGE)
+          git.new_branch(new_branch_name, source_branch_name)
+        else
+          message = Git::RESERVED_BRANCH_MESSAGE
+          git.alert_reserved_branch message
+          exit 1
+        end
       end
 
       # Public: Provide a default value if none is given

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/spec/octopolo/config_spec.rb

@@ -82,6 +82,16 @@ module Octopolo
         end
       end
 
+      context "#merge_resolver" do
+        it "is nil by default" do
+          Config.new.merge_resolver.should == nil
+        end
+
+        it "returns a string if it has a value" do
+          Config.new(merge_resolver: "/opt/resolver.sh").merge_resolver.should == "/opt/resolver.sh"
+        end
+      end
+
       context "#user_notifications" do
         it "is nil by default" do
           Config.new.user_notifications.should == nil

data/spec/octopolo/git_spec.rb

@@ -153,9 +153,11 @@ module Octopolo
         Git.should_receive(:alert_dirty_index).with(Git::DEFAULT_DIRTY_MESSAGE)
 
 
-        Git.if_clean do
-          Math.log 1
-        end
+        expect do
+          Git.if_clean do
+            Math.log 1
+          end
+        end.to raise_error(SystemExit)
       end
 
       it "prints a custom message if git index is not clean and user responds no" do
@@ -164,9 +166,11 @@ module Octopolo
         Math.should_not_receive(:log)
         Git.should_receive(:alert_dirty_index).with(custom_message)
 
-        Git.if_clean custom_message do
-          Math.log 1
-        end
+        expect do
+          Git.if_clean custom_message do
+            Math.log 1
+          end
+        end.to raise_error(SystemExit)
       end
     end
 
@@ -192,7 +196,7 @@ module Octopolo
         Git.should_receive(:if_clean).and_yield
         Git.should_receive(:fetch)
         Git.should_receive(:perform).with("merge --no-ff origin/#{branch_name}", :ignore_non_zero => true)
-        Git.should_receive(:clean?) { true }
+        Git.should_receive(:clean?).twice { true }
         Git.should_receive(:push)
 
         Git.merge branch_name
@@ -202,7 +206,7 @@ module Octopolo
         Git.should_receive(:if_clean).and_yield
         Git.should_receive(:fetch)
         Git.should_receive(:perform).with("merge --no-ff origin/#{branch_name}", :ignore_non_zero => true)
-        Git.should_receive(:clean?) { false }
+        Git.should_receive(:clean?).twice { false }
         Git.should_not_receive(:push)
 
         expect { Git.merge branch_name }.to raise_error(Git::MergeFailed)

data/spec/octopolo/scripts/new_branch_spec.rb

@@ -6,13 +6,14 @@ module Octopolo
     describe NewBranch do
       let(:config) { stub(:config, :deploy_branch => "production") }
       let(:git) { stub(:Git) }
+      let(:cli) { stub(:Cli) }
       let(:new_branch_name) { stub(:string) }
       let(:custom_source_branch) { stub(:string) }
 
       subject { NewBranch }
 
       before do
-        NewBranch.any_instance.stub(:config => config, :git => git)
+        NewBranch.any_instance.stub(:config => config, :git => git, :cli => cli)
       end
 
       context "::execute" do
@@ -22,15 +23,36 @@ module Octopolo
           end
         end
 
-        context "with a only new branch name given" do
+
+        context "with reserved new branch name" do
+          it "exits when aborted" do
+            allow(git).to receive(:reserved_branch?) { true }
+            allow(cli).to receive(:ask_boolean) { false }
+            allow(cli).to receive(:say).with(anything)
+            git.should_receive(:alert_reserved_branch)
+            expect { subject.execute(new_branch_name) }.to raise_error(SystemExit)
+          end
+
+          it "proceeds when confirmed" do
+            allow(git).to receive(:reserved_branch?) { true }
+            allow(cli).to receive(:ask_boolean) { true }
+            allow(cli).to receive(:say).with(anything)
+            git.should_receive(:new_branch).with(new_branch_name, "production")
+            subject.execute(new_branch_name)
+          end
+        end
+
+        context "with only new branch name given" do
           it "delegates to Git.new_branch" do
+            allow(git).to receive(:reserved_branch?) { false }
             git.should_receive(:new_branch).with(new_branch_name, "production")
             subject.execute(new_branch_name)
           end
         end
 
-        context "with a only new branch name given" do
+        context "with new and source branch names given" do
           it "delegates to Git.new_branch" do
+            allow(git).to receive(:reserved_branch?) { false }
             git.should_receive(:new_branch).with(new_branch_name, custom_source_branch)
             subject.execute(new_branch_name, custom_source_branch)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Patrick Byrne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -193,6 +193,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-gemset"
+- ".ruby-version"
 - ".soyuz.yml"
 - ".travis.yml"
 - CHANGELOG.markdown
@@ -332,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A set of GitHub workflow scripts to provide a smooth development process