gitx 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 518a1f2e8d54caa3b1338ec0f411d70f96d87d83
-  data.tar.gz: 7ac3a00cd9436edea5bd22745a5782226551ac19
+SHA256:
+  metadata.gz: 671d64ce9a41a3cd6f6ee6a95601367f71148266eb357068293151ae088a0a01
+  data.tar.gz: 171596d5cb92650991faed668d756c0995241bf6e2d6753de2eddff5d44c876b
 SHA512:
-  metadata.gz: 6006d6b190a47721d9cf895cbed3f5145074530b981cec2e400a445a61a402c13ff57a20e163c4c24c9e1d7581f29084d97c1014fc43cba5ee044039dddcddb0
-  data.tar.gz: 10958f36fae8adfdc04f46a74a0431ec5b35aa4a977a11cd6354d6a27486abe8ab73b02f418d2f39caab970573e1d72559136b55b144f2af0ffc850a70b2d8d4
+  metadata.gz: ac7b82974e53304cab8857268a9fd54985ca5654f161413c785a99ce0de79ea046fde06a079496ad9c27bf7ee789da1c8e7d39602572ce01d0980a33fb5f649c
+  data.tar.gz: 5f59721f300d8f9d74c875e985a81b4dacac6c9ceb15b44609e546e0dc09b3a4fa42ff06e6c577be0d3ed5c2403def965790858b330943a794314b652da0d6b8

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.6.3

data/gitx.gemspec

@@ -1,10 +1,9 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitx/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'gitx'
-  spec.version       = Gitx::VERSION
   spec.authors       = ['Ryan Sonnek']
   spec.email         = ['ryan.sonnek@gmail.com']
   spec.description   = 'Git eXtensions for improved development workflows'
@@ -32,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock'
 
   # configure gem version for continuous integration builds
-  if ENV['TRAVIS_JOB_NUMBER']
-    spec.version = "#{spec.version}.ci.#{ENV['TRAVIS_JOB_NUMBER']}"
-  end
+  version = Gitx::VERSION
+  version = "#{version}.ci.#{ENV['TRAVIS_JOB_NUMBER']}" if ENV['TRAVIS_JOB_NUMBER']
+  spec.version = version
 end

data/lib/gitx/cli/base_command.rb

@@ -50,7 +50,7 @@ module Gitx
       end
 
       def config
-        @configuration ||= Gitx::Configuration.new(repo.workdir)
+        @config ||= Gitx::Configuration.new(repo.workdir)
       end
 
       def executor

data/lib/gitx/cli/buildtag_command.rb

@@ -13,6 +13,7 @@ module Gitx
       method_option :message, type: :string, aliases: '-m', desc: 'message to attach to the buildtag'
       def buildtag
         raise "Branch must be one of the supported taggable branches: #{config.taggable_branches}" unless config.taggable_branch?(branch_name)
+
         run_git_cmd 'tag', build_tag, '--annotate', '--message', label
         run_git_cmd 'push', 'origin', build_tag
       end
@@ -28,7 +29,7 @@ module Gitx
       end
 
       def build_tag
