geordi 5.2.3 → 6.0.0

data/lib/geordi/gitpt.rb

@@ -1,99 +1,185 @@
-class Gitpt
-  require 'yaml'
-  require 'highline'
-  require 'tracker_api'
-
-  # 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 = Geordi::Settings.new
-    self.client = build_client
-  end
+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 run(git_args)
-    Geordi::Interaction.warn <<-WARNING unless Geordi::Util.staged_changes?
+    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
+      WARNING
 
-    story = choose_story
-    if story
-      create_commit "[##{story.id}] #{story.name}", *git_args
+      story = choose_story
+      if story
+        create_commit "[##{story.id}] #{story.name}", *git_args
+      end
     end
-  end
 
-  private
+    def run_branch
+      story = choose_story || Interaction.fail('No story selected.')
 
-  attr_accessor :highline, :client, :settings
+      normalized_story_name = normalize_string(story.name)
 
-  def build_client
-    TrackerApi::Client.new(token: settings.pivotal_tracker_api_key)
-  end
+      branch_list_string = if Util.testing?
+        ENV['GEORDI_TESTING_GIT_BRANCHES'] || ''
+      else
+        `git branch --format="%(refname:short)"`
+      end
 
-  def load_projects
-    project_ids = settings.pivotal_tracker_project_ids
-    project_ids.collect { |project_id| client.project(project_id) }
-  end
+      if branch_list_string.nil? || branch_list_string.strip.empty?
+        Interaction.fail 'Could not determine local git branches.'
+      end
 
-  def applicable_stories
-    projects = load_projects
-    projects.collect do |project|
-      project.stories(filter: 'state:started,finished,rejected')
-    end.flatten
-  end
+      new_branch_name = "#{git_user_initials}/#{normalized_story_name}-#{story.id}"
 
-  def choose_story
-    if Geordi::Util.testing?
-      return OpenStruct.new(id: 12, name: 'Test Story')
+      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
+      end
+    end
+
+    private
+
+    attr_accessor :highline, :client, :settings
+
+    def build_client
+      TrackerApi::Client.new(token: settings.pivotal_tracker_api_key)
     end
 
-    loading_message = 'Connecting to Pivotal Tracker ...'
-    print(loading_message)
-    stories = applicable_stories
-    reset_loading_message = "\r#{' ' * (loading_message.length + stories.length)}\r"
+    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')]
+      end
 
-    highline.choose do |menu|
-      menu.header = 'Choose a story'
+      projects = load_projects
+      projects.collect do |project|
+        project.stories(filter: 'state:started,finished,rejected', fields: ':default,owners(id,name)')
+      end.flatten
+    end
 
-      stories.each do |story|
-        print '.' # Progress
+    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"
 
-        state = story.current_state
-        owners = story.owners
-        owner_is_me = owners.collect(&:id).include?(client.me.id)
+      Geordi::Interaction.fail('No stories to offer.') if stories.empty?
 
-        if state == 'started'
-          state = HighLine::GREEN + state + HighLine::RESET
-        elsif state != 'finished'
-          state = HighLine::RED + state + HighLine::RESET
+      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|
+          print '.' # Progress
+
+          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
 
-        state += HighLine::BOLD if owner_is_me
+        menu.hidden ''
+        print reset_loading_message # Once menu is build
+      end
+
+      nil # Return nothing
+    end
 
-        label = "(#{owners.collect(&:name).join(', ')}, #{state}) #{story.name}"
-        label = bold(label) if owner_is_me
+    def create_commit(message, *git_args)
+      extra = highline.ask("\nAdd an optional message").strip
+      message << ' - ' << extra if extra != ''
 
-        menu.choice(label) { return story }
+      Util.run!(['git', 'commit', '--allow-empty', '-m', message, *git_args])
+    end
+
+    def bold(string)
+      HighLine::BOLD + string + HighLine::RESET
+    end
+
+    def checkout_branch(name, new_branch: false)
+      if new_branch
+        Util.run! ['git', 'checkout', 'master']
+        Util.run! ['git', 'checkout', '-b', name]
+      else
+        Util.run! ['git', 'checkout', name]
       end
+    end
 
-      menu.hidden ''
-      print reset_loading_message # Once menu is build
+    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
 
-    nil # Return nothing
-  end
+    def git_user_initials
+      stdout_str = if Util.testing?
+        ENV['GEORDI_TESTING_GIT_USERNAME']
+      else
+        `git config user.name`
+      end
 
