fancy 0.6.0 → 0.7.0

data/lib/package/installer.fy

@@ -1,8 +1,5 @@
-require("yaml")
-require("open-uri")
-
 class Fancy Package {
-  class Installer {
+  class Installer : Handler {
     """
 
     @Fancy::Package@ installer.
@@ -21,26 +18,7 @@ class Fancy Package {
       Fancy packages).
       """
 
-      splitted = @package_name split: "/"
-      @user, @repository = splitted
-
-      # check for version, e.g. when passing in:
-      # $ fancy install bakkdoor/fyzmq=1.0.1
-      splitted = @repository split: "="
-      if: (splitted size > 1) then: {
-        @repository, @version = splitted
-        @package_name = @user + "/" + @repository
-      }
-
-      @install_path if_nil: {
-        @install_path = Fancy Package DEFAULT_PACKAGES_PATH
-        Directory create!: $ Fancy Package DEFAULT_FANCY_ROOT
-        Directory create!: $ Fancy Package DEFAULT_PACKAGES_PATH
-        Directory create!: $ Fancy Package DEFAULT_PACKAGES_LIB_PATH
-        Directory create!: $ Fancy Package DEFAULT_PACKAGES_PATH ++ "/downloads"
-      }
-
-      @download_path = @install_path ++ "/downloads"
+      initialize: @package_name install_path: @install_path
     }
 
     def run {
@@ -69,7 +47,13 @@ class Fancy Package {
         # now unpack & check for dependencies
         unpack_dir = unpack_file: filename
         rename_dir: unpack_dir
-        load_fancypack
+        load_fancypack: |spec| {
+          fulfill_spec: spec
+          spec gh_user: @user
+          Specification save: spec to: $ Fancy Package package_list_file
+        } else: {
+          "Something wen't wrong. Did not find a fancypack specification for package: " ++ @repository . raise!
+        }
       } else: {
         STDERR println: "Installation aborted."
         STDERR println: "Got error while trying to install #{@package_name} with version: #{@version}"
@@ -88,6 +72,9 @@ class Fancy Package {
     def tags {
       "Returns a list of tags the repository has on Github."
 
+      require("yaml")
+      require("open-uri")
+
       url = "http://github.com/api/v2/yaml/repos/show/" ++ @package_name ++ "/tags/"
       YAML load_stream(open(url)) documents() first at: "tags"
     }
@@ -141,13 +128,6 @@ class Fancy Package {
       dirname = output readlines first chomp
     }
 
-    def installed_path {
-      @install_path + "/" + @user + "_" + @repository + "-" + @version
-    }
-
-    def lib_path {
-      @install_path + "/lib"
-    }
 
     def rename_dir: dirname {
       """
@@ -158,25 +138,6 @@ class Fancy Package {
       System do: $ ["mv ", @install_path, "/", dirname, " ", installed_path] join
     }
 
-    def load_fancypack {
-      """
-      Loads the @.fancypack file within the downloaded package directory.
-      If no @.fancypack file is found, raise an error.
-      """
-
-      Dir glob(installed_path ++ "/*.fancypack") first if_true: |fpackfile| {
-        require: fpackfile
-      }
-
-      if: (Specification[@repository]) then: |spec| {
-        fulfill_spec: spec
-        spec gh_user: @user
-        Specification save: spec to: $ Fancy Package package_list_file
-      } else: {
-        "Something wen't wrong. Did not find a fancypack specification for package: " ++ @repository . raise!
-      }
-    }
-
     def fulfill_spec: spec {
       unless: (spec include_files empty?) do: {
         File open: (lib_path + "/" + (spec package_name)) modes: ['write] with: |f| {
@@ -196,6 +157,15 @@ class Fancy Package {
         }
       }
 
+      spec bin_files each: |bf| {
+        basename = File basename(bf)
+        orig_path = "#{installed_path}/#{bf}"
+        link_path = "#{bin_path}/#{basename}"
+        "Creating symlink #{link_path} for #{orig_path}" println
+        { File delete: link_path } if: $ File exists?: link_path
+        File symlink(orig_path, link_path)
+      }
+
       spec dependencies each: |dep| {
         Package install: dep
       }

data/lib/package/specification.fy

@@ -62,12 +62,19 @@ class Fancy Package {
       }
     }
 
-    def self delete: spec_name from: specs_file {
-      File open: specs_file modes: ['read, 'write] with: |f| {
-        f readlines reject: |l| { l includes?: "name=#{spec_name}" } . each: |l| {
-          f writeln: l
-        }
+    def self delete_specs_from: specs_file if: filter_block {
+      lines = File read: specs_file . lines reject: filter_block
+      File write: specs_file with: |f| {
+        lines each: |l| { f writeln: l }
       }
     }
+
+    def self delete: spec_name from: specs_file {
+      delete_specs_from: specs_file if: @{ includes?: "name=#{spec_name}" }
+    }
+
+    def self delete_specification: spec from: specs_file {
+      delete_specs_from: specs_file if: @{ includes?: "name=#{spec package_name} version=#{spec version}" }
+    }
   }
 }

data/lib/package/uninstaller.fy

@@ -1,13 +1,32 @@
 class Fancy Package {
-  class Uninstaller {
+  class Uninstaller : Handler {
     """
     @Fancy::Package@ Uninstaller.
     """
 
-    def initialize: @package_name {
+    def run {
+      load_fancypack: |spec| {
+        Specification delete_specification: spec from: $ Fancy Package package_list_file
+        delete_package_dir
+        delete_lib_file: (spec package_name)
+        "Successfully uninstalled package #{spec package_name} with version: #{spec version}." println
+      } else: {
+        System abort: "No package found for #{@package_name} with version '#{@version}'."
+      }
     }
 
-    def run {
+    def delete_package_dir {
+      require("FileUtils")
+      if: (Directory exists?: installed_path) then: {
+        "Deleting directory: #{installed_path}" println
+        FileUtils rm_rf(installed_path)
+      }
+    }
+
+    def delete_lib_file: package_name {
+      lib_file = "#{lib_path}/#{package_name}"
+      "Deleting: #{lib_file}" println
+      File delete: lib_file
     }
   }
 }

data/lib/parser/ext/parser.y

@@ -786,6 +786,15 @@ key_value_list: exp space ARROW space exp {
                 | key_value_list COMMA space exp space ARROW space exp {
                   $$ = rb_funcall(self, rb_intern("ast:key:value:into:"), 4, INT2NUM(yylineno), $4, $8, $1);
                 }
+                | key_value_list space COMMA space {
+                  $$ = $1;
+                }
+                | key_value_list COMMA space {
+                  $$ = $1;
+                }
+                | key_value_list COMMA {
+                  $$ = $1;
+                }
                 ;
 
 match_expr:     MATCH exp LCURLY space match_body space RCURLY {

data/lib/proxy.fy

@@ -1,4 +1,4 @@
-class ProxyReceiver : BasicObject {
+class ProxyReceiver : Fancy BasicObject {
   """
   A ProxyReceiver is an object which proxies all message sends to it to 2 other objects.
   It will send each message first to its @proxy instance variable and then to the @obj instance variable.
@@ -30,7 +30,7 @@ class ProxyReceiver : BasicObject {
 
 Proxy = ProxyReceiver
 
-class RespondsToProxy : BasicObject {
+class RespondsToProxy : Fancy BasicObject {
   """
   A RespondsToProxy is a Proxy that forwards any message sent to it to it's @target instance variable
   only if it responds to that message. Any messages that @target doesn't respond to simply won't be sent
@@ -60,4 +60,27 @@ class RespondsToProxy : BasicObject {
       @target receive_message: msg with_params: params
     }
   }
+}
+
+class ActorProxy : Fancy BasicObject {
+  """
+  A ActorProxy is a Proxy that forwards any message sent to it to it's
+  @target instance variable as a future send by default.
+  If explicitly sent an async message, it will forward the async send
+  to @target, returning nil instead of a @FutureSend@, as expected.
+  """
+
+  def initialize: @target
+
+  def send_future: m with_params: p {
+    @target send_future: m with_params: p
+  }
+
+  def send_async: m with_params: p {
+    @target send_async: m with_params: p
+  }
+
+  def unknown_message: m with_params: p {
+    @target send_future: m with_params: p
+  }
 }

data/lib/rbx.fy

@@ -8,12 +8,12 @@
 require: "rbx/alpha"
 require: "rbx/documentation"
 require: "rbx/object"
+require: "rbx/symbol"
 require: "rbx/class"
 require: "rbx/console"
 require: "rbx/array"
 require: "rbx/hash"
 require: "rbx/string"
-require: "rbx/symbol"
 require: "rbx/integer"
 require: "rbx/fixnum"
 require: "rbx/float"
@@ -41,3 +41,4 @@ require: "rbx/time"
 require: "rbx/actor"
 require: "rbx/mutex"
 require: "rbx/module"
+require: "rbx/proc"

data/lib/rbx/array.fy

@@ -103,12 +103,27 @@ class Array {
     @return Joined @String@ with all elements with @join_str.
 
     Joins all elements in the Array with a given @String@.
-        [1,2,3] join: \", \” # => \”1, 2, 3\"
+
+    Example:
+          [1,2,3] join: \", \” # => \”1, 2, 3\"
     """
 
     join(join_str)
   }
 
+  def join {
+    """
+    @return Elements of @Array@ joined to a @String@.
+
+    Joins all elements with the empty @String@.
+
+    Example:
+          [\"hello\", \"world\", \"!\"] join # => \"hello,world!\"
+    """
+
+    join: ""
+  }
+
   def unshift: value {
     """
     @value Value to be added at the front of @self.

data/lib/rbx/class.fy

@@ -1,5 +1,5 @@
 class Class {
-  ruby_aliases: [ 'superclass, '===, 'ancestors, 'instance_methods, 'methods, 'inspect, 'to_s ]
+  ruby_aliases: [ 'superclass, '===, 'ancestors, 'instance_methods, 'methods, 'to_s ]
 
   def new {
     """
@@ -63,7 +63,7 @@ class Class {
     body.
     """
 
-    define_method(message_name: name, &block)
+    define_method(name message_name, &block)
   }
 
   def undefine_method: name {
@@ -73,7 +73,7 @@ class Class {
     Undefines an instance method on a Class with a given name.
     """
 
-    remove_method(message_name: name)
+    remove_method(name message_name)
   }
 
   def define_class_method: name with: block {
@@ -127,7 +127,7 @@ class Class {
     Returns an instance method for a @Class@ with a given name.
     """
 
-    instance_method(message_name: name)
+    instance_method(name message_name)
   }
 
   def alias_method_rbx: new_method_name for: old_method_name {
@@ -136,14 +136,14 @@ class Class {
     reasons. Should not be used directly.
     """
 
-    alias_method(message_name: new_method_name, message_name: old_method_name)
+    alias_method(new_method_name message_name, old_method_name message_name)
   }
 
   def alias_method: new_method_name for_ruby: ruby_method_name {
     """
     Creates a method alias for a Ruby method.
     """
-    alias_method(message_name: new_method_name, ruby_method_name)
+    alias_method(new_method_name message_name, ruby_method_name)
   }
 
   def public: method_names {
@@ -154,7 +154,7 @@ class Class {
     """
 
     method_names = method_names to_a()
-    method_names = method_names map: |m| { message_name: m }
+    method_names = method_names map: |m| { m message_name }
     public(*method_names)
   }
 
@@ -166,7 +166,7 @@ class Class {
     """
 
     method_names = method_names to_a()
-    method_names = method_names map() |m| { message_name: m }
+    method_names = method_names map() |m| { m message_name }
     private(*method_names)
   }
 
@@ -178,10 +178,28 @@ class Class {
     """
 
     method_names = method_names to_a()
-    method_names = method_names map() |m| { message_name: m }
+    method_names = method_names map() |m| { m message_name }
     protected(*method_names)
   }
 
+  def instance_methods: include_superclasses? (true) {
+    """
+    @include_superclasses? Boolean indicating if instance methods of all superclasses should be included (defaults to @true).
+    @return @Array@ of all instance method names for this @Class@.
+    """
+
+    instance_methods(include_superclasses?)
+  }
+
+  def methods: include_superclasses? (true) {
+    """
+    @include_superclasses? Boolean indicating if methods of all superclasses should be included (defaults to @true).
+    @return @Array@ of all class method names for this @Class@.
+    """
+
+    methods(include_superclasses?)
+  }
+
   def forwards_unary_ruby_methods {
     """
     Creates ruby_alias methods for any unary ruby methods of a class.
@@ -195,4 +213,11 @@ class Class {
       ruby_alias: m
     }
   }
+
+  def class_eval: str_or_block {
+    match str_or_block {
+      case Block -> class_eval(&str_or_block)
+      case _ -> class_eval(str_or_block)
+    }
+  }
 }

data/lib/rbx/file.fy

@@ -75,7 +75,7 @@ class File {
     File read(filename, length, offset)
   }
 
-  def File open: filename modes: modes_arr {
+  def File open: filename modes: modes_arr (('read, 'binary)) {
     """
     @filename Filename to open/create.
     @modes_arr Array of symbols that describe the desired operations to perform.
@@ -109,7 +109,7 @@ class File {
     modes_arr each: |m| {
       str << (@@open_mode_conversions[m])
     }
-    str uniq join: ""
+    str unique join: ""
   }
 
   def File delete: filename {

data/lib/rbx/fixnum.fy

@@ -10,21 +10,11 @@ class Fixnum {
   ruby_aliases: [
     '==, '-, '+, '*, '/, '<, '>, '<=, '>=,
     '===, 'chr, 'to_i, 'to_f, '**, '&, '|,
-    '<<, '>>
+    '^, '<<, '>>
   ]
 
   alias_method: 'to_s: for: 'to_s
   alias_method: 'modulo: for: 'modulo
   alias_method: ":%" for: "modulo:" # use a : so we dont overwrite ruby's % operator
   alias_method: 'div: for: 'div
-
-  def random {
-    """
-    @return Random number between 0 and @self.
-
-    Returns a random number between 0 and @self.
-    """
-
-    rand(self)
-  }
 }

data/lib/rbx/io.fy

@@ -1,4 +1,8 @@
 class IOMixin {
+  def read: amount_bytes {
+    read(amount_bytes)
+  }
+
   def readln {
     readline
   }

data/lib/rbx/module.fy

@@ -12,6 +12,17 @@ class Module {
     const_get(constant_name)
   }
 
+  def [constant_name]: value {
+    """
+    @constant_name Name (@String@) of constant's name.
+    @value New value of constant to be used.
+
+    Sets the value of a constant with the given name in @self.
+    """
+
+    const_set(constant_name, value)
+  }
+
   def included: module {
     """
     @module @Module@ or @Class@ that has been included into @self.