planter-cli 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c272d8c938a24e24d8ad5ec220ba9100f6f35fbe6e8d9765a33c982607dbd0
-  data.tar.gz: f9a21781e985fce37c419fcf5f4e6f33cd13c951cd882468b6c90e3a19b50fdd
+  metadata.gz: ff00e3dd5814379c26e559c2183c04907d1082a64d4545af978192e59cb3139e
+  data.tar.gz: 97de83aec4990751e0e1ec91213f5ff18a87e98f073726cec84834599ebaf66a
 SHA512:
-  metadata.gz: ffbd475e7f56a2c96cf325cd1a681e9a7541d191c9cc9f669c06e2b3a74b4c889b2256290c5b390ea36aa408bc5e262f605ed0106e4ec409b2dece751adbbcbc
-  data.tar.gz: cc9241c6c6ac2a10ac2d5b82cdf2e6c204472c18834b113499af57e18615706a429c2900d19bdb9aa287c2d77bbe0f0a0a22c29288c10fceb292d623a23c86c3
+  metadata.gz: 0ececba941990543bca716162fc14ab187e72a8b330100763448e4170b4229848c7d9dae967a9ac0e75d88d6197e141f6db8bd89e528dc6beab561e83dafc64e
+  data.tar.gz: 0030f70d32826d28478f880ed7b17e51d8bb1312830815e27cfd050475bd720a759393e1ed3c17de618f41b7b7e14cfe47e2ad8a863eb52bdab1732636a37b49

data/.irbrc

@@ -3,7 +3,8 @@ IRB.conf[:AUTO_INDENT] = true
 
 require "irb/completion"
 require_relative "lib/planter"
-
+ENV['RUBYOPT'] = "-W1"
+ENV['PLANTER_IRB'] = "true"
 # rubocop:disable Style/MixinUsage
 include Planter # standard:disable all
 # rubocop:enable Style/MixinUsage

data/.yardopts

@@ -1,6 +1,7 @@
 --markup=markdown
 --private
 --protected
+--list-undoc
 lib/**/*.rb
 -
 README.md

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 3.0.5
+
+2024-09-04 07:49
+
+#### NEW
+
+- Date_format setting for date types
+- Allow `today '%Y'` inline date formatting
+- If/then logic for file operators
+- First_letter, first_word modifiers for variables
+- Allow default/value variable configutations to include %%placeholders%% and modifiers
+
+#### IMPROVED
+
+- Code refactoring
+
+#### FIXED
+
+- Overwrite operation not overwriting
+
 ### 3.0.4
 
 2024-09-02 08:43

data/README.md

@@ -2,6 +2,33 @@
 
 Plant a directory structure and files using templates.
 