-  def create_commit(message, *git_args)
-    extra = highline.ask("\nAdd an optional message").strip
-    message << ' - ' << extra if extra != ''
+      git_user_initials = unless stdout_str.nil?
+        stdout_str.strip.split(' ').map(&:chars).map(&:first).join.downcase
+      end
 
-    Geordi::Util.run!(['git', 'commit', '--allow-empty', '-m', message, *git_args])
-  end
+      git_user_initials = Interaction.prompt 'Enter your initals:', git_user_initials
 
-  def bold(string)
-    HighLine::BOLD + string + HighLine::RESET
+      if git_user_initials.nil?
+        Interaction.fail('Could not determine the git user\'s initials.')
+      else
+        git_user_initials
+      end
+    end
   end
-
 end

data/lib/geordi/interaction.rb

@@ -11,8 +11,9 @@ module Geordi
       puts "\e[4;34m#{message}\e[0m" # blue underline
     end
 
-    # Any hints, comments, infos or explanations should be `note`d. Please do
-    # not print any output (data, file contents, lists) with `note`.
+    # Any meta information, i.e. hints, comments, infos or explanations should
+    # be printed with `note`.
+    # Please do not use it for command output (data, file contents, lists etc).
     def note(text)
       puts '> ' + text
     end
@@ -38,7 +39,8 @@ module Geordi
       exit(1)
     end
 
-    # When you're done, inform the user with a `success` and a short message
+    # When you're done, inform the user with a `success` and a short message. It
+    # should be a sentence (i.e. ending with [.!?]).
     def success(text)
       message = "\n> #{text}"
       puts "\e[32m#{message}\e[0m" # green

data/lib/geordi/remote.rb

@@ -3,6 +3,7 @@ require 'geordi/interaction'
 require 'geordi/util'
 require 'highline/import'
 require 'pathname'
+require 'fileutils'
 
 module Geordi
   class Remote
@@ -59,7 +60,7 @@ module Geordi
       server_option = options[:select_server]
       server_number = server_option.to_i
 
-      server =  if server_option == 'select_server'
+      server = if server_option == 'select_server'
         select_server
       elsif server_number != 0 && server_number <= @config.servers.count
         server_index = server_number - 1

data/lib/geordi/settings.rb

@@ -8,8 +8,10 @@ module Geordi
     GLOBAL_SETTINGS_FILE_NAME = Util.testing? ? './tmp/global_settings.yml'.freeze : File.join(ENV['HOME'], '.config/geordi/global.yml').freeze
     LOCAL_SETTINGS_FILE_NAME = Util.testing? ? './tmp/local_settings.yml'.freeze : './.geordi.yml'.freeze
 
-    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver ].freeze
-    ALLOWED_LOCAL_SETTINGS = %w[ use_vnc pivotal_tracker_project_ids ].freeze
+    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver pivotal_tracker_project_ids ].freeze
+    ALLOWED_LOCAL_SETTINGS = %w[ pivotal_tracker_project_ids ].freeze
+
+    SETTINGS_WARNED = 'GEORDI_INVALID_SETTINGS_WARNED'
 
     def initialize
       read_settings
@@ -34,26 +36,14 @@ module Geordi
       save_global_settings
     end
 
-    # Local settings
-    # They should not be changed by geordi to avoid unexpected diffs, therefore
-    # there are no setters for these settings
-    def use_vnc?
-      @local_settings.fetch('use_vnc', true)
-    end
-
     def pivotal_tracker_project_ids
-      project_ids = @local_settings['pivotal_tracker_project_ids'] || pt_project_ids_old
+      local_project_ids = @local_settings['pivotal_tracker_project_ids'] || pt_project_ids_old
+      global_project_ids = @global_settings['pivotal_tracker_project_ids']
 
-      case project_ids
-      when Array
-        # nothing to do
-      when String
-        project_ids = project_ids.split(/[\s]+/).map(&:to_i)
-      when Integer
-        project_ids = [project_ids]
-      else
-        project_ids = []
-      end
+      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
 
       if project_ids.empty?
         puts
@@ -78,14 +68,20 @@ module Geordi
       global_path = GLOBAL_SETTINGS_FILE_NAME
       local_path = LOCAL_SETTINGS_FILE_NAME
 
