kojo 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f80fdd7c65e0cd8e431e54f2fa32119a1ca2f0557329207481290dd2ed09e241
-  data.tar.gz: ebcd8acc4d7352efedb02baea82d2a22605141f88c719c9112cfb07c55261889
+  metadata.gz: 31deffc66dbb1ff100bb90f669f8d2995f8eeac92c78919434caffbb9ecfee69
+  data.tar.gz: 6c4b75d7e13b627520d403d8885333a9c30b06cd40c56889e2cd4823ac125b12
 SHA512:
-  metadata.gz: 68535d8c56fb7a354b1035fbc145093d03e4846ba195c2bf2d1ff03ddf539cf7b9b545a0302d96d34b99d651a7432b8a6ae0697425cd5aba3ea8fd1732e859ab
-  data.tar.gz: 793ef15e654c1c3b2d1e900bcc5d86a6f8df966bc1d007951b749c61bdb5120b6cc413f18b52728608050429ebe711ed32e75a6c498c21d0dce61b0c0c5c736f
+  metadata.gz: b6731a253afc7c3ccdb8f718e4a78d70d6bfcea9079c269f0b9ca1d8da3596abcbfd5b895fa2e32bbc2b14629c4b5a022cd7996fb3428a6260cb5b5b64b97aa8
+  data.tar.gz: 0c285f0dcaeff09fb183fe2f02e8f25a9905b4431bca7908dfc0824bfd5caba74d215476e661b519733c790b2b79ea599c9d325f03bdab7c847f98761c815ffc

data/README.md

@@ -10,8 +10,8 @@
 
 
 Kojo helps you generate configuration files from templates, using variables 
-and definition files.  
-It is a command line utility, and it works on any text file format.
+and definition files. It is a command line utility, and works on any text file
+format.
 
 </div>
 

data/lib/kojo.rb

@@ -1,6 +1,9 @@
 require 'requires'
 require 'byebug' if ENV['BYEBUG']
 
+require 'yaml'
+require 'json'
+
 requires 'kojo/refinements'
 requires 'kojo/extensions'
 

data/lib/kojo/cli.rb

@@ -16,6 +16,7 @@ module Kojo
       runner.route 'config', to: Kojo::Commands::ConfigCmd
       runner.route 'single', to: Kojo::Commands::SingleCmd
       runner.route 'form',   to: Kojo::Commands::FormCmd
+      runner.route 'tojson', to: Kojo::Commands::ToJsonCmd
 
       runner
     end

data/lib/kojo/commands/command_base.rb

@@ -4,9 +4,8 @@ module Kojo
   module Commands
     class CommandBase < MisterBin::Command
       def save(file, output)
-        outpath = "#{outdir}/#{file}"
-        File.deep_write outpath, output
-        say "Saved #{outpath}"  
+        File.deep_write file, output
+        say "Saved #{file}"
       end
     end
   end

data/lib/kojo/commands/config.rb

@@ -3,7 +3,7 @@ require 'mister_bin'
 
 module Kojo::Commands
   # Handle calls to the +kojo config+ command
-  class ConfigCmd < MisterBin::Command
+  class ConfigCmd < CommandBase
     using Kojo::Refinements
 
     attr_reader :gen, :outdir, :opts, :import_base, :config_file
@@ -59,13 +59,5 @@ module Kojo::Commands
         say output
       end
     end
-
-    def save(path, output)
-      dir = File.dirname path
-      FileUtils.mkdir_p dir unless Dir.exist? dir
-      File.write path, output
-      say "Saved #{path}"
-    end
-
   end
 end

data/lib/kojo/commands/dir.rb

@@ -62,7 +62,7 @@ module Kojo
 
       def write(collection)
         collection.render @opts do |file, output|
-          save file, output
+          save "#{outdir}/#{file}", output
         end
       end
     end

data/lib/kojo/commands/file.rb

@@ -3,7 +3,7 @@ require 'mister_bin'
 module Kojo
   module Commands
     # Handle calls to the +kojo file+ command
