diecut 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107febe45026dd5f8483a22c823ff7df081d9376
-  data.tar.gz: 3ad4f743f9aaa20bbe24a5c72a31d4c1ef813048
+  metadata.gz: 050a46989b178da905def8fbfb34438d55420670
+  data.tar.gz: 0d78911f4ba8eff62a23771eac548fc972ec0459
 SHA512:
-  metadata.gz: 4d6837550e1a368a23781bfdd8c0b66450ad3ed19f6d831102cc9b4541285dbdbe4cf45010fa7b767a3babdc29fb78ddff405dfd89d5c5cfa289a5dd6903549f
-  data.tar.gz: 450068202354f5fe74a57f309beeaeb08e11c2eceb4adeb74ca8083d2570679333567d449b616e750146cbf06041d1f363e22f8945b955dff4c5db940c0d4b4d
+  metadata.gz: 95b1f40f8bae335f41412543b63865870590b824606660fa3cd509202725093b13720f2cb1439b02bf4561e6014508363d53187c38302d3cb46122d7ec40e7ab
+  data.tar.gz: 0b7b55d6b626fc9c0e55eac32e8229909f768f8f3651d83d3acf4444d1a131da2bb9d088e63fa25a6c282d11b4bd6084086bc6dc4cc9a52fb9caf325fc434f0d

data/lib/diecut/cli.rb

@@ -15,7 +15,7 @@ module Diecut
           end
 
           mediator.plugins.each do |plugin|
-            class_option "with-#{plugin.name}", :default => plugin.default_active?
+            class_option "with-#{plugin.name}", :default => plugin.default_activated_for(kind)
           end
 
           setup_subclass(mediator, example_ui)
@@ -48,8 +48,10 @@ module Diecut
         mill.activate_plugins {|name| options["with-#{name}"] }
 
         ui = mill.user_interface
-        options.delete_if{|_, value| value.nil?}
-        ui.from_hash(options)
+        ui_hash = Hash[ options.find_all do |name, value|
+          not value.nil?
+        end]
+        ui.from_hash(ui_hash)
 
         mill.churn(ui) do |path, contents|
           create_file(path, contents)

data/lib/diecut/errors.rb

@@ -13,6 +13,10 @@ module Diecut
         "Default on #{context_path.inspect} from plugin #{name} has both a simple default value (#{value}) and a dynamic block value, which isn't allowed."
       end
 
+      def unregistered_plugin_source_message(source_path)
+        "Couldn't find source of plugin which appears to be defined at #{source_path}"
+      end
+
       def missing_context_field(plugin_name, option_name, context_path)
         issue(missing_context_field_message(option_name, context_path))
       end
@@ -25,6 +29,10 @@ module Diecut
         issue invalid_plugin_message(name, context_path, value)
       end
 
+      def unregistered_plugin_source(source_path)
+        issue unregistered_plugin_source_message(source_path)
+      end
+
       def handle_exception(ex)
         if Error === ex
           issue(ex.message)
@@ -56,6 +64,10 @@ module Diecut
         raise
       end
 
+      def unregistered_plugin_source(source_path)
+        raise UnregisteredPluginSource, unregistered_plugin_source_message(source_path)
+      end
+
       def missing_context_field(option_name, context_path)
         raise MissingContext, missing_context_field_message(option_name, context_path)
       end
@@ -80,4 +92,5 @@ module Diecut
   class OverriddenDefault < Error; end
   class InvalidPlugin < Error; end
   class FieldClash < Error; end
+  class UnregisteredPluginSource < Error; end
 end

data/lib/diecut/mediator.rb

@@ -11,8 +11,8 @@ module Diecut
     end
     attr_reader :plugins
 
-    def add_plugin(plug)
-      @activated[plug.name] = plug.default_activated
+    def add_plugin(plug, activated)
+      @activated[plug.name] = activated
       @plugins << plug
     end
 

data/lib/diecut/mill.rb

@@ -37,7 +37,13 @@ module Diecut
           end
           Valise::Set.define do
             stems.each do |stem|
-              ro stem.template_dir
+              if stem.stem
+                stemmed(stem.stem) do
+                  ro stem.template_dir
+                end
+              else
+                ro stem.template_dir
+              end
             end
           end
         end

data/lib/diecut/plugin-description.rb

@@ -8,7 +8,15 @@ module Diecut
     include CallerLocationsPolyfill
     NO_VALUE = Object.new.freeze
 
