geny 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 558b6cc3a2985012f76f27a23c8a1a338aef4bdf
-  data.tar.gz: a859475b06d94fdba962beb25b0ffece71eb1119
+  metadata.gz: 053de574e07eefcb259a4ef3949722575c18e36b
+  data.tar.gz: d9bcca07beaa5a8621e9fa5dce42f4468f3fa282
 SHA512:
-  metadata.gz: cd59935ac74a3cdb86e94e93c61e2154a5a62db930c0f699aef8ff5d9d825d2dc78da99e2a5e94cd103c410b12ac5aac9aac1ff480d2ff5ab4f2ba79b546d9dc
-  data.tar.gz: 0c4465488a3d5920d51659e399cbed3d972179ea7d528c79e9ab92e4f3fffca154565858e78b2f99c674fbf5cd72696ecf2970b6b9ae1dc4c8a8fc803f965f19
+  metadata.gz: 2336a52da788edeb5716327fb3fdc180bd3f4cda6f071a278f49ca2e815d1e6d3fa9b10cf3922511265ddaceecb3c01c535c05c97ec5af60dfc32ff3d1275c6b
+  data.tar.gz: 6ced3852fde17514e948abdfd51d1eece62a5ad26b988ace601df0426f4bbe9b76a86ec34b987bde8302fd9d98cd2d0deb288de8b4fa2643278e2346f9aa2057

data/bin/rspec-each

@@ -0,0 +1,20 @@
+#!/bin/bash
+# Runs each spec file independently
+
+for spec in $(find spec -name "*_spec.rb*"); do
+  echo "Running $spec..."
+
+  until bundle exec rspec "$spec"; do
+    echo -n -e "\n$spec failed. Retry? "
+    read answer
+
+    if [ "$answer" != "${answer#[Yy]}" ]; then
+      echo "Retrying..."
+    else
+      echo "Aborting!"
+      exit
+    fi
+  done
+
+  echo "Success!"
+done

data/lib/geny/command.rb

@@ -6,6 +6,9 @@ module Geny
     # The filename for a generator, relative to the root
     FILENAME = "generator.rb"
 
+    # Nested commands are joined with colon
+    SEPARATOR = ":"
+
     # The directory where templates are stored, relative to the root
     TEMPLATES = "templates"
 

data/lib/geny/dsl.rb

@@ -26,7 +26,8 @@ module Geny
 
     # Define helper methods. These methods are available within
     # the {#invoke} block and all templates.
-    def helpers(&block)
+    def helpers(*modules, &block)
+      @helpers += modules unless modules.empty?
       @helpers << Module.new(&block) if block_given?
       @helpers
     end

data/lib/{generators → geny/generators}/new/generator.rb

@@ -10,6 +10,7 @@ end
 
 helpers do
   def generator_path
-    File.join(".geny", *name.split(":"), Geny::Command::FILENAME)
+    path = name.split(Geny::Command::SEPARATOR)
+    File.join(".geny", *path, Geny::Command::FILENAME)
   end
 end

data/lib/geny/registry.rb

@@ -4,13 +4,17 @@ require "geny/command"
 
 module Geny
   class Registry
-    # The default load path. By default, Geny
-    # will search
-    LOAD_PATH = [
-      File.join(Dir.pwd, ".geny"),
-      *ENV.fetch("CODE_HEN_PATH", "").split(":"),
-      File.expand_path("../generators", __dir__)
-    ]
+    # The load path for project-local generators
+    LOCAL_PATH = [File.join(Dir.pwd, ".geny")]
+
+    # The load path that is read from ENV vars
+    ENV_PATH = ENV.fetch("GENY_PATH", "").split(":")
+
+    # The load path for Geny's own generators
+    GENY_PATH = [File.join(__dir__, "generators")]
+
+    # The default load path. By default, Geny will search
+    LOAD_PATH = LOCAL_PATH + ENV_PATH + GENY_PATH
 
     # The directories to search for commands in
     # @return [Array<String>]
@@ -33,7 +37,7 @@ module Geny
         path.glob(glob).map do |file|
           root = file.dirname
           name = root.relative_path_from(path)
-          name = name.to_s.tr(File::SEPARATOR, ":")
+          name = name.to_s.tr(File::SEPARATOR, Command::SEPARATOR)
           build(name, root.to_s)
         end
       end
@@ -46,7 +50,8 @@ module Geny
     # @return [Command,nil]
     def find(name)
       load_path.each do |path|
-        file = File.join(path, *name.split(":"), Command::FILENAME)
+        parts = name.split(Command::SEPARATOR)
+        file = File.join(path, *parts, Command::FILENAME)
         root = File.dirname(file)
         return build(name, root) if File.exist?(file)
       end

data/lib/geny/version.rb

@@ -1,3 +1,3 @@
 module Geny
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geny
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ray Zane
@@ -140,11 +140,10 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec-each
 - bin/setup
 - exe/geny
 - geny.gemspec
-- lib/generators/new/generator.rb
-- lib/generators/new/templates/generator.rb.erb
 - lib/geny.rb
 - lib/geny/actions/files.rb
 - lib/geny/actions/find.rb
@@ -160,6 +159,8 @@ files:
 - lib/geny/context/view.rb
 - lib/geny/dsl.rb
 - lib/geny/error.rb
+- lib/geny/generators/new/generator.rb
+- lib/geny/generators/new/templates/generator.rb.erb
 - lib/geny/registry.rb
 - lib/geny/version.rb
 homepage: https://github.com/rzane/geny