kisko-suits 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c6d515b90c12063e6344c824ca0f0cfc56c23e7
-  data.tar.gz: 82bb230b2757dda5da601eb5cfc0bc1ad84b5041
+  metadata.gz: bca5121f773054ddae30e80e7ac5fc600e51dd0b
+  data.tar.gz: 4d663b82ac1b9e51cd51654fa52ee653e9f46150
 SHA512:
-  metadata.gz: 3539633e091ec51d82ff676782ccb7ee8fdc4b8bd714d4417642fe52c5f1b5ce592b36b03e014b7dd67f5291788634a007779910763a0918ded4565349923311
-  data.tar.gz: dcc417989bf6baf8557730208e7f57658df75e6f2cc843076156b79b0cd359c7052ef0d16c896bc7c09fdcf176da56a8844625952642e12b5069d16d1695cfb7
+  metadata.gz: '069f74c8bc91e15021fcb55abda9aa6af79921e5800f285e5a2b876d9367918dc4c3aa01d82a54d447aae38466a238127451e0cca5d2285ac9111392d6124e17'
+  data.tar.gz: a6b263b27355379ed9a31202ba32104bfd9261e44b5e789badb620125b9b5562436d0105bddcce4a682beda3009c454b969e4cd9ee0371fd7b20e8731080eccc

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"

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

@@ -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.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
+    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.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kisko-suits
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Antti Akonniemi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2018-02-23 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