geordi 10.1.0 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3324f1c6c2c99a458d355b5a83a915ff96c80a2307f7245780a254df5a2d03fe
-  data.tar.gz: c8d1fdfd659292dfa1aaa7e2feb08ffdca7c4ce996b295637249b6f2d970e852
+  metadata.gz: 310a3633bce8944bb4c56987a2d12cf2ed69013ef978e91f48063acba801c634
+  data.tar.gz: f5e53286619679e6b5c3f0e2439e5c7589ed7c2e2866c0078b51f056658cc3dd
 SHA512:
-  metadata.gz: 89e43ce2db60271bf2cbde52c6255c4331b64c719bfe7ffb28187976513b7efaeceb94da2d2cfbf2427162dd68cd84320cd9cf55e2b8f883f1669076826d7b87
-  data.tar.gz: 5f27fa4ef40ef8c5f135151fb919fbe6626adad1885b96494e51a4e9137895d9b12c51256ff157158d2e1d2a8c87cd36a12526b7cfe9ab73b8ac23d7e37b9623
+  metadata.gz: 692cd04428cdbc217969425a9c3fcc1ea62f95f0a0692aabec218afdb1b804c1e705a181f387c6ba581c5e3dc25acdb5a0485565571c73d7f33d4521629ce300
+  data.tar.gz: 8f9c32e800de8532265c3b302bfd821c0a24295c55bfac166ddb1390a2a0e93fb15e6028d1a63526ec0fc8268b1a617687152d8a72055c75a0546f45fec292c4

data/CHANGELOG.md

@@ -9,6 +9,24 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Breaking changes
 
+## 11.1.0 2024-11-20
+
+### Compatible changes
+
+* Skip `yarn install` for other package managers:
+  * Before: Check for a `package.json`
+  * After: Check for a `yarn.lock`
+
+
+## 11.0.0 2024-11-13
+
+### Compatible changes
+* `geordi unit` now supports `parallel_tests`, binstubs and `bundle exec`
+
+### Breaking changes
+* `geordi branch` now checks out a feature branch based on a Linear issue instead of a story from Pivotal Tracker
+* `geordi commit` now uses a Linear issue title instead of a story title from Pivotal Tracker
+
 
 # 10.1.0 2024-07-23
 

data/Gemfile

@@ -10,5 +10,4 @@ gem 'highline'
 gem 'parallel_tests'
 gem 'launchy'
 gem 'pry-byebug'
-gem 'tracker_api'
 gem 'cucumber', '~> 4'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (10.1.0)
+    geordi (11.1.0)
       thor (~> 1)
 
 GEM
@@ -22,17 +22,11 @@ GEM
       ffi (~> 1.9)
       rspec-expectations (>= 2.99)
       thor (>= 0.19, < 2.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.4)
     byebug (11.1.3)
     childprocess (1.0.1)
       rake (< 13.0)
     coderay (1.1.3)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.1.9)
     contracts (0.16.0)
     cucumber (4.0.0)
@@ -62,36 +56,17 @@ GEM
       cucumber-core (~> 7.0, >= 7.0.0)
       cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
       cucumber-messages (~> 12.1, >= 12.1.1)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
