crun 0.0.1 → 0.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
 = Version history
 
+[0.0.2] Option prepend feature.
+        Small update on option priority.
+        Testcases.
+
 [0.0.1] Initial version.

data/README.rdoc

@@ -126,6 +126,7 @@ program would be given as:
    * Options for crun:
    * -crun-compopts:=-O2
    * crun-compopts:+-lm
+   * crun-compopts:.-std=c99
    * crun-progopts:=-c 12
    */
 
@@ -171,10 +172,10 @@ Summary of option setting from first to last:
 * Defaults (from crun program).
 * ".crun" from home directory.
 * ".crun" from current directory.
+* Options embedded to C source file (main file).
 * "-c" options from files.
 * "-o" options from Crun CLI.
 * "-p" options for program (only).
-* Options embedded to C source file (main file).
 
 
 = Issues

data/bin/crun

@@ -41,6 +41,9 @@ def apply_opt( opt )
     elsif opt.split(':+').length == 2
         parts = opt.split(':+')
         @crun[parts[0]].push parts[1]
+    elsif opt.split(':.').length == 2
+        parts = opt.split(':.')
+        @crun[parts[0]].unshift parts[1]
     end
 end
 
@@ -48,6 +51,7 @@ if Opt['template'].given
     puts "\
 /*
  * crun-compopts:+-O2
+ * crun-progopts:+-f file.txt
  */
 
 #include <stdio.h>
@@ -115,13 +119,6 @@ if Opt['debug'].given
     @crun['crunopts'].push '-g'
 end
 
-# Read in selected user confs.
-if Opt['conf'].given
-    Opt['conf'].value.each do |userconf|
-        load userconf if File.exist? userconf
-    end
-end
-
 
 # ------------------------------------------------------------
 # Collect compilation options from c-file.
@@ -138,6 +135,15 @@ File.readlines( cfiles[0] ).each do |line|
 end
 
 
+# ------------------------------------------------------------
+# Read in selected user confs.
+if Opt['conf'].given
+    Opt['conf'].value.each do |userconf|
+        load userconf if File.exist? userconf
+    end
+end
+
+
 # ------------------------------------------------------------
 # Collect compilation options from CLI.
 

data/examples/crun_conf.rb

@@ -1,2 +1,2 @@
 @crun['compopts'].push "-O2"
-@crun['progopts'].push "-c 4"
+@crun['progopts'].unshift "-c 4"

data/examples/greeting.c

@@ -2,6 +2,7 @@
  * Options for crun:
  * -crun-compopts:=-O2
  * crun-compopts:+-lm
+ * crun-compopts:.-std=c99
  * crun-progopts:=-c 12
  */
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Crun
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
     def Crun.version
         Crun::VERSION
     end

data/test/golden/basic.txt

@@ -0,0 +1,12 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!
+Greeting #5!
+Greeting #6!
+Greeting #7!
+Greeting #8!
+Greeting #9!
+Greeting #10!
+Greeting #11!
+Greeting #12!

data/test/golden/conf.txt

@@ -0,0 +1,4 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!

data/test/golden/override.txt

@@ -0,0 +1,20 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!
+Greeting #5!
+Greeting #6!
+Greeting #7!
+Greeting #8!
+Greeting #9!
+Greeting #10!
+Greeting #11!
+Greeting #12!
+Greeting #13!
+Greeting #14!
+Greeting #15!
+Greeting #16!
+Greeting #17!
+Greeting #18!
+Greeting #19!
+Greeting #20!

data/test/golden/override2.txt

@@ -0,0 +1,13 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!
+Greeting #5!
+Greeting #6!
+Greeting #7!
+Greeting #8!
+Greeting #9!
+Greeting #10!
+Greeting #11!
+Greeting #12!
+Greeting #13!

data/test/golden/override3.txt

@@ -0,0 +1,12 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!
+Greeting #5!
+Greeting #6!
+Greeting #7!
+Greeting #8!
+Greeting #9!
+Greeting #10!
+Greeting #11!
+Greeting #12!

data/test/golden/template.txt