+
+- [Planter](#planter)
+  - [Installation](#installation)
+  - [Configuration](#configuration)
+    - [Scripts](#scripts)
+    - [Templates](#templates)
+      - [Multiple choice type](#multiple-choice-type)
+    - [File-specific handling](#file-specific-handling)
+      - [If/then logic for file handling](#ifthen-logic-for-file-handling)
+    - [Regex replacements](#regex-replacements)
+    - [Finder Tags](#finder-tags)
+    - [Placeholders](#placeholders)
+      - [Default values in template strings](#default-values-in-template-strings)
+      - [Modifiers](#modifiers)
+      - [If/then logic](#ifthen-logic)
+  - [Usage](#usage)
+  - [Documentation](#documentation)
+  - [Development and Testing](#development-and-testing)
+    - [Source Code](#source-code)
+    - [Requirements](#requirements)
+    - [Rake](#rake)
+    - [Guard](#guard)
+  - [Contributing](#contributing)
+  - [License](#license)
+  - [Warranty](#warranty)
+
+
 ## Installation
 
     gem install planter-cli
@@ -33,7 +60,7 @@ Scripts can be executable files in any language, and receive the template direct
 
 Templates are directories found in `~/.config/planter/templates/[TEMPLATE_NAME]`. All files and directories inside of these template directories are copied when that template is called. Filenames, directory names, and file contents can all use template placeholders.
 
-Template placeholders are defined with `%%KEY%%`, where key is the key defined in the `variables` section of the configuration. `%%KEY%%` placeholders can be used in directory/file names, and in the file contents. These work in any plain text or RTF format document, including XML, so they can be used in things like Scrivener templates and MindNode files as well.
+Template placeholders are defined with `%%KEY%%`, where key is the key defined in the `variables` section of the configuration. `%%KEY%%` placeholders can be used in directory/file names, and in the file contents. These work in any plain text or RTF format document, including XML, so they can be used in things like Scrivener templates and MindNode files as well. See the subsections for info on default values and modifiers for template placeholders.
 
 Each template contains a `_planter.yml` file that defines variables and other configuration options. The file format for all configuration files is [YAML](https://yaml.org/spec/1.2.2/).
 
@@ -44,12 +71,15 @@ variables:
   - key: var_key
     prompt: Prompt text
     type: string # [string,paragraph,float,integer,number,date,choice] defaults to string
-    # value: (force value, string can include %%variables%% and regexes will be replaced. For date type can be today, time, now, etc.)
+    value: # (force value, string can include %%variables%% and regexes will be replaced. For date type can be today, time, now, etc.)
     default: Untitled
     min: 1
     max: 5
+    date_format: "%Y-%m-%d" # can be any strftime format, will be applied to any date type
 ```
 
+For the date type, value can be `today`, `now`, `tomorrow`, `last thursday`, etc. and natural language will be converted to a time. The formatting will be determined automatically based on the type of the value, e.g. "now" gets a time string, but "today" just gets a YYYY-mm-dd string. This can be modified using the `date_format` key, which accepts any [strftime](https://www.fabriziomusacchio.com/blog/2021-08-15-strftime_Cheat_Sheet/) value. You can also include a date format string in single parenthesis after a natural language date value, e.g. `value: "now 'This year: %Y'"`.
+
 A configuration can include additional keys:
 
 ```yaml
@@ -61,9 +91,6 @@ replacements: # Dictionary of pattern/replacments for regex substitution, see [R
 repo: # If a repository URL is provided, it will be pulled and duplicated instead of copying an existing file structure
 ```
 
-#### Default values in template strings
-
-In a template you can add a default value for a placholder by adding `%default value` to it. For example, `%%project%Default Project%%` will set the placeholder to `Default Project` if the variable value matches the default value in the configuration (or doesn't exist). This allows you to accept the default on the command line but have a different value inserted in the template. To use another variable in its place, use `$KEY` in the placeholder, e.g. `%%project%$title%%` will replace the `project` key with the value of `title` if the default is selected. Modifiers can be used on either side of the `%`, e.g. `%%project%$title:snake%%`.
 
 #### Multiple choice type
 
@@ -103,48 +130,35 @@ variables:
       - 1. zsh
 ```
 
-If the choice starts with a number (as above), then a numeric list will be generated and typing the associated index number will accept that choice. Numeric lists are automatically numbered, so the preceding digit doesn't matter, as long as it's a digit. In this case a default can be defined with an integer (in the `defaults:` key) for its placement in the list (starting with 1), and parenthesis aren't required.
-
-#### If/then logic
-
-A template can use if/then logic, which is useful with multiple choice types. It can be applied to any type, though.
-
-The format for if/then logic is:
-
-```
-%%if KEY OPERATOR VALUE%%
-content
-%%else if KEY OPERATOR VALUE2%%
-content 2
-%%else%%
-content 3
-%%endif%%
-```
-
-There should be no spaces around the comparison, e.g. `%% if language == javascript %%` won't work. The block must start with an `if` statement and end with `%%endif%%` or `%%end%%`. The `%%else%%` statement is optional -- if it doesn't exist then the entire block will be removed if no conditions are met.
+If the choice starts with a number (as above), then a numeric list will be generated and typing the associated index number will accept that choice. Numeric lists are automatically numbered, so the preceding digit doesn't matter, as long as it's a digit, and only the first item needs a digit to trigger numbering. In this case a default can be defined with an integer (in the `defaults:` key) for its placement in the list (starting with 1), and parenthesis aren't required.
 
-The key should be an existing key defined in `variables`. The operator can be any of:
+`value:` and `default:` can include previous variables, with modifiers:
 
-- `==` or `=` (equals)
-- `=~` (matches regex)
-- `*=` (contains)
-- `^=` (starts with)
-- `$=` (ends with)
-- `>` (greater than)
-- `>=` (greater than or equal)
-- `<` (less than)
-- `<=` (less than or equal)
-
-The value after the operator doesn't need to be quoted, anything after the operator will be compared to the value of the key.
-
-Logic can be used on multiple lines like the example above, or on a single line (useful for filenames):
-
-```
-%%project%%.%%if language == javascript%%js%%else if language == ruby%%rb%%else%%sh%%endif%%
+```yaml
+- variables:
+  - key: language
+    prompt: Programming language
+    type: choice
+    default: 2
+    choices:
+      - 1. ruby
+      - javascript
+      - python
+      - bash
+      - zsh
+  - key: shebang
+    prompt: Shebang line
+    type: choice
+    default: "%%language:first_letter:lowercase%%"
+    choices:
+      (r)uby: "#! /usr/bin/env ruby"
+      (j)avascript: "#! /usr/bin/env node"
+      (p)ython: "#! /usr/bin/env python"
+      (b)ash: "#! /bin/bash"
+      (z)sh: "#! /bin/zsh"
 ```
 
-Content within if/else blocks can contain variables.
-
+The above would define the `language` variable first, accepting `javascript` as default, then when displaying the menu for `shebang`, the language variable would have its first letter lowercased and set as the default option for the menu.
 
 ### File-specific handling
 
@@ -176,7 +190,17 @@ Merged content
 
 By default files that already exist in the destination directory are not overwritten, and merging allows you to add missing parts to a Rakefile or Makefile, for example.
 
-If `ask` is specified, a memu will be provided on the command line asking how to handle a file. If the file doesn't already exist, you will be asked only whether to copy the file or not. If it does exist, `overwrite` and `merge` options will be added.
+If `ask` is specified, a menu will be provided on the command line asking how to handle a file. If the file doesn't already exist, you will be asked only whether to copy the file or not. If it does exist, `overwrite` and `merge` options will be added.
+
+#### If/then logic for file handling
+
+The operation for a file match can be an if/then statement. There are two formats for this.
+
+First, you can simply write `OPERATION if VARIABLE COMP VALUE`, e.g. `copy if language == ruby`. This can have an `else` statement: `overwrite if language == ruby else copy`.
+
+You can also format it as `if VARIABLE COMP VALUE: OPERATION; else: OPERATION`. This format allows `else if` statements, e.g. `if language == perl: copy;else if language == ruby: overwrite; else: ignore`.
+
+Planter's if/then parsing does not handle parenthetical or boolean operations.
 
 ### Regex replacements
 
@@ -194,6 +218,69 @@ Replacements are performed on both file/directory names and file contents. This
 
 If `preserve_tags` is set to `true` in the config (either base or template), then existing Finder tags on the file or folder will be copied to the new file when a template is planted.
 
+### Placeholders
+
+Placeholders are `%%VARIABLE%%` strings used in filenames and within the content of the files. At their most basic, this would just look like `%%project_name%%`. But you can supply default values, string modifiers, and even if/then logic.
+
+#### Default values in template strings
+
+In a template you can add a default value for a placholder by adding `%default value` to it. For example, `%%project%Default Project%%` will set the placeholder to `Default Project` if the variable value matches the default value in the configuration (or doesn't exist). This allows you to accept the default on the command line but have a different value inserted in the template. To use another variable in its place, use `$KEY` in the placeholder, e.g. `%%project%$title%%` will replace the `project` key with the value of `title` if the default is selected. Modifiers can be used on either side of the `%`, e.g. `%%project%$title:snake%%`.
+
+#### Modifiers
+
+A `%%variable%%` in a template can include modifiers that affect the output of the variable. These are added as `%%variable:MODIFIER%%` and multiple modifiers can be strung together, e.g. `%%language:lowercase:first_letter%%`. The available modifiers are (listed with available abbreviations):
+
+- `snake` (`s`): snake_case the value
+- `camel` (`cam`): camelCase the value
+- `upper` (`u`): UPPERCASE the value
+- `lower` (`l`, `d`): lowercase the value
+- `title` (`t`): Title Case The Value
+- `slug` or `file` (`sl`): slug-format-the-value
+- `first_letter` (`fl`): Extract the first letter from the value
+- `first_word` (`fw`): Extract the first word from the value
+
+#### If/then logic
+
+A template can use if/then logic, which is useful with multiple choice types. It can be applied to any type, though.
+
+The format for if/then logic is:
+
+```
+%%if KEY OPERATOR VALUE%%
+content
+%%else if KEY OPERATOR VALUE2%%
+content 2
+%%else%%
+content 3
+%%endif%%
+```
+
+There should be no spaces around the comparison, e.g. `%% if language == javascript %%` won't work. The block must start with an `if` statement and end with `%%endif%%` or `%%end%%`. The `%%else%%` statement is optional -- if it doesn't exist then the entire block will be removed if no conditions are met.
+
+The key should be an existing key defined in `variables`. The operator can be any of:
+
+- `==` or `=` (equals)
+- `=~` (matches regex)
+- `*=` (contains)
+- `^=` (starts with)
+- `$=` (ends with)
+- `>` (greater than)
+- `>=` (greater than or equal)
+- `<` (less than)
+- `<=` (less than or equal)
+
+Any of these operators can be inverted (negated) by preceding with an exclamation point, e.g. `!=` means `not equal` and `!*=` means `does not contain`.
+
+The value after the operator doesn't need to be quoted, anything after the operator will be compared to the value of the key.
+
+Logic can be used on multiple lines like the example above, or on a single line (useful for filenames):
+
+
+    %%project%%.%%if language == javascript%%js%%else if language == ruby%%rb%%else%%sh%%endif%%
+
+
+Content within if/else blocks can contain variables. Planter's if/then parsing does not handle parenthetical or boolean operations.
+
 ## Usage
 
 The executable for Planter is `plant`. You can run `plant TEMPLATE` in any directory and TEMPLATE will be planted in the current directory. You can also use `--in PATH` to plant in another directory.
@@ -222,7 +309,6 @@ Variables can be passed on the command line with `--var KEY:VALUE`. This flag ca
 ## Documentation
 
 - [YARD documentation][RubyDoc] is hosted by RubyDoc.info.
-- [Interactive documentation][Omniref] is hosted by Omniref.
 
 [RubyDoc]: http://www.rubydoc.info/gems/planter-cli
 

data/bin/plant

@@ -79,8 +79,9 @@ opts.parse!
 ##
 def list_vars(template)
   puts "#{template} variables:"
-  Planter.config = template
-  Planter.config[:variables].sort_by { |v| v[:key].to_var }.each do |var|
+  Planter.template = template
+  @config = Planter::Config.new
+  @config.variables.sort_by { |v| v[:key].to_var }.each do |var|
     title = var[:prompt] || var[:key]
     var_type = var[:type].normalize_type || :string
     default = var[:value] || var[:default]
@@ -101,12 +102,12 @@ elsif options[:help]
   end
   Process.exit 0
 elsif ARGV.count.zero?
-  raise Planter::Errors::ArgumentError.new 'Template argument required'
+  die('Template argument required', :argument)
 end
 
 ARGV.each do |template|
   # Planter.spinner.update(title: 'Initializing configuration')
-  Planter.config = template
+  Planter.template = template
   app = Planter::Plant.new
   app.plant
 end

data/lib/planter/array.rb

@@ -9,10 +9,17 @@ module Planter
     ##
     ## @example    ["(c)hoice", "(o)ther"].abbr_choices #=> "[c/o]"
     ##
-    ## @param      default  [String] The color templated output string
+    ## @param      default  [String] The (unprocessed) color templated output string
     ##
     def abbr_choices(default: nil)
+      return default.nil? ? '' : "{xdw}[{xbc}#{default}{dw}]{x}" if all? { |c| c.to_i.positive? }
+
       chars = join(' ').scan(/\((?:(.)\.?)\)/).map { |c| c[0] }
+
+      return default.nil? ? '' : "{xdw}[{xbc}#{default}{dw}]{x}" if chars.all? { |c| c.to_i.positive? }
+
+      die('Array contains duplicates', :input) if chars.duplicates?
+
       out = String.new
       out << '{xdw}['
       out << chars.map do |c|
@@ -32,6 +39,8 @@ module Planter
     ## @return     [Array] Array of choices
     ##
     def to_options(numeric)
+      die('Array contains duplicates', :input) if duplicates?
+
       map.with_index do |c, i|
         # v = c.to_s.match(/\(?([a-z]|\d+\.?)\)?/)[1].strip
         if numeric
@@ -42,6 +51,11 @@ module Planter
       end
     end
 
+    ## test if array has duplicates
+    def duplicates?
+      uniq.size != size
+    end
+
     ## Find the index of a choice in an array of choices
     ##
     ## @param      choice  [String] The choice to find

data/lib/planter/color.rb

@@ -108,6 +108,12 @@ module Planter
         Color.template(self)
       end
 
+      ## Remove template codes from a string
+      ## @return [String] uncolored string
+      def strip_template
+        gsub(/(?<!\\)\{(\w+)\}/i, '')
+      end
+
       ##
       ## Extract the longest valid %color name from a string.
       ##
@@ -243,7 +249,7 @@ module Planter
       ##
       def template(input)
         input = input.join(' ') if input.is_a? Array
-        return input.gsub(/(?<!\\)\{(\w+)\}/i, '') unless Color.coloring?
+        return input.strip_template unless Color.coloring?
 
         input = input.gsub(/(?<!\\)\{((?:[fb]g?)?#[a-f0-9]{3,6})\}/i) do
           hex = Regexp.last_match(1)

data/lib/planter/config.rb

@@ -0,0 +1,172 @@
+# frozen_string_literal: true
+
+module Planter
+  class Config < Hash
+    attr_reader :template
+
+    ##
+    ## Initialize a new Config object for a template
+    ##
+    ## @param template [String] template name
+    ##
+    def initialize
+      # super()
+
+      @config = initial_config
+      @template = Planter.template
+
+      load_template
+
+      die('No configuration found', :config) unless @config
+
+      generate_accessors
+    end
+
+    def initial_config
+      {
+        defaults: false,
+        git_init: false,
+        files: { '_planter.yml' => 'ignore' },
+        color: true,
+        preserve_tags: nil,
+        variables: nil,
+        replacements: nil,
+        repo: false,
+        patterns: nil,
+        debug: false,
+        script: nil
+      }
+    end
+
+    def to_s
+      @config.to_s
+    end
+
+    def [](key)
+      @config[key]
+    end
+
+    ##
+    ## Set a config option
+    ##
+    ## @param key [String,Symbol] key
+    ## @param value [String] value
+    ##
+    def []=(key, value)
+      @config[key.to_sym] = value
+      generate_accessors
+    end
+
+    private
+
+    ##  Generate accessors for configuration
+    def generate_accessors
+      @config.each do |k, v|
+        define_singleton_method(k) { v } unless respond_to?(k)
+      end
+    end
+
+    ##
+    ## Build a configuration from template name
+    ##
+    ## @param      template  [String] The template name
+    ##
+    ## @return     [Hash] Configuration object
+    ##
+    ## @api private
+    ##
+    def load_template
+      Planter.variables ||= {}
+      FileUtils.mkdir_p(Planter.base_dir) unless File.directory?(Planter.base_dir)
+      base_config = File.join(Planter.base_dir, 'planter.yml')
+
+      if File.exist?(base_config)
+        @config = @config.deep_merge(YAML.load(IO.read(base_config)).symbolize_keys)
+      else
+        default_base_config = {
+          defaults: false,
+          git_init: false,
+          files: { '_planter.yml' => 'ignore' },
+          color: true,
+          preserve_tags: true
+        }
+        begin
+          File.open(base_config, 'w') { |f| f.puts(YAML.dump(default_base_config.stringify_keys)) }
+        rescue Errno::ENOENT
+          Planter.notify("Unable to create #{base_config}", :error)
+        end
+        @config = @config.deep_merge(default_base_config).symbolize_keys
+        Planter.notify("New configuration written to #{base_config}, edit as needed.", :warn)
+      end
+
+      base_dir = File.join(Planter.base_dir, 'templates', @template)
+      unless File.directory?(base_dir)
+        notify("Template #{@template} does not exist", :error)
+        res = Prompt.yn('Create template directory', default_response: false)
+
+        die('Canceled') unless res
+
+        FileUtils.mkdir_p(base_dir)
+      end
+
+      load_template_config
+
+      config_array_to_hash(:files) if @config[:files].is_a?(Array)
+      config_array_to_hash(:replacements) if @config[:replacements].is_a?(Array)
+    rescue Psych::SyntaxError => e
+      die("Parse error in configuration file:\n#{e.message}", :config)
+    end
+
+    ##
+    ## Load a template-specific configuration
+    ##
+    ## @return     [Hash] updated config object
+    ##
+    ## @api private
+    ##
+    def load_template_config
+      base_dir = File.join(Planter.base_dir, 'templates', @template)
+      config = File.join(base_dir, '_planter.yml')
+
+      unless File.exist?(config)
+        default_config = {
+          variables: [
+            key: 'var_key',
+            prompt: 'CLI Prompt',
+            type: '[string, float, integer, number, date]',
+            value: '(optional, force value, can include variables. Empty to prompt. For date type: today, now, etc.)',
+            default: '(optional default value, leave empty or remove key for no default)',
+            min: '(optional, for number type set a minimum value)',
+            max: '(optional, for number type set a maximum value)'
+          ],
+          git_init: false,
+          files: {
+            '*.tmp' => 'ignore',
+            '*.bak' => 'ignore',
+            '.DS_Store' => 'ignore'
+          }
+        }
+        FileUtils.mkdir_p(base_dir)
+        File.open(config, 'w') { |f| f.puts(YAML.dump(default_config.stringify_keys)) }
+        Planter.notify("New configuration written to #{config}, please edit.", :warn)
+        Process.exit 0
+      end
+      @config = @config.deep_merge(YAML.load(IO.read(config)).symbolize_keys)
+    end
+
+    ##
+    ## Convert an errant array to a hash
+    ##
+    ## @param      key   [Symbol] The key in @config to convert
+    ##
+    ## @api private
+    ##
+    def config_array_to_hash(key)
+      files = {}
+      @config[key].each do |k|
+        files[k.keys.first] = k.values.first
+      end
+      @config[key] = files
+    end
+  end
+end

data/lib/planter/filelist.rb

@@ -65,8 +65,15 @@ module Planter
       apply_tags(entry)
     end
 
+    #
+    # Apply tags to the target file from the source file
+    #
+    # @param [FileEntry] entry
+    #
+    # @return [Boolean] success
+    #
     def apply_tags(entry)
-      return unless Planter.config[:preserve_tags]
+      return unless Planter.config.preserve_tags
 
       Tag.copy(entry.file, entry.target) if File.exist?(entry.target)
     end
@@ -158,6 +165,9 @@ module Planter
     ## @return     [Boolean] success
     ##
     def copy_file(file, overwrite: false)
+      # If the target file already exists and overwrite is true,
+      # or Planter.overwrite is true, then delete the target file
+      FileUtils.rm_rf(file.target) if (overwrite || Planter.overwrite) && File.exist?(file.target)
       # Check if the target file already exists
       # If it does and overwrite is true, or Planter.overwrite is true,
       # or if the file doesn't exist, then copy the file
@@ -165,7 +175,7 @@ module Planter
         # Make sure the target directory exists
         FileUtils.mkdir_p(File.dirname(file.target))
         # Copy the file if it isn't a directory
-        FileUtils.cp(file.file, file.target) unless File.directory?(file.file)
+        FileUtils.cp_r(file.file, file.target) unless File.directory?(file.file)
         # Log a message to the console
         Planter.notify("[Copied] #{file.file} => #{file.target}", :debug, above_spinner: true)
         # Return true to indicate success

data/lib/planter/numeric.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Planter
+  class ::Integer
+    def clean_value
+      self
+    end
+
+    def has_selector?
+      true
+    end
+
+    def highlight_character(default: nil)
+      "(#{self})".highlight_character(default: default)
+    end
+  end
+
+  class ::Float
+    def clean_value
+      self
+    end
+
+    def has_selector?
+      true
+    end
+
+    def highlight_character(default: nil)
+      "(#{self})".highlight_character(default: default)
+    end
+  end
+end