irust 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a8680765ab2d6bbe030ce43b0dd47ce13c60989
-  data.tar.gz: ec059eae0484d928fe6c91a0e75c57a87e7d618d
+  metadata.gz: d71c1afd38f1f48fc58a4705783bd9de7f058f20
+  data.tar.gz: ae752373a7856bd1cb5b9fc2c81feee7e12ed0fb
 SHA512:
-  metadata.gz: 4a7d90d96f88aa46f29bbe17bc246d909f23f0a1c1e90f93dc4719482dc2757d26345a476f05e2213e27b9b773419c61c7e2a5bda3402ddee7c26334cc45d5a2
-  data.tar.gz: 520b0149be9f72c76c34d29dd45ba6c8e9bd0798e7acd8051677615dec7967f5abd11869b7a36b680e8669f335d4b069fc2f1cb7df7e2fefd97c0e15f0515fce
+  metadata.gz: 9a90fcd4505d163b5f28ac2e496dfb14251386519039d35e9e41a7a57d24112763d8e98b879d0f873268cbd7078f740439edac06b4223dd33771ee0c225c714c
+  data.tar.gz: 1157872356efef33da734d5be8be7c9a344723463cbddba868138f2ef2b2d43b5a0135f7fac5ba4619438ce02b477afc0e3284b8cbd2428dcbedc78a4a2810bd

data/CHANGES.md

@@ -1,3 +1,10 @@
+1.1.0 (2014-01-05)
+------------------
+* Keep a basic history
+* Show the type of the return value
+* Display the type and value of let and fn statements
+* Rewrite internals around an ERB template
+
 1.0.1 (2013-12-22)
 ------------------
 * Exit properly when ^D is pressed

data/README.md

@@ -47,7 +47,7 @@ Now type some fancy Rust expressions and watch them get magically evaluated
 before your eyes!
 
     irust> 2+2
-    4
+    4 : int
     irust>
 
 Technology!
@@ -60,5 +60,5 @@ Technology!
 
 ## License
 
-Copyright (c) 2013 Tony Arcieri. Distributed under the MIT License. See
+Copyright (c) 2014 Tony Arcieri. Distributed under the MIT License. See
 LICENSE.txt for further details.

data/lib/irust.rb

@@ -2,6 +2,8 @@ require "readline"
 require "tmpdir"
 require "open3"
 
+require "irust/template_renderer"
+
 module IRust
   module_function
 
@@ -9,21 +11,8 @@ module IRust
     Readline.readline("irust> ", true)
   end
 
-  def rust_program(line)
-<<-RUST
-#[feature(globs, macro_rules, struct_variant)];
-extern mod extra;
-
-fn main() {
-  let r = {
-    fn type_of<T>(_: &T) -> &'static str { unsafe {
-    (*std::unstable::intrinsics::get_tydesc::<T>()).name } } struct
-    Foo<T>(T);
-    #{line}
-  };
-  println!("{:?}", r)
-}
-RUST
+  def rust_program(line, history)
+    IRust::TemplateRenderer.new(line, history).render
   end
 
   def compile(tmpdir)
@@ -39,20 +28,25 @@ RUST
     end
   end
 
-  def eval(line)
+  def eval(line, history = nil)
     exit 0 if line.nil?
 
     Dir.mktmpdir do |tmpdir|
       input_src = File.join(tmpdir, "irust.rs")
-      File.write input_src, rust_program(line)
+      File.write input_src, rust_program(line, history)
 
       if compile(tmpdir)
         system input_src.sub(/\.rs$/, '')
+        history + ";\n" + line
+      else
+        history
       end
     end
   end
 
   def run
-    loop { eval read }
+    history = ""
+    loop { history = eval read, history }
   end
 end
+

data/lib/irust/template.rs.erb

@@ -0,0 +1,20 @@
+#[feature(globs, macro_rules, struct_variant)];
+extern mod extra;
+
+fn main() {
+  fn type_of<T>(_: &T) -> &'static str {
+    unsafe {
+      (*std::unstable::intrinsics::get_tydesc::<T>()).name
+    }
+  } struct Foo<T>(T);
+
+  <%= history %>;
+  
+  <% if let_var %>
+  <%= rust_code %>;
+  println!("<%= let_var%> = {:?} : {:s}", <%= let_var %>, type_of(&<%= let_var %>));
+  <% else %>
+  let _result = { <%= rust_code %> };
+  println!("{:?} : {:s}", _result, type_of(&_result));
+  <% end %>
+}

data/lib/irust/template_renderer.rb

@@ -0,0 +1,22 @@
+require 'erb'
+
+module IRust
+  class TemplateRenderer
+    RUST_TEMPLATE = File.expand_path("../template.rs.erb", __FILE__)
+
+    attr_reader :rust_code, :history
+
+    def initialize(rust_code, history = nil)
+      @rust_code, @history = rust_code, history
+    end
+
+    def render
+      template = File.read(RUST_TEMPLATE)
+      ERB.new(template).result(binding)
+    end
+
+    def let_var
+      rust_code[/^\s*(let|fn)\s+(mut\s+)?(\w+)/, 3]
+    end
+  end
+end

data/lib/irust/version.rb

@@ -1,3 +1,3 @@
 module IRust
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: irust
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: iRust is an interactive REPL for Rust
@@ -46,7 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -55,6 +55,8 @@ files:
 - bin/irust
 - irust.gemspec
 - lib/irust.rb
+- lib/irust/template.rs.erb
+- lib/irust/template_renderer.rb
 - lib/irust/version.rb
 homepage: https://github.com/tarcieri/irust
 licenses:
@@ -66,17 +68,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Read, Eval, and Print Rust code to your heart's desire!