lux-hammer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17ad95331316a0cd95554605d58b2a7dce64f9db9d6adc997b34cf5f3b1e2b1a
-  data.tar.gz: 633ad47b777e68b848f11552e5345d5b468e01a0fa27a273dc6551aac7d18af1
+  metadata.gz: 9b973a2becedf10ed4247fce46d195f07619c6f6b9bf56f41464b57764733716
+  data.tar.gz: a1ffdc8fa9b19f47599a3e930181fa1972095872db4f92740308cf393090bfcd
 SHA512:
-  metadata.gz: '0568fccc6f143b0671166a08c1853a3f682bf2c4c5488791fa7d46e1c4d8b3cc311ae29a016e9cf9a93f2cc31a577a551af72f0f4754cc9e9bd3adb66c5f6731'
-  data.tar.gz: bf5e04d1e37e50f138c7c14079b889018f85bda195dad8676df4f634a37fe62414a1511a451aacb08f1e0860651426d8a7bca78cf3bad35b1fbf3dc137423438
+  metadata.gz: 55e093ed6cc2ed08349fdfd9296360153b2d0cb4763b57546e4e9453657e0da7e74608179b70946d6600499624b0cac1c57017208a91143d3eba6917a1cef976
+  data.tar.gz: 3401f9c5defba4419e40c571cfcab4869ceb408dbcf8a88d9bab98aea2760ad810ceee02feaa31f78b661849e88b1ecb7c5e63ad3e930ed3baa371637d15f20b

data/.version

@@ -1 +1 @@
-0.2.1
+0.2.2

data/README.md

@@ -844,18 +844,18 @@ end
 
 ```sh
 $ hammer
-Usage: demo COMMAND [ARGS]
+Usage: hammer COMMAND [ARGS]
 
 Commands:
-  demo build               # Build the project
-  demo deploy (alt: ship)  # Deploy to URL
+  hammer build               # Build the project
+  hammer deploy (alt: ship)  # Deploy to URL
 
 db:
-  demo db:migrate (alt: m)  # Run pending migrations
+  hammer db:migrate (alt: m)  # Run pending migrations
 
 db:users:
-  demo db:users:list       # List users
-  demo db:users:create     # Create a user
+  hammer db:users:list       # List users
+  hammer db:users:create     # Create a user
 
 $ hammer build prod -v
 building prod
@@ -872,17 +872,17 @@ $ hammer db:users:create --email=dino@example.com --admin
 create dino@example.com admin=true
 
 $ hammer db                  # bare namespace shows its contents
-Usage: demo db:COMMAND [ARGS]
+Usage: hammer db:COMMAND [ARGS]
 
 Commands:
-  demo db:migrate (alt: m)  # Run pending migrations
+  hammer db:migrate (alt: m)  # Run pending migrations
 
 users:
-  demo db:users:list        # List users
-  demo db:users:create      # Create a user
+  hammer db:users:list        # List users
+  hammer db:users:create      # Create a user
 
 $ hammer db:users:create -h
-Usage: demo db:users:create EMAIL [OPTIONS]
+Usage: hammer db:users:create EMAIL [OPTIONS]
   Create a user
 
 Options:

data/lib/hammer/builder.rb

@@ -7,10 +7,6 @@ class Hammer
       @klass = klass
     end
 
-    def program(name)
-      @klass.program_name(name)
-    end
-
     def define(name, &block)
       @klass.define(name, &block)
     end

data/lib/lux-hammer.rb

@@ -11,8 +11,6 @@ require_relative 'hammer/command_builder'
 # Class DSL:
 #
 #   class MyCli < Hammer
-#     program_name 'mycli'
-#
 #     define :build do
 #       desc    'Build the project'
 #       example 'build -v --env=prod'
@@ -29,7 +27,6 @@ require_relative 'hammer/command_builder'
 # Block DSL is identical, just inside `Hammer.run`:
 #
 #   Hammer.run(ARGV) do
-#     program 'inline'
 #     define :hello do
 #       desc 'Greet someone'
 #       opt :loud, type: :boolean, alias: :l
@@ -101,15 +98,17 @@ class Hammer
       @pending_needs    = []
     end
 
-    def program_name(name = nil)
-      @program_name = name if name
-      @program_name || default_program_name
+    # Resolved lazily on first read and memoized, so callers that need the
+    # cwd-relative form (see `default_program_name`) can warm the cache
+    # before chdir-ing elsewhere.
+    def program_name
+      @program_name ||= default_program_name
     end
 
-    # Default shown in help/usage when `program_name` is not set:
-    # the invocation path relative to cwd if the script lives inside it
-    # (e.g. `bin/foo` when invoked from the project root), otherwise the
-    # basename (e.g. `lux` for a globally installed bin in PATH).
+    # Program name shown in help/usage: the invocation path relative to cwd
+    # if the script lives inside it (e.g. `bin/foo` when invoked from the
+    # project root), otherwise the basename (e.g. `lux` for a globally
+    # installed bin in PATH).
     def default_program_name
       prog = $PROGRAM_NAME
       return File.basename(prog) unless prog.include?('/')
@@ -159,8 +158,8 @@ class Hammer
     end
 
     # Open a namespace (group of commands). Everything inside the block
-    # (define, nested namespace, program_name override, ...) belongs to
-    # that namespace, evaluated against an anonymous Hammer subclass.
+    # (define, nested namespace, ...) belongs to that namespace, evaluated
+    # against an anonymous Hammer subclass.
     #
     #   namespace :db do
     #     define :migrate do ... end
@@ -175,9 +174,10 @@ class Hammer
       # Parent link, so `before` hooks defined further up the namespace
       # tree can be collected and run outer -> inner before a command.
       sub.instance_variable_set(:@parent, self)
-      # Inherit program_name so help banners show "myapp ns:cmd", not
-      # whichever binary the namespace class fell back to.
-      sub.program_name(program_name) if @program_name
+      # Share the parent's resolved program_name so help banners show
+      # "myapp ns:cmd" with the same prefix everywhere - and so the value
+      # captured pre-chdir (see `Hammer.cli`) survives into nested classes.
+      sub.instance_variable_set(:@program_name, program_name)
       sub.class_eval(&block) if block
       @namespaces[name.to_s] = sub
     end
@@ -548,8 +548,8 @@ class Hammer
 
   # ----- block DSL -----------------------------------------------------
 
-  # Define and run a CLI inline. Inside the block use `program`,
-  # `define :name do ... end`, and `namespace`.
+  # Define and run a CLI inline. Inside the block use
+  # `define :name do ... end`, `namespace`, and `load`.
   #
   # Without a block: load ./Hammerfile if it exists, otherwise
   # auto-discover *_hammer.rb under Dir.pwd, then dispatch ARGV.
@@ -577,8 +577,6 @@ class Hammer
       Shell.print_error "no Hammerfile found in #{Dir.pwd} or any parent directory"
       Shell.say "create one - example:"
       Shell.say <<~RUBY
-        program 'mycli'
-
         define :hello do
           desc 'say hello'
           proc { |opts| say "hello \#{opts[:args].first || 'world'}", :green }
@@ -589,8 +587,8 @@ class Hammer
 
     klass = Class.new(Hammer)
     # Resolve before chdir so paths like `bin/foo` stay relative to the
-    # cwd the user actually invoked from.
-    klass.program_name(klass.default_program_name)
+    # cwd the user actually invoked from. `program_name` memoizes.
+    klass.program_name
 
     # chdir into the Hammerfile's directory for the entire run so commands
     # operate on the project root (Rake-style).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lux-hammer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dino Reic