-    equalizer (0.0.11)
-    excon (0.78.0)
-    faraday (0.17.3)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
     ffi (1.12.2)
     highline (2.0.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (1.0.0)
     middleware (0.1.0)
-    mimemagic (0.3.9)
-      nokogiri (~> 1)
-      rake
-    mini_portile2 (2.4.0)
     minitest (5.14.4)
-    multi_json (1.15.0)
     multi_test (0.1.2)
-    multipart-post (2.1.1)
-    nokogiri (1.9.1)
-      mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
     parallel_tests (2.32.0)
       parallel
@@ -108,10 +83,6 @@ GEM
       pry (~> 0.13.0)
     public_suffix (3.1.1)
     rake (12.3.3)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -129,24 +100,8 @@ GEM
       ffi (~> 1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tracker_api (1.11.0)
-      addressable
-      equalizer
-      excon
-      faraday
-      faraday_middleware
-      mimemagic
-      multi_json
-      representable
-      virtus
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    uber (0.1.0)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -162,7 +117,6 @@ DEPENDENCIES
   pry-byebug
   rake (< 13)
   rspec
-  tracker_api
 
 BUNDLED WITH
    2.3.25

data/README.md

@@ -24,11 +24,11 @@ Commands will occasionally print "did you know" hints of other Geordi features.
 You can always run `geordi help <command>` to quickly look up command help.
 
 ### `geordi branch`
-Check out a feature branch based on a story from Pivotal Tracker.
+Check out a feature branch based on a Linear issue.
 
 Example: `geordi branch`
 
-On the first execution we ask for your Pivotal Tracker API token and for your Git user initials. Both will be
+On the first execution we ask for your Linear API token. It will be
 stored in `~/.config/geordi/global.yml`.
 
 **Options**
@@ -59,13 +59,13 @@ Remove unneeded files from the current directory.
 
 
 ### `geordi commit`
-Commit using a story title from Pivotal Tracker.
+Commit using an issue title from Linear.
 
 Example: `geordi commit`
 
 Any extra arguments are forwarded to `git commit -m <message>`.
 
-On the first execution we ask for your Pivotal Tracker API token. It will be
+On the first execution we ask for your Linear API token. It will be
 stored in `~/.config/geordi/global.yml`.
 
 
@@ -343,6 +343,11 @@ All rspec specs and cucumber features matching the given paths will be run.
 ### `geordi unit`
 Run Test::Unit.
 
+Supports `parallel_tests`, binstubs and `bundle exec`.
+
+In order to limit processes in a parallel run, you can set an environment
+variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi unit`
+
 
 ### `geordi update`
 Bring a project up to date.

data/lib/geordi/commands/branch.rb

@@ -1,16 +1,16 @@
-desc 'branch', 'Check out a feature branch based on a story from Pivotal Tracker'
+desc 'branch', 'Check out a feature branch based on a Linear issue'
 long_desc <<-LONGDESC
 Example: `geordi branch`
 
-On the first execution we ask for your Pivotal Tracker API token and for your Git user initials. Both will be
+On the first execution we ask for your Linear API token. It will be
 stored in `~/.config/geordi/global.yml`.
 LONGDESC
 
 option :from_master, aliases: '-m', type: :boolean, desc: 'Branch from master instead of the current branch'
 
 def branch
-  require 'geordi/gitpt'
-  Gitpt.new.run_branch(from_master: options.from_master)
+  require 'geordi/gitlinear'
+  Gitlinear.new.branch(from_master: options.from_master)
 
   Hint.did_you_know [
     :commit,

data/lib/geordi/commands/commit.rb

@@ -1,16 +1,16 @@
-desc 'commit', 'Commit using a story title from Pivotal Tracker'
+desc 'commit', 'Commit using an issue title from Linear'
 long_desc <<-LONGDESC
 Example: `geordi commit`
 
 Any extra arguments are forwarded to `git commit -m <message>`.
 
-On the first execution we ask for your Pivotal Tracker API token. It will be
+On the first execution we ask for your Linear API token. It will be
 stored in `~/.config/geordi/global.yml`.
 LONGDESC
 
 def commit(*git_args)
-  require 'geordi/gitpt'
-  Gitpt.new.run_commit(git_args)
+  require 'geordi/gitlinear'
+  Gitlinear.new.commit(git_args)
 
   Hint.did_you_know [
     :branch,

data/lib/geordi/commands/unit.rb

@@ -1,11 +1,23 @@
 desc 'unit', 'Run Test::Unit'
+long_desc <<-LONGDESC
+Supports `parallel_tests`, binstubs and `bundle exec`.
+
+In order to limit processes in a parallel run, you can set an environment
+variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi unit`
+LONGDESC
 def unit
   if File.exist?('test/test_helper.rb')
     invoke_geordi 'bundle_install'
     invoke_geordi 'yarn_install'
 
     Interaction.announce 'Running Test::Unit'
-    Util.run!([Util.binstub_or_fallback('rake'), 'test'])
+
+    if Util.file_containing?('Gemfile', /parallel_tests/)
+      Interaction.note 'All unit tests at once (using parallel_tests)'
+      Util.run!([Util.binstub_or_fallback('rake'), 'parallel:test'], fail_message: 'Test::Unit failed.')
+    else
+      Util.run!([Util.binstub_or_fallback('rake'), 'test'], fail_message: 'Test::Unit failed.')
+    end
   else
     Interaction.note 'Test::Unit not employed.'
   end

data/lib/geordi/commands/yarn_install.rb

@@ -1,7 +1,7 @@
 desc 'yarn-install', 'Runs yarn install if required', hide: true
 
 def yarn_install
-  if File.exist?('package.json') && !system('yarn check --integrity > /dev/null 2>&1')
+  if File.exist?('yarn.lock') && !system('yarn check --integrity > /dev/null 2>&1')
     Interaction.announce 'Yarn install'
     Util.run!('yarn install')
   end

data/lib/geordi/gitlinear.rb

@@ -0,0 +1,188 @@
+require 'highline'
+require 'net/http'
+require 'json'
+
+module Geordi
+  class Gitlinear
+    # This require-style is to prevent Ruby from loading files of a different
+    # version of Geordi.
+    require File.expand_path('settings', __dir__)
+
+    API_ENDPOINT = 'https://api.linear.app/graphql'.freeze
+
+    def initialize
+      self.highline = HighLine.new
+      self.settings = Settings.new
+    end
+
+    def commit(git_args)
+      Interaction.warn <<~WARNING unless Util.staged_changes?
+        No staged changes. Will create an empty commit.
+      WARNING
+
+      issue = choose_issue
+      create_commit "[#{issue['identifier']}] #{issue['title']}", "Issue: #{issue['url']}", *git_args
+    end
+
+    def branch(from_master: false)
+      issue = choose_issue
+
+      local_branches = local_branch_names
+      matching_local_branch = local_branches.find { |branch_name| branch_name == issue['branchName'] }
+      matching_local_branch ||= local_branches.find { |branch_name| branch_name.include? issue['identifier'].to_s }
+
+      if matching_local_branch.nil?
+        Util.run! ['git', 'checkout', 'master'] if from_master
+        Util.run! ['git', 'checkout', '-b', issue['branchName']]
+      else
+        Util.run! ['git', 'checkout', matching_local_branch]
+      end
+    end
+
+    private
+
+    attr_accessor :highline, :settings
+
+    def local_branch_names
+      @local_branch_names ||= begin
+        branch_list_string = if Util.testing?
+          ENV['GEORDI_TESTING_GIT_BRANCHES'].to_s
+        else
+          `git branch --format="%(refname:short)"`
+        end
+
+        if branch_list_string.strip.empty?
+          Interaction.fail 'Could not determine local Git branches.'
+        end
+
+        branch_list_string.split("\n")
+      end
+    end
+
+    def choose_issue
+      if Util.testing?
+        return dummy_issue_for_testing
+      end
+
+      loading_message = 'Connecting to Linear ...'
+      print(loading_message)
+      issues = fetch_linear_issues
+      reset_loading_message = "\r#{' ' * (loading_message.length + issues.length)}\r"
+
+      if issues.empty?
+        print reset_loading_message
+        Geordi::Interaction.fail('No issues to offer.')
+      end
+
+      highline.choose do |menu|
+        menu.header = 'Choose an issue'
+
+        issues.each do |issue|
+          state = issue['state']['name']
+          if issue['assignee']
+            assignee = issue['assignee']['name']
+            assignee_is_me = issue['assignee']['isMe']
+          else
+            assignee = "unassigned"
+            assignee_is_me = false
+          end
+
+          state += HighLine::BOLD if assignee_is_me
+
+          label = "(#{assignee}, #{state}) #{issue['title']}"
+          label = bold(label) if assignee_is_me
+
+          menu.choice(label) { return issue }
+        end
+
+        menu.hidden('') { Interaction.fail('No issue selected.') }
+        print reset_loading_message # Once menu is build
+      end
+
+      nil # Return nothing
+    end
+
+    def dummy_issue_for_testing
+      settings.linear_api_key
+      ENV['GEORDI_TESTING_NO_LINEAR_ISSUES'] == 'true' ? Geordi::Interaction.fail('No issues to offer.') : {
+        'identifier' => 'team-123',
+        'title' => 'Test Issue',
+        'url' => 'https://www.issue-url.com',
+        'branchName' => 'testuser/team-123-test-issue',
+        'assignee' => { 'name' => 'Test User', 'isMe' => true },
+        'state' => { 'name' => 'In Progress' }
+      }
+    end
+
+    def create_commit(title, description, *git_args)
+      extra = highline.ask("\nAdd an optional message").strip
+      title << ' - ' << extra if extra != ''
+      Util.run!(['git', 'commit', '--allow-empty', '-m', title, '-m', description, *git_args])
+    end
+
+    def fetch_linear_issues
+      team_ids = settings.linear_team_ids
+      filter = {
+        "team": {
+          "id": {
+            "in": team_ids,
+          }
+        },
+        "state": {
+          "type": {
+            "eq": "started"
+          }
+        }
+      }
+      response = query_api(<<~GRAPHQL, filter: filter)
+        query Issues($filter: IssueFilter) {
+          issues(filter: $filter) {
+            nodes {
+              title
+              identifier
+              url
+              branchName
+              assignee {
+                name
+                isMe
+              }
+              state {
+               name
+             }
+            }
+          }
+        }
+      GRAPHQL
+
+      response.dig(*%w[issues nodes])
+    end
+
+    def query_api(attributes, variables)
+      uri = URI(API_ENDPOINT)
+
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = true
+
+      query = [{ query: attributes.split.join(' '), variables: variables }].to_json
+
+      request = Net::HTTP::Post.new(uri.path)
+      request.body = query
+
+      request['Content-Type'] = 'application/json'
+      request['Authorization'] = settings.linear_api_key
+
+      response = https.request(request)
+
+      parsed_response = JSON.parse(response.body)[0]
+      if parsed_response.key?('errors')
+        raise parsed_response.dig('errors')
+      else
+        parsed_response['data']
+      end
+    end
+
+    def bold(string)
+      HighLine::BOLD + string + HighLine::RESET
+    end
+  end
+end

data/lib/geordi/settings.rb

@@ -10,14 +10,13 @@ module Geordi
 
     ALLOWED_GLOBAL_SETTINGS = %w[
       auto_update_chromedriver
-      git_initials
       hint_probability
       irb_flags
-      pivotal_tracker_api_key
-      pivotal_tracker_project_ids
+      linear_api_key
+      linear_team_ids
     ].freeze
 
-    ALLOWED_LOCAL_SETTINGS = %w[ pivotal_tracker_project_ids ].freeze
+    ALLOWED_LOCAL_SETTINGS = %w[ linear_team_ids ].freeze
 
     SETTINGS_WARNED = 'GEORDI_INVALID_SETTINGS_WARNED'
 
@@ -30,12 +29,15 @@ module Geordi
       @global_settings['irb_flags']
     end
 
-    def pivotal_tracker_api_key
-      @global_settings['pivotal_tracker_api_key'] || gitpt_api_key_old || inquire_pt_api_key
+    def linear_api_key
+      @global_settings['linear_api_key'] || begin
+        Interaction.warn 'Linear API key not found'
+        inquire_linear_api_key
+      end
     end
 
-    def pivotal_tracker_api_key=(value)
-      @global_settings['pivotal_tracker_api_key'] = value
+    def linear_api_key=(value)
+      @global_settings['linear_api_key'] = value
       save_global_settings
     end
 
@@ -43,15 +45,6 @@ module Geordi
       @global_settings['hint_probability']
     end
 
-    def git_initials
-      @global_settings['git_initials']
-    end
-
-    def git_initials=(value)
-      @global_settings['git_initials'] = value
-      save_global_settings
-    end
-
     def auto_update_chromedriver
       @global_settings["auto_update_chromedriver"] || false
     end
@@ -61,30 +54,21 @@ module Geordi
       save_global_settings
     end
 
-    def pivotal_tracker_project_ids
-      local_project_ids = @local_settings['pivotal_tracker_project_ids'] || pt_project_ids_old
-      global_project_ids = @global_settings['pivotal_tracker_project_ids']
-
-      local_project_ids = array_wrap_project_ids(local_project_ids)
-      global_project_ids = array_wrap_project_ids(global_project_ids)
-
-      project_ids = local_project_ids | global_project_ids
+    def linear_team_ids
+      local_team_ids = normalize_team_ids(@local_settings['linear_team_ids'])
+      global_team_ids = normalize_team_ids(@global_settings['linear_team_ids'])
 
-      if project_ids.empty?
-        puts
-        Geordi::Interaction.warn "Sorry, I could not find a project ID in .geordi.yml :("
-        puts
+      team_ids = local_team_ids | global_team_ids
 
-        puts "Please put at least one Pivotal Tracker project id into the .geordi.yml file in this directory, e.g."
-        puts
-        puts "pivotal_tracker_project_ids:"
-        puts "- 123456"
-        puts
-        puts 'You may add multiple IDs.'
+      if team_ids.empty?
+        Geordi::Interaction.warn 'No team id found.'
+        Interaction.note 'Please open a team in Linear, open the command menu with CTRL + K and choose'
+        Interaction.note "\"Copy model UUID\". Store that team id in #{LOCAL_SETTINGS_FILE_NAME}:"
+        puts 'linear_team_ids: abc-123-123-abc, def-456-456-def'
         exit 1
       end
 
-      project_ids
+      team_ids
     end
 
     private
@@ -132,54 +116,24 @@ module Geordi
       end
     end
 
-    # deprecated
-    def gitpt_api_key_old
-      file_path = File.join(ENV['HOME'], '.gitpt')
-      if File.exist?(file_path) && !Util.testing?
-        token = YAML.load_file(file_path).fetch :token
-        self.pivotal_tracker_api_key = token
-
-        Geordi::Interaction.warn "The ~/.gitpt file is deprecated."
-        Geordi::Interaction.note "The contained setting has been moved to ~/.config/geordi/global.yml."
-        Geordi::Interaction.note "If you don't need to work with an older version of geordi you can delete ~/.gitpt now."
-
-        token
-      end
-    end
-
-    def inquire_pt_api_key
-      Geordi::Interaction.warn 'Your settings are missing or invalid.'
-      Geordi::Interaction.warn "Please configure your Pivotal Tracker access."
-      token = Geordi::Interaction.prompt('Your API key:').to_s # Just be sure
-      self.pivotal_tracker_api_key = token
+    def inquire_linear_api_key
+      Geordi::Interaction.note 'Create an API key here: https://linear.app/makandra/settings/api'
+      token = Geordi::Interaction.prompt("Please enter the API key:")
+      self.linear_api_key = token
+      Interaction.note("API key stored in #{GLOBAL_SETTINGS_FILE_NAME}.")
       puts
 
       token
     end
 
-    # deprecated
-    def pt_project_ids_old
-      if File.exist?('.pt_project_id')
-        project_ids = File.read('.pt_project_id')
-        puts # Make sure to start on a new line (e.g. when invoked after a #print)
-        Geordi::Interaction.warn "The usage of the .pt_project_id file is deprecated."
-        Geordi::Interaction.note(<<~INSTRUCTIONS)
-          Please remove this file from your project and add or extend the .geordi.yml file with the following content:
-            pivotal_tracker_project_ids: #{project_ids}
-        INSTRUCTIONS
-
-        project_ids
-      end
-    end
-
-    def array_wrap_project_ids(project_ids)
-      case project_ids
+    def normalize_team_ids(team_ids)
+      case team_ids
       when Array
-        project_ids
+        team_ids
       when String
-        project_ids.split(/[\s]+/).map(&:to_i)
+        team_ids.split(/[\s,;]+/)
       when Integer
-        [project_ids]
+        [team_ids]
       else
         []
       end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '10.1.0'.freeze
+  VERSION = '11.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 11.1.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -87,7 +87,7 @@ files:
 - lib/geordi/cucumber.rb
 - lib/geordi/db_cleaner.rb
 - lib/geordi/dump_loader.rb
-- lib/geordi/gitpt.rb
+- lib/geordi/gitlinear.rb
 - lib/geordi/hint.rb
 - lib/geordi/interaction.rb
 - lib/geordi/remote.rb
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails

data/lib/geordi/gitpt.rb

@@ -1,189 +0,0 @@
-require 'yaml'
-require 'highline'
-require 'tracker_api'
-
-module Geordi
-  class Gitpt
-
-    # This require-style is to prevent Ruby from loading files of a different
-    # version of Geordi.
-    require File.expand_path('settings', __dir__)
-
-    def initialize
-      self.highline = HighLine.new
-      self.settings = Settings.new
-      self.client = build_client
-    end
-
-    def run_commit(git_args)
-      Interaction.warn <<~WARNING unless Util.staged_changes?
-        No staged changes. Will create an empty commit.
-      WARNING
-
-      story = choose_story
-      if story
-        create_commit "[##{story.id}] #{story.name}", "Story: #{story.url}", *git_args
-      end
-    end
-
-    def run_branch(from_master: false)
-      story = choose_story || Interaction.fail('No story selected.')
-
-      normalized_story_name = normalize_string(story.name)
-
-      branch_list_string = if Util.testing?
-        ENV['GEORDI_TESTING_GIT_BRANCHES'] || ''
-      else
-        `git branch --format="%(refname:short)"`
-      end
-
-      if branch_list_string.nil? || branch_list_string.strip.empty?
-        Interaction.fail 'Could not determine local git branches.'
-      end
-
-      new_branch_name = "#{git_user_initials}/#{normalized_story_name}-#{story.id}"
-
-      local_branches = branch_list_string.split("\n")
-      branch_name = local_branches.find { |branch_name| branch_name == new_branch_name }
-      branch_name ||= local_branches.find { |branch_name| branch_name.include? story.id.to_s }
-
-      if branch_name.present?
-        checkout_branch branch_name, new_branch: false
-      else
-        checkout_branch new_branch_name, new_branch: true, from_master: from_master
-      end
-    end
-
-    private
-
-    attr_accessor :highline, :client, :settings
-
-    def build_client
-      TrackerApi::Client.new(token: settings.pivotal_tracker_api_key)
-    end
-
-    def load_projects
-      project_ids = settings.pivotal_tracker_project_ids
-      project_ids.collect do |project_id|
-        begin
-          client.project(project_id)
-        rescue TrackerApi::Errors::ClientError
-          puts # Start a new line
-          Geordi::Interaction.warn "Could not access project #{project_id}. Skipping."
-        end
-      end.compact
-    end
-
-    def applicable_stories
-      if Util.testing?
-        return ENV['GEORDI_TESTING_NO_PT_STORIES'] == 'true' ? [] : [OpenStruct.new(id: 12, name: 'Test Story', url: 'https://www.story-url.com')]
-      end
-
-      projects = load_projects
-      projects.collect do |project|
-        project.stories(filter: 'state:started,finished,rejected', fields: ':default,owners(id,name)')
-      end.flatten
-    end
-
-    def choose_story
-      loading_message = 'Connecting to Pivotal Tracker ...'
-      print(loading_message)
-      stories = applicable_stories
-      reset_loading_message = "\r#{' ' * (loading_message.length + stories.length)}\r"
-
-      Geordi::Interaction.fail('No stories to offer.') if stories.empty?
-
-      if Util.testing?
-        return stories[0]
-      end
-
-      my_id = client.me.id
-
-      highline.choose do |menu|
-        menu.header = 'Choose a story'
-
-        stories.each do |story|
-          state = story.current_state
-          owners = story.owners
-          owner_is_me = owners.collect(&:id).include?(my_id)
-
-          if state == 'started'
-            state = HighLine::GREEN + state + HighLine::RESET
-          elsif state != 'finished'
-            state = HighLine::RED + state + HighLine::RESET
-          end
-
-          state += HighLine::BOLD if owner_is_me
-
-          label = "(#{owners.collect(&:name).join(', ')}, #{state}) #{story.name}"
-          label = bold(label) if owner_is_me
-
-          menu.choice(label) { return story }
-        end
-
-        menu.hidden ''
-        print reset_loading_message # Once menu is build
-      end
-
-      nil # Return nothing
-    end
-
-    def create_commit(title, description, *git_args)
-      extra = highline.ask("\nAdd an optional message").strip
-      title << ' - ' << extra if extra != ''
-
-      Util.run!(['git', 'commit', '--allow-empty', '-m', title, '-m', description, *git_args])
-    end
-
-    def bold(string)
-      HighLine::BOLD + string + HighLine::RESET
-    end
-
-    def checkout_branch(name, new_branch: false, from_master: false)
-      if new_branch
-        Util.run! ['git', 'checkout', 'master'] if from_master
-        Util.run! ['git', 'checkout', '-b', name]
-      else
-        Util.run! ['git', 'checkout', name]
-      end
-    end
-
-    def normalize_string(name)
-      name.gsub!('ä', 'ae')
-      name.gsub!('ö', 'oe')
-      name.gsub!('ü', 'ue')
-      name.gsub!('ß', 'ss')
-      name.tr!('^A-Za-z0-9_ ', '')
-      name.squeeze! ' '
-      name.gsub!(' ', '-')
-      name.downcase!
-      name
-    end
-
-    def git_user_initials
-      if settings.git_initials
-        Interaction.note "Using Git user initials from #{Settings::GLOBAL_SETTINGS_FILE_NAME}"
-        return settings.git_initials
-      end
-
-      stdout_str = if Util.testing?
-        ENV['GEORDI_TESTING_GIT_USERNAME']
-      else
-        `git config user.name`
-      end
-
-      git_user_initials = unless stdout_str.nil?
-        stdout_str.strip.split(' ').map(&:chars).map(&:first).join.downcase
-      end
-
-      git_user_initials = Interaction.prompt 'Enter your initials:', git_user_initials
-
-      if git_user_initials.nil?
-        Interaction.fail('Could not determine the git user\'s initials.')
-      else
-        settings.git_initials = git_user_initials
-        git_user_initials
-      end
-    end
-  end
-end