story_branch 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2084cb533a3635cde91837c75309fa1033fe80398aa7f730a90ad5e1a46d1272
-  data.tar.gz: 13bf5a6cb246301153206b9e9cae7133ee71cf147465cc1ceb84bfb964953beb
+  metadata.gz: eb75bb1f32ca84983e87fb92d97f5e49d5639d186989a456ae94495d6b68854e
+  data.tar.gz: aea71dc4c13e83f1b2eed1df1b0107b80ba87e8e0248edc2cd5a4e24868c0567
 SHA512:
-  metadata.gz: 8fb92e096420e47938befb9a684657c3ec14525a01a5172a89691ab2fe6fba41e5aabe3ff00ff2ac592a5b25e6143f0ad013bfe95c01e65ee976e0addfecb4bc
-  data.tar.gz: 58db1c589e85b911f2a9cd5268247f2a629e1b276c8ff72173b136662be286faeb7335368f410ed967a293d64d0554d63746a2edc5efb488d919d0e324d79738
+  metadata.gz: 5407dbbd33c208b33286f4aa0ea0fa9efa566e2683204e2ef0ece08e8ca674424326c7e08612124d41fb52d5dbf2550004379fafde72df1bebb6b1bd213ef3a9
+  data.tar.gz: 402a42e1e29186a4f500c5c85f440f386aa76a329211c28f13404286ed6d0795b99a114b0fe7435afd7d6f0ebfa249fb289ddb0ccb2858609cf7c037c6e9e4a0

data/.github/weekly-digest.yml

@@ -0,0 +1,7 @@
+# Configuration for weekly-digest - https://github.com/apps/weekly-digest
+publishDay: sun
+canPublishIssues: true
+canPublishPullRequests: true
+canPublishContributors: true
+canPublishStargazers: true
+canPublishCommits: true

data/.gitignore

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

data/.rubocop.yml

@@ -7,3 +7,45 @@ AllCops:
     - 'exe/*'
     - '**/Gemfile'
     - '.github/**/*'
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.7.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    story_branch (0.7.1)
+    story_branch (0.7.2)
       blanket_wrapper (~> 3.0)
       damerau-levenshtein (~> 1.3)
       jira-ruby (~> 1.7)
@@ -15,57 +15,62 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    ast (2.4.1)
     atlassian-jwt (0.2.0)
       jwt (~> 2.1.0)
     blanket_wrapper (3.0.2)
       httparty
       recursive-open-struct
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     damerau-levenshtein (1.3.2)
     diff-lcs (1.3)
     docile (1.3.1)
     equatable (0.6.1)
     fakefs (0.20.1)
     git (1.5.0)
-    httparty (0.17.3)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    jira-ruby (1.7.1)
+    jira-ruby (1.8.0)
       activesupport
       atlassian-jwt
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     json (2.1.0)
     jwt (2.1.0)
