fancy 0.7.0 → 0.8.0

data/lib/option_parser.fy

@@ -0,0 +1,118 @@
+class OptionParser {
+  """
+  Parses command-line options from a given @Array@ (usually @ARGV) and
+  executes registered handlers for options specified.
+  """
+
+  class Option {
+    read_slots: ('option, 'arg, 'doc_string, 'block)
+    def initialize: @option arg: @arg doc: @doc_string block: @block
+    def name_with_arg {
+      if: @arg then: {
+        "#{@option} [#{@arg}]"
+      } else: {
+        @option
+      }
+    }
+  }
+
+  class InvalidOptionsError : StandardError
+
+  read_slots: ('options, 'parsed_options)
+  read_write_slots: ('banner, 'exit_on_help, 'remove_after_parsed)
+
+  def initialize: @block (nil) {
+    """
+    @block (Optional) @Block@ to be called with @self for easy setup.
+
+    Creates a new OptionParser.
+
+    Example:
+          o = OptionParser new: @{
+            with: \"--my-option\" doc: \"Sets some option value\" do: {
+              # do stuff in here...
+            }
+          }
+          o parse: ARGV # parse options from ARGV
+    """
+
+    @options = <[]>
+    @parsed_options = <[]>
+    @banner = nil
+    @exit_on_help = true
+    @remove_after_parsed = false
+
+    with: "--help" doc: "Display this information" do: {
+      print_help_info
+      { System exit } if: @exit_on_help
+    }
+
+    { @block call: [self] } if: @block
+  }
+
+  def with: option_string doc: doc_string do: block {
+    """
+    @option_string Option flag and (optional) argument within \"[]\", e.g. \"--file [filename]\".
+    @doc_string Documentation @String@ for @option_string that is used in the standard @--help option.
+    @block @Block@ to be executed if @option_string is matched during parsing. If the option takes an argument it will be passed to @block as an argument.
+
+    Example:
+          o = OptionParser new
+          o with: \"--file [filename]\" doc: \"Use this file for processing\" do: |filename| {
+            # do something with filename
+          }
+    """
+
+    option, arg = option_string split: " "
+    if: arg then: {
+      match arg {
+        case /\[(.+)\]/ -> |_, arg_name|
+          arg = arg_name downcase
+        case _ -> InvalidOptionsError new: "Could not correctly parse option argument: #{arg}" . raise!
+      }
+    }
+
+    o = Option new: option arg: arg doc: doc_string block: block
+    @options[option]: o
+  }
+
+  def parse: args {
+    """
+    @args @Array@ of arguments to parse options from. Typically you'd pass @ARGV here.
+
+    Parses options from @args and executes registered option handlers.
+    """
+
+    @options each: |name opt| {
+      if: (args index: name) then: |idx| {
+        block = opt block
+        match block arity {
+          case 0 -> block call
+          case 1 ->
+            arg = args at: (idx + 1)
+            block call: [arg]
+            @parsed_options[name]: arg
+            { args remove_at: idx } if: @remove_after_parsed
+        }
+
+        { args remove_at: idx } if: @remove_after_parsed
+      }
+    }
+  }
+
+  def print_help_info {
+    """
+    Displays the @--help information on @*stdout* based on all options that were registered via @OptionParser#with:doc:do:@.
+    """
+
+    max_size = @options map: |name opt| { opt name_with_arg size } . max
+    if: @banner then: {
+      *stdout* println: @banner
+      *stdout* println
+    }
+    @options keys sort each: |name| {
+      opt = @options[name]
+      *stdout* printf("  %-#{max_size}s  %s\n", opt name_with_arg, opt doc_string)
+    }
+  }
+}

data/lib/package/dependency.fy

@@ -5,10 +5,8 @@ class Fancy Package {
     Represents a Dependency to another Package with a given version.
     """
 
-    read_slots: ['name, 'version]
-
-    def initialize: @name version: @version ('latest) {
-    }
+    read_slots: ('name, 'version)
+    def initialize: @name version: @version ('latest);
   }
 
   class RubyDependency {
@@ -16,10 +14,8 @@ class Fancy Package {
     Same as @Fancy::Package::Dependency@, just for rubygem packages.
     """
 
-    read_slots: ['gem_name, 'version]
-
-    def initialize: @gem_name version: @version ('latest) {
-    }
+    read_slots: ('gem_name, 'version)
+    def initialize: @gem_name version: @version ('latest);
 
     def install {
       """

data/lib/package/dependency_installer.fy

@@ -16,7 +16,7 @@ class Fancy {
             "Installing dependency: #{dep name} (#{dep version})" println
             Fancy Package install: (dep name) version: (dep version)
           }
-          s rubygem_dependencies each: |dep| {
+          s ruby_dependencies each: |dep| {
             "Installing Ruby dependency: #{dep gem_name} (#{dep version})" println
             dep install
          }

data/lib/package/handler.fy

@@ -52,5 +52,11 @@ class Fancy Package {
     def bin_path {
       @install_path + "/bin"
     }
+
+    def installed_bin_symlinks: spec {
+      spec bin_files map: |bf| {
+        "#{bin_path}/#{File basename(bf)}"
+      }
+    }
   }
 }

data/lib/package/installer.fy

@@ -12,8 +12,8 @@ class Fancy Package {
 
     def initialize: @package_name version: @version ('latest) install_path: @install_path (ENV["FANCY_PACKAGE_DIR"]) {
       """
-      Creates a new @Package Installer@ for a given package name, an
-      optional version (default is 'latest) and an optional
+      Creates a new @Fancy::Package@ installer for a given package name, an
+      optional version (default is @'latest) and an optional
       installation path (default is the standard installation path for
       Fancy packages).
       """
@@ -61,26 +61,40 @@ class Fancy Package {
     }
 
     def latest_tag {
-      "Returns the latest tag (sorted alphabetically)."
+      """
+      Returns the latest tag (sorted alphabetically).
+      """
 
-      tags = self tags
-      if: (tags size > 0) then: {
-        tags keys sort last
-      }
+      tags sort last
     }
 
     def tags {
-      "Returns a list of tags the repository has on Github."
+      """
+      @return @Array@ of git tags in the package's Github repository.
+      """
 
-      require("yaml")
       require("open-uri")
+      require("rubygems")
+      require("json")
 
-      url = "http://github.com/api/v2/yaml/repos/show/" ++ @package_name ++ "/tags/"
-      YAML load_stream(open(url)) documents() first at: "tags"
+      url = "https://api.github.com/repos/#{@package_name}/git/refs/tags"
+
+      try {
+        return JSON load(open(url)) map: |tag| {
+          tag["ref"] split: "refs/tags/" . last
+        }
+      } catch OpenURI HTTPError {
+        return [] # no tags available, default to master (latest)
+      }
     }
 
     def has_version?: version {
-      "Indicates, if a given version is available on Github."
+      """
+      @version Version of package to check for.
+      @return @true, if this package has the given version, @false otherwise.
+
+      Indicates, if a given version for this package is available on Github.
+      """
 
       match version {
         case "master" -> true
@@ -122,6 +136,12 @@ class Fancy Package {
     }
 
     def unpack_file: filename {
+      """
+      @filename File name of package's downloaded .tar.gz file (from Github) to extract
+
+      Unpacks the given @filename and installs it into Fancy's package install dir.
+      """
+
       "Unpacking " ++ filename println
       System do: $ ["tar xf ", @download_path, "/", filename, " -C ", @install_path, "/"] join
       output = System pipe: $ ["tar tf ", @download_path, "/", filename] join
@@ -139,12 +159,19 @@ class Fancy Package {
     }
 
     def fulfill_spec: spec {
+      """
+      @spec @Fancy::Package::Specification@ to be fulfilled.
+
+      Installs all dependencies of @spec, sets up symlinks for binary files in @spec,
+      as well as installing the include-file into the Fancy package lib dir.
+      """
+
       unless: (spec include_files empty?) do: {
         File open: (lib_path + "/" + (spec package_name)) modes: ['write] with: |f| {
           spec include_files each: |if| {
-            unless: (spec rubygem_dependencies empty?) do: {
+            unless: (spec ruby_dependencies empty?) do: {
               f writeln: "require(\"rubygems\")"
-              spec rubygem_dependencies each: |rd| {
+              spec ruby_dependencies each: |rd| {
                 f writeln: "require(\"#{rd gem_name}\")"
               }
             }
@@ -167,10 +194,10 @@ class Fancy Package {
       }
 
       spec dependencies each: |dep| {
-        Package install: dep
+        Fancy Package install: (dep name) version: (dep version)
       }
 
-      spec rubygem_dependencies each: |dep| { dep install }
+      spec ruby_dependencies each: |dep| { dep install }
     }
   }
 }

data/lib/package/list.fy

@@ -1,7 +1,6 @@
 class Fancy Package {
   class List {
-    def initialize: @package_list_file {
-    }
+    def initialize: @package_list_file
 
     def println {
       packages each: |p| {

data/lib/package/specification.fy

@@ -3,13 +3,13 @@ class Fancy Package {
     @@specs = <[]>
 
     read_write_slots: ['author, 'email, 'include_files, 'bin_files,
-                       'description, 'homepage, 'version, 'gh_user]
+                       'description, 'homepage, 'version, 'gh_user, 'package_name]
 
-    read_slots: ['package_name, 'dependencies, 'rubygem_dependencies]
+    read_slots: ['dependencies, 'ruby_dependencies]
 
     def initialize: @package_name with: block {
       @dependencies = []
-      @rubygem_dependencies = []
+      @ruby_dependencies = []
       @include_files = []
       @bin_files = []
 
@@ -34,7 +34,7 @@ class Fancy Package {
         version = d second
         { version = 'latest } unless: version
         dep = RubyDependency new: gem_name version: version
-        @rubygem_dependencies << dep
+        @ruby_dependencies << dep
       }
     }
 
@@ -45,7 +45,7 @@ class Fancy Package {
 
     def add_ruby_dependency: gem_name version: version ('latest) {
       dep = RubyDependency new: gem_name version: version
-      @rubygem_dependencies << dep
+      @ruby_dependencies << dep
     }
 
     def to_s {

data/lib/package/uninstaller.fy

@@ -9,6 +9,7 @@ class Fancy Package {
         Specification delete_specification: spec from: $ Fancy Package package_list_file
         delete_package_dir
         delete_lib_file: (spec package_name)
+        delete_bin_files: (installed_bin_symlinks: spec)
         "Successfully uninstalled package #{spec package_name} with version: #{spec version}." println
       } else: {
         System abort: "No package found for #{@package_name} with version '#{@version}'."
@@ -16,7 +17,7 @@ class Fancy Package {
     }
 
     def delete_package_dir {
-      require("FileUtils")
+      require("fileutils")
       if: (Directory exists?: installed_path) then: {
         "Deleting directory: #{installed_path}" println
         FileUtils rm_rf(installed_path)
@@ -26,7 +27,13 @@ class Fancy Package {
     def delete_lib_file: package_name {
       lib_file = "#{lib_path}/#{package_name}"
       "Deleting: #{lib_file}" println
-      File delete: lib_file
+      File delete!: lib_file
+    }
+
+    def delete_bin_files: bin_files {
+      bin_files each: |bf| {
+        File delete!: bf
+      }
     }
   }
 }

data/lib/parser.fy

@@ -1,4 +1,2 @@
-
 require: "parser/methods"
-require(File.expand_path("parser/ext/fancy_parser", File.dirname(__FILE__)))
-
+require(File.expand_path("parser/ext/fancy_parser", File.dirname(__FILE__)))

data/lib/parser/ext/ext.c

@@ -30,6 +30,7 @@ fancy_parse_file(VALUE self) {
   yylineno = NUM2INT(lineno);
   yyparse(self);
   yy_delete_buffer(buffstate);
+  fclose(f);
   return self;
 }
 

data/lib/parser/ext/lexer.lex

@@ -54,6 +54,7 @@ identifier      @?@?({lower}|[_&*])({letter}|{digit}|{special_under})*
 selector        ({letter}|[_&*])({letter}|{digit}|{special_under})*":"
 constant        {capital}({letter}|{digit}|{special_under})*
 nested_constant ({constant}::)+{constant}
+toplevel_constant ::({constant}|{nested_constant})
 symbol_lit      \'({identifier}|{operator}|{constant}|:|"[]"|"|"|".")+
 ruby_send_open  ({constant}|{identifier}){lparen}
 ruby_oper_open  {operator}{lparen}
@@ -166,6 +167,10 @@ escaped_newline "\\".*\n
                   yylval.object = rb_str_new2(yytext);
                   return CONSTANT;
                 }
+{toplevel_constant} {
+                  yylval.object = rb_str_new2(yytext);
+                  return CONSTANT;
+                }
 {symbol_lit}    {
                   yylval.object = rb_str_new2(yytext);
                   return SYMBOL_LITERAL;

data/lib/parser/methods.fy

@@ -2,8 +2,10 @@ require: "parse_error"
 
 class Fancy {
   class Parser {
-    SelectorVarDefault = Struct.new('selector, 'variable, 'default)
+    SelectorVarDefault = Struct new('selector, 'variable, 'default)
+    SelectorVarDefault read_write_slots: ('selector, 'variable, 'default)
     SelectorValue = Struct new('selector, 'value)
+    SelectorValue read_write_slots: ('selector, 'value)
 
     def self parse_file: filename line: line (1) {
       new: filename line: line . parse_file . script
@@ -17,9 +19,11 @@ class Fancy {
       ParseError new: line message: text filename: (Thread current['__fancy__parser__filename__]) . raise!
     }
 
-    read_write_slots: ['filename, 'line, 'script]
+    read_write_slots: ('filename, 'line, 'script)
 
-    def initialize: @filename line: @line { Thread current['__fancy__parser__filename__]: @filename }
+    def initialize: @filename line: @line {
+      Thread current['__fancy__parser__filename__]: @filename
+    }
 
     def body: body {
       @script = AST Script new: @line file: @filename body: body
@@ -33,8 +37,8 @@ class Fancy {
     def ast: line identity: identity { identity }
 
     def ast: line concat: object into: ary ([]) {
-      if: (object kind_of?(Array)) then: {
-        ary concat(object)
+      if: (object is_a?: Array) then: {
+        ary append: object
       } else: {
         { ary << object } if: object
       }
@@ -49,16 +53,16 @@ class Fancy {
     }
 
     def ast: line fixnum: text base: base (10) {
-      AST FixnumLiteral new: line value: (text to_i(base))
+      AST FixnumLiteral new: line value: $ text to_i: base
     }
 
     def ast: line number: text base: base (10) {
-      AST NumberLiteral new: line value: (text to_f())
+      AST NumberLiteral new: line value: $ text to_f
     }
 
     def ast: line symbol: text {
       str = text from: 1 to: -1
-      AST SymbolLiteral new: line value: (str to_sym())
+      AST SymbolLiteral new: line value: $ str to_sym
     }
 
     def ast: line regexp: text {
@@ -68,41 +72,34 @@ class Fancy {
 
     def ast: line string: text {
       str = text from: 1 to: -2
-      match str {
-        # OK, I know this is ugly. But it works for now, so let's just go with it.
-        # TODO: Clean this up or make it simpler...
-
-        # this case handles string interpolation
-        case /(.*)#{(.*)}(.*)/m -> |matches|
-          prefix = matches[1]
-          interpol_str = matches[2]
-          suffix = matches[3]
-
-          prefix_str = ast: line string: (" " + prefix + " ") # hack, pre- & append " " since it gets removed
-          suffix_str = ast: line string: (" " + suffix + " ")
-          interpol_ast = AST StringInterpolation new: line code: interpol_str
-          # create messagesend to concatenate:
-          concat_ident = ast: line identifier: "<<"
-          interpol_send = AST MessageSend new: line message: concat_ident to: prefix_str args: (AST MessageArgs new: line args: [interpol_ast])
-
-          # don't concatenate suffix if it's empty..
-          unless: (suffix == "") do: {
-            interpol_send = AST MessageSend new: line message: concat_ident to: interpol_send args: (AST MessageArgs new: line args: [suffix_str])
-          }
+      match_data = /#{([^}]*)}/ match: str
 
-          interpol_send # this shall get returned, yo
-        case _ ->
-          AST StringLiteral new: line value: str
+      { return AST StringLiteral new: line value: str } unless: match_data
+
+      # this case handles string interpolation
+      prefix_str = ast: line string: $ " " + (match_data pre_match) + " "  # hack, pre- & append " " since it gets removed
+      suffix_str = ast: line string: $ " " + (match_data post_match) + " "
+      interpol_ast = AST StringInterpolation new: line code: (match_data[1]) filename: @filename
+
+      # create messagesend to concatenate:
+      concat_ident = ast: line identifier: "<<"
+      interpol_send = AST MessageSend new: line message: concat_ident to: prefix_str args: $ AST MessageArgs new: line args: [interpol_ast]
+
+      # don't concatenate suffix if it's empty..
+      unless: (match_data post_match == "") do: {
+        interpol_send = AST MessageSend new: line message: concat_ident to: interpol_send args: $ AST MessageArgs new: line args: [suffix_str]
       }
+
+      interpol_send
     }
 
     def ast: line multi_line_string: string {
-      ast: line string: (string from: 2 to: -3)
+      ast: line string: $ string from: 2 to: -3
     }
 
     def ast: line backtick: backtick_string {
       str = ast: line string: backtick_string
-      selector = (ast: line identifier: "backtick:")
+      selector = ast: line identifier: "backtick:"
       args = AST MessageArgs new: line args: [str]
       AST MessageSend new: line message: selector to: (AST Self new: line) args: args
     }
@@ -194,13 +191,13 @@ class Fancy {
         AST MessageArgs new: line args: []
       }
       name = message
-      if: (message kind_of?(String)) then: {
+      if: (message is_a?: String) then: {
         name = AST Identifier from: message line: line
       }
-      if: (message kind_of?(Array)) then: {
-        name = message map: |m| { m selector() string } . join
+      if: (message is_a?: Array) then: {
+        name = message map: |m| { m selector string } . join
         name = AST Identifier new: line string: name
-        args = message map: |m| { m value() }
+        args = message map: |m| { m value }
         args = AST MessageArgs new: line args: args
       }
       AST MessageSend new: line message: name to: receiver args: args
@@ -217,13 +214,13 @@ class Fancy {
     }
 
     def method_name: margs {
-      margs map: |a| { a selector() string } . join("")
+      margs map: |a| { a selector string } . join("")
     }
 
     def method: margs delegators: block {
-      idx = margs index() |m| { m default() != nil }
+      idx = margs index: |m| { m default != nil }
       if: idx then: {
-        line = margs first selector() line
+        line = margs first selector line
         target = method_name: margs
         (margs size - idx) times: |pos| {
           required = margs from: 0 to: (idx + pos - 1)
@@ -232,7 +229,7 @@ class Fancy {
           if: only_default_args then: {
             required = []
           }
-          params = required map: |r| { r variable() } . + $ default map: |d| { d default() }
+          params = required map: |r| { r variable } . + $ default map: |d| { d default }
 
           forward = AST MessageSend new: line \
                                     message: (AST Identifier from: target line: line) \
@@ -245,7 +242,7 @@ class Fancy {
           # use base method name (e.g. "foo:" -> "foo") for the method to be generated
           # if there are no more arguments left (only default args left)
           if: only_default_args then: {
-            required = AST Identifier from: (margs first selector() string from: 0 to: -2) line: line
+            required = AST Identifier from: (margs first selector string from: 0 to: -2) line: line
           }
 
           block call: [required, body]
@@ -275,7 +272,7 @@ class Fancy {
       } else: {
         name = method_name: margs
         name = AST Identifier new: line string: name
-        args = margs map() |m| { m variable() string }
+        args = margs map: |m| { m variable string }
         args = AST MethodArgs new: line args: args
         if: owner then: {
           AST SingletonMethodDef new: line name: name args: args \
@@ -323,12 +320,17 @@ class Fancy {
       AST MatchClause new: line expr: expr body: body args: match_args
     }
 
-    def ast: line ex_handler: expr_list cond: cond (AST Identifier from: "Object" line: line) var: var (nil) {
+    def ast: line ex_handler: expr_list cond: cond (AST Identifier from: "StandardError" line: line) var: var (nil) {
       AST ExceptionHandler new: line condition: cond var: var body: expr_list
     }
 
     def ast: line try_block: body ex_handlers: handlers finally_block: finaly (AST NilLiteral new: line) {
-      AST TryCatch new: line body: body handlers: handlers ensure: finaly
+      match finaly {
+        case AST NilLiteral -> AST TryCatch new: line body: body handlers: handlers ensure: finaly
+        case _ ->
+          inner = AST TryCatch new: line body: body handlers: handlers ensure: (AST NilLiteral new: line)
+          AST TryCatch new: line body: (AST ExpressionList new: line list: [inner]) handlers: [] ensure: finaly
+      }
     }
 
     def ast: line ruby_send: text {