aster 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58243f4638f7370eaedd71419622f967f24bd60e
-  data.tar.gz: 8426cc93373842fb7cf66d2fcc3c389a47cdecf1
+  metadata.gz: 0c85417587339f5f431df3347c2045046b742aae
+  data.tar.gz: 72836e9ed31cd3f4ba159509bebcbbfe28bca42c
 SHA512:
-  metadata.gz: 1adc2b41461422e04081c6fa8c4d9f2c460b8661691ee0aff87bacf5fc7d9b611fa031a7e1115b680221e767f071ec0c61ca953d44761e2062191fbb863a7ae4
-  data.tar.gz: 1cdcbe16dff0aaf31ec201df89181461416f94d3c1044d890de17ad664b60c8a06fcf7f8b6622266cc051f950fe647b2d3172770a2d3e3e7b3439b194bcd65ef
+  metadata.gz: 54058d24e135d2efee5e8abfc2755b32067f84a4f4210029cdfa688460d478b43ab4ca6f83f2a3904b65a7ea93eb4e84bed1d2e98367e3e0fcac974573122557
+  data.tar.gz: b8d77eb5a75520e918749ebb2e875e3488e25e055c017749a853db83d662caa3da0a975352e36880a45219e18f6b02106786e0aee8d1dbb75ea0ea78181758b5

data/README.md

@@ -2,9 +2,10 @@
 
 Aster is a programming language that's designed to make configuration management more fun.
 
-## Example
+### Example
 
     server web
+
       default-instance-vars
         var username root
         var ssh-port 22
@@ -17,6 +18,7 @@ Aster is a programming language that's designed to make configuration management
         config-set username admin
         config-set ssh-port 2222
         upload sample.conf /etc/conf
+        exec set-hostname $instance.hostname
 
       add-remote-file-runner .rb
         exec `which ruby`
@@ -43,10 +45,24 @@ Aster is a programming language that's designed to make configuration management
     create-server-instance web
       configure-instance {{instance.id}}
 
-## Install
+### Install
   
     gem install aster
 
-## Usage
+### Usage
+
+#### Adding ruby-side macro
+
+    class Server
+    end
+
+    e = Aster::Environment.new
+
+    # Make a special form of "server" that 
+    e.define_macro "server" do |arguments, body|
+      body.parse_tree
+    end
+
+### Notes
 
 Aster is not a configuration management application. Right now it is an experimental language that supports other languages embedded within `.aster` files.

data/TODO

@@ -1,4 +1,12 @@
 # TODO
 
-* reserve gem name
+
+
+# Done
+
+* implement sub-language text gathering
+* implement ruby-side macros
+* implement equal
+* implement not
 * eval sub-commands like "equal {add 1 1} 2"
+* reserve gem name

data/aster.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "ZenTest"
 end

data/lib/aster.rb

@@ -12,4 +12,5 @@ require_relative './aster/command'
 require_relative './aster/environment'
 require_relative './aster/function'
 require_relative './aster/parser'
+require_relative './aster/macro'
 

data/lib/aster/command.rb

@@ -1,24 +1,31 @@
 module Aster
   class Command
-    attr_accessor :text, :sublines
+    attr_accessor :text, :sub_commands, :sub_text
 
-    def initialize(commands, sublines = [])
-      @commands = commands
-      @sublines = sublines
-    end
-
-    def rest
-      @text.split(' ', 2)[1]
+    def initialize(commands, subcommands = [])
+      @commands = make_commands commands
+      @sub_commands = sub_commands
     end
 
     def arguments
-      _, *args = @commands
-      args
+      @commands[1..-1]
     end
 
     def function_name
       @function_name ||= @commands.first.to_sym
     end
 
+    private
+
+      def make_commands(cmds)
+        cmds.map do |cmd|
+          if cmd.is_a?(Array)
+            Command.new(cmd)
+          else
+            cmd
+          end
+        end
+      end
+
   end
 end

data/lib/aster/environment.rb

@@ -7,17 +7,9 @@ module Aster
     def initialize(parent = nil)
       @parent = parent
       @env = {}
-      @stdout = ""
-      @stderr = ""
+      @stdout, @stderr = "", ""
 
-      if parent.nil?
-        define_function :echo, [:_list_] do |arguments|
-          @stdout << arguments.join(' ')
-        end
-        define_function :equal, [:a, :b] do |(a, b)|
-          a.to_s == b.to_s ? "yes" : "no"
-        end
-      end
+      define_base_environment if parent.nil?
     end
 
     def child
@@ -38,59 +30,97 @@ module Aster
     end
 
     def define_function(name, args, commands = nil, &block)
-      @env[name.to_sym] = Function.new(args, commands, &block)
+      self[name] = Function.new(args, commands, &block)
+    end
+
+    def define_macro(name, &block)
+      self[name] = Macro.new self, block
     end
 
     private
 
-      def eval_line(command)
+      def define_base_environment
+        define_function :echo, [:_list_] do |arguments|
+          @stdout << arguments.join(' ')
+        end
+
+        define_function :equal, [:a, :b] do |(a, b)|
+          a.to_s == b.to_s ? "yes" : "no"
+        end
+
+        define_function :add, [:_list_] do |arguments|
+          arguments.inject(0){|r, s| s.to_i + r}.to_s
+        end
+
+      end
+
+
+      def eval_command(command)
         case command.function_name
         when :function
           fun, *args = command.arguments
           self.define_function(
             fun,
             args,
-            command.sublines
+            command.sub_commands
           )
         when :if
-          cond_value = eval_line Command.new(command.rest)
+          cond_value = eval_command Command.new(command.rest)
           if is_true?(cond_value)
-            eval_tree command.sublines
+            eval_tree command.sub_commands
           end
         when :not
-          cond_value = eval_line Command.new(command.rest)
+          cond_value = eval_arguments([command.arguments.first]).first
           is_true?(cond_value) ? "no" : "yes"
         else
-          function = self[command.function_name]
-          if function
-            eval_function(function, command.arguments, self.child)
+          case function_or_macro = self[command.function_name]
+          when Function
+            eval_function(
+              function_or_macro, 
+              eval_arguments(command.arguments), 
+              self.child
+            )
+          when Macro
+            eval_macro(function_or_macro, command)
+          else
+            # ?            binding.pry
+          end
+        end
+      end
+
+      def eval_arguments(arguments)
+        arguments.map do |arg|
+          if arg.is_a?(Command)
+            eval_command(arg)
+          elsif arg.is_a?(Variable)
+            self[arg.name]
           else
-            #binding.pry
+            arg
           end
         end
       end
 
       def is_true?(val)
-        val && value.strip == "yes"
+        val && val.strip == "yes"
       end
 
       def eval_tree(tree)
-        tree.each do |command|
-          eval_line command
-        end
+        tree.map do |command|
+          res = eval_command command
+        end.last
       end
 
-      def eval_function(function, arguments, env)
-        # need to eval args
-        arguments = arguments.map do |arg|
-          if arg.is_a?(Variable)
-            env[arg.name]
-          else
-            arg
-          end
+      def eval_macro(macro, command)
+        command_or_commands = macro.function(command)
+        if command_or_commands.is_a?(Array)
+          eval_tree command_or_commands
+        else
+          eval_command command_or_commands
         end
+      end
 
-        # bind arguments
+      def eval_function(function, arguments, env)
+        # bind arguments to new env
         function.arguments.each_with_index do |a, i|
           env[a] = arguments[i]
         end
@@ -101,13 +131,7 @@ module Aster
           function.block.call arguments
         else
           raise
-        end
-        
-      end
-
-
-      def eval_custom(m, args)
-
+        end        
       end
 
   end

data/lib/aster/macro.rb

@@ -0,0 +1,12 @@
+class Macro
+
+  def initialize(env, block)
+    @env = env
+    @block = block
+  end
+
+  def function(command)
+    @block.call command
+  end
+
+end

data/lib/aster/parser.rb

@@ -1,4 +1,3 @@
-
 require 'treetop'
 
 module Aster
@@ -59,7 +58,15 @@ module Aster
               break
             end
           end
-          command.sublines = parse_lines sublines
+
+          begin
+            command.sub_commands = parse_lines sublines
+          rescue
+            command.sub_commands = :GARBAGE
+          end
+          command.sub_text = sublines.map do |subline|
+            subline.gsub(/^[ ]{#{next_indent*2}}/, '')
+          end.join("\n")
         end
         data << command
       end

data/lib/aster/sexp.treetop

@@ -1,6 +1,3 @@
-
-
-
 grammar Sexp
 
   rule body
@@ -13,7 +10,6 @@ grammar Sexp
       end
     }
   end
-
   
   rule expression
     space? '{' body '}' space? {
@@ -25,7 +21,6 @@ grammar Sexp
       end
     }
   end
-
  
   rule variable
     '$' identifier {

data/lib/aster/version.rb

@@ -1,3 +1,3 @@
 module Aster
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_environment.rb

@@ -2,10 +2,32 @@ require_relative './helper'
 
 class TestEnvironment < Test::Unit::TestCase
 
+  def eval(text)
+    Aster::Environment.new.eval(text)
+  end
+
   def test_not
     e = Aster::Environment.new
-    #assert_equal "no", e.eval("not yes")
-    #assert_equal "yes", e.eval("not no")
+    assert_equal "no", e.eval("not yes")
+    assert_equal "yes", e.eval("not no")
+  end
+
+  def test_sub_not
+    e = Aster::Environment.new
+    assert_equal "no", e.eval("not {not no}")
+    assert_equal "yes", e.eval("not {not {not no}}")
+  end
+
+  def test_equal
+    e = Aster::Environment.new
+    assert_equal "yes", e.eval("equal 1 1")
+    assert_equal "yes", e.eval("equal {not no} yes")
+  end
+
+  def test_add
+    assert_equal "12", eval("add 6 6")
+    assert_equal "6", eval("add 1 2 3")
+    assert_equal "12", eval("add 1 2 3 {add 3 3}")
   end
 
   def test_function
@@ -15,4 +37,19 @@ class TestEnvironment < Test::Unit::TestCase
     assert_equal("one and two", e.stdout)
   end
 
+  def test_macro
+    e = Aster::Environment.new
+    e.define_macro :double do |c|
+      assert_kind_of Aster::Command, c
+      tree = Aster::Parser.new.parse("add #{c.arguments.first} #{c.arguments.first}")
+      tree.first
+    end
+    assert_equal "32", e.eval("double 16")
+  end
+
+  def test_env
+
+
+  end
+
 end

data/test/test_parser.rb

@@ -55,4 +55,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
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aster
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sam Murphy
@@ -66,6 +66,20 @@ 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
@@ -84,6 +98,7 @@ files:
 - lib/aster/command.rb
 - lib/aster/environment.rb
 - lib/aster/function.rb
+- lib/aster/macro.rb
 - lib/aster/parser.rb
 - lib/aster/sexp.treetop
 - lib/aster/variable.rb