-      if File.exists?(global_path)
-        global_settings = YAML.safe_load(File.read(global_path))
-        check_for_invalid_keys(global_settings, ALLOWED_GLOBAL_SETTINGS, global_path)
+      global_settings = if File.exists?(global_path)
+        YAML.safe_load(File.read(global_path))
+      end
+      local_settings = if File.exists?(local_path)
+        YAML.safe_load(File.read(local_path))
       end
 
-      if File.exists?(local_path)
-        local_settings = YAML.safe_load(File.read(local_path))
+      # Prevent duplicate warnings caused by another instance of Settings
+      unless ENV[SETTINGS_WARNED]
+        check_for_invalid_keys(global_settings, ALLOWED_GLOBAL_SETTINGS, global_path)
         check_for_invalid_keys(local_settings, ALLOWED_LOCAL_SETTINGS, local_path)
+        Interaction.warn "Unsupported config file \".firefox-version\". Please remove it." if File.exists?('.firefox-version')
+
+        ENV[SETTINGS_WARNED] = 'true'
       end
 
       @global_settings = global_settings || {}
@@ -93,21 +89,12 @@ module Geordi
     end
 
     def check_for_invalid_keys(settings, allowed_keys, file)
+      return if settings.nil?
+
       invalid_keys = settings.keys - allowed_keys
       unless invalid_keys.empty?
-        Geordi::Interaction.warn "Geordi detected unknown keys in #{file}.\n"
-
-        invalid_keys.sort.each do |key|
-          puts "* #{key}"
-        end
-
-        puts "\nAllowed keys are:"
-        allowed_keys.sort.each do |key|
-          puts "* #{key}"
-        end
-        puts
-
-        exit 1
+        Interaction.warn "Unknown settings in #{file}: #{invalid_keys.join(", ")}"
+        Interaction.note "Supported settings in #{file} are: #{allowed_keys.join(", ")}"
       end
     end
 
@@ -160,5 +147,18 @@ module Geordi
       end
     end
 
+    def array_wrap_project_ids(project_ids)
+      case project_ids
+      when Array
+        project_ids
+      when String
+        project_ids.split(/[\s]+/).map(&:to_i)
+      when Integer
+        [project_ids]
+      else
+        []
+      end
+    end
+
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '5.2.3'.freeze
+  VERSION = '6.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 6.0.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,12 +32,12 @@ executables:
 - b
 - dumple
 - geordi
-- launchy_browser
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -48,15 +48,14 @@ files:
 - exe/b
 - exe/dumple
 - exe/geordi
-- exe/launchy_browser
 - geordi.gemspec
 - lib/geordi.rb
 - lib/geordi/COMMAND_TEMPLATE
 - lib/geordi/capistrano_config.rb
 - lib/geordi/chromedriver_updater.rb
 - lib/geordi/cli.rb
-- lib/geordi/commands/_setup_vnc.rb
 - lib/geordi/commands/apache_site.rb
+- lib/geordi/commands/branch.rb
 - lib/geordi/commands/bundle_install.rb
 - lib/geordi/commands/capistrano.rb
 - lib/geordi/commands/chromedriver_update.rb
@@ -71,7 +70,6 @@ files:
 - lib/geordi/commands/docker.rb
 - lib/geordi/commands/drop_databases.rb
 - lib/geordi/commands/dump.rb
-- lib/geordi/commands/firefox.rb
 - lib/geordi/commands/migrate.rb
 - lib/geordi/commands/png_optimize.rb
 - lib/geordi/commands/rake.rb
@@ -85,14 +83,12 @@ files:
 - lib/geordi/commands/unit.rb
 - lib/geordi/commands/update.rb
 - lib/geordi/commands/version.rb
-- lib/geordi/commands/vnc.rb
 - lib/geordi/commands/with_rake.rb
 - lib/geordi/commands/yarn_install.rb
 - lib/geordi/cucumber.rb
 - lib/geordi/db_cleaner.rb
 - lib/geordi/docker.rb
 - lib/geordi/dump_loader.rb
-- lib/geordi/firefox_for_selenium.rb
 - lib/geordi/gitpt.rb
 - lib/geordi/interaction.rb
 - lib/geordi/remote.rb
@@ -103,7 +99,10 @@ homepage: https://makandra.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: 'Support for sequential running of integration tests tagged
+  with @solo has been dropped.
+
+'
 rdoc_options: []
 require_paths:
 - lib