ninny 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c95a75100e8d999b3c8d8797623bf50b3b27595fa1da0a496ec0821fb43d38
-  data.tar.gz: 20c4f576d8d81047a3aee49a45993f2021a35b020a78c5701d45da4bf02a2f52
+  metadata.gz: 1c01f0689e01c71df928ec993bf38c3be68321b1389ef4db7c1ca0c601d0fd02
+  data.tar.gz: 60d84b30dcfe5e8da077e12f59dac45085c94e10d6a060d5d44fa205bbd9196a
 SHA512:
-  metadata.gz: 5f71dfc3a85f2cfe43f576dcbf751c5b323061e098caffa16862c2afd3ae0c7b1bfb4cd036088d40723f59a7f4faeef7329df467024d16446d11f5a8b5ecd09c
-  data.tar.gz: ae54faf5617617129f155b900cdf5491442885e654f2c731cdf38d4f8ff0f0a8ed18fb3653fadb28aba2368fe2780fda86e72b0942a7c65cad99f024b9148118
+  metadata.gz: 051ef3ceebdc3934e5e2438c25020cc2b7ff8cb1c5428746005c0138658682c8934207fbddb605b03b7f7458ac79d018a56d380bfb8b971075e8c9229642b67a
+  data.tar.gz: 7f3cb4b1f7857bb0380de618016c3d17cd29f9dbdfec9a5d3c1ead4110adaa596a390afae4933b71ef5a9aeca8c9e464878d80c2233149b835bb2660e39d425d

data/.rubocop.yml

@@ -11,6 +11,10 @@ Gemspec/RequiredRubyVersion:
 Style/Documentation:
   Enabled: false
 
+Layout/LineLength:
+  Exclude:
+    - spec/**/*
+
 Lint/EmptyClass:
   Enabled: false
 
@@ -20,8 +24,22 @@ Lint/EmptyBlock:
 Lint/MissingSuper:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+    - ninny.gemspec
+
 Metrics/MethodLength:
   Max: 15
 
+Style/AccessModifierDeclarations:
+  EnforcedStyle: inline
+
+Style/BlockDelimiters:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
 Style/OptionalBooleanParameter:
   Enabled: false

data/lib/ninny/commands/create_dated_branch.rb

@@ -13,11 +13,12 @@ module Ninny
       def execute(output: $stdout)
         create_branch
         delete_old_branches
-        output.puts "#{branch_name} created"
+        output.puts "Branch #{branch_name} successfully created."
       end
 
       # Public: Create the desired branch
       def create_branch
+        prompt.say "Attempting to create branch #{branch_name}."
         Ninny.git.new_branch(branch_name, Ninny.project_config.deploy_branch)
       end
 

data/lib/ninny/git.rb

@@ -38,7 +38,7 @@ module Ninny
 
     def merge(branch_name)
       if_clean do
-        git.fetch
+        git.fetch('-p')
         command 'merge', ['--no-ff', "origin/#{branch_name}"]
         raise MergeFailed unless clean?
 
@@ -65,7 +65,7 @@ module Ninny
     # branch_name - The name of the branch to check out
     # do_after_pull - Should a pull be done after checkout?
     def check_out(branch, do_after_pull = true)
-      git.fetch
+      git.fetch('-p')
       git.checkout(branch)
       pull if do_after_pull
       raise CheckoutFailed, "Failed to check out '#{branch}'" unless current_branch.name == branch.name
@@ -84,11 +84,20 @@ module Ninny
     # new_branch_name - The name of the branch to create
     # source_branch_name - The name of the branch to branch from
     def new_branch(new_branch_name, source_branch_name)
-      git.fetch
-      command('branch', ['--no-track', new_branch_name, "origin/#{source_branch_name}"])
-      new_branch = branch(new_branch_name)
-      new_branch.checkout
-      command('push', ['-u', 'origin', new_branch_name])
+      git.fetch('-p')
+      remote_branches = command('branch', ['--remote'])
+
+      if remote_branches.include?("origin/#{new_branch_name}")
+        ask_to_recreate_branch(new_branch_name, source_branch_name)
+      else
+        create_branch(new_branch_name, source_branch_name)
+      end
+    rescue ::Git::GitExecuteError => e
+      if e.message.include?(':fatal: A branch named') && e.message.include?(' already exists')
+        puts "The local branch #{new_branch_name} already exists." \
+          ' Please delete it manually and then run this command again.'
+        exit 1
+      end
     end
 
     # Public: Delete the given branch
@@ -98,13 +107,17 @@ module Ninny
       branch = branch_name.is_a?(::Git::Branch) ? branch_name : git.branch(branch_name)
       git.push('origin', ":#{branch}")
       branch.delete
+    rescue ::Git::GitExecuteError => e
+      if e.message.include?(':error: branch') && e.message.include?(' not found.')
+        puts 'Could not delete local branch, but the remote branch was deleted.'
+      end
     end
 
     # Public: The list of branches on GitHub
     #
     # Returns an Array of Strings containing the branch names
     def remote_branches
-      git.fetch
+      git.fetch('-p')
       git.branches.remote.map { |branch| git.branch(branch.name) }.sort_by(&:name)
     end
 
@@ -159,6 +172,30 @@ module Ninny
       TTY::Prompt.new(options)
     end
 
+    # Private: Ask the user if they wish to delete and recreate a branch
+    #
+    # new_branch_name: the name of the branch in question
+    # source_branch_name: the name of the branch the new branch is supposed to be based off of
+    private def ask_to_recreate_branch(new_branch_name, source_branch_name)
+      if prompt.yes?("The branch #{new_branch_name} already exists. Do you wish to delete and recreate?")
+        delete_branch(new_branch_name)
+        new_branch(new_branch_name, source_branch_name)
+      else
+        exit 1
+      end
+    end
+
+    # Private: Create a branch
+    #
+    # new_branch_name: the name of the branch in question
+    # source_branch_name: the name of the branch the new branch is supposed to be based off of
+    private def create_branch(new_branch_name, source_branch_name)
+      command('branch', ['--no-track', new_branch_name, "origin/#{source_branch_name}"])
+      new_branch = branch(new_branch_name)
+      new_branch.checkout
+      command('push', ['-u', 'origin', new_branch_name])
+    end
+
     # Exceptions
     CheckoutFailed = Class.new(StandardError)
     NotOnBranch = Class.new(StandardError)

data/lib/ninny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ninny
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Dispatch Engineers
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -325,7 +325,7 @@ homepage: https://github.com/dispatchinc/ninny
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'
 test_files: []