nasl 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1211036372f4f6f5cf6638769d1de8d46720ffd
-  data.tar.gz: 996d639bae9ddda1394e59745c19eafaca51eb45
+  metadata.gz: f7f194e85bfffd0d60eeba8e2e0c9731fefb8efd
+  data.tar.gz: d1ae8dbd9a8f4cfa6bdea898acb19c6e07715e28
 SHA512:
-  metadata.gz: d376f113cf2fead0955db0b34a56855128f6c8dee42999fbb4173857b649de5ffe31aa3db31129f1879af46ed6c73adb8a7381e46d92cebbb4ae078bca6b5c5d
-  data.tar.gz: 8c90427b235c11cfffae66f294125dfd2094af5fe8cce28701867d84a9e9de95cfc5cba2bf33206cc3eb9b8e49556405a5293fdabac50bb2e9075af956239345
+  metadata.gz: 127f28c3d561498967aedd5de3ae092eec8327b1781a8a7321934fb40c617f2aab5940b6ff1f6bdfeb90b1122f1489f2b83a42273a4a8dcbdeb54ddddb28aeba
+  data.tar.gz: 25f4fc9e456ad37df32f2fe6999ec3fa62089511d2d71a6703772ef454da6bbde0ba80b140051dc007a0b792693d4d358d21e13c585e6bd7f85215425236a29c

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+
+rvm: 
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+
+gemfile:
+  - Gemfile.ci
+
+notifications:
+  email:
+    - jhammack@tenable.com
+    - aweber@tenable.com
+
+before_install:
+  - gem --version
+

data/Gemfile

@@ -1,4 +1,6 @@
-source 'http://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in nasl.gemspec
-gemspec
+gem "racc", '1.4.12'
+gem "rake", '10.3.2'
+gem "builder", '3.2.2'
+gem "rainbow", '2.0.0'

data/Gemfile.ci

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "racc", '1.4.12'
+gem "rake", '10.3.2'
+gem "builder", '3.2.2'
+gem "rainbow", '2.0.0'

data/lib/nasl/grammar.racc

@@ -195,7 +195,7 @@ rule
              ;
 
   rep        : call_exp REP expr SEMICOLON
-             { n(:Repetition, n(:Call, val[0]), *val[1..-1]) }
+             { n(:Repetition, *val[0..-1]) }
              ;
 
   return     : RETURN expr SEMICOLON

data/lib/nasl/parser/node.rb

@@ -48,7 +48,7 @@ module Nasl
     end
 
     def region
-      @tokens.first.region.begin..@tokens.last.region.end
+      @tokens.flatten.first.region.begin..@tokens.flatten.last.region.end
     end
 
     def to_xml(xml)

data/lib/nasl/version.rb

@@ -25,5 +25,5 @@
 ################################################################################
 
 module Nasl
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/test/unit/parser/test_repetition.rb

@@ -0,0 +1,46 @@
+################################################################################
+# Copyright (c) 2011-2014, Tenable Network Security
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+################################################################################
+
+class TestRepetition < Test::Unit::TestCase
+  include Nasl::Test
+
+  def test_does
+    pass("exit() x 10;");
+  end
+
+  def test_two_args
+    tree = parse("exit(2, 3) x 10;")
+    assert_not_nil(tree)
+
+    calls = tree.all(:Call)
+    assert_not_nil(calls)
+    assert_equal(1, calls.length)
+
+    call = calls.first
+    assert_not_nil(call)
+    assert_equal(2, call.args.length)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nasl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Mak Kolybabi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -80,7 +80,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Gemfile.ci
 - README.md
 - Rakefile
 - bin/nasl-parse
@@ -157,6 +159,7 @@ files:
 - test/unit/parser/test_ip.rb
 - test/unit/parser/test_list.rb
 - test/unit/parser/test_local.rb
+- test/unit/parser/test_repetition.rb
 - test/unit/parser/test_return.rb
 - test/unit/parser/test_string.rb
 - test/unit/parser/test_whitespace.rb
@@ -210,6 +213,7 @@ test_files:
 - test/unit/parser/test_ip.rb
 - test/unit/parser/test_list.rb
 - test/unit/parser/test_local.rb
+- test/unit/parser/test_repetition.rb
 - test/unit/parser/test_return.rb
 - test/unit/parser/test_string.rb
 - test/unit/parser/test_whitespace.rb