pragmater 7.1.0 → 8.3.0

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: pragmater
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 8.3.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -28,247 +28,37 @@ cert_chain:
   2XV8FRa7/JimI07sPLC13eLY3xd/aYTi85Z782KIA4j0G8XEEWAX0ouBhlXPocZv
   QWc=
   -----END CERTIFICATE-----
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: runcom
+  name: refinements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.16'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: runcom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '6.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: climate_control
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: gemsmith
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '14.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '14.0'
-- !ruby/object:Gem::Dependency
-  name: git-cop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.79'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.79'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.37'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.37'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-description: 
+        version: '6.4'
+description:
 email:
 - brooke@alchemists.io
 executables:
@@ -282,12 +72,25 @@ files:
 - README.adoc
 - bin/pragmater
 - lib/pragmater.rb
-- lib/pragmater/cli.rb
-- lib/pragmater/commenter.rb
-- lib/pragmater/formatter.rb
+- lib/pragmater/cli/helper.rb
+- lib/pragmater/cli/options/assembler.rb
+- lib/pragmater/cli/options/configuration.rb
+- lib/pragmater/cli/options/core.rb
+- lib/pragmater/cli/options/defaults.yml
+- lib/pragmater/cli/options/insert_remove.rb
+- lib/pragmater/cli/options/merger.rb
+- lib/pragmater/cli/shell.rb
+- lib/pragmater/context.rb
+- lib/pragmater/formatters/general.rb
+- lib/pragmater/formatters/main.rb
+- lib/pragmater/formatters/shebang.rb
 - lib/pragmater/identity.rb
+- lib/pragmater/parsers/comments.rb
+- lib/pragmater/parsers/file.rb
+- lib/pragmater/processors/handler.rb
+- lib/pragmater/processors/inserter.rb
+- lib/pragmater/processors/remover.rb
 - lib/pragmater/runner.rb
-- lib/pragmater/writer.rb
 homepage: https://www.alchemists.io/projects/pragmater
 licenses:
 - Apache-2.0
@@ -296,7 +99,7 @@ metadata:
   changelog_uri: https://www.alchemists.io/projects/pragmater/changes.html
   documentation_uri: https://www.alchemists.io/projects/pragmater
   source_code_uri: https://github.com/bkuhlmann/pragmater
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.0
+signing_key:
 specification_version: 4
 summary: A command line interface for managing/formatting source file pragma comments.
 test_files: []

data/lib/pragmater/cli.rb

@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-
-require "pathname"
-require "thor"
-require "thor/actions"
-require "runcom"
-
-module Pragmater
-  # The Command Line Interface (CLI) for the gem.
-  class CLI < Thor
-    include Thor::Actions
-
-    package_name Identity::VERSION_LABEL
-
-    # rubocop:disable Metrics/MethodLength
-    def self.configuration
-      Runcom::Config.new "#{Identity::NAME}/configuration.yml",
-                         defaults: {
-                           add: {
-                             comments: "",
-                             includes: []
-                           },
-                           remove: {
-                             comments: "",
-                             includes: []
-                           }
-                         }
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    def initialize args = [], options = {}, config = {}
-      super args, options, config
-      @configuration = self.class.configuration
-    rescue Runcom::Errors::Base => error
-      abort error.message
-    end
-
-    desc "-a, [--add=PATH]", "Add comments to source file(s)."
-    map %w[-a --add] => :add
-    method_option :comments,
-                  aliases: "-c",
-                  desc: "Define desired comments",
-                  type: :array,
-                  default: configuration.to_h.dig(:add, :comments)
-    method_option :includes,
-                  aliases: "-i",
-                  desc: "Include specific files and/or directories",
-                  type: :array,
-                  default: configuration.to_h.dig(:add, :includes)
-    def add path = "."
-      settings = configuration.merge(
-        add: {comments: options.comments, includes: options.includes}
-      ).to_h
-
-      runner = Runner.new path,
-                          comments: settings.dig(:add, :comments),
-                          includes: settings.dig(:add, :includes)
-
-      runner.run(action: :add) { |file| say_status :info, "Processed: #{file}.", :green }
-    end
-
-    desc "-r, [--remove=PATH]", "Remove comments from source file(s)."
-    map %w[-r --remove] => :remove
-    method_option :comments,
-                  aliases: "-c",
-                  desc: "Define desired comments",
-                  type: :array,
-                  default: configuration.to_h.dig(:remove, :comments)
-    method_option :includes,
-                  aliases: "-i",
-                  desc: "Include specific files and/or directories",
-                  type: :array,
-                  default: configuration.to_h.dig(:remove, :includes)
-    def remove path = "."
-      settings = configuration.merge(
-        remove: {comments: options.comments, includes: options.includes}
-      ).to_h
-
-      runner = Runner.new path,
-                          comments: settings.dig(:remove, :comments),
-                          includes: settings.dig(:remove, :includes)
-
-      runner.run(action: :remove) { |file| say_status :info, "Processed: #{file}.", :green }
-    end
-
-    desc "-c, [--config]", "Manage gem configuration."
-    map %w[-c --config] => :config
-    method_option :edit,
-                  aliases: "-e",
-                  desc: "Edit gem configuration.",
-                  type: :boolean,
-                  default: false
-    method_option :info,
-                  aliases: "-i",
-                  desc: "Print gem configuration.",
-                  type: :boolean,
-                  default: false
-    def config
-      path = configuration.current
-
-      if options.edit? then `#{ENV["EDITOR"]} #{path}`
-      elsif options.info?
-        path ? say(path) : say("Configuration doesn't exist.")
-      else help :config
-      end
-    end
-
-    desc "-v, [--version]", "Show gem version."
-    map %w[-v --version] => :version
-    def version
-      say Identity::VERSION_LABEL
-    end
-
-    desc "-h, [--help=COMMAND]", "Show this message or get help for a command."
-    map %w[-h --help] => :help
-    def help task = nil
-      say and super
-    end
-
-    private
-
-    attr_reader :configuration
-  end
-end

data/lib/pragmater/commenter.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Pragmater
-  # Handles pragma comments.
-  class Commenter
-    def initialize older, newer, formatter: Formatter
-      @formatter = formatter
-      @older = format older
-      @newer = format newer
-    end
-
-    def add
-      older | newer
-    end
-
-    def remove
-      older - (older & newer)
-    end
-
-    private
-
-    attr_reader :older, :newer, :formatter
-
-    def filter comments
-      Array(comments).select { |comment| comment =~ formatter.valid_formats }
-    end
-
-    def format comments
-      filter(comments).map { |comment| formatter.new(comment).format }
-    end
-  end
-end