story_branch 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84fdb1c006fd2a93b1cc43521fbd68535235f04edc2d47aa983db3153bcf15a4
-  data.tar.gz: f8130e415f3b5463e37eeddf4078951a07003eaea3076fc97aa98b8ca5235c46
+  metadata.gz: 1c822a7c84f60daf75722fad9e100028aa8bec4e28b6f0a811135c511975c756
+  data.tar.gz: b44a6fe6aa0a18f9bae8ff0c240f99637fea1c2b519bdc645449b867529f253d
 SHA512:
-  metadata.gz: 1b237f56136d2259ac96bea8f32ab310a385c4035483912f6bf11f8ca1168e53609d1af5692a5c9495f69246a87cf62f27884b1f5fade181f89220d0d1f5b9fd
-  data.tar.gz: cb2653af80af48f510c56aa6431168b5cf0a6320ee513364a8173e580f1e2e2110798dfa73bdc7fd2e5e31ce16b196201e208499a1c86e347b7dbbad0bd865ad
+  metadata.gz: 06c7c3802616972f40da61237b8f7f44bac809ec8b77f19ecddd700fef1b65c7551db9fe0cb31bc8e17935ad8b87d086828ce7fd398d50c02d7eac73f7ab9f70
+  data.tar.gz: 9c59ac43012d9bf73d680b5736897b2c6b7fea6d6c196f801c7df2718adb82aa81c719a28b1b9ba2b8658de2df512a89a920acc3cb402984fd8259c34a93efea

data/.circleci/config.yml

@@ -7,7 +7,7 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby_version: ["ruby:2.6-buster", "ruby:2.7-buster", "ruby:3.0-buster"]
+              ruby_version: ["ruby:2.6", "ruby:2.7", "ruby:3.0"]
 
           filters:
             tags:
@@ -29,7 +29,7 @@ jobs:
       ruby_version:
         type: string
     docker:
-      - image: circleci/<< parameters.ruby_version >>
+      - image: cimg/<< parameters.ruby_version >>
     working_directory: ~/repo
 
     steps:
@@ -45,6 +45,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
+            rm Gemfile.lock
             gem install bundler
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
@@ -76,7 +77,7 @@ jobs:
 
   publish:
     docker:
-      - image: circleci/ruby:3.0-buster
+      - image: cimg/ruby:3.0
     working_directory: ~/repo
 
     steps:

data/.gitignore

@@ -4,4 +4,3 @@ story_branch-*.gem
 .byebug_history
 coverage
 tools/release*.*
-Gemfile.lock

data/Changelog.md

