rfix 2.0.4 → 3.0.0

data/lib/rfix/types.rb

@@ -2,6 +2,8 @@
 
 require "dry/types"
 require "dry/logic"
+require "pathname"
+require "rugged"
 
 module Rfix
   module Types
@@ -28,25 +30,33 @@ module Rfix
 
       List = Array(Symbol)
 
-      WorkTreeDeleted = List.constrained(includes: :worktree_deleted)
-      DeletedOther = List.constrained(includes: :deleted)
-      Deleted = WorkTreeDeleted.or(DeletedOther)
+      Deleted = %i[deleted worktree_deleted].map do |status|
+        List.constrained(includes: status)
+      end.reduce(:|)
 
-      module IgnoredType
-        Ignored = List.constrained(includes: :ignored)
-        Unmodified = List.constrained(includes: :unmodified)
-      end
+      Ignored = %i[ignored unmodified].map do |status|
+        List.constrained(includes: status)
+      end.reduce(:|)
 
-      Ignored = IgnoredType::Ignored.or(IgnoredType::Unmodified).and(Deleted.not)
+      Untracked = %i[untracked index_new worktree_new].map do |status|
+        List.constrained(includes: status)
+      end.reduce(:|)
 
-      module Staged
-        Tree = List.constrained(includes: :worktree_new)
-        Index = List.constrained(includes: :index_new)
-      end
+      Tracked = List << (Deleted | Ignored | Untracked).not
+    end
+
+    Dry::Logic::Predicates.predicate(:truthy?) do |attribute, input|
+      !!input.public_send(attribute)
+    rescue NoMethodError
+      false
+    end
 
-      Untracked = Staged::Tree.or(Staged::Index).and(Ignored.not)
-      Tracked = Untracked.not
+    module Path
+      include Dry::Types()
 
+      Pathname = Constructor(Pathname) << (String | Instance(Pathname))
+      Absolute = Pathname.constrained(truthy: :absolute?)
+      Relative = Pathname.constrained(truthy: :relative?)
     end
   end
 end

data/lib/rfix/version.rb

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

data/rfix.gemspec

@@ -2,6 +2,8 @@
 
 require_relative "lib/rfix/version"
 
+$LOAD_PATH.unshift Pathname(__dir__).join("vendor").to_s
+
 Gem::Specification.new do |spec|
   spec.name          = "rfix"
   spec.version       = Rfix::VERSION
@@ -20,14 +22,15 @@ Gem::Specification.new do |spec|
   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.metadata["homepage_uri"] = spec.homepage
+  spec.executables << "rfix"
 
   spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "bootsnap"
   spec.add_runtime_dependency "bundler"
+  spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "dry-cli"
   spec.add_runtime_dependency "dry-core"
   spec.add_runtime_dependency "dry-initializer"
@@ -38,12 +41,17 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rake"
   spec.add_runtime_dependency "rouge", "~> 3.20"
   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 "strings-ansi"
   spec.add_runtime_dependency "tty-box"
   spec.add_runtime_dependency "tty-link"
+  spec.add_runtime_dependency "tty-logger"
+  spec.add_runtime_dependency "tty-progressbar"
   spec.add_runtime_dependency "tty-prompt"
   spec.add_runtime_dependency "tty-screen"
+  spec.add_runtime_dependency "tty-table"
+  spec.add_runtime_dependency "tty-tree"
+  spec.add_runtime_dependency "xdg"
   spec.add_runtime_dependency "zeitwerk"
 end

data/vendor/cli-ui/Gemfile

@@ -0,0 +1,17 @@
+# NOTE: These are development-only dependencies
+source 'https://rubygems.org'
+
+gemspec
+
+group :development, :test do
+  gem 'rubocop'
+  gem 'rubocop-shopify'
+  gem 'byebug', platforms: [:mri]
+  gem 'method_source'
+end
+
+group :test do
+  gem 'mocha', require: false
+  gem 'minitest', '>= 5.0.0', require: false
+  gem 'minitest-reporters', require: false
+end

data/vendor/cli-ui/Gemfile.lock

