erb_asterisk 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10921588da08da44d6bea41147209c7116366db2
-  data.tar.gz: b48c7ea95a4ce48c57324fb720021fcf96a55767
+  metadata.gz: bbf38bf4e673c087ae0196dc27ecb1e34c94d1df
+  data.tar.gz: 8da193f97e93ea16c87a9ec70fc294c6dfd39c0c
 SHA512:
-  metadata.gz: 0eb250cd67eb98cff1653e9b54a30b9e797724b4d87d7b7364cb73392acda5272a6136bc202c606867cb95726d5f5cda1d44552f0788714f85dcd7e247b50c85
-  data.tar.gz: 7868a18253dfec254c82188027f9820aac8b990d863e9e440bdb8bee34984334d08d63b8a79f1ca8b5330c383e280a28a8ab96ed1c0ea09984540ee9eed41837
+  metadata.gz: d715f98ac45b62b52a2431418c152e09940bb572f6b470def263604952a117e1fb33e02be6290cd11b488d5e833b9ae5b27e321227d201dfbcd3c157b336342c
+  data.tar.gz: ced26955e954ee6fdbbc08f33cabb429c21fbfae13b5956cec00705a532230ff731cba22e88c54cb66633bdc517fac53370318c90b670d791c9a5acc8ee5919a

data/erb_asterisk.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.executables   = 'erb_asterisk'
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'slop', '~> 4.5'
+
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.3'

data/exe/erb_asterisk

@@ -1,10 +1,14 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'pathname'
 $LOAD_PATH.unshift(
   File.expand_path('../../lib', Pathname.new(__FILE__).realpath))
 
 require 'erb_asterisk'
+require 'erb_asterisk/arg_parser'
+
+arg_parser = ErbAsterisk::ArgParser.new
 
 include ErbAsterisk
-execute
+execute(arg_parser.execute)

data/lib/erb_asterisk.rb

@@ -4,9 +4,8 @@ require 'pathname'
 
 module ErbAsterisk
   # Render template
-  # TODO: render user defined templates
   def render(template, vars = {})
-    tpl = File.read("#{@templates_path}/#{template}.erb")
+    tpl = read_template(template)
     e = ERB.new(tpl)
 
     b = TOPLEVEL_BINDING
@@ -56,8 +55,8 @@ module ErbAsterisk
     @yields[tag]
   end
 
-  def execute
-    init_instance
+  def execute(opts)
+    init_instance(opts)
     load_project_file
 
     root = asterisk_root
@@ -73,10 +72,13 @@ module ErbAsterisk
   ERB_ASTERISK_CONF = 'asterisk.conf'.freeze
   ERB_ASTERISK_DIR = 'asterisk/'.freeze
 
-  def init_instance
+  def init_instance(opts)
     @exports = {}
     @templates_path = ''
     @yields = {}
+
+    user_path = opts[:templates].nil? ? '~/.erb_asterisk' : opts[:templates]
+    @user_templates = File.expand_path("#{user_path}/templates")
   end
 
   def asterisk_root
@@ -141,4 +143,15 @@ module ErbAsterisk
       File.write("#{root}#{include_file}", result)
     end
   end
+
+  def read_template(template)
+    file_name = "#{template}.erb"
+    project_template = "#{@templates_path}/#{file_name}"
+    return File.read(project_template) if File.exist?(project_template)
+
+    user_template = "#{@user_templates}/#{file_name}"
+    return File.read(user_template) if File.exist?(user_template)
+
+    raise "Template not found: #{template}"
+  end
 end

data/lib/erb_asterisk/arg_parser.rb

@@ -0,0 +1,23 @@
+require 'slop'
+require 'erb_asterisk/version'
+
+module ErbAsterisk
+  class ArgParser
+    def execute
+      Slop.parse do |o|
+        o.string '-t', '--templates',
+                 'set templates path (e.g.: ~/.erb_asterisk)'
+
+        o.on '-v', '--version', 'print the version' do
+          puts "#{VERSION}"
+          exit
+        end
+
+        o.on '-h', '--help', 'print this help' do
+          puts o
+          exit
+        end
+      end
+    end
+  end
+end

data/lib/erb_asterisk/version.rb

@@ -1,3 +1,3 @@
 module ErbAsterisk
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb_asterisk
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Artem Baikuzin
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +112,7 @@ files:
 - erb_asterisk.gemspec
 - exe/erb_asterisk
 - lib/erb_asterisk.rb
+- lib/erb_asterisk/arg_parser.rb
 - lib/erb_asterisk/version.rb
 homepage: https://github.com/ybinzu/erb_asterisk
 licenses: