nutrella 1.5.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24e66cfc7e3e0b2cf58e7ecb47d16d2689c417e60f4c499bf7ecf777a6e08015
-  data.tar.gz: 53d417160b545b06988e41c1d6b434d0d61822e04cb54dd7482d725e11e450a7
+  metadata.gz: 3c60899382e6e79688404c049df88f7976ec1f1acf77a37e3f1cc7ad939cb152
+  data.tar.gz: c1227cbc48e26c2fafe4fd1d4bca4950f037ffcb82fa2f79168e29203d280158
 SHA512:
-  metadata.gz: 44e1e12f2f85e870b7d48324450e6d42fa109d606760b31b8a5f0ff70b22b4109a4b304bd00eb765f69b0dc8f40db1ee2571e60014346ea509cf0573cfa4beea
-  data.tar.gz: 874d0d22d8fc5a51fc27712226927363a3e1c0883b029d0dd449f2b245c4a47073c64f98ad25a45a08ec150fb36bea16b473d43c08ac146d4c063adb5ac903fd
+  metadata.gz: 124ce5c5115109501ca6bbf2789acbae393ea1583c285faf4a5a98a635ab56c58937696db6dbf2abd930988640f542b123c5ac43b22862010148408717d41f6f
+  data.tar.gz: 536177377379d391139bd47aa4838013e8b41b5ee28da5e686f347bcd5c0e7941ac66a14fcafcb7ee2ac3259ecdbffc339b3d6167e2a6c170a506266911f6630

data/.codeclimate.yml

@@ -7,11 +7,6 @@ engines:
       - ruby
   fixme:
     enabled: true
-  rubocop:
-    enabled: true
-    checks:
-      Rubocop/Rails/Output:
-        enabled: false
   reek:
     enabled: true
 ratings:

data/.rubocop.yml

@@ -4,11 +4,15 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
 
   Exclude:
     - 'bin/**/*'
 
+
+Layout/LineLength:
+  Max: 120
+
 # Rubocop and I cannot agree.
 Layout/MultilineMethodCallBraceLayout:
   Enabled: false
@@ -28,9 +32,6 @@ RSpec/AnyInstance:
 RSpec/ExampleLength:
   Max: 15
 
-Metrics/LineLength:
-  Max: 120
-
 RSpec/DescribeClass:
   Enabled: false
 

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.0.5

data/CHANGELOG.md