-    class FileCmd < MisterBin::Command
+    class FileCmd < CommandBase
       using Kojo::Refinements
 
       attr_reader :opts, :outfile, :infile, :import_base
@@ -48,8 +48,7 @@ module Kojo
         output = template.render(opts)
 
         if outfile
-          File.write outfile, output
-          say "Saved #{outfile}"
+          save outfile, output
         else
           puts output
         end

data/lib/kojo/commands/form.rb

@@ -24,8 +24,7 @@ module Kojo
         template = Kojo::Form.new infile
         
         if outfile
-          File.deep_write outfile, template.render
-          say "Saved #{outfile}"  
+          save outfile, template.render
         else
           puts template.render 
         end

data/lib/kojo/commands/single.rb

@@ -46,7 +46,7 @@ module Kojo
 
       def write(template)
         template.render opts do |file, output|
-          save file, output
+          save "#{outdir}/#{file}", output
         end
       end
     end

data/lib/kojo/commands/to_json.rb

@@ -0,0 +1,67 @@
+require 'mister_bin'
+
+module Kojo
+  module Commands
+    # Handle calls to the +kojo dir+ command
+    class ToJsonCmd < CommandBase
+      using Kojo::Refinements
+
+      attr_reader :input, :save_files, :replace_files
+
+      help "Convert one or more YAML files to JSON"
+
+      usage "kojo tojson INPUT... [(--save | --replace)]"
+      usage "kojo tojson (-h|--help)"
+
+      option "-s --save", "Save each input file in the same directory"
+      option "-r --replace", "Save each input file in the same directory and delete the input file"
+
+      param "INPUT", "Path to a YAML file or multiple files using a glob pattern"
+
+      example "kojo tojson myfile.yaml"
+      example "kojo tojson myfile.yaml --save"
+      example "kojo tojson indir/*.yaml"
+      example "kojo tojson indir/*.yaml --replace"
+      example "kojo tojson indir/**/*.yml"
+
+      def run
+        @input = get_input_files
+        @save_files = args['--save'] || args['--replace']
+        @replace_files = args['--replace']
+
+        save_files ? write : show
+      end
+
+    private
+
+      def tojson(path)
+        JSON.pretty_generate YAML.load_file(path)
+      end
+
+      # Glob patterns are usually handled by the shell, but in case
+      # we still have '*' in our string (for example, if it was sent
+      # quoted), we will do the globbing ourselves
+      def get_input_files
+        args['INPUT'].map do |path|
+          path.include?('*') ? Dir[path].sort : path
+        end.flatten
+      end
+
+      def show
+        input.each do |infile|
+          outfile = infile.gsub(/\.ya?ml/, '.json')
+          say "\n!txtgrn!# #{outfile}"
+          say tojson(infile)
+        end
+      end
+
+      def write
+        input.each do |infile|
+          outfile = infile.gsub(/\.ya?ml/, '.json')
+          save outfile, tojson(infile)
+          File.delete infile if replace_files
+        end
+      end
+    end
+  end
+end

data/lib/kojo/config.rb

@@ -1,5 +1,3 @@
-require 'yaml'
-
 module Kojo
   # The Config class handles multiple template generation from a 
   # definitions YAML file.

data/lib/kojo/front_matter_template.rb

@@ -1,5 +1,3 @@
-require 'yaml'
-
 module Kojo
   # The FrontMatterTemplate class handles a single template file, that 
   # contains a YAML front matter.

data/lib/kojo/version.rb

@@ -1,3 +1,3 @@
 module Kojo
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kojo
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mister_bin
@@ -99,6 +99,7 @@ files:
 - lib/kojo/commands/file.rb
 - lib/kojo/commands/form.rb
 - lib/kojo/commands/single.rb
+- lib/kojo/commands/to_json.rb
 - lib/kojo/config.rb
 - lib/kojo/exceptions.rb
 - lib/kojo/extensions/file.rb
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Configuration Ninja