kojo 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61ba22b7003667b908b01d8a1c6c4b3996ba18653d9424574700a7c75086cf1e
-  data.tar.gz: 1a5da4957a819a19e0fc31bd6229e3aaf4aae72e45ed807da9424c3ee03a52de
+  metadata.gz: 45f5390450577b2234342140411f0e0f2c0d35922dcea389217797ec2937c4f6
+  data.tar.gz: 6646baf64c8ca5df34c0d93b4937ed045efe35514b5f07e25abcf73b92392c6d
 SHA512:
-  metadata.gz: 2f2496aee4ebee3a2b2d9acb89361f8646abe2b84173f4b24d7938ac4270b653e49424fdc26fa4102b0f6e625087a1c57a4d00767f6a27c38a6c0138fb025966
-  data.tar.gz: 5bbaf81bb30c7794b00cc630025d9af12e280b4e440b4389eff4284071ccd79a70cb338ddc3df82f361b785fec2ceb527788db8f86a8a1be0491a83fde6382ca
+  metadata.gz: ce8e0883e9c75c615d88c2597554e0b0f927ddef024a36ab62873b4ee67e9193a128f25c70dab4adc70fda927ccdfa1aa0684308c9a82377fb16acf123db6ff9
+  data.tar.gz: d4e562cc197c81f125a43f81ab5c5a0d625cc607fea2556cb5f9baa4b698027291208ca224d719f87421e57812b305f97f8c5804375ba655eb3e81a76c0cd12f

data/bin/kojo

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
 require 'kojo'
-require 'mister_bin'
-require 'kojo/version'
 
-runner = MisterBin::Runner.new 'kojo', basedir: __dir__,
-  header: "Kojo #{Kojo::VERSION}"
+runner = Kojo::CLI.runner
 
 begin
   exit runner.run ARGV

data/lib/kojo/cli.rb

@@ -0,0 +1,17 @@
+require 'mister_bin'
+require 'kojo/commands'
+
+module Kojo
+  class CLI
+    def self.runner
+      runner = MisterBin::Runner.new version: Kojo::VERSION
+
+      runner.route 'file',   to: Kojo::Commands::FileCmd
+      runner.route 'dir',    to: Kojo::Commands::DirCmd
+      runner.route 'config', to: Kojo::Commands::ConfigCmd
+
+      runner
+    end
+  end
+
+end

data/lib/kojo/commands/config.rb

@@ -0,0 +1,52 @@
+require 'fileutils'
+
+module Kojo
+  module Commands
+    class ConfigCmd < MisterBin::Command
+      include Colsole
+
+      help "Generate based on instructions from a config file"
+
+      usage "kojo config CONFIG [--save DIR --args FILE] [ARGS...]"
+      usage "kojo config (-h|--help)"
+
+      option "-s --save DIR", "Save output to directory instead of printing"
+      option "-a --args FILE", "Load arguments from YAML file"
+
+      param "ARGS", "Optional key=value pairs"
+
+      example "kojo config config.yml"
+      example "kojo config config.yml --save output"
+      example "kojo config config.yml -s output scale=3"
+      example "kojo config config.yml -s output --args args.yml"
+
+      def run(args)
+        gen = Kojo::Generator.new args['CONFIG']
+        outdir = args['--save']
+        opts = args['ARGS'].args_to_hash
+        argfile = args['--args']
+
+        if argfile
+          fileopts = YAML.load_file(argfile).symbolize_keys
+          opts = fileopts.merge opts
+        end
+
+        gen.generate opts do |file, output|
+          path = "#{outdir}/#{file}"
+          if outdir
+            dir = File.dirname path
+            FileUtils.mkdir_p dir unless Dir.exist? dir
+
+            File.write path, output
+            say "Saved #{path}"
+          else
+            say "\n!txtgrn!# #{file}"
+            say output
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/kojo/commands/dir.rb