@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.0] - 2023-03-25
+
+- Update ruby-trello
+- Update development dependencies
+
+#### Breaking Changes
+
+- Drop support for all Ruby 2.x versions
+
+## [1.6.0] - 2021-07-30
+
+#### New Features
+
+- Allow opening a previously created Trello board based on a JIRA ticket
+- Added a configuration option to specify exactly how to search in the cache first
+
 ## [1.5.4] - 2021-07-29
 
 #### New Features

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](http://img.shields.io/gem/v/nutrella.svg?style=flat)](https://rubygems.org/gems/nutrella)
 [![Code Climate](https://codeclimate.com/github/amckinnell/nutrella/badges/gpa.svg)](https://codeclimate.com/github/amckinnell/nutrella)
-[![Build Status](https://travis-ci.org/amckinnell/nutrella.svg?branch=master)](https://travis-ci.org/amckinnell/nutrella)
 
 A command line tool for associating a Trello board with the current git branch.
 
@@ -45,7 +44,7 @@ Insert your `token` into your `~/.nutrella.yml` file.
 
 If your haven't already done so, insert your `key`, `secret`, and `token` into your `~/.nutrella.yml` file.
 
-The configuration file should look like the following (don't use the keys below, they won't work):
+The configuration file should look like the following (don't use the keys below as they won't work for you):
 
 ```yaml
     # Trello Developer API Keys
@@ -59,6 +58,7 @@ The configuration file should look like the following (don't use the keys below,
     enable_trello_app: false
     enable_logging: true
     cache_capacity: 5
+    cache_first: '^PM-\d+'
 ```
 
 **Step 6**: Adjust configuration file (Optional)
@@ -89,22 +89,43 @@ Adjust the `cache_capacity` configuration to increase the capacity of the cache
    cache_capacity: 15
 ```
 
+Adjust the `cache_first` configuration to allow searching the cache first before creating or opening a Trello board:
+
+```yaml
+   cache_first: '^(PM|QC)-\d+'
+```
+
+The string that you specify will be treated as a regular expression.
+
+
 
 ## Usage
 
-Create or open a Trello board based on the name of the current git branch:
+There are three ways to invoke the nutrella command:
+
+1. Create or open a Trello board based on the name of the current git branch:
 
-```sh
+    ```sh
     $ nutrella
-```
+    ```
+   
+    This is the command invocation that should meet your needs 90% of the time.
 
-Create or open a named Trello board:
 
-```sh
+1. Create or open a named Trello board using the full git branch name:
+
+    ```sh
     $ nutrella <git-branch-name>
-```
+    ```
+
+
+2. Create or open a previously created Trello board using a JIRA ticket like `PM-9423`:
+
+    ```sh
+    $ nutrella <JIRA Ticket>
+    ```
 
-Note: you can invoke `nutrella` from your project directory or from any subdirectory.
+    This behaviour relies on the `cache_first` configuration setting. Invoking `nutrella` with a JIRA ticket number is for those situations where you make multiple git branches for the same JIRA ticket with a different suffix.
 
 
 ## Troubleshooting

data/exe/nutrella

@@ -2,6 +2,6 @@
 
 require "nutrella"
 
-board_name = Nutrella::TaskBoardName.board_name(ARGV)
+board_name = Nutrella::TaskBoardName.board_name_from_git_branch(ARGV)
 
 Nutrella::Command.new(Dir.home, board_name).run

data/lib/nutrella/board_name_resolver.rb

@@ -0,0 +1,29 @@
+module Nutrella
+  #
+  # Knows how to take the supplied board name and resolve it to a Trello board url.
+  #
+  class BoardNameResolver
+    def initialize(url_cache, search_specification)
+      @url_cache = url_cache
+      @search_specification = search_specification
+    end
+
+    def resolve(board_name, &block)
+      matching_url(board_name) || cached_url(board_name, &block)
+    end
+
+    private
+
+    def matching_url(board_name)
+      return nil unless @search_specification.match?(board_name)
+
+      search_reg_exp = Regexp.new(board_name, Regexp::IGNORECASE)
+
+      @url_cache.search(search_reg_exp)
+    end
+
+    def cached_url(board_name, &block)
+      @url_cache.fetch(board_name, &block)
+    end
+  end
+end

data/lib/nutrella/cache.rb

@@ -20,6 +20,12 @@ module Nutrella
       value
     end
 
+    def search(search_reg_exp)
+      cache_contents.find { |k, _v| search_reg_exp.match?(k) }.last
+    rescue
+      nil
+    end
+
     private
 
     def lookup(key)
@@ -41,7 +47,11 @@ module Nutrella
     end
 
     def cache_contents
-      @_cache_contents ||= YAML.load_file(path)
+      @_cache_contents ||= begin
+        YAML.load_file(path)
+      rescue
+        nil
+      end
     end
   end
 end

data/lib/nutrella/command.rb

@@ -42,7 +42,7 @@ module Nutrella
     end
 
     def cached_url
-      @_cached_url ||= url_cache.fetch(@board_name) { task_board.lookup_or_create(@board_name).url }
+      @_cached_url ||= board_name_resolver.resolve(@board_name) { task_board.lookup_or_create(@board_name).url }
     end
 
     def configuration_values
@@ -65,6 +65,10 @@ module Nutrella
       http_url.gsub(/^http.?:/, "trello:")
     end
 
+    def board_name_resolver
+      Nutrella::BoardNameResolver.new(url_cache, configuration_values.fetch(:cache_first, ""))
+    end
+
     def task_board
       Nutrella::TaskBoard.new(configuration_values)
     end

data/lib/nutrella/configuration.rb

@@ -21,6 +21,7 @@ module Nutrella
       enable_trello_app: false
       enable_logging: false
       cache_capacity: 5
+      cache_first: '^PM-\d+'
     YAML
 
     attr_reader :path, :values
@@ -46,7 +47,8 @@ module Nutrella
         launch_command: configuration.fetch("launch_command", "open $url$"),
         enable_trello_app: configuration.fetch("enable_trello_app", "false"),
         enable_logging: configuration.fetch("enable_logging", "false"),
-        cache_capacity: configuration.fetch("cache_capacity", 5)
+        cache_capacity: configuration.fetch("cache_capacity", 5),
+        cache_first: to_reg_exp("cache_first")
       }
     rescue => e
       abort "#{path} #{e}"
@@ -77,5 +79,9 @@ module Nutrella
         See https://github.com/amckinnell/nutrella for instructions.
       TEXT
     end
+
+    def to_reg_exp(key)
+      Regexp.new(configuration.fetch(key, '^PM-\d+'), Regexp::IGNORECASE)
+    end
   end
 end

data/lib/nutrella/task_board_name.rb

@@ -9,7 +9,7 @@ module Nutrella
   # Note: will also accept the name of a branch as an argument.
   #
   class TaskBoardName
-    def self.board_name(args)
+    def self.board_name_from_git_branch(args)
       git_branch_name = args[0]
       return git_branch_name if git_branch_name.present?
 

data/lib/nutrella/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nutrella
-  VERSION = "1.5.4"
+  VERSION = "1.7.0"
 end

data/lib/nutrella.rb

@@ -1,5 +1,4 @@
-require "nutrella/string_ext"
-
+require "nutrella/board_name_resolver"
 require "nutrella/cache"
 require "nutrella/command"
 require "nutrella/configuration"

data/nutrella.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |spec|
     "homepage_uri" => "https://github.com/amckinnell/nutrella",
     "changelog_uri" => "https://github.com/amckinnell/nutrella/blob/master/CHANGELOG.md",
     "source_code_uri" => "https://github.com/amckinnell/nutrella",
-    "bug_tracker_uri" => "https://github.com/amckinnell/nutrella/issues"
+    "bug_tracker_uri" => "https://github.com/amckinnell/nutrella/issues",
+    "rubygems_mfa_required" => "true"
   }
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|features)/}) }
@@ -24,14 +25,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 3.0"
 
-  spec.add_runtime_dependency "ruby-trello", "~> 3.0"
+  spec.add_runtime_dependency "ruby-trello", "~> 4.0"
 
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.10"
-  spec.add_development_dependency "rubocop", "~> 1.18"
+  spec.add_development_dependency "rspec", "~> 3.12"
+  spec.add_development_dependency "rubocop", "~> 1.48"
   spec.add_development_dependency "rubocop-rake", "~> 0.6"
-  spec.add_development_dependency "rubocop-rspec", "~> 2.4"
-  spec.add_development_dependency "simplecov", "~> 0.21"
+  spec.add_development_dependency "rubocop-rspec", "~> 2.19"
+  spec.add_development_dependency "simplecov", "~> 0.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutrella
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.7.0
 platform: ruby
 authors:
 - Alistair McKinnell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2023-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-trello
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.48'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.19'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 description:
 email:
 - alistair.mckinnell@gmail.com
@@ -123,7 +123,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -138,11 +137,11 @@ files:
 - bin/setup
 - exe/nutrella
 - lib/nutrella.rb
+- lib/nutrella/board_name_resolver.rb
 - lib/nutrella/cache.rb
 - lib/nutrella/command.rb
 - lib/nutrella/configuration.rb
 - lib/nutrella/developer_keys.rb
-- lib/nutrella/string_ext.rb
 - lib/nutrella/task_board.rb
 - lib/nutrella/task_board_name.rb
 - lib/nutrella/version.rb
@@ -155,6 +154,7 @@ metadata:
   changelog_uri: https://github.com/amckinnell/nutrella/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/amckinnell/nutrella
   bug_tracker_uri: https://github.com/amckinnell/nutrella/issues
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -163,14 +163,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.24
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: A command line tool for creating a Trello Board based on the current git

data/.travis.yml

@@ -1 +0,0 @@
-language: ruby

data/lib/nutrella/string_ext.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# Simpler versions of an extension from ActiveSupport.
-#
-class String
-  def titleize
-    tr("_-", " ").split.map(&:capitalize).join(" ")
-  end
-end