fancy 0.6.0 → 0.7.0

data/lib/fancy_spec.fy

@@ -175,7 +175,7 @@ class FancySpec {
       @@current
     }
 
-    def SpecTest print_failures: start_time {
+    def SpecTest print_failures: start_time no_failures: ok_block else: error_block {
       @@failed_positive each: |test_obj failed_tests| {
         failed_tests each: |t| {
           Console newline
@@ -194,11 +194,7 @@ class FancySpec {
 
       Console newline
       "Ran #{@@total_tests} tests (#{@@total_expectations} expectations) with #{@@failed_count} failures in #{Time now - start_time} seconds." println
-      if: (@@failed_count > 0) then: {
-        System exit: 1
-      } else: {
-        System exit: 0
-      }
+      if: (@@failed_count == 0) then: ok_block else: error_block
     }
 
     def initialize: @info_str block: @block {

data/lib/file.fy

@@ -26,6 +26,25 @@ class File {
     File open: filename modes: ['read] with: block
   }
 
+  def File read_binary: filename with: block {
+    """
+    @filename Filename of @File@ to read from.
+    @block @Block@ called with a @File@ object to read from.
+
+    Opens a @File@ for reading and calls @block with it.
+    """
+
+    File open: filename modes: ['read, 'binary] with: block
+  }
+
+  def File read_binary: filename {
+    content = nil
+    File read_binary: filename with: |f| {
+      content = f read
+    }
+    content
+  }
+
   def File touch: filename {
     """
     @filename Name of @File@ to be created, if not already existant.
@@ -39,6 +58,54 @@ class File {
     }
   }
 
+  def File eval: filename {
+    """
+    @filename Name of Fancy source file (*.fy) to be read and evaluated.
+    @return Value of evaluating code in @filename.
+    """
+
+    File read: filename . eval
+  }
+
+  def File read_config: filename {
+    """
+    @filename @String@ that is the name of file to be read as a config file.
+    @return @Hash@ of key-value pairs of the config file.
+
+    Reads a .fy source file as a config file.
+
+    Example:
+          # Given a file config.fy with these contents:
+          {
+            host: \"127.0.0.1\"
+            port: 1234
+            names: [
+              'foo,
+              'bar,
+              'baz
+            ]
+            something_else: {
+              another_value: 'foo
+            }
+          }
+
+          # It can be read like so:
+          config = File read_config: \"config.fy\"
+
+          # config is now:
+          <[
+            'host => \"127.0.0.1\",
+            'port => 1234,
+            'names => ['foo, 'bar, 'baz],
+            'something_else: <[
+              'another_value => 'foo
+            ]>
+          ]>
+    """
+
+    File read: filename . eval to_hash_deep
+  }
+
   def writeln: x {
     """
     Writes a given argument as a String followed by a newline into the

data/lib/future.fy

@@ -1,11 +1,22 @@
 class FutureSend {
-  read_slots: [ 'receiver, 'message, 'params ]
+  """
+  A @FutureSend@ gets created whenever an asynchronous message via the @@ operator gets sent, yielding a @FutureSend@.
+  They represent Futures/Promises in Fancy.
+
+  Example:
+        f = some_object @ some_method: some_argument
+        f class # => FutureSend
+        f value # => Value returned by some_method, but may block the current Thread if f hasn't completed yet.
+  """
+
+  read_slots: ('receiver, 'message, 'params)
   def initialize: @actor receiver: @receiver message: @message with_params: @params ([]) {
     @completed_mutex = Mutex new
     @condvar = ConditionVariable new
     @completed = false
     @failed = false
     @continuations = []
+    @fail_continuations = []
     @actor ! ('future, (@message, @params), self)
   }
 
@@ -27,9 +38,20 @@ class FutureSend {
 
   def completed! {
     @condvar broadcast
-    unless: @failed do: {
-      @continuations each: @{ call: [@value] }
+    if: @failed then: {
+      try {
+        @fail_continuations each: @{ call: [@fail_reason] }
+      } catch Exception => ex {
+        *stderr* println: "Error in FutureSend#completed! while calling fail continuations: #{ex}"
+      }
+    } else: {
+      try {
+        @continuations each: @{ call: [@value] }
+      } catch Exception => ex {
+        *stderr* println: "Error in FutureSend#completed! while calling success continuations: #{ex}"
+      }
     }
+    @fail_continuations = []
     @continuations = []
   }
 
@@ -113,6 +135,23 @@ class FutureSend {
     value send_future: message with_params: params
   }
 
+  def when_failed: block {
+    """
+    @block @Block@ to be registered as a continuation when @self fails.
+
+    Registers @block as a continuation to be called with @self's fail reason in case of failure.
+    """
+
+    { return nil } if: succeeded?
+    @completed_mutex synchronize: {
+      if: @failed then: {
+        block call: [@fail_reason]
+      } else: {
+        @fail_continuations << block
+      }
+    }
+  }
+
   def when_done: block {
     """
     @block @Block@ to be registered as a continuation when @self succeeds.

data/lib/hash.fy

@@ -6,6 +6,9 @@ class Hash {
 
   include: Fancy Enumerable
 
+  alias_method: 'get_slot: for: 'at:
+  alias_method: 'set_slot:value: for: 'at:put:
+
   def [key] {
     """
     @key Key for value to get.
@@ -25,13 +28,44 @@ class Hash {
 
     Returns the value for a given key.
     If the key is not found, calls @else_block and returns the value it yields.
+
+    Example:
+          <['foo => 'bar]> at: 'foo else: { 42 } # => 'bar
+          <['foo => 'bar]> at: 'unknown else: { 42 } # => 42
+          <['nil => nil]> at: 'nil else: { 'not_found } # => nil
+    """
+
+    if: (includes?: key) then: {
+      at: key
+    } else: {
+      else_block call: [key]
+    }
+  }
+
+  alias_method: 'fetch:else: for: 'at:else:
+
+  def at: key else_put: else_block {
+    """
+    @key Key of value to get.
+    @else_block @Block@ that gets called and its value inserted into @self if @key not in @self.
+
+    Example:
+          h = <['foo => 'bar]>
+          h at: 'foo else_put: { 42 } # => 'bar
+          h['foo] # => 'bar
+          h at: 'undefined else_put: { 42 } # => 42
+          h['undefined] # => 42
     """
 
     if: (includes?: key) then: {
       at: key
-    } else: else_block
+    } else: {
+      at: key put: $ else_block call: [key]
+    }
   }
 
+  alias_method: 'fetch:else_put: for: 'at:else_put:
+
   def each: block {
     """
     @block @Block@ to be called with each key and value in @self.
@@ -85,16 +119,6 @@ class Hash {
     map: |pair| { pair }
   }
 
-  def to_s {
-    """
-    @return @String@ representation of @self.
-
-    Returns a @String@ representation of a @Hash@.
-    """
-
-    to_a to_s
-  }
-
   def to_object {
     """
     @return New @Object@ with slots defined by keys and values in @self.
@@ -139,22 +163,4 @@ class Hash {
 
     keys map: |k| { at: k }
   }
-
-  def fetch: key else: else_block {
-    """
-    @key Key of value to get.
-    @else_block @Block@ that gets called if @key not in @self.
-
-    Example:
-          <['foo => 'bar]> fetch: 'foo else: { 42 } # => 'bar
-          <['foo => 'bar]> fetch: 'unknown else: { 42 } # => 42
-          <['nil => nil]> fetch: 'nil else: { 'not_found } # => nil
-    """
-
-    if: (includes?: key) then: {
-      at: key
-    } else: {
-      else_block call: [key]
-    }
-  }
 }

data/lib/html.fy

@@ -8,7 +8,7 @@ class HTML {
           html: @{
             head: @{ title: \"My Fancy Website\" }
             body: @{
-              div: { id: \”main\” } with: \"Hello, Fancy World!\"
+              div: { id: \"main\" } with: \"Hello, Fancy World!\"
             }
           }
         } . to_s

data/lib/integer.fy

@@ -16,4 +16,38 @@ class Integer {
       block call: [i + offset]
     }
   }
+
+  def times_try: block retry_with: retry_block ({}) {
+    """
+    @block @Block@ to be called and retries @self amount of times if exceptions get thrown.
+    @retry_block @Block@ to be called before retrying execution of @block. Defaults to an empty @Block@.
+    @return Return value of calling @block or raises an exception after @self tries.
+            Returns @nil if @self <= 0.
+
+    Tries to call a @Block@ @self amount of times, returning its return
+    value or raising the last exception raised frin @block after @self tries.
+
+    Example:
+          2 times_try: {
+            # this code will be tried 2 times.
+            # if it succeeds the first time, simply return its value, otherwise try once more.
+            # if it still fails after 2 attempts, raises the exception thrown (in this case probably an IOError).
+            @connection readln
+          } retry_with: { @connection reconnect }
+    """
+
+    max_retries = self
+    { return nil } if: $ max_retries <= 0
+    value = nil
+    try {
+      value = block call: [max_retries]
+    } catch Exception => e {
+      max_retries = max_retries - 1
+      { e raise! } unless: $ max_retries > 0
+      retry_block call
+      retry
+    } finally {
+      return value
+    }
+  }
 }

data/lib/main.fy

@@ -6,7 +6,7 @@
 
 if: (ARGV size == 1) then: {
   ARGV for_options: ["-v", "--version"] do: {
-    "Fancy " ++ FANCY_VERSION println
+    "Fancy #{Fancy VERSION}" println
     "(C) 2010, 2011, 2012 Christopher Bertels <chris@fancy-lang.org>" println
     System exit
   }
@@ -20,12 +20,13 @@ if: (ARGV size == 1) then: {
      "  -I directory            Add directory to Fancy's LOAD_PATH",
      "  -e 'command'            One line of Fancy code that gets evaluated immediately",
      "  -c [filenames]          Compile given files to Rubinius bytecode",
-     "  -cv [filenames]         Compile given files to Rubinius bytecode verbosely (outputting the generated bytecode).",
+     "  -cv [filenames]         Compile given files to Rubinius bytecode verbosely (outputting the generated bytecode)",
      "",
      "Fancy package management:",
      "  install   [packagename] Install a Fancy package with a given name to $FANCYPACK_DIR",
-     "  install   --deps        Install dependencies specified in .fancypack file (expected in current directory).",
-     "  uninstall [packagename] Uninstall a Fancy package with a given name from $FANCYPACK_DIR"] println
+     "  install   --deps        Install dependencies specified in .fancypack file (expected in current directory)",
+     "  uninstall [packagename] Uninstall a Fancy package with a given name from $FANCYPACK_DIR",
+     "  list-packages           List all installed packages"] println
     System exit # quit when running --help
   }
 }
@@ -41,9 +42,14 @@ ARGV for_option: "-e" do: |eval_string| {
 
 ARGV for_option: "-c" do: {
   ARGV index: "-c" . if_true: |idx| {
-    ARGV[[idx + 1, -1]] each: |filename| {
-      "Compiling " ++ filename println
-      Fancy Compiler compile_file: filename to: nil line: 1 print: false
+    ARGV[[idx + 1, -1]] . tap: |filenames| {
+      filenames each: |filename| {
+        "Compiling " ++ filename println
+        Fancy Compiler compile_file: filename to: nil line: 1 print: false
+      }
+      files = "file"
+      { files = "files" } if: $ filenames size != 1
+      "Compiled #{filenames size} #{files}." println
     }
   }
   System exit

data/lib/message_sink.fy

@@ -1,5 +1,5 @@
 class Fancy {
-  class MessageSink : BasicObject {
+  class MessageSink : Fancy BasicObject {
     """
     A MessageSink just swallows all messages that are sent to it.
     """

data/lib/number.fy

@@ -210,4 +210,14 @@ class Number {
       other
     }
   }
+
+  def random {
+    """
+    @return Random number between 0 and @self.
+
+    Returns a random number between 0 and @self.
+    """
+
+    rand(self)
+  }
 }

data/lib/object.fy

@@ -290,13 +290,16 @@ class Object {
     cond if_true: else_block else: block
   }
 
+  alias_method: 'unless:then: for: 'unless:do:
+  alias_method: 'unless:then:else: for: 'unless:do:else:
+
   def method: method_name {
     """
     @return @Method@ with @method_name defined for @self, or @nil.
     Returns the method with a given name for self, if defined.
     """
 
-    method(message_name: method_name)
+    method(method_name message_name)
   }
 
   def documentation {
@@ -572,6 +575,29 @@ class Object {
     }
   }
 
+  def with_mutable_slots: slotnames do: block {
+    """
+    @slotnames @Fancy Enumerable@ of slotnames to be mutable within @block.
+    @block @Block@ to be called with @self.
+
+    Calls @block with @self while having slots defined in @slotnames
+    be mutable during execution of @block.
+    """
+
+    metaclass read_write_slots: slotnames
+    val = nil
+    try {
+      val = block call: [self]
+    } finally {
+      slotnames each: |s| {
+        metaclass undefine_method: s
+        metaclass undefine_method: "#{s}:"
+      }
+      return val
+    }
+  }
+  private: 'with_mutable_slots:do:
+
   def <=> other {
     """
     @other Other object to compare against.

data/lib/package.fy

@@ -1,3 +1,4 @@
+require: "package/handler"
 require: "package/installer"
 require: "package/dependency_installer"
 require: "package/uninstaller"
@@ -29,6 +30,7 @@ class Fancy Package {
   DEFAULT_FANCY_ROOT = ENV["HOME"] ++ "/.fancy"
   DEFAULT_PACKAGES_PATH = DEFAULT_FANCY_ROOT ++ "/packages"
   DEFAULT_PACKAGES_LIB_PATH = DEFAULT_PACKAGES_PATH ++ "/lib"
+  DEFAULT_PACKAGES_BIN_PATH = DEFAULT_PACKAGES_PATH ++ "/bin"
 
   def self install: package_name version: version ('latest) {
     """

data/lib/package/handler.fy

@@ -0,0 +1,56 @@
+class Fancy Package {
+  class Handler {
+    read_write_slots: ('user, 'repository, 'version)
+
+    def initialize: @package_name install_path: @install_path (ENV["FANCY_PACKAGE_DIR"]) {
+      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
+      } else: {
+        @version = 'latest
+      }
+
+      @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_BIN_PATH
+        Directory create!: $ Fancy Package DEFAULT_PACKAGES_PATH ++ "/downloads"
+      }
+
+      @download_path = @install_path ++ "/downloads"
+    }
+
+    def load_fancypack: success_block else: else_block ({}) {
+      """
+      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: success_block else: else_block
+    }
+
+    def installed_path {
+      "#{@install_path}/#{@user}_#{@repository}-#{@version}"
+    }
+
+    def lib_path {
+      @install_path + "/lib"
+    }
+
+    def bin_path {
+      @install_path + "/bin"
+    }
+  }
+}