@@ -0,0 +1,60 @@
+PATH
+  remote: .
+  specs:
+    cli-ui (1.5.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    byebug (11.1.3)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    minitest-reporters (1.4.3)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mocha (1.12.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.12.1)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-shopify (2.0.1)
+      rubocop (~> 1.11)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  byebug
+  cli-ui!
+  method_source
+  minitest (>= 5.0.0)
+  minitest-reporters
+  mocha
+  rake (~> 13.0)
+  rubocop
+  rubocop-shopify
+
+BUNDLED WITH
+   2.1.0

data/vendor/cli-ui/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Burke Libbey
+
+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.

data/vendor/cli-ui/README.md

@@ -0,0 +1,224 @@
+CLI UI
+---
+
+CLI UI is a small framework for generating nice command-line user interfaces
+
+- [Master Documentation](http://www.rubydoc.info/github/Shopify/cli-ui/master/CLI/UI)
+- [Documentation of the Rubygems version](http://www.rubydoc.info/gems/cli-ui/)
+- [Rubygems](https://rubygems.org/gems/cli-ui)
+
+## Installation
+
+```bash
+gem install cli-ui
+```
+
+or add the following to your Gemfile:
+
+```ruby
+gem 'cli-ui'
+```
+
+In your code, simply add a `require 'cli/ui'`. Most options assume `CLI::UI::StdoutRouter.enable` has been called.
+
+## Features
+
+This may not be an exhaustive list. Please check our [documentation](http://www.rubydoc.info/github/Shopify/cli-ui/master/CLI/UI) for more information.
+
+---
+
+### Nested framing
+To handle content flow (see example below)
+
+```ruby
+CLI::UI::StdoutRouter.enable
+CLI::UI::Frame.open('Frame 1') do
+  CLI::UI::Frame.open('Frame 2') { puts "inside frame 2" }
+  puts "inside frame 1"
+end
+```
+
+![Nested Framing](https://user-images.githubusercontent.com/3074765/33799861-cb5dcb5c-dd01-11e7-977e-6fad38cee08c.png)
+
+---
+
+### Interactive Prompts
+Prompt user with options and ask them to choose. Can answer using arrow keys, vim bindings (`j`/`k`), or numbers  (or y/n for yes/no questions).
+
+For large numbers of options, using `e`, `:`, or `G` will toggle "line select" mode which allows numbers greater than 9 to be typed and
+`f` or `/` will allow the user to filter options using a free-form text input.
+
+```ruby
+CLI::UI.ask('What language/framework do you use?', options: %w(rails go ruby python))
+```
+
+Can also assign callbacks to each option
+
+```ruby
+CLI::UI::Prompt.ask('What language/framework do you use?') do |handler|
+  handler.option('rails')  { |selection| selection }
+  handler.option('go')     { |selection| selection }
+  handler.option('ruby')   { |selection| selection }
+  handler.option('python') { |selection| selection }
+end
+```
+
+* Note that the two examples provided above are identical in functionality
+
+![Interactive Prompt](https://user-images.githubusercontent.com/3074765/33797984-0ebb5e64-dcdf-11e7-9e7e-7204f279cece.gif)
+
+---
+
+### Free form text prompts
+
+```ruby
+CLI::UI.ask('Is CLI UI Awesome?', default: 'It is great!')
+```
+
+  ![Free form text prompt](https://user-images.githubusercontent.com/3074765/33799822-47f23302-dd01-11e7-82f3-9072a5a5f611.png)
+
+---
+
+### Spinner groups
+Handle many multi-threaded processes while suppressing output unless there is an issue. Can update title to show state.
+
+```ruby
+spin_group = CLI::UI::SpinGroup.new
+spin_group.add('Title')   { |spinner| sleep 3.0 }
+spin_group.add('Title 2') { |spinner| sleep 3.0; spinner.update_title('New Title'); sleep 3.0 }
+spin_group.wait
+```
+
+![Spinner Group](https://user-images.githubusercontent.com/3074765/33798295-d94fd822-dce3-11e7-819b-43e5502d490e.gif)
+
+---
+
+### Text Color formatting
+e.g. `{{red:Red}} {{green:Green}}`
+
+```ruby
+puts CLI::UI.fmt "{{red:Red}} {{green:Green}}"
+```
+
+![Text Format](https://user-images.githubusercontent.com/3074765/33799827-6d0721a2-dd01-11e7-9ab5-c3d455264afe.png)
+
+---
+
+### Symbol/Glyph Formatting
+e.g. `{{*}}` => a yellow ⭑
+
+```ruby
+puts CLI::UI.fmt "{{*}} {{v}} {{?}} {{x}}"
+```
+
+![Symbol Formatting](https://user-images.githubusercontent.com/3074765/33799847-9ec03fd0-dd01-11e7-93f7-5f5cc540e61e.png)
+
+---
+
+### Status Widget
+
+```ruby
+CLI::UI::Spinner.spin("building packages: {{@widget/status:1:2:3:4}}") do |spinner|
+  # spinner.update_title(...)
+  sleep(3)
+end
+```
+
+![Status Widget](https://user-images.githubusercontent.com/1284/61405142-11042580-a8a7-11e9-9885-46ba44c46358.gif)
+
+---
+
+### Progress Bar
+
+Show progress of a process or operation.
+
+```ruby
+CLI::UI::Progress.progress do |bar|
+  100.times do
+    bar.tick
+  end
+end
+```
+
+![Progress Bar](https://user-images.githubusercontent.com/3074765/33799794-cc4c940e-dd00-11e7-9bdc-90f77ec9167c.gif)
+
+---
+
+### Frame Styles
+
+Modify the appearance of CLI::UI both globally and on an individual frame level.
+
+To set the default style:
+
+```ruby
+CLI::UI.frame_style = :box
+```
+
+To style an individual frame:
+
+```ruby
+CLI::UI.frame('New Style!', frame_style: :bracket) { puts 'It's pretty cool!' }
+```
+
+The default style - `:box` - is what has been used up until now.  The other style - `:bracket` - looks like this:
+
+```ruby
+CLI::UI.frame_style = :bracket
+CLI::UI::StdoutRouter.enable
+CLI::UI::Frame.open('Frame 1') do
+  CLI::UI::Frame.open('Frame 2') { puts "inside frame 2" }
+  puts "inside frame 1"
+end
+```
+
+![Frame Style](https://user-images.githubusercontent.com/315948/65287373-9a82de80-db08-11e9-94fb-20f4b7561c07.png)
+
+---
+
+## Example Usage
+
+The following code makes use of nested-framing, multi-threaded spinners, formatted text, and more.
+
+```ruby
+require 'cli/ui'
+
+CLI::UI::StdoutRouter.enable
+
+CLI::UI::Frame.open('{{*}} {{bold:a}}', color: :green) do
+  CLI::UI::Frame.open('{{i}} b', color: :magenta) do
+    CLI::UI::Frame.open('{{?}} c', color: :cyan) do
+      sg = CLI::UI::SpinGroup.new
+      sg.add('wow') do |spinner|
+        sleep(2.5)
+        spinner.update_title('second round!')
+        sleep (1.0)
+      end
+      sg.add('such spin') { sleep(1.6) }
+      sg.add('many glyph') { sleep(2.0) }
+      sg.wait
+    end
+  end
+  CLI::UI::Frame.divider('{{v}} lol')
+  puts CLI::UI.fmt '{{info:words}} {{red:oh no!}} {{green:success!}}'
+  sg = CLI::UI::SpinGroup.new
+  sg.add('more spins') { sleep(0.5) ; raise 'oh no' }
+  sg.wait
+end
+```
+
+Output:
+
+![Example Output](https://user-images.githubusercontent.com/3074765/33797758-7a54c7cc-dcdb-11e7-918e-a47c9689f068.gif)
+
+## Development
+
+- Run tests using `bundle exec rake test`. All code should be tested.
+- No code, outside of development and tests needs, should use dependencies. This is a self contained library
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/Shopify/cli-ui.
+
+## License
+
+The code is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/vendor/cli-ui/Rakefile

@@ -0,0 +1,20 @@
+$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
+require 'cli/ui'
+require 'rake/testtask'
+require 'rubocop/rake_task'
+require 'bundler/gem_tasks'
+
+TEST_ROOT = File.expand_path('../test', __FILE__)
+
+Rake::TestTask.new do |t|
+  t.libs += ['test']
+  t.test_files = FileList[File.join(TEST_ROOT, '**', '*_test.rb')]
+  t.verbose = false
+  t.warning = false
+end
+
+RuboCop::RakeTask.new(:style) do |t|
+  t.options = ['--display-cop-names']
+end
+
+task(default: [:test, :style])