-    KindStem = Struct.new(:kind, :stem, :template_dir)
+    class KindStem < Struct.new(:kind, :stem, :template_dir, :default_activated)
+      def default_off
+        self.default_activated = false
+      end
+
+      def default_on
+        self.default_activated = true
+      end
+    end
 
     def initialize(name, source_path)
       @name = name
@@ -39,6 +47,15 @@ module Diecut
       @kind_stems.key?(kind)
     end
 
+    def default_activated_for(kind)
+      stem = @kind_stems[kind]
+      if stem.default_activated.nil?
+        default_active?
+      else
+        stem.default_activated
+      end
+    end
+
     def default_active?
       @default_activated
     end
@@ -71,10 +88,12 @@ module Diecut
     #
     #
     def for_kind(kind, templates = nil, stem = nil)
-      stem ||= [kind]
       templates ||= "diecut_templates"
       templates = File.expand_path(templates, File.dirname(caller_locations(1..1).first.absolute_path))
-      @kind_stems[kind] = KindStem.new(kind, stem, templates)
+      kind_stem = KindStem.new(kind, stem, templates, nil)
+      @kind_stems[kind] = kind_stem
+      yield kind_stem if block_given?
+      return kind_stem
     end
 
     # Force this plugin to be enabled to be used. Good for optional features.
@@ -118,7 +137,6 @@ module Diecut
         end
       if value != NO_VALUE and not block.nil?
         issue_handler.invalid_plugin(name, context_path, value)
-        raise InvalidPlugin, "Default on #{name.inspect} both has a simple default value (#{value}) and a dynamic block value, which isn't allowed."
       end
       @context_defaults << ContextDefault.new(context_path, value, block)
     end

data/lib/diecut/plugin-loader.rb

@@ -32,6 +32,11 @@ module Diecut
       end
     end
 
+    def issue_handler
+      @issue_handler ||= Diecut.issue_handler
+    end
+    attr_writer :issue_handler
+
     # :nocov:
     def latest_specs(prerelease)
       Gem::Specification.latest_specs(prerelease)
@@ -170,7 +175,9 @@ module Diecut
           return path
         end
       end
-      raise "Couldn't find source of plugin..."
+      fallback_location = locations.first.absolute_path
+      issue_handler.unregistered_plugin_source(fallback_location)
+      return fallback_location
     end
 
     def add_plugin_desc(desc)

data/lib/diecut.rb

@@ -5,6 +5,18 @@ require 'diecut/errors'
 
 module Diecut
   class << self
+    # Used in a `diecut_plugin.rb` file (either in the `lib/` of a gem, or at
+    # the local `~/.config/diecut/diecut_plugin.rb` to register a new plugin.
+    #
+    # @param name [String, Symbol]
+    #   Names the plugin so that it can be toggled  later
+    #
+    # @yieldparam description [PluginDescription]
+    #   The description object to configure the plugin with.
+    def plugin(name, &block)
+      plugin_loader.describe_plugin(name, &block)
+    end
+
     def plugin_loader
       @plugin_loader ||= PluginLoader.new
     end
@@ -30,18 +42,6 @@ module Diecut
     end
     attr_writer :issue_handler
 
-    # Used in a `diecut_plugin.rb` file (either in the `lib/` of a gem, or at
-    # the local `~/.config/diecut/diecut_plugin.rb` to register a new plugin.
-    #
-    # @param name [String, Symbol]
-    #   Names the plugin so that it can be toggled  later
-    #
-    # @yieldparam description [PluginDescription]
-    #   The description object to configure the plugin with.
-    def plugin(name, &block)
-      plugin_loader.describe_plugin(name, &block)
-    end
-
     def kinds
       plugins.reduce([]) do |list, plugin|
         list + plugin.kinds
@@ -52,7 +52,7 @@ module Diecut
       Mediator.new.tap do |med|
         plugins.each do |plug|
           next unless plug.has_kind?(kind)
-          med.add_plugin(plug)
+          med.add_plugin(plug, plug.default_activated_for(kind))
         end
       end
     end

data/spec/linter_spec.rb

@@ -59,7 +59,7 @@ describe Diecut::Mill do
     allow(Diecut).to receive(:plugin_loader).and_return(loader)
 
     plugins.each do |plugin|