@@ -0,0 +1,12 @@
+/*
+ * crun-compopts:+-O2
+ * crun-progopts:+-f file.txt
+ */
+
+#include <stdio.h>
+
+int main( int argc, char** argv )
+{
+  
+  return 0;
+}

data/test/result/basic.txt

@@ -0,0 +1,12 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!
+Greeting #5!
+Greeting #6!
+Greeting #7!
+Greeting #8!
+Greeting #9!
+Greeting #10!
+Greeting #11!
+Greeting #12!

data/test/result/conf.txt

@@ -0,0 +1,4 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!

data/test/result/override.txt

@@ -0,0 +1,20 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!
+Greeting #5!
+Greeting #6!
+Greeting #7!
+Greeting #8!
+Greeting #9!
+Greeting #10!
+Greeting #11!
+Greeting #12!
+Greeting #13!
+Greeting #14!
+Greeting #15!
+Greeting #16!
+Greeting #17!
+Greeting #18!
+Greeting #19!
+Greeting #20!

data/test/result/override2.txt

@@ -0,0 +1,13 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!
+Greeting #5!
+Greeting #6!
+Greeting #7!
+Greeting #8!
+Greeting #9!
+Greeting #10!
+Greeting #11!
+Greeting #12!
+Greeting #13!

data/test/result/override3.txt

@@ -0,0 +1,12 @@
+Greeting #1!
+Greeting #2!
+Greeting #3!
+Greeting #4!
+Greeting #5!
+Greeting #6!
+Greeting #7!
+Greeting #8!
+Greeting #9!
+Greeting #10!
+Greeting #11!
+Greeting #12!

data/test/result/template.txt

@@ -0,0 +1,12 @@
+/*
+ * crun-compopts:+-O2
+ * crun-progopts:+-f file.txt
+ */
+
+#include <stdio.h>
+
+int main( int argc, char** argv )
+{
+  
+  return 0;
+}

data/test/test_crun.rb

@@ -0,0 +1,43 @@
+require 'test/unit'
+
+# Select training if you want to renew golden files.
+#TRAINING = true
+TRAINING = false
+
+
+# Test execution routine.
+def runTest( test, cmdopts )
+    rf = "result/#{test}.txt"
+    gf = "golden/#{test}.txt"
+
+    system( "export RUBYLIB=../lib; ../bin/crun #{cmdopts} > #{rf}" )
+
+    if TRAINING
+        # Populate golden files after inspection.
+        system( "cp #{rf} #{gf}" )
+    end
+
+    assert( system( "diff #{rf} #{gf}" ), "FAILED: diff #{rf} #{gf}" )
+end
+
+
+# Tests.
+class CrunTest < Test::Unit::TestCase
+
+    def setup
+        Dir.chdir( 'test' )
+        FileUtils.mkdir_p "result"
+    end
+
+    def teardown
+        Dir.chdir( '..' )
+    end
+
+    def test_basic()      runTest( "basic", "-f ../examples/greeting.c" ); end
+    def test_conf()       runTest( "conf", "-f ../examples/greeting.c -c ../examples/crun_conf.rb" ); end
+    def test_override()   runTest( "override", "-f ../examples/greeting.c -c ../examples/crun_conf.rb -o \"progopts:.-c 20\"" ); end
+    def test_override2()  runTest( "override2", "-f ../examples/greeting.c -o \"progopts:.-c 13\"" ); end
+    def test_override3()  runTest( "override3", "-f ../examples/greeting.c -o \"progopts:+-c 13\"" ); end
+    def test_template()   runTest( "template", "-f ../examples/greeting.c -o \"progopts:+-c 13\" -t" ); end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crun
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: como
@@ -55,24 +55,19 @@ files:
 - examples/greeting.c
 - examples/sizeof.c
 - examples/crun_conf.rb
-- doc/top-level-namespace.html
-- doc/js/full_list.js
-- doc/js/app.js
-- doc/js/jquery.js
-- doc/index.html
-- doc/css/common.css
-- doc/css/full_list.css
-- doc/css/style.css
-- doc/Array.html
-- doc/file.README.html
-- doc/method_list.html
-- doc/file_list.html
-- doc/Crun.html
-- doc/class_list.html
-- doc/_index.html
-- doc/file.CHANGELOG.html
-- doc/CrunMod.html
-- doc/frames.html
+- test/golden/override.txt
+- test/golden/override3.txt
+- test/golden/basic.txt
+- test/golden/override2.txt
+- test/golden/conf.txt
+- test/golden/template.txt
+- test/test_crun.rb
+- test/result/override.txt
+- test/result/override3.txt
+- test/result/basic.txt
+- test/result/override2.txt
+- test/result/conf.txt
+- test/result/template.txt
 - bin/crun
 homepage: 
 licenses:
@@ -98,5 +93,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Shell env variable management utility.
+summary: C-program prototyping environment.
 test_files: []

data/doc/Array.html

@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>
-  Class: Array
-  
-    &mdash; Documentation by YARD 0.8.7.6
-  
-</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" charset="utf-8" />
-
-  <link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
-
-<script type="text/javascript" charset="utf-8">
-  hasFrames = window.top.frames.main ? true : false;
-  relpath = '';
-  framesUrl = "frames.html#!Array.html";
-</script>
-
-
-  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
-
-  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
-
-
-  </head>
-  <body>
-    <div id="header">
-      <div id="menu">
-  
-    <a href="_index.html">Index (A)</a> &raquo;
-    
-    
-    <span class="title">Array</span>
-  
-
-  <div class="noframes"><span class="title">(</span><a href="." target="_top">no frames</a><span class="title">)</span></div>
-</div>
-
-      <div id="search">
-  
-    <a class="full_list_link" id="class_list_link"
-        href="class_list.html">
-      Class List
-    </a>
-  
-    <a class="full_list_link" id="method_list_link"
-        href="method_list.html">
-      Method List
-    </a>
-  
-    <a class="full_list_link" id="file_list_link"
-        href="file_list.html">
-      File List
-    </a>
-  
-</div>
-      <div class="clear"></div>
-    </div>
-
-    <iframe id="search_frame"></iframe>
-
-    <div id="content"><h1>Class: Array
-  
-  
-  
-</h1>
-
-<dl class="box">
-  
-    <dt class="r1">Inherits:</dt>
-    <dd class="r1">
-      <span class="inheritName">Object</span>
-      
-        <ul class="fullTree">
-          <li>Object</li>
-          
-            <li class="next">Array</li>
-          
-        </ul>
-        <a href="#" class="inheritanceTree">show all</a>
-      
-      </dd>
-    
-  
-  
-    
-  
-    
-  
-  
-  
-    <dt class="r2 last">Defined in:</dt>
-    <dd class="r2 last">bin/crun</dd>
-  
-</dl>
-<div class="clear"></div>
-
-
-
-
-
-
-
-
-  
-    <h2>
-      Instance Method Summary
-      <small>(<a href="#" class="summary_toggle">collapse</a>)</small>
-    </h2>
-
-    <ul class="summary">
-      
-        <li class="public ">
-  <span class="summary_signature">
-    
-      <a href="#crun-instance_method" title="#crun (instance method)">- (Object) <strong>crun</strong> </a>
-    
-
-    
-  </span>
-  
-  
-  
-  
-  
-  
-  
-
-  
-    <span class="summary_desc"><div class='inline'>
-<p>Join array elements with space.</p>
-</div></span>
-  
-</li>
-
-      
-    </ul>
-  
-
-
-
-  <div id="instance_method_details" class="method_details_list">
-    <h2>Instance Method Details</h2>
-
-    
-      <div class="method_details first">
-  <h3 class="signature first" id="crun-instance_method">
-  
-    - (<tt>Object</tt>) <strong>crun</strong> 
-  
-
-  
-
-  
-</h3><div class="docstring">
-  <div class="discussion">
-    
-<p>Join array elements with space.</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-169
-170
-171</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'bin/crun', line 169</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_crun'>crun</span>
-    <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_join'>join</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'> </span><span class='tstring_end'>&#39;</span></span><span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
-</div>
-    
-  </div>
-
-</div>
-
-    <div id="footer">
-  Generated on Sun Dec 25 20:31:45 2016 by
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
-</div>
-
-  </body>
-</html>