@@ -0,0 +1,61 @@
+module Kojo
+  module Commands
+    class DirCmd < MisterBin::Command
+      include Colsole
+
+      help "Compile a folder of templates to a similar output folder"
+
+      usage "kojo dir INDIR [--save DIR --import DIR --args FILE] [ARGS...]"
+      usage "kojo dir (-h|--help)"
+
+      option "-s --save DIR", "Save output to directory instead of printing"
+      option "-i --import DIR", "Specify base directory for @import directives"
+      option "-a --args FILE", "Load arguments from YAML file"
+
+      param "ARGS", "Optional key=value pairs"
+
+      example "kojo dir indir"
+      example "kojo dir in --save out env=production"
+      example "kojo dir in --save out --import snippets env=production"
+      example "kojo dir in -s out -i snippets -a args.yml"
+
+      def run(args)
+        opts = args['ARGS'].args_to_hash
+        indir = args['INDIR']
+        outdir = args['--save']
+        import_base = args['--import']
+        argfile = args['--args']
+
+        if argfile
+          fileopts = YAML.load_file(argfile).symbolize_keys
+          opts = fileopts.merge opts
+        end
+
+        files = Dir["#{indir}/**/*"].reject { |file| File.directory? file }
+
+        files.each do |file|
+
+          template = Kojo::Template.new(file, opts)
+          template.import_base = import_base if import_base
+          output = template.render
+
+          if outdir
+            outpath = file.sub(/#{indir}/, outdir)
+            
+            dir = File.dirname outpath
+            FileUtils.mkdir_p dir unless Dir.exist? dir
+
+            File.write outpath, output
+            say "Saved #{outpath}"  
+          else
+            outpath = file.sub(/#{indir}/, '')
+            say "\n!txtgrn!# #{outpath}"
+            say output
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/kojo/commands/file.rb

@@ -0,0 +1,47 @@
+require 'kojo'
+
+module Kojo
+  module Commands
+    class FileCmd < MisterBin::Command
+      include Colsole
+
+      help "Compile a file from a template"
+
+      usage "kojo file INFILE [--save FILE --args FILE] [ARGS...]"
+      usage "kojo file (-h|--help)"
+
+      option "-s --save FILE", "Save to file instead of printing"
+      option "-a --args FILE", "Load arguments from YAML file"
+
+      param "ARGS", "Optional key=value pairs"
+
+      example "kojo file main.yml"
+      example "kojo file main.yml --save out.yml"
+      example "kojo file main.yml -s out.yml app=lause"
+      example "kojo file main.yml -s out.yml --args args.yml"
+
+      def run(args)
+        opts = args['ARGS'].args_to_hash
+        outfile = args['--save']
+        infile = args['INFILE']
+        argfile = args['--args']
+
+        if argfile
+          fileopts = YAML.load_file(argfile).symbolize_keys
+          opts = fileopts.merge opts
+        end
+
+        output = Kojo::Template.new(infile, opts).render
+
+        if outfile
+          File.write outfile, output
+          say "Saved #{outfile}"
+        else
+          puts output
+        end
+      end
+
+    end
+  end
+end
+

data/lib/kojo/commands.rb

@@ -0,0 +1,3 @@
+require 'kojo/commands/config'
+require 'kojo/commands/dir'
+require 'kojo/commands/file'

data/lib/kojo/version.rb

@@ -1,3 +1,3 @@
 module Kojo
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/kojo.rb

@@ -1,7 +1,9 @@
 require 'kojo/extensions/array'
 require 'kojo/extensions/hash'
 
+require 'kojo/cli'
 require 'kojo/template'
 require 'kojo/generator'
+require 'kojo/version'
 
 require 'byebug' if ENV['BYEBUG']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kojo
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -113,18 +113,17 @@ description: Generate configuration files from templates, using variables and de
 email: db@dannyben.com
 executables:
 - kojo
-- kojo-config.rb
-- kojo-dir.rb
-- kojo-file.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/kojo
-- bin/kojo-config.rb
-- bin/kojo-dir.rb
-- bin/kojo-file.rb
 - lib/kojo.rb
+- lib/kojo/cli.rb
+- lib/kojo/commands.rb
+- lib/kojo/commands/config.rb
+- lib/kojo/commands/dir.rb
+- lib/kojo/commands/file.rb
 - lib/kojo/extensions/array.rb
 - lib/kojo/extensions/hash.rb
 - lib/kojo/generator.rb

data/bin/kojo-config.rb

@@ -1,44 +0,0 @@
-require 'kojo'
-require 'fileutils'
-
-help "Generate based on instructions from a config file"
-
-usage "kojo config CONFIG [--save DIR --args FILE] [ARGS...]"
-usage "kojo config (-h|--help)"
-
-option "-s --save DIR", "Save output to directory instead of printing"
-option "-a --args FILE", "Load arguments from YAML file"
-
-param "ARGS", "Optional key=value pairs"
-
-example "kojo config config.yml"
-example "kojo config config.yml --save output"
-example "kojo config config.yml -s output scale=3"
-example "kojo config config.yml -s output --args args.yml"
-
-action do |args|
-  gen = Kojo::Generator.new args['CONFIG']
-  outdir = args['--save']
-  opts = args['ARGS'].args_to_hash
-  argfile = args['--args']
-
-  if argfile
-    fileopts = YAML.load_file(argfile).symbolize_keys
-    opts = fileopts.merge opts
-  end
-
-  gen.generate opts do |file, output|
-    path = "#{outdir}/#{file}"
-    if outdir
-      dir = File.dirname path
-      FileUtils.mkdir_p dir unless Dir.exist? dir
-
-      File.write path, output
-      say "Saved #{path}"
-    else
-      say "\n!txtgrn!# #{file}"
-      say output
-    end
-  end
-end
-

data/bin/kojo-dir.rb

@@ -1,54 +0,0 @@
-require 'kojo'
-
-help "Compile a folder of templates to a similar output folder"
-
-usage "kojo dir INDIR [--save DIR --import DIR --args FILE] [ARGS...]"
-usage "kojo dir (-h|--help)"
-
-option "-s --save DIR", "Save output to directory instead of printing"
-option "-i --import DIR", "Specify base directory for @import directives"
-option "-a --args FILE", "Load arguments from YAML file"
-
-param "ARGS", "Optional key=value pairs"
-
-example "kojo dir indir"
-example "kojo dir in --save out env=production"
-example "kojo dir in --save out --import snippets env=production"
-example "kojo dir in -s out -i snippets -a args.yml"
-
-action do |args|
-  opts = args['ARGS'].args_to_hash
-  indir = args['INDIR']
-  outdir = args['--save']
-  import_base = args['--import']
-  argfile = args['--args']
-
-  if argfile
-    fileopts = YAML.load_file(argfile).symbolize_keys
-    opts = fileopts.merge opts
-  end
-
-  files = Dir["#{indir}/**/*"].reject { |file| File.directory? file }
-
-  files.each do |file|
-
-    template = Kojo::Template.new(file, opts)
-    template.import_base = import_base if import_base
-    output = template.render
-
-    if outdir
-      outpath = file.sub(/#{indir}/, outdir)
-      
-      dir = File.dirname outpath
-      FileUtils.mkdir_p dir unless Dir.exist? dir
-
-      File.write outpath, output
-      say "Saved #{outpath}"  
-    else
-      outpath = file.sub(/#{indir}/, '')
-      say "\n!txtgrn!# #{outpath}"
-      say output
-    end
-  end
-end
-

data/bin/kojo-file.rb

@@ -1,38 +0,0 @@
-require 'kojo'
-
-help "Compile a file from a template"
-
-usage "kojo file INFILE [--save FILE --args FILE] [ARGS...]"
-usage "kojo file (-h|--help)"
-
-option "-s --save FILE", "Save to file instead of printing"
-option "-a --args FILE", "Load arguments from YAML file"
-
-param "ARGS", "Optional key=value pairs"
-
-example "kojo file main.yml"
-example "kojo file main.yml --save out.yml"
-example "kojo file main.yml -s out.yml app=lause"
-example "kojo file main.yml -s out.yml --args args.yml"
-
-action do |args|
-  opts = args['ARGS'].args_to_hash
-  outfile = args['--save']
-  infile = args['INFILE']
-  argfile = args['--args']
-
-  if argfile
-    fileopts = YAML.load_file(argfile).symbolize_keys
-    opts = fileopts.merge opts
-  end
-
-  output = Kojo::Template.new(infile, opts).render
-
-  if outfile
-    File.write outfile, output
-    say "Saved #{outfile}"
-  else
-    puts output
-  end
-end
-