mj 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b15f4c4efd81a03bf545e20a2bebb6beff7a12612c470173073f35c5b67cab2
-  data.tar.gz: 6c61d4acd6cc0d8590835bfd038fe0e291df05fd3100db7fff41f189eeade3fe
+  metadata.gz: 40c3258afb7e8d688b06de487bb9286f0acb6999355a7156b099a77095206cc5
+  data.tar.gz: 301506dcf36dee5629e0912a6fd5d89e6d130f73daab6255a86aefc802e14763
 SHA512:
-  metadata.gz: 7d1017ad9f4b623c86d864e16c5110b9ecc1e131bbe96e27f23e0782b79ce209257972837a857a6557877a484dd0de834c2bf0c5be6c38d2ff5c67866243872c
-  data.tar.gz: 77da1cdfb825c43e50d8ae4cf7b203f585fc7c4be33c1121ad47e46c30befe773ec9cfe345a980112e02b625e0f3a82bd4158ef5d15438e8f46f46816b416529
+  metadata.gz: 32a385ff987a4ff7ebb24b4b4329bdbbe018194e976aea69c4dc650cf66679e690d609550f8be34a914adb480a82751241d1f4090921a8319176bcacb3a0c6c5
+  data.tar.gz: b2ef3335c6cab5e6d6da130755130f07b5e829dd1a703e6f4ecda2a5b8098a61c427d18a68923ff262a352b0ac7b15cbbc53b655a7211f0d0be891d2e51e75cf

data/Gemfile.lock

@@ -1,97 +1,101 @@
 PATH
   remote: .
   specs:
-    mj (0.8.0)
+    mj (0.9.0)
+      colorize
       koine-rest_client
       mj-hash_utils
       ruby-openai (~> 6.2.0)
       thor (~> 1.2.1)
+      uri (~> 0.13.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     awesome_print (1.9.2)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
+    colorize (1.1.0)
+    csv (3.3.0)
     diff-lcs (1.5.1)
-    docile (1.4.0)
+    docile (1.4.1)
     event_stream_parser (0.3.0)
-    faraday (2.9.0)
+    faraday (2.10.1)
       faraday-net_http (>= 2.0, < 3.2)
+      logger
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (3.1.0)
+    faraday-net_http (3.1.1)
       net-http
-    httparty (0.21.0)
+    httparty (0.22.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.7.1)
+    json (2.7.2)
     koine-rest_client (1.1.1)
       addressable (>= 2.3)
       httparty (>= 0.17.0)
     koine-test_runner (0.4.0)
     language_server-protocol (3.17.0.3)
-    method_source (1.0.0)
+    logger (1.6.0)
+    method_source (1.1.0)
     mini_mime (1.1.5)
     mj-hash_utils (0.1.0)
-    multi_xml (0.6.0)
-    multipart-post (2.4.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    multipart-post (2.4.1)
     net-http (0.4.1)
       uri
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.1)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.4)
+      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.62.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-performance (1.20.2)
+    rubocop-ast (1.32.0)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.27.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.4)
+      rubocop (~> 1.61)
     ruby-openai (6.2.0)
       event_stream_parser (>= 0.3.0, < 1.0.0)
       faraday (>= 1)
@@ -104,11 +108,13 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
+    strscan (3.1.0)
     thor (1.2.2)
     unicode-display_width (2.5.0)
     uri (0.13.0)
 
 PLATFORMS
+  arm64-darwin-23
   ruby
 
 DEPENDENCIES
@@ -127,4 +133,4 @@ DEPENDENCIES
   uri (~> 0.13)
 
 BUNDLED WITH
-   2.3.16
+   2.5.17

data/README.md

@@ -16,11 +16,11 @@ gem 'mj'
 
 And then execute:
 
-    $ bundle install
+    bundle install
 
 Or install it yourself as:
 
-    $ gem install mj
+    gem install mj
 
 ## Usage
 
