script_executor 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73c1c08d24e34a3c848c5514f9468ac6da34a109
-  data.tar.gz: 21361a7deed4aa7961730300d9e8a774c52223d4
+  metadata.gz: 14d76bcbd7dec002c5f8a212e401e85fc179d48d
+  data.tar.gz: fdd367cd483f92c06fca53ceed9071971ade9eb6
 SHA512:
-  metadata.gz: 3a49c7dcae66dcb6ac84fe3f37d7317c55a25a8807e4bb46f788a010e4dd3936a926316bceb2a1f013debac9711e48cc0b086678924bfb98e28244c8c178fc7a
-  data.tar.gz: 38543fcc57931bfdfe4a52c988fd581e59ba4ecd5bfc9baefd050f57562500fc3972bb4d6c955322104827e9d0c008e6e793a9b26752847bceba6e7ea0a1d777
+  metadata.gz: 7cd378c64712dcfda80578495da636439cf31845c98350f0c574daa9ffb15ce4d772875996634c7cf284fd60a1eea1259f34973ddfda1de2adbe6023f5ad4f67
+  data.tar.gz: 15301ca977bf1cc446da11ebc71caa22ae5eb7ca1b601add1f28459e2366a18af72cd149b614f6d539b15193b02e716d8e5148167ca453f5a40d64707f4e2fdd

data/CHANGES

@@ -109,3 +109,7 @@
 == Version 1.7.1 - 1.7.4
 
 * Bug fixes.
+
+== Version 1.7.5
+
+* Add one more format for name section.

data/lib/script_executor/scripts_parser.rb

@@ -3,25 +3,29 @@ require 'parslet'
 class ScriptsParser < Parslet::Parser
   root :language
 
-  rule(:language)    { (shebang.as(:shebang).maybe >> empty_lines >> comment.repeat(0).as(:ignored) >> empty_lines >> scripts).as(:language) }
+  rule(:language)     { (shebang.maybe >> ignored >> scripts).as(:language) }
 
-  rule(:shebang)     { str('#') >> str('!') >> match['\w\d_/\s'].repeat(1) }
+  rule(:shebang)      { str('#') >> str('!') >> match['\w\d_/\s'].repeat(1).as(:shebang) }
+  rule(:ignored)      { empty_lines >> (name.absent? >> comment).repeat(0).as(:ignored) >> empty_lines }
 
-  rule(:comment)     { (str(';') | str('#')) >> spaces >> (newline.absent? >> any).repeat(0).as(:comment) >> eol }
+  rule(:comment)      { comment_char >> spaces >> (newline.absent? >> any).repeat(0).as(:comment) >> eol }
+  rule(:comment_char) { str(';') | str('#') }
 
-  rule(:scripts)     { script.repeat(0).as(:scripts) }
+  rule(:scripts)      { script.repeat(0).as(:scripts) }
+  rule(:script)       { (name >> empty_lines >> (name.absent? >> (comment | code_line)).repeat(0)).as(:script) }
 
-  rule(:name)        { spaces >> str('[') >> spaces >> name_chars.as(:name) >> str(']') >> eol }
-  rule(:name_chars)  { match['\w\d_'].repeat(1) }
+  rule(:name)         { name_v1 |name_v2 }
+  rule(:name_v1)      { spaces >> str('[') >> spaces >> name_chars.as(:name) >> str(']') >> spaces >> eol }
+  rule(:name_v2)      { spaces >> comment_char >> spaces >> str('[') >> spaces >> name_chars.as(:name) >> str(']') >> spaces >> eol }
+  rule(:name_chars)   { match['\w\d_'].repeat(1) }
 
-  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 }
+  rule(:code_line)    { (newline.absent? >> code_chars).repeat(1).as(:code_line) >> eol }
+  rule(:code_chars)   { any }
 
-  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? }
+  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/version.rb

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

data/spec/scripts_parser_spec.rb

@@ -55,17 +55,21 @@ describe ScriptsParser do
 
       ap transform parsed_content
     end
-
+#
 #     it "test" do
 #       content = <<-DATA
 # #!/usr/bin/env bash
 #
+# #######################################
+#
 # # Some description
-# [name]
+# # [name]
 #
 # # some comment
-# aaa
-# bbb
+#
+#       aaa
+#       bbb
+#
 #       DATA
 #
 #       parsed_content = subject.parse(content)

data/spec/support/script1.sh

@@ -1,28 +1,32 @@
 #!/usr/bin/env bash
 
-[test1]
+
+# [test1]
 # Some description
 
 echo "<%= name %>"
 
-[test2]
+
+#######################################
+# [test2]
 
 echo "test2"
 
+
 #######################################
-[echo]
+# [echo]
 
 echo "Hello world!"
 
 
 #######################################
-[ubuntu_update]
+# [ubuntu_update]
 
 sudo apt-get update
 
 
 #######################################
-[prepare_linux]
+# [prepare_linux]
 # Updates linux core packages
 
 sudo apt-get update
@@ -51,7 +55,7 @@ sudo apt-get install -y libffi-dev
 
 
 #######################################
-[rvm]
+# [rvm]
 # Installs rvm
 
 curl -L https://get.rvm.io | bash
@@ -60,7 +64,7 @@ curl -L https://get.rvm.io | bash
 
 
 #######################################
-[ruby]
+# [ruby]
 # Installs ruby
 
 source /usr/local/rvm/scripts/rvm
@@ -69,14 +73,14 @@ rvm install ruby-2.2.3
 
 
 #######################################
-[node]
+# [node]
 # Installs node
 
 sudo apt-get install -y node
 
 
 #######################################
- [rbenv ]
+# [rbenv ]
 # Installs node
 
 sudo apt-get install -y rbenv
@@ -84,8 +88,9 @@ git clone git://github.com/jf/rbenv-gemset.git $HOME/.rbenv/plugins/rbenv-gemset
 
 
 #######################################
-[prepare]
+# [prepare]
 # to support nokogiri
+
 sudo apt-get install -y libgmp-dev
 
 # to support capybara-webkit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: script_executor
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline