script_executor 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0a0de62f31cf6ee86a7d9ae383d1e28fa4edacd
-  data.tar.gz: 154c990b179af68c7dfd41697d2c8165a1e2df62
+  metadata.gz: 73c1c08d24e34a3c848c5514f9468ac6da34a109
+  data.tar.gz: 21361a7deed4aa7961730300d9e8a774c52223d4
 SHA512:
-  metadata.gz: f362a894b9185ee0297885933e1db9aa5ede241635b717466fba2cf850228a2c07b006435f8ffe14aaf04a58b1bcb9d7cfd15f10db12c2ad7a5d67f10902ae64
-  data.tar.gz: 0e1a3bbfaceed66e2d7d2837deefd431ec40f2dce54449f96822f7c6cb4c68a6625cf26a0ac95f471ec7bdd03ed222a83307b760fdf6012ec59a2ca6a4ae8d29
+  metadata.gz: 3a49c7dcae66dcb6ac84fe3f37d7317c55a25a8807e4bb46f788a010e4dd3936a926316bceb2a1f013debac9711e48cc0b086678924bfb98e28244c8c178fc7a
+  data.tar.gz: 38543fcc57931bfdfe4a52c988fd581e59ba4ecd5bfc9baefd050f57562500fc3972bb4d6c955322104827e9d0c008e6e793a9b26752847bceba6e7ea0a1d777

data/CHANGES

@@ -106,6 +106,6 @@
 
 * Replace simple parsing with parslet-based parsing.
 
-== Version 1.7.1, 1.7.2,1.7.3
+== Version 1.7.1 - 1.7.4
 
 * Bug fixes.

data/lib/script_executor/script_locator.rb

@@ -1,15 +1,23 @@
 require 'erb'
 require 'text_interpolator'
+
 require 'script_executor/scripts_parser'
+require 'script_executor/scripts_transform'
 
 module ScriptLocator
 
   def scripts file
     data = extract_data file
 
-    scripts_parser = ScriptsParser.new
+    begin
+      scripts_parser = ScriptsParser.new
+      parsed_content = scripts_parser.parse data
 
-    scripts_parser.parse data
+      transformer = ScriptsTransform.new
+      transformer.transform(parsed_content)
+    rescue Parslet::ParseFailed => failure
+      puts failure.cause.ascii_tree
+    end
   end
 
   def evaluate_script_body content, env, type=:erb

data/lib/script_executor/scripts_parser.rb

@@ -1,42 +1,27 @@
 require 'parslet'
 
-require 'script_executor/scripts_transformer'
-
 class ScriptsParser < Parslet::Parser
   root :language
 
-  # language
-  rule(:language)   { (shebang.as(:shebang).maybe >> ignored.as(:ignored).maybe >> scripts.as(:scripts)).as(:language) }
-
-  rule(:shebang)    { str('#') >> str('!') >> match['\w\d_/\s'].repeat(1) }
-  rule(:ignored)    { comment.repeat }
-  rule(:scripts)    { script.repeat }
-
-  rule(:script)     { emptyLines >> (name >> comment.maybe >> code).as(:script) }
-  rule(:comment)    { emptyLines >> spaces >> (str('#') >> spaces >> (newline.absent? >> any).repeat.as(:comment)) >> newline }
-  rule(:name)       { spaces >> str('[') >> spaces >> spaces >> nameChars.as(:name) >> spaces >> str(']') >> spaces >> newline }
-
-  rule(:code)  { (emptyLines >> codeLine.repeat.maybe >> emptyLines).as(:code) }
-  rule(:codeLine)   { emptyLines >> codeChars.as(:codeLine) >> newline }
+  rule(:language)    { (shebang.as(:shebang).maybe >> empty_lines >> comment.repeat(0).as(:ignored) >> empty_lines >> scripts).as(:language) }
 
-  rule(:nameChars)  { match['\w\d_'].repeat(1) }
-  rule(:codeChars)  { match['(.*)\w\d $_#"<>{}\'\/\.%=!\-+/\*|:~@'].repeat(1) }
+  rule(:shebang)     { str('#') >> str('!') >> match['\w\d_/\s'].repeat(1) }
 
-  rule(:emptyLines) { emptyLine.repeat }
-  rule(:emptyLine)  { spaces >> newline }
-  rule(:newline)    { str("\n") >> str("\r").maybe }
+  rule(:comment)     { (str(';') | str('#')) >> spaces >> (newline.absent? >> any).repeat(0).as(:comment) >> eol }
 
-  rule(:spaces)     { str(' ').repeat }
+  rule(:scripts)     { script.repeat(0).as(:scripts) }
 
-  def parse content
-    begin
-      parsed_content = super content + "\n"
+  rule(:name)        { spaces >> str('[') >> spaces >> name_chars.as(:name) >> str(']') >> eol }
+  rule(:name_chars)  { match['\w\d_'].repeat(1) }
 
-      transformer = ScriptsTransformer.new
+  rule(:script)      { (name >> empty_lines >> (name.absent? >> (comment | code_line)).repeat(0)).as(:script) }
+  rule(:code_line)   { (newline.absent? >> code_chars).repeat(1).as(:code_line) >> eol }
+  rule(:code_chars)  { any }
 
-      transformer.apply(parsed_content)[:scripts]
-    rescue Parslet::ParseFailed => failure
-      puts failure.cause.ascii_tree
-    end
-  end
+  rule(:empty_lines) { empty_line.repeat(0) }
+  rule(:empty_line)  { spaces >> newline }
+  rule(:newline)     { str("\n") >> match("\r").maybe }
+  rule(:spaces)      { match["\s\t "].repeat(0) }
+  rule(:eol)         { (newline.repeat(0) | eof) }
+  rule(:eof)         { any.absent? }
 end

data/lib/script_executor/scripts_transform.rb

@@ -0,0 +1,50 @@
+require 'parslet'
+
+class ScriptsTransform < Parslet::Transform
+
+  rule(:language => subtree(:language)) do
+    language.delete(:ignored)
+
+    new_scripts = {}
+
+    language[:scripts].each do |el|
+      script = el[:script]
+
+      name = script[0][:name].to_sym
+
+      has_main_comment = script[1][:comment] != nil
+
+      main_comment = has_main_comment ? script[1][:comment].to_s : ''
+
+      start_index = has_main_comment ? 2 : 1
+
+      code = []
+
+      (start_index..script.size-1).each do |index|
+        script_node = script[index]
+
+        comment = script_node[:comment]
+
+        if comment && comment.to_s !~ /^[\s;#]+$/
+          code << '# ' + comment.to_s
+        end
+
+        code_line = script_node[:code_line]
+
+        if code_line
+          code << code_line.to_s
+        end
+      end
+
+      new_scripts[name] = {comment: main_comment, code: code}
+    end
+
+    language[:scripts] = new_scripts
+
+    language
+  end
+
+  def transform content
+    apply(content)[:scripts]
+  end
+end

data/lib/script_executor/version.rb

@@ -1,3 +1,3 @@
 class ScriptExecutor
-  VERSION = "1.7.3"
+  VERSION = "1.7.4"
 end

data/spec/base_provision_spec.rb

@@ -10,7 +10,7 @@ describe BaseProvision do
 
   describe "#initialize" do
     it "parses content from file" do
-      expect(subject.script_list.size).to equal(10)
+      expect(subject.script_list.size).to equal(9)
     end
   end
 

data/spec/scripts_parser_spec.rb

@@ -1,16 +1,19 @@
 require 'spec_helper'
 
 require 'script_executor/scripts_parser'
-require 'script_executor/scripts_transformer'
+require 'script_executor/scripts_transform'
 
 describe ScriptsParser do
+
   describe "#parse" do
     it "parses content from file 1" do
       content = File.read('spec/support/script1.sh')
 
       parsed_content = subject.parse(content)
 
-      ap parsed_content
+      #ap parsed_content
+
+      ap transform parsed_content
     end
 
     it "parses content from file 2" do
@@ -18,7 +21,9 @@ describe ScriptsParser do
 
       parsed_content = subject.parse(content)
 
-      ap parsed_content
+      #ap parsed_content
+
+      ap transform parsed_content
     end
 
     it "parses content from file 3" do
@@ -26,7 +31,9 @@ describe ScriptsParser do
 
       parsed_content = subject.parse(content)
 
-      ap parsed_content
+      #ap parsed_content
+
+      ap transform parsed_content
     end
 
     it "parses content from file 4" do
@@ -34,7 +41,9 @@ describe ScriptsParser do
 
       parsed_content = subject.parse(content)
 
-      ap parsed_content
+      #ap parsed_content
+
+      ap transform parsed_content
     end
 
     it "parses content from file 5" do
@@ -42,7 +51,32 @@ describe ScriptsParser do
 
       parsed_content = subject.parse(content)
 
-      ap parsed_content
+      #ap parsed_content
+
+      ap transform parsed_content
     end
+
+#     it "test" do
+#       content = <<-DATA
+# #!/usr/bin/env bash
+#
+# # Some description
+# [name]
+#
+# # some comment
+# aaa
+# bbb
+#       DATA
+#
+#       parsed_content = subject.parse(content)
+#
+#       ap parsed_content
+#     end
+  end
+
+  def transform content
+    script_transform = ScriptsTransform.new
+
+    script_transform.transform content
   end
 end

data/spec/support/script1.sh

@@ -76,7 +76,7 @@ sudo apt-get install -y node
 
 
 #######################################
-[rbenv]
+ [rbenv ]
 # Installs node
 
 sudo apt-get install -y rbenv
@@ -93,4 +93,4 @@ sudo apt-get install -y libqt4-dev
 sudo apt-get install -y libqtwebkit-dev
 
 # to support headless
-sudo apt-get install -y xvfb
+sudo apt-get install -y xvfb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: script_executor
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -161,7 +161,7 @@ files:
 - lib/script_executor/script_executor.rb
 - lib/script_executor/script_locator.rb
 - lib/script_executor/scripts_parser.rb
-- lib/script_executor/scripts_transformer.rb
+- lib/script_executor/scripts_transform.rb
 - lib/script_executor/version.rb
 - lib/script_locator.rb
 - script_executor.gemspec

data/lib/script_executor/scripts_transformer.rb

@@ -1,25 +0,0 @@
-require 'parslet'
-
-class ScriptsTransformer < Parslet::Transform
-  rule(:language => subtree(:language)) do
-    language.delete(:ignored)
-
-    new_scripts = {}
-
-    language[:scripts].each do |script|
-      name = script[:script][:name].to_sym
-      comment = script[:script][:comment].to_s
-      code = script[:script][:code]
-
-      code.each_with_index do |codeLine, index|
-        code[index] = codeLine[:codeLine].to_s
-      end
-
-      new_scripts[name] = {comment: comment, code: code}
-    end
-
-    language[:scripts] = new_scripts
-
-    language
-  end
-end