irust 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9bfb0bc7d02ab895c1997bce90ae057e5b1d9a1
-  data.tar.gz: b2cd75e03c51dfb488e66b0b3b4675c8e06cd3d7
+  metadata.gz: b9debcb414133ceb3d964ef6e18d61b4fc2d638d
+  data.tar.gz: e39312da8354aba888c2e55d0c8c60dfaf3f54e6
 SHA512:
-  metadata.gz: a38e74bdc5b51192509ac5dd9351a9a5cb0f85fd43f86be395ad7de16aa5c6419aa9177917d8c19049bebdf9d38dd83c4330ddcf2f74a73e294d41da5aa9ab29
-  data.tar.gz: 5d0d7c5236e5a776a05dcf3e18b4c8e22e6a242e35c1704ef16526dac4248a430752ffc797967106d7add89032c382b508f37fc24c6867bc60bea353e0a7b77f
+  metadata.gz: ba493d4832c350dfb4cd22191fc1a4f22eec0f25e09fd3b06d7ebca552dc139423b98f133df3cc71bb265d5b9af3b30b9390f387a8acc85f6644e12522ddde98
+  data.tar.gz: eb0ef17740eea2ac4f688a6a6c81e650302a6a47ce7d8e7c3dc0bd178b7fd4c583c564151584eb4682acd1bdbf7323320f1b97f02ed19f6e655a6ef10c14ff14

data/CHANGES.md

@@ -1,3 +1,7 @@
+1.1.2 (2014-01-23)
+------------------
+* Display failing program (with line numbers) for debugging assistance
+
 1.1.1 (2014-01-05)
 ------------------
 * Detect and display installed Rust version

data/irust.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "colorize", ">= 0.6.0"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/irust.rb

@@ -1,6 +1,7 @@
 require "readline"
 require "tmpdir"
 require "open3"
+require "colorize"
 
 require "irust/template_renderer"
 
@@ -24,16 +25,20 @@ module IRust
     IRust::TemplateRenderer.new(line, history).render
   end
 
-  def compile(tmpdir)
+  def compile(tmpdir, src)
     Dir.chdir(tmpdir) do
       stdin, stderr, status = Open3.capture3("rustc irust.rs")
+      return true if status.success?
 
-      if status.success?
-        true
-      else
-        STDERR.puts stderr
-        false
+      error = "--- BEGIN FAILED PROGRAM ---\n"
+      src.split("\n").each_with_index do |line, i|
+          error << "#{i + 1}: #{line}\n"
       end
+      error << "---- END FAILED PROGRAM ----"
+
+      STDERR.puts error.red
+      STDERR.puts stderr
+      false
     end
   end
 
@@ -41,11 +46,12 @@ module IRust
     exit 0 if line.nil?
 
     Dir.mktmpdir do |tmpdir|
-      input_src = File.join(tmpdir, "irust.rs")
-      File.write input_src, rust_program(line, history)
+      src     = rust_program(line, history)
+      srcfile = File.join(tmpdir, "irust.rs")
+      File.write(srcfile, src)
 
-      if compile(tmpdir)
-        system input_src.sub(/\.rs$/, '')
+      if compile(tmpdir, src)
+        system srcfile.sub(/\.rs$/, '')
         history + ";\n" + line
       else
         history

data/lib/irust/template.rs.erb

@@ -1,13 +1,11 @@
 #[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);
+fn type_of<T>(_: &T) -> &'static str {
+  unsafe { (*std::unstable::intrinsics::get_tydesc::<T>()).name }
+}
 
+fn main() {
   <%= history %>;
   
   <% if let_var %>

data/lib/irust/version.rb

@@ -1,3 +1,3 @@
 module IRust
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: irust
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement