aster 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae416c0202884d73a16768ac01f7b0e5693e5bb
-  data.tar.gz: fdcb60a7b8bf0b6cdcdbe48bbfb2555f78189cb5
+  metadata.gz: 86ae38efe125e81c630c4809edbafbc19455939c
+  data.tar.gz: 7459061363e884eef7c18cf0985109bf7b5ae684
 SHA512:
-  metadata.gz: f18dd67914ad7c8ee11eabb2024be171584dd0bab372f19cca0ecd60061c84b5591ec3dfa66c8dcdc37b3a511181658e617dcf13b242e40ecbc3cc6446ea26f2
-  data.tar.gz: 6e99ec823ba740726b5ec263587e2743257b6f046c034179d574fbbd997b92dd511517f045a2c550c478f4396fd01ced36cef6de72d57174c8950502cd66f9fb
+  metadata.gz: 6efbc37aac9bbe54efb6f11d35cd94b409d301359d4cbe70578a4d9e10c3e17f41e170ebd939564b7c03e1395248bb2b2d7dc6a196f2d6529d9885dac4b4bb82
+  data.tar.gz: aa0f874e642c9fd23f8e557f750e164a983b8027ece0d9b0a3a349870affc5ac09868be835b1fd59d0bc39fcfbf891a25e2f447d936af0ded50c734e96425874

data/.travis.yml

@@ -0,0 +1,2 @@
+language: ruby
+script: "bundle exec rake test"

data/README.md

@@ -1,5 +1,7 @@
 # Aster
 
+[![Build Status](https://travis-ci.org/smurphy/aster.svg?branch=master)](https://travis-ci.org/smurphy/aster)
+
 Aster is a programming language that's designed to make configuration management more fun.
 
 ### Example

data/aster.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "treetop"
   #spec.add_dependency "thor"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "ZenTest"
 end

data/lib/aster/environment.rb

@@ -59,6 +59,7 @@ module Aster
         case command.function_name
         when :function
           fun, *args = command.arguments
+          
           self.define_function(
             fun,
             args,

data/lib/aster/parser.rb

@@ -23,8 +23,24 @@ module Aster
 
     def raw_parse_line(line)
       @sexp ||= SexpParser.new
+
       result = @sexp.parse(line)
-      result.value
+
+      if result && result.value
+        res = result.value
+        def res.garbage?
+          false
+        end
+        res
+      else
+        # garbage mode
+        result = line.split(' ', 2)
+        def result.garbage?
+          true
+        end
+        result
+      end
+
     end
 
     def parse_line(line)

data/lib/aster/sexp.treetop

@@ -31,7 +31,7 @@ grammar Sexp
   end
 
   rule identifier
-    [a-zA-Z0-9] [a-zA-Z0-9]* {
+    [^\n|\s|"|\}]+ {
       def value
         text_value
       end

data/lib/aster/version.rb

@@ -1,3 +1,3 @@
 module Aster
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/helper.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), *%w(.. lib aster))
 
+
 require 'rubygems'
 require 'test/unit'
 

data/test/test_environment.rb

@@ -33,7 +33,9 @@ class TestEnvironment < Test::Unit::TestCase
   def test_set
     e = Aster::Environment.new
     e.eval "set key value"
+    e.eval "set whatev 22"
     assert_equal "yes", e.eval("equal value $key")
+    assert_equal "yes", e.eval("equal $whatev {add 2 10 10}")
   end
 
   def test_function

data/test/test_parser.rb

@@ -2,11 +2,17 @@ require_relative './helper'
 
 class TestParser < Test::Unit::TestCase
 
-  def parse_line(text)
+  def raw_parse_line text
     p = Aster::Parser.new
     p.send :raw_parse_line, text
   end
 
+  def parse_line text
+    r = raw_parse_line text
+    assert_equal false, r.garbage?
+    r
+  end
+
   def parse text
     p = Aster::Parser.new
     p.parse text
@@ -27,11 +33,29 @@ class TestParser < Test::Unit::TestCase
 
   def test_line_parse
     assert_equal ["a"], parse_line("a")
-    assert_equal ["a", "a"], parse_line("a a")
+
+    tree = parse_line("a $a")
+    assert_equal "a", tree.first
+    assert_equal :a, tree.last.name
+
     assert_equal [:a, :b], parse_line("{$a $b}").first.map{|v| v.name.to_sym}
     assert_equal ["upload", "\"asdf.jpg\""], parse_line(%q(upload "asdf.jpg"))
+    assert_equal ["upload", "nginx.conf"], parse_line("upload nginx.conf")
+    assert_equal ["upload", "nginx/nginx.conf", "~/nginx.test"], parse_line("upload nginx/nginx.conf ~/nginx.test")
+  end
+
+  def test_parse_garbage
+
+    def g p
+      raw_parse_line(p).tap do |g|
+        assert_equal true, g.garbage?
+      end
+    end
+
+
   end
 
+
   def test_command_parse
     c = parse "asdf one two"
     assert_equal c.first.function_name, :asdf
@@ -55,17 +79,17 @@ function test2 asdf
     tree = parser.parse file
   end
 
-  def test_ruby_script
-    tree = parse %Q{
-ruby
-  require 'rubygems'
-  a = ArchiveRecord::Base;
-  a.define "s" do |asdf|
-    asdf.asdf << #end
-  end
-    }
-    text = "require 'rubygems'\na = ArchiveRecord::Base;\na.define \"s\" do |asdf|\n  asdf.asdf << #end\nend\n  "
-    assert_equal text, tree.first.sub_text
-  end
+#   def test_ruby_script
+#     tree = parse %Q{
+# ruby
+#   require 'rubygems'
+#   a = ArchiveRecord::Base;
+#   a.define "s" do |asdf|
+#     asdf.asdf << #end
+#   end
+#     }
+#     text = "require 'rubygems'\na = ArchiveRecord::Base;\na.define \"s\" do |asdf|\n  asdf.asdf << #end\nend\n  "
+#     assert_equal text, tree.first.sub_text
+#   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aster
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sam Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - sam.murphy@gmail.com
@@ -88,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A programming language for configuring servers