-      mill.mediator.add_plugin(plugin)
+      mill.mediator.add_plugin(plugin, plugin.default_active?)
     end
   end
 

data/spec/mill_spec.rb

@@ -31,8 +31,8 @@ describe Diecut::Mill do
   end
 
   before :each do
-    mill.mediator.add_plugin(plugin)
-    mill.mediator.add_plugin(other_plugin)
+    mill.mediator.add_plugin(plugin, true)
+    mill.mediator.add_plugin(other_plugin, true)
   end
 
   it "should render files" do

data/spec/register_plugin_spec.rb

@@ -8,6 +8,8 @@ describe "Diecut.plugin" do
   end
 
   before :each do
+    Diecut.clear_plugins
+
     Diecut.plugin_loader = loader
     Diecut.plugin("test") do |plugin|
       plugin.for_kind("app")

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'cadre/rspec3'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
+  config.example_status_persistence_file_path = "example_results.txt"
   config.add_formatter(Cadre::RSpec3::NotifyOnCompleteFormatter)
   config.add_formatter(Cadre::RSpec3::QuickfixFormatter)
 

data/spec/stemming_kinds_spec.rb

@@ -0,0 +1,78 @@
+require 'diecut/mill'
+require 'file-sandbox'
+
+describe Diecut::Mill do
+  include FileSandbox
+  before :each do
+    Diecut.clear_plugins
+
+    sandbox["resource/src/common/resources/{{resource_name}}.js"].contents = "yup"
+    sandbox["mappers/app/mappers/{{mapper_name}}.rb"].contents = "yup"
+  end
+
+  before :each do
+    Diecut.plugin("relayer-resource") do |resource|
+      resource.for_kind("xing", File.join(sandbox.root, "resource")) do |xing|
+        xing.stem = 'frontend'
+      end
+
+      resource.for_kind('angular-one', File.join(sandbox.root, "resource")) do |ng|
+        ng.default_off
+      end
+    end
+  end
+
+  before :each do
+    Diecut.plugin("rails-mapper") do |mapper|
+      mapper.for_kind("xing", File.join(sandbox.root, "mappers")) do |xing|
+        xing.stem = 'backend'
+      end
+
+      mapper.for_kind('rails', File.join(sandbox.root, "mappers"))
+    end
+  end
+
+  after :each do
+    Diecut.clear_plugins
+  end
+
+  let :path_list do
+    mill.load_files
+    mill.templates.templates.map{|n, template| template.path}
+  end
+
+  describe "Mixed with stems" do
+    let :mill do
+      Diecut::Mill.new("xing")
+    end
+
+    it "should have files in stemmed directories" do
+      expect(path_list).to include("frontend/src/common/resources/{{resource_name}}.js", "backend/app/mappers/{{mapper_name}}.rb")
+    end
+  end
+
+  describe "Simpler kind" do
+    let :mill do
+      Diecut::Mill.new("rails")
+    end
+
+    it "should have files in stemmed directories" do
+      expect(path_list).to include("app/mappers/{{mapper_name}}.rb")
+    end
+  end
+
+  describe "Simpler, but defaults off for kind" do
+    let :mill do
+      Diecut::Mill.new("angular-one")
+    end
+
+    it "should have files in stemmed directories" do
+      expect(path_list).to eq([])
+    end
+
+    it "should get the files if enables" do
+      mill.activate_plugins{ true }
+      expect(path_list).to include("src/common/resources/{{resource_name}}.js")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diecut
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -80,7 +80,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: ''
+description: |2
+    Diecut is a tool for supporting the process of writing code generation. It provides
+    linting, a general purpose command line generator, discovery of templated values, and
+    composed generation.
 email:
 - nyarly@gmail.com
 executables:
@@ -127,6 +130,7 @@ files:
 - spec/plugin_loader_spec.rb
 - spec/register_plugin_spec.rb
 - spec/spec_helper.rb
+- spec/stemming_kinds_spec.rb
 - spec/template-reducer_spec.rb
 - spec/template_set_spec.rb
 - spec/template_spec.rb
@@ -140,7 +144,7 @@ rdoc_options:
 - "--main"
 - doc/README
 - "--title"
-- diecut-0.0.3 Documentation
+- diecut-0.0.4 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -158,6 +162,6 @@ rubyforge_project: diecut
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: ''
+summary: Code generation support tools
 test_files:
 - gem_test_suite.rb