-        @buildtag ||= [
+        @build_tag ||= [
           BUILD_TAG_PREFIX,
           branch_name,
           utc_timestamp

data/lib/gitx/cli/cleanup_command.rb

@@ -38,6 +38,7 @@ module Gitx
         return false if config.reserved_branches.include?(branch)
         return false if config.aggregate_branch?(branch)
         return false if config.base_branch == branch
+
         true
       end
 

data/lib/gitx/cli/integrate_command.rb

@@ -34,6 +34,7 @@ module Gitx
 
       def pull_request_for_branch(branch)
         return nil if config.reserved_branch?(branch)
+
         find_or_create_pull_request(branch)
       end
 
@@ -54,11 +55,9 @@ module Gitx
       end
 
       def feature_branch_name
-        @feature_branch ||= begin
+        @feature_branch_name ||= begin
           feature_branch = options[:resume] || current_branch.name
-          until local_branch_exists?(feature_branch)
-            feature_branch = ask("#{feature_branch} does not exist. Please select one of the available local branches: #{local_branches}")
-          end
+          feature_branch = ask("#{feature_branch} does not exist. Please select one of the available local branches: #{local_branches}") until local_branch_exists?(feature_branch)
           feature_branch
         end
       end

data/lib/gitx/cli/nuke_command.rb

@@ -14,6 +14,7 @@ module Gitx
 
         last_known_good_tag = current_build_tag(good_branch)
         return unless yes?("Reset #{bad_branch} to #{last_known_good_tag}? (y/n)", :green)
+
         assert_aggregate_branch!(bad_branch)
         return if migrations_need_to_be_reverted?(bad_branch, last_known_good_tag)
 
@@ -34,6 +35,7 @@ module Gitx
 
       def migrations_need_to_be_reverted?(bad_branch, last_known_good_tag)
         return false unless File.exist?('db/migrate')
+
         outdated_migrations = run_git_cmd('diff', "#{last_known_good_tag}...#{bad_branch}", '--name-only', 'db/migrate').split
         return false if outdated_migrations.empty?
 
@@ -49,6 +51,7 @@ module Gitx
       def current_build_tag(branch)
         last_build_tag = build_tags_for_branch(branch).last
         raise "No known good tag found for branch: #{branch}.  Verify tag exists via `git tag -l`" unless last_build_tag
+
         last_build_tag
       end
 

data/lib/gitx/cli/release_command.rb

@@ -11,9 +11,10 @@ module Gitx
       desc 'release', 'release the current branch to production'
       method_option :cleanup, type: :boolean, desc: 'cleanup merged branches after release'
       def release(branch = nil)
-        return unless yes?("Release #{current_branch.name} to #{config.base_branch}? (y/n)", :green)
-
         branch ||= current_branch.name
+        
+        return unless yes?("Release #{branch} to #{config.base_branch}? (y/n)", :green)
+
         assert_not_protected_branch!(branch, 'release')
         checkout_branch(branch)
         run_git_cmd 'update'

data/lib/gitx/cli/start_command.rb

@@ -6,14 +6,12 @@ module Gitx
   module Cli
     class StartCommand < BaseCommand
       EXAMPLE_BRANCH_NAMES = %w[api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link].freeze
-      VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/
+      VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/.freeze
 
       desc 'start', 'start a new git branch with latest changes from master'
       method_option :issue, type: :string, aliases: '-i', desc: 'Issue identifier'
       def start(branch_name = nil)
-        until valid_new_branch_name?(branch_name)
-          branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})")
-        end
+        branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})") until valid_new_branch_name?(branch_name)
 
         checkout_branch config.base_branch
         run_git_cmd 'pull'
@@ -35,12 +33,13 @@ module Gitx
 
       def valid_new_branch_name?(branch)
         return false if repo_branches.include?(branch)
+
         Rugged::Reference.valid_name?("refs/heads/#{branch}")
       end
 
       # get list of local and remote branches
       def repo_branches
-        @branch_names ||= repo.branches.each_name.map do |branch|
+        @repo_branches ||= repo.branches.each_name.map do |branch|
           branch.gsub('origin/', '')
         end
       end

data/lib/gitx/executor.rb

@@ -15,6 +15,7 @@ module Gitx
         loop do
           line = stdout_err.gets
           break unless line
+
           output << line
           yield line if block_given?
         end

data/lib/gitx/github.rb

@@ -124,7 +124,7 @@ module Gitx
     end
 
     def github_client
-      @client ||= Octokit::Client.new(access_token: authorization_token)
+      @github_client ||= Octokit::Client.new(access_token: authorization_token)
     end
 
     # @return [String] github username (ex: 'wireframe') of the current github.user
@@ -132,6 +132,7 @@ module Gitx
     def username
       username = repo.config['github.user']
       raise "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" unless username
+
       username
     end
 
@@ -154,7 +155,7 @@ module Gitx
     end
 
     def global_config
-      @config ||= begin
+      @global_config ||= begin
         File.exist?(global_config_file) ? YAML.load_file(global_config_file) : {}
       end
     end

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -281,8 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations