rfix 1.4.1 → 2.0.0

data/lib/rfix/types.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "dry/types"
+require "dry/logic"
+
+module Rfix
+  module Types
+    include Dry::Types()
+    include Dry::Logic
+
+    Rugged = Instance(::Rugged::Repository)
+    Constrained = Dry::Types::Constrained
+
+    Dry::Types.define_builder(:not) do |type|
+      Constrained.new(type.lax, rule: Operations::Negation.new(type.rule))
+    end
+
+    Dry::Types.define_builder(:and) do |left, right|
+      Constrained.new(left.lax << right.lax, rule: left.rule & right.rule)
+    end
+
+    Dry::Types.define_builder(:or) do |left, right|
+      Constrained.new(left.lax << right.lax, rule: left.rule | right.rule)
+    end
+
+    module Status
+      include Dry::Types()
+
+      List = Array(Symbol)
+
+      WorkTreeDeleted = List.constrained(includes: :worktree_deleted)
+      DeletedOther = List.constrained(includes: :deleted)
+      Deleted = WorkTreeDeleted.or(DeletedOther)
+
+      module IgnoredType
+        Ignored = List.constrained(includes: :ignored)
+        Unmodified = List.constrained(includes: :unmodified)
+      end
+
+      Ignored = IgnoredType::Ignored.or(IgnoredType::Unmodified).and(Deleted.not)
+
+      module Staged
+        Tree = List.constrained(includes: :worktree_new)
+        Index = List.constrained(includes: :index_new)
+      end
+
+      Untracked = Staged::Tree.or(Staged::Index).and(Ignored.not)
+      Tracked = Untracked.not
+
+    end
+  end
+end

data/lib/rfix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfix
-  VERSION = "1.4.1"
+  VERSION = "2.0.0"
 end

data/rfix.gemspec

@@ -1,59 +1,49 @@
 # frozen_string_literal: true
 
-require "pathname"
 require_relative "lib/rfix/version"
-# require_relative "lib/rfix/gem_helper"
 
 Gem::Specification.new do |spec|
   spec.name          = "rfix"
-  spec.version = Rfix::VERSION
+  spec.version       = Rfix::VERSION
   spec.authors       = ["Linus Oleander"]
   spec.email         = ["linus@oleander.nu"]
-  # rubocop:disable Layout/LineLength
   spec.summary       = "RuboCop CLI that only lints and auto-fixes code you committed by utilizing `git-log` and `git-diff`"
-  # rubocop:enable Layout/LineLength
-
-  spec.description   = <<~TEXT
+  spec.description = <<~TEXT
     RuboCop CLI that only lints and auto-fixes code you committed by utilizing `git-log` and `git-diff`. Rfix CLI makes it possible to lint (`rfix lint`) and auto-fix (`rfix local|origin|branch`) code changes since a certain point in history. You can auto-fix code committed since creating the current branch (`rfix origin`) or since pushing to upstream (`rfix local`).
 
     Includes a RuboCop formatter with syntax highlighting and build in hyperlinks for offense documentation.
 
     Holds the same CLI arguments as RuboCop. Run `rfix --help` for a complete list or `rfix` for supported commands.
   TEXT
-  spec.homepage      = "https://github.com/oleander/rfix-rb"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  # 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 added into git.
-  validate_file = ->(f) { f.match(%r{^(test|spec|features)/}) }
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject(&validate_file)
-  end
 
-  spec.files += Dir.glob("vendor/shopify/cli-ui/lib/**/*").reject(&validate_file)
+  spec.homepage              = "https://github.com/oleander/rfix-rb"
+  spec.license               = "MIT"
+  spec.required_ruby_version = ">= 2.6"
+  spec.files                 = Dir["lib/**/*", "exe/rfix", "vendor/**/*", "rfix.gemspec"]
+  spec.executables << "rfix"
+  spec.bindir = "exe"
+  spec.requirements << "git >= 2"
 
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib", "vendor/shopify/cli-ui/lib"]
-
-  spec.requirements << "git, v2.0+"
+  spec.metadata["homepage_uri"] = spec.homepage
 
-  spec.add_runtime_dependency "cri", "~> 2.15.10"
-  spec.add_runtime_dependency "dry-core", "~> 0.5.0"
-  spec.add_runtime_dependency "listen", "~> 3.0"
+  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "bundler"
+  spec.add_runtime_dependency "dry-cli"
+  spec.add_runtime_dependency "dry-core"
+  spec.add_runtime_dependency "dry-initializer"
+  spec.add_runtime_dependency "dry-struct"
+  spec.add_runtime_dependency "dry-types"
+  spec.add_runtime_dependency "pastel"
   spec.add_runtime_dependency "rainbow", "~> 3.0"
-  spec.add_runtime_dependency "require_all", "~> 3.0.0"
+  spec.add_runtime_dependency "rake"
   spec.add_runtime_dependency "rouge", "~> 3.20"
-  spec.add_runtime_dependency "rubocop", ">= 0.80", "< 0.90"
-  spec.add_runtime_dependency "rugged", "~> 1.0.0"
-
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-its", "~> 1.3.0"
-  spec.add_development_dependency "aruba", "~> 1.0"
-  spec.add_development_dependency "colorize", "~> 0.8.1"
-  spec.add_development_dependency "git", "~> 1.7.0"
-  spec.add_development_dependency "pry", "~> 0.13.1"
-  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_runtime_dependency "rubocop", ">= 0.82.0", "!= 0.85.0"
+  spec.add_runtime_dependency "rubocop-ast"
+  spec.add_runtime_dependency "rugged"
+  spec.add_runtime_dependency "strings"
+  spec.add_runtime_dependency "tty-box"
+  spec.add_runtime_dependency "tty-link"
+  spec.add_runtime_dependency "tty-prompt"
+  spec.add_runtime_dependency "tty-screen"
+  spec.add_runtime_dependency "zeitwerk"
 end

data/vendor/dry-cli/CHANGELOG.md

@@ -0,0 +1,191 @@
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+## 0.6.0 2020-03-06
+
+
+### Added
+
+- [Ivan Shamatov] Ability to pass command along with registry (for a singular command case)
+- [Nikita Shilnikov] [Internal] Backported ability to run gem's CI against ruby 2.3
+- [Ivan Shamatov] Inline syntax for commands
+- [Ivan Shamatov] Introduced stderr to any diagnostic output
+
+### Fixed
+
+- [John Ledbetter & Luca Guidi] Fix ruby 2.7 warnings
+- [Ivan Shamatov] Fix banner, when option is a type of Array
+
+
+[Compare v0.5.1...v0.6.0](https://github.com/dry-rb/dry-cli/compare/v0.5.1...v0.6.0)
+
+## 0.5.1 2020-01-23
+
+
+### Added
+
+- [Ivan Shamatov] Anonymous Registry sintax
+- [Ivan Shamatov] [Internal] Specs refactored, more unit specs added
+- [Luca Guidi] [Internal] removed `dry-inflector` as runtime dependency
+- [Ivan Shamatov] [Internal] Refactored Command class (command_name property removed)
+- [Piotr Solnica, Luca Guidi, Nikita Shilnikov & Christian Georgii] [Internal] Adapt gem to dry-rb style
+
+### Fixed
+
+- [Piotr Solnica] Added missing 'set' require
+
+
+[Compare v0.5.0...v0.5.1](https://github.com/dry-rb/dry-cli/compare/v0.5.0...v0.5.1)
+
+## 0.5.0 2019-12-21
+
+
+### Added
+
+- [Ivan Shamatov, Piotr Solnica, Luca Guidi] [Internal] removed runtime and development dependency against `hanami-utils`
+
+
+[Compare v0.4.0...v0.5.0](https://github.com/dry-rb/dry-cli/compare/v0.4.0...v0.5.0)
+
+## 0.4.0 2019-12-10
+
+
+### Added
+
+- [Ivan Shamatov, Piotr Solnica, Luca Guidi] `hanami-cli` => `dry-cli`
+
+
+[Compare v0.3.1...v0.4.0](https://github.com/dry-rb/dry-cli/compare/v0.3.1...v0.4.0)
+
+## 0.3.1 2019-01-18
+
+
+### Added
+
+- [Luca Guidi] Official support for Ruby: MRI 2.6
+- [Luca Guidi] Support `bundler` 2.0+
+
+
+[Compare v0.3.0...v0.3.1](https://github.com/dry-rb/dry-cli/compare/v0.3.0...v0.3.1)
+
+## 0.3.0 2018-10-24
+
+
+
+[Compare v0.3.0.beta1...v0.3.0](https://github.com/dry-rb/dry-cli/compare/v0.3.0.beta1...v0.3.0)
+
+## 0.3.0.beta1 2018-08-08
+
+
+### Added
+
+- [Anton Davydov & Alfonso Uceda] Introduce array type for arguments (`foo exec test spec/bookshelf/entities spec/bookshelf/repositories`)
+- [Anton Davydov & Alfonso Uceda] Introduce array type for options (`foo generate config --apps=web,api`)
+- [Alfonso Uceda] Introduce variadic arguments (`foo run ruby:latest -- ruby -v`)
+- [Luca Guidi] Official support for JRuby 9.2.0.0
+
+### Fixed
+
+- [Anton Davydov] Print informative message when unknown or wrong option is passed (`"test" was called with arguments "--framework=unknown"`)
+
+
+[Compare v0.2.0...v0.3.0.beta1](https://github.com/dry-rb/dry-cli/compare/v0.2.0...v0.3.0.beta1)
+
+## 0.2.0 2018-04-11
+
+
+
+[Compare v0.2.0.rc2...v0.2.0](https://github.com/dry-rb/dry-cli/compare/v0.2.0.rc2...v0.2.0)
+
+## 0.2.0.rc2 2018-04-06
+
+
+
+[Compare v0.2.0.rc1...v0.2.0.rc2](https://github.com/dry-rb/dry-cli/compare/v0.2.0.rc1...v0.2.0.rc2)
+
+## 0.2.0.rc1 2018-03-30
+
+
+
+[Compare v0.2.0.beta2...v0.2.0.rc1](https://github.com/dry-rb/dry-cli/compare/v0.2.0.beta2...v0.2.0.rc1)
+
+## 0.2.0.beta2 2018-03-23
+
+
+### Added
+
+- [Anton Davydov & Luca Guidi] Support objects as callbacks
+
+### Fixed
+
+- [Anton Davydov & Luca Guidi] Ensure callbacks' context of execution (aka `self`) to be the command that is being executed
+
+
+[Compare v0.2.0.beta1...v0.2.0.beta2](https://github.com/dry-rb/dry-cli/compare/v0.2.0.beta1...v0.2.0.beta2)
+
+## 0.2.0.beta1 2018-02-28
+
+
+### Added
+
+- [Anton Davydov] Register `before`/`after` callbacks for commands
+
+
+[Compare v0.1.1...v0.2.0.beta1](https://github.com/dry-rb/dry-cli/compare/v0.1.1...v0.2.0.beta1)
+
+## 0.1.1 2018-02-27
+
+
+### Added
+
+- [Luca Guidi] Official support for Ruby: MRI 2.5
+
+### Fixed
+
+- [Alfonso Uceda] Ensure default values for arguments to be sent to commands
+- [Alfonso Uceda] Ensure to fail when a missing required argument isn't provider, but an option is provided instead
+
+
+[Compare v0.1.0...v0.1.1](https://github.com/dry-rb/dry-cli/compare/v0.1.0...v0.1.1)
+
+## 0.1.0 2017-10-25
+
+
+
+[Compare v0.1.0.rc1...v0.1.0](https://github.com/dry-rb/dry-cli/compare/v0.1.0.rc1...v0.1.0)
+
+## 0.1.0.rc1 2017-10-16
+
+
+
+[Compare v0.1.0.beta3...v0.1.0.rc1](https://github.com/dry-rb/dry-cli/compare/v0.1.0.beta3...v0.1.0.rc1)
+
+## 0.1.0.beta3 2017-10-04
+
+
+
+[Compare v0.1.0.beta2...v0.1.0.beta3](https://github.com/dry-rb/dry-cli/compare/v0.1.0.beta2...v0.1.0.beta3)
+
+## 0.1.0.beta2 2017-10-03
+
+
+### Added
+
+-  [Alfonso Uceda] Allow default value for arguments
+
+
+[Compare v0.1.0.beta1...v0.1.0.beta2](https://github.com/dry-rb/dry-cli/compare/v0.1.0.beta1...v0.1.0.beta2)
+
+## 0.1.0.beta1 2017-08-11
+
+
+### Added
+
+-  [Alfonso Uceda, Luca Guidi] Commands banner and usage
+-  [Alfonso Uceda] Added support for subcommands
+- [Alfonso Uceda] Validations for arguments and options
+- [Alfonso Uceda] Commands arguments and options
+- [Alfonso Uceda] Commands description
+- [Alfonso Uceda, Oana Sipos] Commands aliases
+- [Luca Guidi] Exit on unknown command
+- [Luca Guidi, Alfonso Uceda, Oana Sipos] Command lookup
+- [Luca Guidi, Tim Riley] Trie based registry to register commands and allow third-parties to override/add commands

data/vendor/dry-cli/CODEOWNERS

@@ -0,0 +1 @@
+* @solnic

data/vendor/dry-cli/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.4.0, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct)

data/vendor/dry-cli/CONTRIBUTING.md

@@ -0,0 +1,29 @@
+# Issue Guidelines
+
+## Reporting bugs
+
+If you found a bug, report an issue and describe what's the expected behavior versus what actually happens. If the bug causes a crash, attach a full backtrace. If possible, a reproduction script showing the problem is highly appreciated.
+
+## Reporting feature requests
+
+Report a feature request **only after discussing it first on [discourse.dry-rb.org](https://discourse.dry-rb.org)** where it was accepted. Please provide a concise description of the feature.
+
+## Reporting questions, support requests, ideas, concerns etc.
+
+**PLEASE DON'T** - use [discourse.dry-rb.org](http://discourse.dry-rb.org) instead.
+
+# Pull Request Guidelines
+
+A Pull Request will only be accepted if it addresses a specific issue that was reported previously, or fixes typos, mistakes in documentation etc.
+
+Other requirements:
+
+1) Do not open a pull request if you can't provide tests along with it. If you have problems writing tests, ask for help in the related issue.
+2) Follow the style conventions of the surrounding code. In most cases, this is standard ruby style.
+3) Add API documentation if it's a new feature
+4) Update API documentation if it changes an existing feature
+5) Bonus points for sending a PR which updates user documentation in the `docsite` directory
+
+# Asking for help
+
+If these guidelines aren't helpful, and you're stuck, please post a message on [discourse.dry-rb.org](https://discourse.dry-rb.org).

data/vendor/dry-cli/Gemfile

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+eval_gemfile "Gemfile.devtools"
+
+gemspec
+
+gem "backports", "~> 3.15.0", require: false
+
+unless ENV["CI"]
+  gem "byebug", require: false, platforms: :mri
+  gem "yard",   require: false
+end

data/vendor/dry-cli/Gemfile.devtools

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# this file is managed by dry-rb/devtools project
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+group :test do
+  gem "simplecov", require: false, platforms: :ruby
+  gem "simplecov-cobertura", require: false, platforms: :ruby
+  gem "rexml", require: false
+
+  gem "warning" if RUBY_VERSION >= "2.4.0"
+end
+
+group :tools do
+  # this is the same version that we use on codacy
+  gem "rubocop", "~> 1.12"
+end

data/vendor/dry-cli/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2021 dry-rb team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.