@@ -28,10 +28,21 @@ Or install it yourself as:
 mj help
 ```
 
+### Git
+
+```
+bundle exec mj git checkout partial-branch-name           # it will create a local branch if that is remote only
+bundle exec mj git checkout partial-branch-name --dry-run # if you want to see the command before executing
+```
+
+```
+
 ### ChatGPT
 
 ```
+
 bundle exec mj chatgpt ask "Who won the World Cup in 1994?" --request-file samples/chatgpt/football-team.yml | jq
+
 ```
 
 Where the config file looks like:
@@ -113,7 +124,6 @@ query QueryAccountUsers(
 }
 ```
 
-
 ### Alternative file
 
 Examples:
@@ -180,7 +190,6 @@ end
 
 This way I can use `<leader>a{direction}`, where `k` is `next`, and `j` is `previous` alternative file.
 
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -189,7 +198,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/mjacobus/mj. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/mjacobus/mj/blob/main/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at <https://github.com/mjacobus/mj>. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/mjacobus/mj/blob/main/CODE_OF_CONDUCT.md).
 
 ## License
 

data/lib/mj/alternative_file/resolver.rb

@@ -13,10 +13,8 @@ module Mj
 
       def resolve(file)
         file = AlternativeFile::CurrentFile.new(file.to_s)
-        resolved = []
-
-        @stack.each do |resolver|
-          resolved.push(resolver.resolve(file))
+        resolved = @stack.map do |resolver|
+          resolver.resolve(file)
         end
 
         AlternativeFile::Candidates.new(resolved.flatten.compact)

data/lib/mj/cli.rb

@@ -5,6 +5,7 @@ require_relative "version"
 require_relative "alternative_file/thor_command"
 require_relative "graphql/thor_command"
 require_relative "chatgpt/thor_command"
+require_relative "git/thor_command"
 
 module Mj
   class Cli < Thor
@@ -25,5 +26,8 @@ module Mj
 
     desc "chatgpt", "CLI client for ChatGPT"
     subcommand "chatgpt", ChatGpt::ThorCommand
+
+    desc "git", "Git utilities"
+    subcommand "git", Git::ThorCommand
   end
 end

data/lib/mj/git/branches.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require_relative "local_branch"
+require_relative "remote_branch"
+
+module Mj
+  module Git
+    class Branches
+      include Enumerable
+
+      def self.from_branch_names(branch_names)
+        branches = branch_names.map do |branch|
+          branch = branch.sub("*", "").strip
+
+          if branch.start_with?("remotes/")
+            next RemoteBranch.new(branch)
+          end
+
+          next LocalBranch.new(branch)
+        end
+
+        new(branches)
+      end
+
+      def to_local
+        self.class.new(map(&:to_local))
+      end
+
+      def uniq
+        branches = {}
+        each do |branch|
+          branches[branch.name] ||= branch
+        end
+
+        self.class.new(branches.values)
+      end
+
+      def initialize(branches)
+        @branches = branches
+      end
+
+      def each(&block)
+        @branches.each(&block)
+      end
+
+      def length
+        @branches.length
+      end
+
+      def matching(pattern)
+        self.class.new(@branches.select { |branch| branch.name.match?(pattern) })
+      end
+    end
+  end
+end

data/lib/mj/git/command_executer.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module Mj
+  module Git
+    class CommandExecuter
+      Error = Class.new(RuntimeError)
+
+      def execute(command)
+        stdout_str, stderr_str, status = Open3.capture3(command)
+
+        if status.success?
+          return stdout_str.split("\n")
+        end
+
+        raise Error, "Command '#{command}' exited with (#{status.exitstatus}): #{stderr_str.strip}"
+      end
+    end
+  end
+end

data/lib/mj/git/commands/checkout_command.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Mj
+  module Git
+    module Commands
+      class CheckoutCommand
+        attr_reader :branch
+
+        def initialize(branch:, options: {})
+          @branch = branch
+          @options = options
+        end
+
+        def dry_run?
+          @options[:dry_run]
+        end
+      end
+    end
+  end
+end

data/lib/mj/git/commands/checkout_command_handler.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require_relative "../branches"
+require "colorize"
+
+module Mj
+  module Git
+    module Commands
+      class CheckoutCommandHandler
+        def initialize(stdout:, command_executer: CommandExecuter.new)
+          @stdout = stdout
+          @command_executer = command_executer
+        end
+
+        def handle(command)
+          branches = @command_executer.execute("git branch -a")
+          branches = Git::Branches.from_branch_names(branches).matching(command.branch)
+
+          if branches.to_local.uniq.length > 1
+            warn_multiple_matches(branches)
+          end
+
+          winner = branches.min_by(&:length)
+
+          puts(winner.checkout_command, color: :green)
+
+          if command.dry_run?
+            return
+          end
+
+          @command_executer.execute(winner.checkout_command)
+        end
+
+        private
+
+        def warn_multiple_matches(branches)
+          puts("Multiple branches found:", color: :blue)
+
+          branches.each do |branch|
+            puts("\t#{branch.name}", color: :yellow)
+          end
+          puts("\n")
+        end
+
+        def puts(string, color: nil)
+          if color
+            string = string.colorize(color)
+          end
+
+          @stdout.puts(string)
+        end
+      end
+    end
+  end
+end

data/lib/mj/git/local_branch.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mj
+  module Git
+    class LocalBranch
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def length
+        @name.length
+      end
+
+      def checkout_command
+        "git checkout #{name}"
+      end
+
+      def to_local
+        self
+      end
+    end
+  end
+end

data/lib/mj/git/remote_branch.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Mj
+  module Git
+    class RemoteBranch
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def checkout_command
+        "git checkout -b #{local_branch_name} #{name}"
+      end
+
+      def length
+        @name.length
+      end
+
+      def to_local
+        LocalBranch.new(local_branch_name)
+      end
+
+      private
+
+      def local_branch_name
+        pattern = %r{^remotes/\w+/}
+        name.sub(pattern, "")
+      end
+    end
+  end
+end

data/lib/mj/git/thor_command.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "commands/checkout_command_handler"
+require_relative "commands/checkout_command"
+require_relative "command_executer"
+
+module Mj
+  module Git
+    class ThorCommand < Thor
+      desc "checkout <branch>", "Partial branch"
+      option :dry_run, type: :boolean, banner: "Just outputs, does not checkout", aliases: :d
+      def checkout(branch)
+        command = Commands::CheckoutCommand.new(branch: branch, options: options)
+        handler = Commands::CheckoutCommandHandler.new(stdout: $stdout)
+        handler.handle(command)
+      end
+    end
+  end
+end

data/lib/mj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mj
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/mj.gemspec

@@ -31,10 +31,12 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "colorize"
   spec.add_dependency "koine-rest_client"
   spec.add_dependency "mj-hash_utils"
   spec.add_dependency "ruby-openai", "~> 6.2.0"
   spec.add_dependency "thor", "~> 1.2.1"
+  spec.add_dependency "uri", "~> 0.13.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: koine-rest_client
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: uri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 description: A collection of useful commands for my personal use
 email:
 - marcelo.jacobus@gmail.com
@@ -105,6 +133,13 @@ files:
 - lib/mj/chatgpt/request.rb
 - lib/mj/chatgpt/thor_command.rb
 - lib/mj/cli.rb
+- lib/mj/git/branches.rb
+- lib/mj/git/command_executer.rb
+- lib/mj/git/commands/checkout_command.rb
+- lib/mj/git/commands/checkout_command_handler.rb
+- lib/mj/git/local_branch.rb
+- lib/mj/git/remote_branch.rb
+- lib/mj/git/thor_command.rb
 - lib/mj/graphql/client.rb
 - lib/mj/graphql/commands/query_file_command.rb
 - lib/mj/graphql/commands/query_file_command_handler.rb