cnc 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3be381add3c7cd3bad3f2b21ee24c2a006b1fbd625176cf76ad3333f1f9f8cb
-  data.tar.gz: d05f5f8329249b522dea60146d1cc6cfc350a2bc101ceb40d4b1d7f17c369988
+  metadata.gz: 8459613ef49acef2ed7d23d7287ed2e0474837327ab06c4050575fac8e6e8f01
+  data.tar.gz: 5f16174cced2e0bb4cf898a955d7a75168fe804a07aea26e333e1ab9e8c95bb1
 SHA512:
-  metadata.gz: ce0b72c3899ec257fa214dc513c95aff713ecf6513243c2406acf531466ba7986e5e5722939e25cfe29c8f5a466c549dcb41521880a4b5a13722c4ee1564613e
-  data.tar.gz: db6223759d5c533d59f7324c23d87e64fec7356a1c7b1f7554330a5105f4b43d6261a0eae7bbdfd6b3fb96f65396d17e9e84e792fa09c5bf1de5e8bacd227d92
+  metadata.gz: 50138b9621ef1d7909b5bec0c408d11e4df2bc6eeae689e7a8a86523e121d1eb5bed8cdb8efa9d6e172d464ec72908965fef8b7142e4ee0c8d479a08fd4c5ea5
+  data.tar.gz: 486c616a3d8380af39a4c94d67a7d4450e4226e15feebacc46d2ef80c5a814a9ebca8782c8660b13a3a313a6399b211312fe9d6b0a45d9056bf0d10c62c90707

data/exe/cnc

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "dry/cli"
+require "cnc"
 
-require "cnc/cli/commands"
-
-Dry::CLI.new(CNC::CLI::Commands).call
+CNC::CLI.start

data/lib/cnc/cli.rb

@@ -0,0 +1,10 @@
+require "thor"
+
+module CNC
+  class CLI < Thor
+    desc "version", "Print version"
+    def version
+      puts VERSION
+    end
+  end
+end

data/lib/cnc/core_ext/module.rb

@@ -1,10 +1,14 @@
 class Module
   # Shorthand for `const_set(name.camelize, Class.new(parent) { ... })`.
   # Useful when defining classes in macros.
-  def define_class(name, parent = nil, &)
+  def define_class(name, parent = nil, **macros, &)
     name = name.to_s.camelize
     raise NameError, "class exists: #{name}" if const_defined?(name, false)
-    const_set name, Class.new(parent, &)
+    klass = Class.new(parent) do
+      macros.each {|key, value| send(key, *value) }
+      class_eval(&)
+    end
+    const_set name, klass
   end
 
   # Defines a constant of the given name using the given block if it doesn't

data/lib/cnc/version.rb

@@ -1,3 +1,3 @@
 module CNC
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

data/lib/cnc.rb

@@ -4,11 +4,14 @@ require "cnc/core_ext"
 require "cnc/version"
 
 loader = Zeitwerk::Loader.for_gem
-loader.inflector.inflect("cnc" => "CNC")
+loader.inflector.inflect("cnc" => "CNC", "cli" => "CLI")
+loader.ignore("#{__dir__}/cnc/core_ext.rb")
 loader.ignore("#{__dir__}/cnc/core_ext")
 loader.setup
 
-ActiveSupport::Inflector.inflections { _1.acronym "CNC" }
+ActiveSupport::Inflector.inflections do |i|
+  i.acronym "CNC"
+end
 
 module CNC
 end

data/rubocop.yml

@@ -85,7 +85,7 @@ Minitest/LifecycleHooksOrder: # new in 0.28
 Minitest/LiteralAsActualArgument: # new in 0.10
   Enabled: true
 Minitest/MultipleAssertions: # new in 0.10
-  Enabled: true
+  Enabled: false
 Minitest/NonExecutableTestMethod: # new in 0.34
   Enabled: true
 Minitest/NonPublicTestMethod: # new in 0.27

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnc
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Jeff Peterson
@@ -80,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-cli
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -120,7 +120,7 @@ files:
 - Rakefile
 - exe/cnc
 - lib/cnc.rb
-- lib/cnc/cli/commands.rb
+- lib/cnc/cli.rb
 - lib/cnc/core_ext.rb
 - lib/cnc/core_ext/hash.rb
 - lib/cnc/core_ext/module.rb

data/lib/cnc/cli/commands.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require "cnc/version"
-
-module CNC
-  module CLI
-    module Commands
-      extend Dry::CLI::Registry
-
-      class Command < Dry::CLI::Command; end
-
-      class Version < Command
-        desc "Print version"
-
-        def call(*)
-          puts VERSION
-        end
-      end
-
-      register "version", Version, aliases: %w[v -v --version]
-    end
-  end
-end