@@ -1,3 +1,17 @@
+# 2.3.0
+
+Mon Aug 22 23:55:00 2022 +0800
+
+- Moved Git::Wrapper to separate gem
+- Try to read local file from both current path and git root's directory (#136)
+
+# 2.2.1
+
+Mon Aug 15 17:36:00 2022 +0800
+
+- Fixed broken command story_branch open when using linear.app (#126)
+- Fixed linear.app graphql query to filter team by key instead of name (#130)
+
 # 2.2.0
 
 Wed Aug 11 07:37:00 2022 +0800

data/Gemfile.lock

@@ -0,0 +1,162 @@
+PATH
+  remote: .
+  specs:
+    story_branch (2.3.0)
+      blanket_wrapper (~> 3.0, > 3.0)
+      damerau-levenshtein (~> 1.3, > 1.3)
+      httparty (> 0)
+      jira-ruby (> 1.7, < 3)
+      story_branch-git_wrapper (~> 0.0.3)
+      story_branch-graphql (~> 0.0.2)
+      thor (> 0.20, < 2)
+      tty-command (~> 0.8, > 0.8)
+      tty-config (~> 0.2, > 0.2)
+      tty-pager (~> 0.12, > 0.12)
+      tty-prompt (~> 0.18, > 0.18)
+      xdg (> 3.0, < 6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    atlassian-jwt (0.2.1)
+      jwt (~> 2.1)
+    blanket_wrapper (3.0.2)
+      httparty
+      recursive-open-struct
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    damerau-levenshtein (1.3.3)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    fakefs (1.8.0)
+    git (1.12.0)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    httparty (0.20.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    jira-ruby (2.2.0)
+      activesupport
+      atlassian-jwt
+      multipart-post
+      oauth (~> 0.5, >= 0.5.0)
+    json (2.6.2)
+    jwt (2.4.1)
+    method_source (1.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    minitest (5.16.3)
+    multi_xml (0.6.0)
+    multipart-post (2.2.3)
+    oauth (0.5.10)
+    ostruct (0.5.5)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (5.0.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rchardet (1.8.0)
+    recursive-open-struct (1.1.3)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rspec_junit_formatter (0.5.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (1.35.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    story_branch-git_wrapper (0.0.3)
+    story_branch-graphql (0.0.2)
+      httparty (> 0)
+    strings (0.2.1)
+      strings-ansi (~> 0.2)
+      unicode-display_width (>= 1.5, < 3.0)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.2.0)
+    thor (1.2.1)
+    tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
+    tty-config (0.6.0)
+    tty-cursor (0.7.1)
+    tty-pager (0.14.0)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+    unicode_utils (1.4.0)
+    wisper (2.0.1)
+    xdg (4.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.1, > 2.1)
+  fakefs (> 0.14, < 2)
+  git (~> 1.5, > 1.5)
+  ostruct (~> 0.1, > 0.1)
+  pry (~> 0.11, > 0.11)
+  rake (>= 12.3.3, < 14)
+  rspec (~> 3, > 3)
+  rspec_junit_formatter (~> 0.4, > 0.4)
+  rubocop (~> 1.22)
+  simplecov (~> 0.16, > 0.16)
+  story_branch!
+
+BUNDLED WITH
+   2.1.4

data/lib/story_branch/config_manager.rb

@@ -3,6 +3,7 @@
 require 'tty-config'
 require 'tty-prompt'
 require 'xdg'
+require 'story_branch/git'
 
 module StoryBranch
   # Config manager is used to manage all possible configuration settings
@@ -141,7 +142,7 @@ module StoryBranch
     end
 
     def load_configs
-      @local = read_config('.')
+      @local = local_config
       xdg_conf = XDG::Config.new
       home_path = if conf_exist?(Dir.home)
                     Dir.home
@@ -151,6 +152,11 @@ module StoryBranch
       @global = read_config(home_path)
     end
 
+    def local_config
+      possible_local_paths = [Dir.pwd, StoryBranch::Git::Wrapper.command('rev-parse --show-toplevel')].uniq
+      read_config(possible_local_paths)
+    end
+
     def read_config(path)
       config = init_config(path)
       config.read if config.persisted?
@@ -162,10 +168,13 @@ module StoryBranch
       config.persisted?
     end
 
-    def init_config(path)
+    def init_config(paths)
+      paths = Array(paths)
       config = ::TTY::Config.new
       config.filename = CONFIG_FILENAME
-      config.append_path path
+      paths.each do |path|
+        config.append_path path
+      end
       config
     end
   end

data/lib/story_branch/git_utils.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'damerau-levenshtein'
-require_relative './git_wrapper'
+require 'story_branch/git/wrapper'
 
 module StoryBranch
   # Class used to interact with git. It relies on git gem as the wrapper
   # and levenshtein algo to determine branch name proximity
   class GitUtils
     def self.similar_branch?(name)
-      GitWrapper.branch_names.each do |n|
+      Git::Wrapper.branch_names.each do |n|
         return true if DamerauLevenshtein.distance(n, name) < 3
 
         branch_name_match = n.match(/(.*)(-[1-9]+[0-9]*$)/)
@@ -21,11 +21,11 @@ module StoryBranch
     end
 
     def self.branch_to_story_string(regex_matcher = /.*-(\d+$)/)
-      GitWrapper.current_branch.match(regex_matcher)
+      Git::Wrapper.current_branch.match(regex_matcher)
     end
 
     def self.status?(state)
-      status = GitWrapper.status
+      status = Git::Wrapper.status
       return false unless status
 
       !status[state].empty?

data/lib/story_branch/main.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require 'story_branch/git/wrapper'
 require_relative './git_utils'
-require_relative './git_wrapper'
 require_relative './config_manager'
 require_relative './url_opener'
 require_relative 'tracker_initializer'
@@ -44,7 +44,7 @@ module StoryBranch
       commit_message = build_finish_message
       proceed = prompt.yes?("Commit with standard message? #{commit_message}")
       if proceed
-        GitWrapper.commit commit_message
+        Git::Wrapper.commit commit_message
       else
         prompt.say 'Aborted'
       end
@@ -164,7 +164,7 @@ module StoryBranch
       feature_branch_name_with_story_id = build_branch_name(branch_name, story.id)
 
       prompt.say("Creating: #{feature_branch_name_with_story_id} with #{current_branch} as parent")
-      GitWrapper.create_branch feature_branch_name_with_story_id
+      Git::Wrapper.create_branch feature_branch_name_with_story_id
     end
 
     def valid_branch_name(story)
@@ -206,7 +206,7 @@ module StoryBranch
     end
 
     def current_branch
-      @current_branch ||= GitWrapper.current_branch
+      @current_branch ||= Git::Wrapper.current_branch
     end
   end
   # rubocop:enable Metrics/ClassLength

data/lib/story_branch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoryBranch
-  VERSION = '2.2.1'
+  VERSION = '2.3.0'
 end

data/story_branch.gemspec

@@ -58,6 +58,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'httparty', '>0'
   spec.add_runtime_dependency 'jira-ruby', '> 1.7', '< 3'
   spec.add_runtime_dependency 'story_branch-graphql', '~> 0.0.2'
+  spec.add_runtime_dependency 'story_branch-git_wrapper', '~> 0.0.3'
   spec.add_runtime_dependency 'thor', '> 0.20', '< 2'
   spec.add_runtime_dependency 'tty-command', '~> 0.8', '> 0.8'
   spec.add_runtime_dependency 'tty-config', '~> 0.2', '> 0.2'

data/tools/prep_changelog.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../lib/story_branch/git_wrapper'
+require 'story_branch/git/wrapper'
 
 def grab_and_print_log(from, to)
-  all_log = StoryBranch::GitWrapper.command("log #{from}..#{to}")
+  all_log = StoryBranch::Git::Wrapper.command("log #{from}..#{to}")
 
   matches = all_log.scan(/CHANGELOG\n(.*?)--- 8< ---/m).flatten
   matches.map!(&:strip)
@@ -19,7 +19,7 @@ end
 # rubocop:disable Metrics/MethodLength
 # rubocop:disable Metrics/AbcSize
 def print_all_logs
-  all_tags = StoryBranch::GitWrapper.command_lines('tag --list')
+  all_tags = StoryBranch::Git::Wrapper.command_lines('tag --list')
   cleanup_tags = all_tags.map do |t|
     { cleanup_tag: t.delete('v'), tag: t }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story_branch
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Rui Baltazar
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blanket_wrapper
@@ -102,6 +102,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: story_branch-git_wrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -448,6 +462,7 @@ files:
 - ".story_branch.yml"
 - Changelog.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -471,7 +486,6 @@ files:
 - lib/story_branch/config_manager.rb
 - lib/story_branch/constants.rb
 - lib/story_branch/git_utils.rb
-- lib/story_branch/git_wrapper.rb
 - lib/story_branch/github/issue.rb
 - lib/story_branch/github/label.rb
 - lib/story_branch/github/milestone.rb
@@ -530,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Create git branches based on your preferred tracker tickets

data/lib/story_branch/git_wrapper.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-# NOTE: Consider extracting this to a separate gem
-module StoryBranch
-  # GitWrapper to help running git commands with direct system calls
-  # Essentially it provides a couple of commands to interact with git
-  # - StoryBranch::GitWrapper.command('<cmd>', [<opts>])
-  #   Returns the output as is
-  #
-  # - StoryBranch::GitWrapper.command_lines('<cmd>', [<opts>])
-  #   Returns the output split into an array of lines, stripped and chomped
-  #
-  # - StoryBranch::GitWrapper.branch_names
-  #   Returns the list of available branch names, locally and configured remotes
-  class GitWrapper
-    STATI_MATCHERS = {
-      modified_rx: /^ M (.*)/,
-      untracked_rx: /^\?\? (.*)/,
-      staged_rx: /^M  (.*)/,
-      added_rx: /^A  (.*)/
-    }.freeze
-
-    def self.command(cmd, opts = [])
-      gw = new
-      gw.call(cmd, opts)
-    end
-
-    def self.command_lines(cmd, opts = [])
-      result = command(cmd, opts)
-      lines = result.split("\n")
-      lines.each(&:strip!)
-    end
-
-    def self.branch_names
-      # NOTE: Regex matcher for cases as:
-      # remotes/origin/allow.... <- remote branch (remove 'remotes/origin')
-      # * allow.... <- * indicates current branch (remove '* ')
-      # allow <- local branch (do nothing)
-      regex = %r{(^remotes/.*/|\s|[*])}
-      all_branches.map do |line|
-        line = line.sub(regex, '')
-        line
-      end
-    end
-
-    def self.current_branch
-      current_branch_line = all_branches.detect do |line|
-        line.match(/\*/)
-      end
-      current_branch_line.tr('*', ' ').strip
-    end
-
-    def self.all_branches
-      command_lines('branch', '-a')
-    end
-
-    def self.create_branch(name)
-      command('checkout', ['-b', name])
-    end
-
-    def self.status
-      g_status = command_lines('status', '-s')
-      return nil if g_status.empty?
-
-      {
-        modified: status_collect(g_status, STATI_MATCHERS[:modified_rx]),
-        untracked: status_collect(g_status, STATI_MATCHERS[:untracked_rx]),
-        added: status_collect(g_status, STATI_MATCHERS[:added_rx]),
-        staged: status_collect(g_status, STATI_MATCHERS[:staged_rx])
-      }
-    end
-
-    def self.status_collect(status, regex)
-      chosen_stati = status.select { |e| e.match(regex) }
-      chosen_stati.map { |e| e.match(regex)[1] }
-    end
-
-    def self.commit(message)
-      command('commit', ['-m', message])
-    end
-
-    def initialize
-      @system_git = 'git'
-    end
-
-    def call(cmd, opts = [])
-      opts = prepare_opts(opts)
-      git_cmd = "#{@system_git} #{cmd} #{opts}"
-      `#{git_cmd}`.chomp.strip
-    end
-
-    private
-
-    # NOTE: Taken from ruby git gem
-    def escape(str = '')
-      str = str.to_s
-      return "'#{str.gsub('\'', '\'"\'"\'')}'" if RUBY_PLATFORM !~ /mingw|mswin/
-
-      # Keeping the old escape format for windows users
-      escaped = str.gsub('\'', '\'\\\'\'')
-      %("#{escaped}")
-    end
-
-    def prepare_opts(opts = [])
-      [opts].flatten.map { |s| escape(s) }.join(' ')
-    end
-  end
-end