-    kramdown (1.16.2)
     method_source (0.9.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    minitest (5.14.0)
+    mime-types-data (3.2020.0512)
+    minitest (5.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     necromancer (0.5.1)
     oauth (0.5.4)
     ostruct (0.1.0)
-    pastel (0.7.3)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
-    recursive-open-struct (1.1.0)
-    rouge (3.15.0)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    recursive-open-struct (1.1.2)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -81,6 +86,18 @@ GEM
     rspec-support (3.9.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.86.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -93,71 +110,15 @@ GEM
     strings-ansi (0.1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tty (0.10.0)
-      bundler (~> 1.16, < 2.0)
-      equatable (~> 0.5)
-      pastel (~> 0.7.2)
-      thor (~> 0.20.0)
-      tty-box (~> 0.4.1)
-      tty-color (~> 0.5)
-      tty-command (~> 0.9.0)
-      tty-config (~> 0.3.2)
-      tty-cursor (~> 0.7)
-      tty-editor (~> 0.5)
-      tty-file (~> 0.8.0)
-      tty-font (~> 0.4.0)
-      tty-logger (~> 0.2.0)
-      tty-markdown (~> 0.6.0)
-      tty-pager (~> 0.12)
-      tty-pie (~> 0.3.0)
-      tty-platform (~> 0.2)
-      tty-progressbar (~> 0.17)
-      tty-prompt (~> 0.19)
-      tty-screen (~> 0.7)
-      tty-spinner (~> 0.9)
-      tty-table (~> 0.11.0)
-      tty-tree (~> 0.3)
-      tty-which (~> 0.4)
-    tty-box (0.4.1)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.6)
-      tty-cursor (~> 0.7)
     tty-color (0.5.1)
     tty-command (0.9.0)
       pastel (~> 0.7.0)
     tty-config (0.3.2)
-    tty-cursor (0.7.0)
-    tty-editor (0.5.1)
-      tty-prompt (~> 0.19)
-      tty-which (~> 0.4)
-    tty-file (0.8.0)
-      diff-lcs (~> 1.3)
-      pastel (~> 0.7.2)
-      tty-prompt (~> 0.18)
-    tty-font (0.4.0)
-    tty-logger (0.2.0)
-      pastel (~> 0.7.0)
-    tty-markdown (0.6.0)
-      kramdown (~> 1.16.2)
-      pastel (~> 0.7.2)
-      rouge (~> 3.3)
-      strings (~> 0.1.4)
-      tty-color (~> 0.4)
-      tty-screen (~> 0.6)
-    tty-pager (0.12.1)
-      strings (~> 0.1.4)
-      tty-screen (~> 0.6)
-      tty-which (~> 0.4)
-    tty-pie (0.3.0)
-      pastel (~> 0.7.3)
-      tty-cursor (~> 0.7)
-    tty-platform (0.3.0)
-    tty-progressbar (0.17.0)
-      strings-ansi (~> 0.1.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      unicode-display_width (~> 1.6)
-    tty-prompt (0.20.0)
+    tty-cursor (0.7.1)
+    tty-pager (0.13.0)
+      strings (~> 0.1.8)
+      tty-screen (~> 0.8)
+    tty-prompt (0.21.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
       tty-reader (~> 0.7.0)
@@ -165,40 +126,30 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
-    tty-spinner (0.9.2)
-      tty-cursor (~> 0.7)
-    tty-table (0.11.0)
-      equatable (~> 0.6)
-      necromancer (~> 0.5)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.5)
-      tty-screen (~> 0.7)
-    tty-tree (0.4.0)
-    tty-which (0.4.2)
-    tzinfo (1.2.6)
+    tty-screen (0.8.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     wisper (2.0.1)
     xdg (3.1.1)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17, < 2.0)
+  bundler (~> 2.1)
   fakefs (~> 0.14)
   git (~> 1.5)
   ostruct (~> 0.1)
   pry (~> 0.11)
-  rake (~> 10.0)
+  rake (~> 12.3, >= 12.3.3)
   rspec (~> 3)
   rspec_junit_formatter (~> 0.4)
+  rubocop (~> 0.86)
   simplecov (~> 0.16)
   story_branch!
-  tty (~> 0.10)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -4,11 +4,17 @@
 
 # Story Branch
 
-Story branch is a CLI application that interacts with Pivotal Tracker or Github at the
+Story branch is a CLI application that interacts with Pivotal Tracker, Github and Jira
 at the moment.
-It allows you to start and un-start stories in Pivotal Tracker, as well as creating
-branches based on the story name and id and have a final commit message marking
-the story as Finished.
+
+For all the trackers it supports creating local branches from the tickets or
+opening the ticket in your browser from the branch you're working on. In the future
+I plan to support different workflows in order to integrate your individual
+process in the tool.
+
+As for PivotalTracker, since the flow is mostly the same for everyone, it allows
+you to start and un-start stories as well.
+
 
 [View Changelog](Changelog.md)
 

data/lib/story_branch/commands/add.rb

@@ -45,10 +45,8 @@ module StoryBranch
 
         return unless tracker == 'jira'
 
-        # rubocop:disable Metrics/LineLength
         username = prompt.ask('Please provide username (email most of the times) for this key:',
                               required: true)
-        # rubocop:enable Metrics/LineLength
         @new_config.username = username
       end
 

data/lib/story_branch/git_wrapper.rb

@@ -36,7 +36,7 @@ module StoryBranch
       # remotes/origin/allow.... <- remote branch (remove 'remotes/origin')
       # * allow.... <- * indicates current branch (remove '* ')
       # allow <- local branch (do nothing)
-      regex = %r{(^remotes\/.*\/|\s|[*])}
+      regex = %r{(^remotes/.*/|\s|[*])}
       all_branches.map do |line|
         line = line.sub(regex, '')
         line

data/lib/story_branch/github/issue.rb

@@ -15,9 +15,7 @@ module StoryBranch
         @title = blanket_story.title
         @id = blanket_story.number
         @labels = blanket_story.labels.map { |label| Label.new(label) }
-        @milestone = if blanket_story.milestone
-                       Milestone.new(blanket_story.milestone)
-                     end
+        @milestone = Milestone.new(blanket_story.milestone) if blanket_story.milestone
         @html_url = blanket_story.html_url
       end
 

data/lib/story_branch/github/label.rb

@@ -5,6 +5,7 @@ module StoryBranch
     # Github Labels representation
     class Label
       attr_accessor :name, :color
+
       def initialize(label_data)
         @name = label_data.name
         @color = label_data.color

data/lib/story_branch/jira/issue.rb

@@ -30,7 +30,7 @@ module StoryBranch
       private
 
       def transform_url(url)
-        url.gsub(%r{rest\/api.*$}, "browse/#{@id}")
+        url.gsub(%r{rest/api.*$}, "browse/#{@id}")
       end
     end
   end

data/lib/story_branch/jira/tracker.rb

@@ -12,7 +12,6 @@ module StoryBranch
   module Jira
     # JIRA API wrapper for story branch tracker
     class Tracker < StoryBranch::TrackerBase
-      # rubocop:disable Metrics/LineLength
       def initialize(tracker_domain:, project_id:, api_key:, username:, extra_query:)
         super
 
@@ -23,7 +22,6 @@ module StoryBranch
         @username = username
         @extra_query = extra_query
       end
-      # rubocop:enable Metrics/LineLength
 
       def valid?
         [@api_key, @project_id, @username, @tracker_url].none?(&:nil?)

data/lib/story_branch/main.rb

@@ -93,9 +93,7 @@ module StoryBranch
     end
 
     def unstaged_changes?
-      unless GitUtils.status?(:untracked) || GitUtils.status?(:modified)
-        return false
-      end
+      return false unless GitUtils.status?(:untracked) || GitUtils.status?(:modified)
 
       message = <<~MESSAGE
         There are unstaged changes
@@ -166,18 +164,15 @@ module StoryBranch
       branch_name = valid_branch_name(story)
       return unless branch_name
 
-      # rubocop:disable Metrics/LineLength
       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")
-      # rubocop:enable Metrics/LineLength
       GitWrapper.create_branch feature_branch_name_with_story_id
     end
 
     def valid_branch_name(story)
       prompt.say "You are checked out at: #{current_branch}"
-      branch_name = prompt.ask('Provide a new branch name',
-                               default: story.dashed_title)
+      branch_name = prompt.ask('Provide a new branch name', default: story.dashed_title)
       feature_branch_name = StringUtils.truncate(branch_name.chomp)
 
       validate_branch_name(feature_branch_name)
@@ -187,8 +182,7 @@ module StoryBranch
     # rubocop:disable Metrics/MethodLength
     def validate_branch_name(name)
       if GitUtils.similar_branch? name
-        prompt.warn('This name is very similar to an existing branch.'\
-                    ' It is recommended to use a more unique name.')
+        prompt.warn('This name is very similar to an existing branch. It is recommended to use a more unique name.')
         decision = prompt.select('What to do?') do |menu|
           menu.choice 'Rename the branch', 1
           menu.choice 'Proceed with branch name', 2
@@ -221,11 +215,11 @@ module StoryBranch
       tracker_type = @config.tracker_type
       case tracker_type
       when 'github'
-        StoryBranch::Github::Tracker.new(@config.tracker_params)
+        StoryBranch::Github::Tracker.new(**@config.tracker_params)
       when 'pivotal-tracker'
-        StoryBranch::Pivotal::Tracker.new(@config.tracker_params)
+        StoryBranch::Pivotal::Tracker.new(**@config.tracker_params)
       when 'jira'
-        StoryBranch::Jira::Tracker.new(@config.tracker_params)
+        StoryBranch::Jira::Tracker.new(**@config.tracker_params)
       end
     end
   end

data/lib/story_branch/version.rb

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

data/story_branch.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
     'documentation_uri' => 'https://github.com/story-branch/story_branch/blob/master/README.md',
     'source_code_uri' => 'https://github.com/story-branch/story_branch'
   }
-  spec.required_ruby_version = ['>= 2.4', '< 2.7']
+  spec.required_ruby_version = ['>= 2.4', '< 3']
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been
@@ -63,15 +63,15 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tty-prompt', '~> 0.18'
   spec.add_runtime_dependency 'xdg', '~> 3.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.17', '< 2.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'simplecov', '~> 0.16'
   spec.add_development_dependency 'fakefs', '~> 0.14'
   spec.add_development_dependency 'git', '~> 1.5'
   spec.add_development_dependency 'ostruct', '~> 0.1'
   spec.add_development_dependency 'pry', '~> 0.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'rubocop', '~> 0.86'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
-  spec.add_development_dependency 'tty', '~> 0.10'
 end
 # rubocop:enable Metrics/BlockLength

data/tools/prep_changelog.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative '../lib/story_branch/git_wrapper'
+
+def grab_and_print_log(from, to)
+  all_log = StoryBranch::GitWrapper.command("log #{from}..#{to}")
+
+  matches = all_log.scan(/CHANGELOG\n(.*?)--- 8< ---/m).flatten
+  matches.map!(&:strip)
+
+  File.open("release-#{from}-#{to}.md", 'w') do |output|
+    output << "# RELEASE NOTES\n\n"
+    matches.each do |m|
+      output << "#{m}\n"
+    end
+  end
+end
+
+# rubocop:disable Metrics/MethodLength
+def print_all_logs
+  all_tags = StoryBranch::GitWrapper.command_lines('tag --list')
+  cleanup_tags = all_tags.map do |t|
+    { cleanup_tag: t.delete('v'), tag: t }
+  end
+  cleanup_tags.sort_by! { |ctags| ctags[:cleanup_tag] }
+  puts cleanup_tags
+
+  cleanup_tags.each_with_index do |tag, idx|
+    next if idx + 1 >= cleanup_tags.length
+
+    from = tag[:tag]
+    to = cleanup_tags[idx + 1][:tag]
+    grab_and_print_log(from, to)
+  end
+end
+# rubocop:enable Metrics/MethodLength
+
+all_logs = ARGV[0] == 'all'
+if all_logs
+  print_all_logs
+else
+  from = ARGV[0] || 'v0.7.0'
+  to = ARGV[1] || 'HEAD'
+  grab_and_print_log(from, to)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story_branch
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Rui Baltazar
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blanket_wrapper
@@ -146,20 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -236,14 +230,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -259,33 +259,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.86'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.86'
 - !ruby/object:Gem::Dependency
-  name: tty
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.4'
 description: |
   This simple gem allows you to create a branch based on the existing issues
   in your preferred tracker. It integrates with PivotalTracker, Github and
@@ -309,6 +309,7 @@ files:
 - ".circleci/setup-rubygems.sh"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/weekly-digest.yml"
 - ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rspec"
@@ -367,6 +368,7 @@ files:
 - lib/story_branch/url_opener.rb
 - lib/story_branch/version.rb
 - story_branch.gemspec
+- tools/prep_changelog.rb
 homepage: https://github.com/story-branch/story_branch
 licenses:
 - MIT
@@ -386,7 +388,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="