story_branch 0.7.0 → 2.0.1

data/lib/story_branch/main.rb

@@ -6,6 +6,7 @@ require_relative './jira/tracker'
 require_relative './git_utils'
 require_relative './git_wrapper'
 require_relative './config_manager'
+require_relative './url_opener'
 require 'tty-prompt'
 
 module StoryBranch
@@ -67,6 +68,15 @@ module StoryBranch
       update_status('started', 'unstarted', 'unstart')
     end
 
+    def open_current_url
+      if current_story
+        prompt.say 'Opening story in browser...'
+        StoryBranch::UrlOpener.open_url(current_story.html_url)
+      else
+        prompt.say 'Could not find matching story in configured tracker'
+      end
+    end
+
     private
 
     def require_pivotal
@@ -77,23 +87,13 @@ module StoryBranch
     end
 
     def current_story
-      return @current_story if @current_story
-
-      current_story = GitUtils.current_branch_story_parts
+      return nil unless @tracker
 
-      unless current_story.empty?
-        @current_story = @tracker.get_story_by_id(current_story[:id])
-        return @current_story if @current_story
-      end
-
-      prompt.error('No tracked feature associated with this branch')
-      nil
+      @tracker.current_story
     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
@@ -114,7 +114,6 @@ module StoryBranch
       true
     end
 
-    # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
     def update_status(current_status, next_status, action)
       stories = @tracker.stories_with_state(current_status)
@@ -139,7 +138,6 @@ module StoryBranch
       story
     end
     # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/AbcSize
 
     def build_stories_structure(stories)
       options = {}
@@ -161,26 +159,18 @@ module StoryBranch
     def create_feature_branch(story)
       return if story.nil?
 
-      if GitUtils.branch_for_story_exists? story.id
-        prompt.error("An existing branch has the same story id: #{story.id}")
-        return
-      end
-
       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)
@@ -190,8 +180,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
@@ -224,11 +213,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/pivotal/project.rb

@@ -10,17 +10,17 @@ module StoryBranch
         @project = blanket_project
       end
 
+      private
+
       # Returns an array of PT Stories (Story Class)
       # TODO: add other possible args
-      def stories(options = {}, estimated = true)
+      def stories(options = {})
         stories = if options[:id]
                     [@project.stories(options[:id]).get.payload]
                   else
                     @project.stories.get(params: options)
                   end
         stories = stories.map { |s| Story.new(s, @project) }
-        return stories if estimated == false
-
         stories.select(&:estimated)
       end
     end

data/lib/story_branch/pivotal/tracker.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'blanket'
-require 'story_branch/tracker_base'
+require_relative '../tracker_base'
 require_relative './project'
 
 module StoryBranch
@@ -12,6 +12,7 @@ module StoryBranch
       API_URL = 'https://www.pivotaltracker.com/services/v5/'
 
       def initialize(project_id:, api_key:, **)
+        super
         @project_id = project_id
         @api_key = api_key
       end

data/lib/story_branch/string_utils.rb

@@ -11,7 +11,7 @@ module StoryBranch
         undef: :replace, # Replace anything not defined in ASCII
         replace: '-' # Use a dash for those replacements
       }
-      res.encode(Encoding.find('ASCII'), encoding_options)
+      res.encode(Encoding.find('ASCII'), **encoding_options)
     end
 
     def self.dashed(text)

data/lib/story_branch/templates/open_issue/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/story_branch/tracker_base.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-require 'pry'
-
 module StoryBranch
   # Base story branch tracker class that will define the expected interface
   class TrackerBase
+    def initialize(_options = {})
+      @issue_regex = Regexp.new('(\\d+)')
+    end
+
     def valid?
       raise 'valid? > must be implemented in the custom tracker'
     end
@@ -21,6 +23,21 @@ module StoryBranch
       []
     end
 
+    def current_story
+      return @current_story if @current_story
+
+      # TODO: This should look at the tracker configuration and search
+      # for the string either in the beginning or the end, according
+      # to what is configured
+      story_from_branch = GitUtils.branch_to_story_string(@issue_regex)
+      if story_from_branch.length == 2
+        @current_story = get_story_by_id(story_from_branch[0])
+        return @current_story
+      end
+      prompt.error('No tracked feature associated with this branch')
+      nil
+    end
+
     private
 
     def api

data/lib/story_branch/url_opener.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module StoryBranch
+  # Class used to open a URL
+  class UrlOpener
+    def self.open_url(url)
+      url = "https://#{url}" unless url.start_with?('http')
+      case RbConfig::CONFIG['host_os']
+      when /mswin|mingw|cygwin/
+        system "start #{url}"
+      when /darwin/
+        system "open #{url}"
+      when /linux|bsd/
+        system "xdg-open #{url}"
+      end
+    end
+  end
+end

data/lib/story_branch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoryBranch
-  VERSION = '0.7.0'
+  VERSION = '2.0.1'
 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.1']
 
   # 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
@@ -53,23 +53,25 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'blanket_wrapper', '~> 3.0'
-  spec.add_runtime_dependency 'damerau-levenshtein', '~> 1.3'
-  spec.add_runtime_dependency 'jira-ruby', '~> 1.7'
-  spec.add_runtime_dependency 'thor', '~> 0.20.0'
-  spec.add_runtime_dependency 'tty-command', '~> 0.8.2'
-  spec.add_runtime_dependency 'tty-config', '~> 0.2.0'
-  spec.add_runtime_dependency 'tty-pager', '~> 0.12'
-  spec.add_runtime_dependency 'tty-prompt', '~> 0.18'
-  spec.add_runtime_dependency 'xdg', '~> 3.0'
+  spec.add_runtime_dependency 'blanket_wrapper', '~> 3.0', '> 3.0'
+  spec.add_runtime_dependency 'damerau-levenshtein', '~> 1.3', '> 1.3'
+  spec.add_runtime_dependency 'jira-ruby', '> 1.7', '< 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'
+  spec.add_runtime_dependency 'tty-pager',  '~> 0.12', '> 0.12'
+  spec.add_runtime_dependency 'tty-prompt', '~> 0.18', '> 0.18'
+  spec.add_runtime_dependency 'xdg', '> 3.0', '< 6'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  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 'rspec', '~> 3'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
+  spec.add_development_dependency 'bundler', '~> 2.1', '> 2.1'
+  spec.add_development_dependency 'fakefs', '> 0.14', '< 2'
+  spec.add_development_dependency 'git', '~> 1.5', '> 1.5'
+  spec.add_development_dependency 'ostruct', '~> 0.1', '> 0.1'
+  spec.add_development_dependency 'pry', '~> 0.11', '> 0.11'
+  spec.add_development_dependency 'rake', '>= 12.3.3', '< 14'
+  spec.add_development_dependency 'rubocop', '~> 1.22'
+  spec.add_development_dependency 'rspec', '~> 3', '> 3'
+  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4', '> 0.4'
+  spec.add_development_dependency 'simplecov', '~> 0.16', '> 0.16'
 end
 # rubocop:enable Metrics/BlockLength

data/tools/prep_changelog.rb

@@ -0,0 +1,50 @@
+# 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
+# rubocop:disable Metrics/AbcSize
+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|
+    from = tag[:tag]
+    if idx + 1 == cleanup_tags.length
+      to = 'HEAD'
+    else
+      from = tag[:tag]
+      to = cleanup_tags[idx + 1][:tag]
+    end
+    grab_and_print_log(from, to)
+  end
+end
+# rubocop:enable Metrics/AbcSize
+# 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