sapluuna 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08c183c5c9228c8cd0b92d35d4431dc83afb39d6
-  data.tar.gz: b782533aac78700e6196d33ea251a04558b346cc
+  metadata.gz: ff104d8db679a2a2a66a4f46b6f54e56b0dd5154
+  data.tar.gz: 59ee8ee4a7272fdcae0a32b2ccb51da257cebe1b
 SHA512:
-  metadata.gz: dc69d28c81e1303fc27aeabfae1eb1c0315aabc646e17e3df7e5fdd389ebdb10182efab47e149b6850276c9404596a1f37adbb22c9df548bc5ce1d9450f0513f
-  data.tar.gz: 189bd23af3893e47cefe1851ad088e1addf9261819bb7ef15ac1346fe61e02b3efc1f7e889b171bbbaecea163419ec349aeb0dc7fb6c02a161995d225cbdcf0a
+  metadata.gz: 9e1d6bb34f4a66b0c605cc1b685ea7cd06165c1a5518b5ff0485be1ce15414506c35a5e91be0cdd7b4e38c9af812dd49b9bb3063527740077dc147243841b9c2
+  data.tar.gz: fbae0ae675d4eef4fbf3b9edf543aeb1cc7402d4e2fb97d84ff74e0612684989de878ae2c016042cfddc1885c2a92173ce6399b3dc599b821e6bfb34bebcc482

data/.gitignore

@@ -1,2 +1,2 @@
-gems
+pkg
 cfg*

data/README.md

@@ -4,7 +4,7 @@ Silly little template based configuration maker
 
   * Anything outside {{{ ... }}} is comment and won't be in generated file
   * Inside {{{ }}} you can have <% foo %> which is just ruby
-  * For method_missing in <% foo %> we try variable[name] hash, given to constrcutor, i.e. Sapluuna.new variables: {replace_this: 'with_this'} .... <% replace_this %> works
+  * For method_missing in <% foo %> we try variable[name] hash, given to constructor, i.e. Sapluuna.new variables: {replace_this: 'with_this'} .... <% replace_this %> works
   * {{{ can be followed by negative or positive labels, if labels match to those given to constructor {{{ }}} is evaluated, otherwise ignored
   * rationale for labels is {{{ PE ..... }}}   or     {{{ Finland Sweden ..... }}} to conditionally evaluate blocks
   * You can query the instance on what variables are needed when labels X are set, use-case is in say in webUI to automatically generate form with all variables template needs

data/Rakefile

@@ -1,10 +1,5 @@
-begin
-  require 'rake/testtask'
-  require 'bundler'
-  # Bundler.setup
-rescue LoadError
-  warn 'bundler missing'
-end
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 gemspec = eval(File.read(Dir['*.gemspec'].first))
 file    = [gemspec.name, gemspec.version].join('-') + '.gem'
@@ -17,31 +12,31 @@ end
 desc 'Run minitest'
 task :test do
   Rake::TestTask.new do |t|
-    t.libs.push "lib"
-    t.test_files = FileList['spec/*_spec.rb']
+    t.libs << 'spec'
+    t.test_files = FileList['spec/**/*_spec.rb']
+    t.warning = true
     t.verbose = true
   end
 end
 
-desc 'Build gem'
-task :build do
-  system "gem build #{gemspec.name}.gemspec"
-  FileUtils.mkdir_p 'gems'
-  FileUtils.mv file, 'gems'
-end
-
-desc 'Install gem'
-task :install => :build do
-  system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
+desc 'sudo install gem'
+task :sudo_install => :build do
+   system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
 end
 
 desc 'Remove gems'
 task :clean do
-  FileUtils.rm_rf 'gems'
+  FileUtils.rm_rf 'pkg'
 end
 
-desc 'Push to rubygems'
-task :push do
-  system "gem push gems/#{file}"
+desc 'Tag the release'
+task :tag do
   system "git tag #{gemspec.version}"
 end
+
+desc 'Push to rubygems'
+task :push => :tag do
+  system "gem push pkg/#{file}"
+end
+
+task default: :test

data/lib/sapluuna/context.rb

@@ -43,9 +43,10 @@ class Sapluuna
 
     def import file
       template = File.read resolve_file(file)
-      @opts[:variables]      = @variables
-      @opts[:root_directory] = @root_directory.dup
+      @opts[:variables]          = @variables
+      @opts[:root_directory]     = @root_directory.dup
       @opts[:discover_variables] = @discover_variables
+      @opts[:context]            = self.class
       Log.debug "importing #{file}"
       sapl     = Sapluuna.new @opts
       output   = sapl.parse template

data/sapluuna.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'sapluuna'
-  s.version           = '0.1.7'
+  s.version           = '0.2.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
   s.executables       = %w( sapluuna )
   s.require_path      = 'lib/sapluuna'
 
-  s.required_ruby_version =        '>= 2.0.0'
-  s.add_runtime_dependency 'slop', '~> 4.0'
+  s.required_ruby_version =            '>= 2.0.0'
+  s.add_runtime_dependency     'slop', '~> 4.0'
+
+  s.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapluuna
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: Template based network configuration generator
 email:
 - saku@ytti.fi
@@ -64,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sapluuna
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Template parser