kisko-suits 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c6d515b90c12063e6344c824ca0f0cfc56c23e7
-  data.tar.gz: 82bb230b2757dda5da601eb5cfc0bc1ad84b5041
+SHA256:
+  metadata.gz: 64311c554df4ff27cf625648dd7584ef813edac27927a18974da796e9adc66b7
+  data.tar.gz: e506f0a895b3a862ec043221357d981ec4bb0aaaa12c71d59b7135aaf960611e
 SHA512:
-  metadata.gz: 3539633e091ec51d82ff676782ccb7ee8fdc4b8bd714d4417642fe52c5f1b5ce592b36b03e014b7dd67f5291788634a007779910763a0918ded4565349923311
-  data.tar.gz: dcc417989bf6baf8557730208e7f57658df75e6f2cc843076156b79b0cd359c7052ef0d16c896bc7c09fdcf176da56a8844625952642e12b5069d16d1695cfb7
+  metadata.gz: 13be24948a51f1c543a8dc61d35a68937df17d4a47a306470c6d24c21ee791fc7a689b69505c83210eb70a03fb8c717c15ef5cb699f940129a6697bc7652be10
+  data.tar.gz: d4a7c0fa3d6a2d7dbf85128db80ec7111bfad2ccc9b798dd1d56f8aad140eedb2c947ab37e704e4bce31ee3b48e2b2433b9291f6935f45faecb33564956a4f62

data/data/preso_with_variables_within_variables.md.suits

@@ -0,0 +1,4 @@
+$$my_variable = Variable content
+$$another_variable= More $$my_variable
+
+Normal content $$another_variable

data/data/preso_with_variables_within_variables.md_proper

@@ -0,0 +1,2 @@
+
+Normal content More Variable content

data/lib/kisko-suits/application.rb

@@ -5,21 +5,17 @@ module KiskoSuits
     end
 
     def run
-      if @files.empty? || @files.size > 1 || !@files.first.include?(".suits")
+      if !suits_file_passed?
         abort "Usage: 'kisko-suits my-presentation.md.suits'\n\nOr start watching file with: 'kisko-suits -w my-presentation.md.suits'"
       else
         if @params[:watch]
           on_update = ->(filename) {
-            compiler = KiskoSuits::Compiler.new(@files.first)
-            compiler.render
-            puts "Processed files and compiled '#{compiler.output_filename}'"
+            compiler = compile_and_render
             compiler.included_filenames
           }
           KiskoSuits::Watcher.new(@files.first, on_update).start
         else
-          compiler = KiskoSuits::Compiler.new(@files.first)
-          compiler.render
-          puts "Processed files and compiled '#{compiler.output_filename}'"
+          compile_and_render
         end
       end
     end
@@ -33,5 +29,16 @@ module KiskoSuits
 
       [params, files]
     end
+
+    def suits_file_passed?
+      @files.size == 1 && @files.first.include?(".suits")
+    end
+
+    def compile_and_render
+      compiler = KiskoSuits::Compiler.new(@files.first)
+      compiler.render
+      puts "Processed files and compiled '#{compiler.output_filename}'"
+      compiler
+    end
   end
 end

data/lib/kisko-suits/compiler.rb

@@ -16,7 +16,7 @@ module KiskoSuits
       @included_filenames.clear
       @variables.clear
 
-      abort "Suits file '#{path}' not found" unless File.exists?(path)
+      abort "Suits file '#{path}' not found" unless File.exist?(path)
 
       open_output_file do |output|
         File.foreach(path).each do |line|
@@ -32,27 +32,12 @@ module KiskoSuits
         # It's a comment
         ""
       elsif line.match(/\s*\$\$\w+\s?=/)
-        variable_name, variable_value = line.split("=").map(&:strip)
-        @variables[variable_name] = variable_value
-        ""
+        set_variable(line)
       elsif match = line.match(/\s*include:\s*([\w\.\/]+)/)
         included_path = "#{root_dir}/#{match[1]}"
-        if File.exists?(included_path)
-          @included_filenames << included_path
-
-          File.foreach(included_path).map { |included_line|
-            process_line(File.dirname(included_path), included_line)
-          }.join
-        else
-          puts "Include #{included_path} can't be found"
-          ""
-        end
+        include_file(included_path)
       else
-        @variables.each do |variable_name, variable_value|
-          line.gsub!(Regexp.new(Regexp.escape(variable_name)), variable_value)
-        end
-
-        line
+        substitute_variables(line)
       end
     end
 
@@ -63,5 +48,32 @@ module KiskoSuits
 
       File.open(@output_filename, 'w', &block)
     end
+
+    def set_variable(line)
+      variable_name, variable_value = line.split("=").map(&:strip)
+      @variables[variable_name] = variable_value
+      ""
+    end
+
+    def include_file(included_path)
+      if File.exist?(included_path)
+        @included_filenames << included_path
+
+        File.foreach(included_path).map { |included_line|
+          process_line(File.dirname(included_path), included_line)
+        }.join
+      else
+        puts "Include #{included_path} can't be found"
+        ""
+      end
+    end
+
+    def substitute_variables(line)
+      @variables.each do |variable_name, variable_value|
+        line = line.gsub(Regexp.new(Regexp.escape(variable_name)), variable_value)
+      end
+
+      line
+    end
   end
 end

data/lib/kisko-suits/version.rb

@@ -1,3 +1,3 @@
 module KiskoSuits
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/kisko-suits.rb

@@ -1,5 +1,5 @@
 require "optparse"
-require 'filewatcher'
+require "filewatcher"
 
 require_relative "kisko-suits/application"
 require_relative "kisko-suits/compiler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kisko-suits
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Antti Akonniemi
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatcher
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.2.1
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 description: This app was meant to compile markdown partials as one document for our
   sales team using Deckset for Mac
 email:
@@ -48,7 +76,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- bin/kisko-suits
 - data/fail.md.suits
 - data/folder/proot.md
 - data/folder/what.md
@@ -56,8 +83,11 @@ files:
 - data/preso.md_proper
 - data/preso_with_variables.md.suits
 - data/preso_with_variables.md_proper
+- data/preso_with_variables_within_variables.md.suits
+- data/preso_with_variables_within_variables.md_proper
 - data/short_test.md
 - data/test.md
+- exe/kisko-suits
 - lib/kisko-suits.rb
 - lib/kisko-suits/application.rb
 - lib/kisko-suits/compiler.rb
@@ -67,7 +97,7 @@ homepage: http://github.com/kiskolabs/kisko-suits
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: kisko-suits
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Application to compile files as one
 test_files: []