story_branch 1.0.0 → 2.2.0

data/lib/story_branch/main.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require_relative './pivotal/tracker'
-require_relative './github/tracker'
-require_relative './jira/tracker'
 require_relative './git_utils'
 require_relative './git_wrapper'
 require_relative './config_manager'
 require_relative './url_opener'
+require_relative 'tracker_initializer'
+
 require 'tty-prompt'
 
 module StoryBranch
@@ -20,7 +19,7 @@ module StoryBranch
     def initialize
       @config = ConfigManager.new
       abort(@config.errors.join("\n")) unless @config.valid?
-      @tracker = initialize_tracker
+      @tracker = StoryBranch::TrackerInitializer.initialize_tracker(config: @config)
       abort('Invalid tracker configuration setting.') unless @tracker.valid?
     end
 
@@ -114,7 +113,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 +137,6 @@ module StoryBranch
       story
     end
     # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/AbcSize
 
     def build_stories_structure(stories)
       options = {}
@@ -198,30 +195,19 @@ module StoryBranch
     # rubocop:enable Metrics/MethodLength
 
     def build_branch_name(branch_name, story_id)
-      if @config.issue_placement.casecmp('beginning').zero?
-        "#{story_id}-#{branch_name}"
-      else
-        "#{branch_name}-#{story_id}"
-      end
+      branch_name = if @config.issue_placement.casecmp('beginning').zero?
+                      "#{story_id}-#{branch_name}"
+                    else
+                      "#{branch_name}-#{story_id}"
+                    end
+      return branch_name unless @config.branch_username
+
+      "#{@config.branch_username}/#{branch_name}"
     end
 
     def current_branch
       @current_branch ||= GitWrapper.current_branch
     end
-
-    def initialize_tracker
-      # TODO: Ideally this would be mapped out somewhere so we don't need to
-      # evaluate anything from the config here
-      tracker_type = @config.tracker_type
-      case tracker_type
-      when 'github'
-        StoryBranch::Github::Tracker.new(**@config.tracker_params)
-      when 'pivotal-tracker'
-        StoryBranch::Pivotal::Tracker.new(**@config.tracker_params)
-      when 'jira'
-        StoryBranch::Jira::Tracker.new(**@config.tracker_params)
-      end
-    end
   end
   # rubocop:enable Metrics/ClassLength
 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/tracker_initializer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative './constants'
+require_relative './pivotal/tracker'
+require_relative './github/tracker'
+require_relative './jira/tracker'
+require_relative './linear_app/tracker'
+
+module StoryBranch
+  # helper class to find out which tracker should be initialized based on the
+  # configuration values
+  class TrackerInitializer
+    def self.initialize_tracker(config:)
+      tracker_class = find_tracker_class(config.tracker_type)
+      raise 'Invalid tracker configuration' unless tracker_class
+
+      tracker_class.new(**config.tracker_params)
+    end
+
+    def self.find_tracker_class(tracker_type)
+      tracker_str = StoryBranch::TRACKERS_CLASSES[tracker_type]
+      return nil unless tracker_str
+
+      Kernel.const_get(tracker_str)
+    end
+  end
+end

data/lib/story_branch/url_opener.rb

@@ -5,11 +5,12 @@ module StoryBranch
   class UrlOpener
     def self.open_url(url)
       url = "https://#{url}" unless url.start_with?('http')
-      if RbConfig::CONFIG['host_os'].match?(/mswin|mingw|cygwin/)
+      case RbConfig::CONFIG['host_os']
+      when /mswin|mingw|cygwin/
         system "start #{url}"
-      elsif RbConfig::CONFIG['host_os'].match?(/darwin/)
+      when /darwin/
         system "open #{url}"
-      elsif RbConfig::CONFIG['host_os'].match?(/linux|bsd/)
+      when /linux|bsd/
         system "xdg-open #{url}"
       end
     end

data/lib/story_branch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoryBranch
-  VERSION = '1.0.0'
+  VERSION = '2.2.0'
 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', '< 3']
+  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,25 +53,27 @@ 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'
-  spec.add_runtime_dependency 'tty-command', '~> 0.8'
-  spec.add_runtime_dependency 'tty-config', '~> 0.2'
-  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 'httparty', '>0'
+  spec.add_runtime_dependency 'jira-ruby', '> 1.7', '< 3'
+  spec.add_runtime_dependency 'story_branch-graphql', '~> 0.0.1'
+  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.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', '~> 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 '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

@@ -17,6 +17,7 @@ def grab_and_print_log(from, to)
 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|
@@ -36,6 +37,7 @@ def print_all_logs
     grab_and_print_log(from, to)
   end
 end
+# rubocop:enable Metrics/AbcSize
 # rubocop:enable Metrics/MethodLength
 
 all_logs = ARGV[0] == 'all'