pione 0.3.1 → 0.3.2

data/test/command/spec_pione-compiler.rb

@@ -5,9 +5,36 @@ TestHelper.scope do |this|
 
   describe Pione::Command::PioneCompiler do
     it "should compile from PNML to PIONE document" do
-      res = TestHelper::Command.succeed do
+      TestHelper::Command.succeed do
         Command::PioneCompiler.run [this::PNML1.path.to_s]
       end
     end
+
+    it "should compile with package name" do
+      res = TestHelper::Command.succeed do
+        Command::PioneCompiler.run [this::PNML1.path.to_s, "--name", "Sequence"]
+      end
+      res.stdout.string.should.include "@ PackageName :: \"Sequence\""
+      res.stdout.string.should.not.include "@ Editor ::"
+      res.stdout.string.should.not.include "@ Tag ::"
+    end
+
+    it "should compile with package name and editor" do
+      res = TestHelper::Command.succeed do
+        Command::PioneCompiler.run [this::PNML1.path.to_s, "--name", "Sequence", "--editor", "yamaguchi"]
+      end
+      res.stdout.string.should.include "@ PackageName :: \"Sequence\""
+      res.stdout.string.should.include "@ Editor :: \"yamaguchi\""
+      res.stdout.string.should.not.include "@ Tag ::"
+    end
+
+    it "should compile with package name, editor, and tag" do
+      res = TestHelper::Command.succeed do
+        Command::PioneCompiler.run [this::PNML1.path.to_s, "--name", "Sequence", "--editor", "yamaguchi", "--tag", "test"]
+      end
+      res.stdout.string.should.include "@ PackageName :: \"Sequence\""
+      res.stdout.string.should.include "@ Editor :: \"yamaguchi\""
+      res.stdout.string.should.include "@ Tag :: \"test\""
+    end
   end
 end

data/test/command/spec_pione-update-package-info.rb

@@ -0,0 +1,66 @@
+require 'pione/test-helper'
+
+describe Pione::Command::PioneUpdatePackageInfo do
+  before do
+    # package
+    @location = Location[Temppath.mkdir]
+
+    # PIONE document
+    (@location + "TestPioneUpdatePackageInfo").write(<<-PIONE)
+      .@ PackageName :: "TestPioneUpdatePackageInfo"
+
+      Rule Main
+        input 'i'
+        output 'o'.touch
+      End
+    PIONE
+
+    # bin
+    (@location + "bin" + "test.sh").write("echo 'Hello, world!' > o")
+
+    # scenario
+    (@location + "scenario").mkdir
+
+    # scenario document
+    (@location + "scenario" + "Scenario.pione").write(<<-PIONE)
+      .@ ScenarioName :: "Test"
+    PIONE
+  end
+
+  it "should update package info files" do
+    args = [@location.path.to_s]
+    TestHelper::Command.succeed do
+      Pione::Command::PioneUpdatePackageInfo.run(args)
+    end
+    (@location + "pione-package.json").should.exist
+    (@location + "pione-package.json").size.should > 0
+    (@location + "scenario" + "pione-scenario.json").should.exist
+    (@location + "scenario" + "pione-scenario.json").size.should > 0
+  end
+
+  it "should not update package info files because they are newer than other files" do
+    ptime = (@location + "pione-package.json").write("").mtime
+    stime = (@location + "scenario" + "pione-scenario.json").write("").mtime
+
+    args = [@location.path.to_s]
+    TestHelper::Command.succeed do
+      Pione::Command::PioneUpdatePackageInfo.run(args)
+    end
+
+    (@location + "pione-package.json").mtime.should == ptime
+    (@location + "scenario" + "pione-scenario.json").mtime.should == stime
+  end
+
+  it "should update package info files by 'force' option" do
+    ptime = (@location + "pione-package.json").write("").mtime
+    stime = (@location + "scenario" + "pione-scenario.json").write("").mtime
+
+    args = [@location.path.to_s, "--force"]
+    TestHelper::Command.succeed do
+      Pione::Command::PioneUpdatePackageInfo.run(args)
+    end
+
+    (@location + "pione-package.json").mtime.should > ptime
+    (@location + "scenario" + "pione-scenario.json").mtime.should > stime
+  end
+end

data/test/lang/data/literal-parser.yml

@@ -27,6 +27,7 @@ string:
     - '"日本語"'
     # escape
     - '"\""'
+    - '"a\"b\"c"'
   invalid:
     # single quote
     - "'abc'"

data/test/lang/spec_environment.rb

@@ -18,6 +18,25 @@ describe 'Pione::Lang::Environment' do
     TestHelper::Lang.expr!(@env, "$p.var($y)").should  == Lang::IntegerSequence.of(2)
   end
 
+  it 'should get variable names by package ID' do
+    @env = @env.setup_new_package("A")
+    TestHelper::Lang.declaration!(@env, "$a := 1")
+    @env = @env.setup_new_package("B", ["A"])
+    TestHelper::Lang.declaration!(@env, "$b := 2")
+    @env = @env.setup_new_package("C", ["B"])
+    TestHelper::Lang.declaration!(@env, "$c := 3")
+    @env = @env.setup_new_package("D")
+    TestHelper::Lang.declaration!(@env, "$d := 4")
+    @env = @env.setup_new_package("E", ["C", "D"])
+    TestHelper::Lang.declaration!(@env, "$e := 4")
+
+    @env.variable_table.select_names_by(@env, "A").sort.should == ["a"]
+    @env.variable_table.select_names_by(@env, "B").sort.should == ["a", "b"]
+    @env.variable_table.select_names_by(@env, "C").sort.should == ["a", "b", "c"]
+    @env.variable_table.select_names_by(@env, "D").sort.should == ["d"]
+    @env.variable_table.select_names_by(@env, "E").sort.should == ["a", "b", "c", "d", "e"]
+  end
+
   it 'should append new package' do
     # append a package
     TestHelper::Lang.declaration!(@env, "package $p <- &Test")

data/test/literate-action/data/D1.md

@@ -0,0 +1,25 @@
+# Titile
+
+desc
+
+## Name1
+
+desc
+
+```sh
+echo A
+```
+
+## Name2
+
+desc1
+
+```ruby
+puts "A"
+```
+
+desc2
+
+```ruby
+puts "B"
+```

data/test/literate-action/data/HelloWorld.md

@@ -0,0 +1,11 @@
+# Action for net `HelloWorld`
+
+This is a document for action of net `HelloWorld`.
+
+## SayHello
+
+Off course, just print "Hello, world!".
+
+``` sh
+echo "Hello, world!" > message.txt
+```

data/test/literate-action/spec_document.rb

@@ -0,0 +1,20 @@
+require 'pione/test-helper'
+
+TestHelper.scope do |this|
+  this::DIR = Location[File.dirname(__FILE__)] + "data"
+  this::D1 = this::DIR + "D1.md"
+
+  describe Pione::LiterateAction::Document do
+    it "should get action names" do
+      doc = LiterateAction::Document.load(this::D1)
+      doc.action_names.sort.should == ["Name1", "Name2"]
+    end
+
+    it "should get action handler by name" do
+      doc = LiterateAction::Document.load(this::D1)
+      doc.find("Name1").should.kind_of LiterateAction::Handler
+      doc.find("Name2").should.kind_of LiterateAction::Handler
+      doc.find("Name3").should.nil
+    end
+  end
+end

data/test/literate-action/spec_handler.rb

@@ -0,0 +1,28 @@
+require 'pione/test-helper'
+
+TestHelper.scope do |this|
+  this::DIR = Location[File.dirname(__FILE__)] + "data"
+  this::D1 = this::DIR + "D1.md"
+
+  describe Pione::LiterateAction::Handler do
+    it "should get a text" do
+      doc = LiterateAction::Document.load(this::D1)
+      doc.find("Name1").tap do |handler|
+        handler.textize(nil).chomp.should == "echo A"
+      end
+      doc.find("Name2").tap do |handler|
+        handler.textize(nil).chomp.should == "puts \"A\"\nputs \"B\""
+      end
+    end
+
+    it "should execute" do
+      doc = LiterateAction::Document.load(this::D1)
+      doc.find("Name1").tap do |handler|
+        handler.execute(nil).chomp.should == "A"
+      end
+      doc.find("Name2").tap do |handler|
+        handler.execute(nil).chomp.should == "A\nB"
+      end
+    end
+  end
+end

data/test/literate-action/spec_parser.rb

@@ -0,0 +1,51 @@
+require 'pione/test-helper'
+
+describe Pione::LiterateAction::Parser do
+  it "should parse" do
+    parsed = LiterateAction::Parser.parse(Util::Indentation.cut(<<-ACTION))
+      # Titile
+
+      desc
+
+      ## Name1
+
+      desc
+
+      ```sh
+      A
+      ```
+
+      ## Name2
+
+      desc1
+
+      ```ruby
+      A
+      ```
+
+      desc2
+
+      ```ruby
+      B
+      ```
+    ACTION
+    parsed.keys.sort.should == ["Name1", "Name2"]
+    parsed["Name1"][:lang].should == "sh"
+    parsed["Name1"][:content].should == "A\n"
+    parsed["Name2"][:lang].should == "ruby"
+    parsed["Name2"][:content].should == "A\nB\n"
+  end
+
+  it "should get a rule name without needless spaces" do
+    parsed = LiterateAction::Parser.parse(Util::Indentation.cut(<<-ACTION))
+      # Title
+
+      ##    Test    
+
+      ``` sh
+      A
+      ```
+    ACTION
+    parsed.keys.first.should == "Test"
+  end
+end

data/test/package/spec_scenario-info.rb

@@ -4,12 +4,12 @@ describe Pione::Package::ScenarioInfo do
   it "should generate a JSON and read it" do
     info = Package::ScenarioInfo.read(JSON.generate(Package::ScenarioInfo.new(
           name: "S1",
-          param_set: "{}",
+          textual_param_sets: "{}",
           inputs: ["input/i1", "input/i2", "input/i3"],
           outputs: ["output/o1", "output/o2", "output/o3"]
     )))
     info.name.should == "S1"
-    info.param_set.should == "{}"
+    info.textual_param_sets.should == "{}"
     info.inputs.should == ["input/i1", "input/i2", "input/i3"]
     info.outputs.should == ["output/o1", "output/o2", "output/o3"]
   end

data/test/package/spec_scenario-scanner.rb

@@ -29,7 +29,7 @@ TestHelper.scope do |this|
     it "should scan scenario direcotry: S1" do
       s1 = Package::ScenarioScanner.new(this::S1).scan
       s1.name.should == "S1"
-      s1.param_set.should.nil
+      s1.textual_param_sets.should.nil
       s1.inputs.size.should == 3
       s1.inputs.should.include "input/i1"
       s1.inputs.should.include "input/i2"
@@ -43,7 +43,7 @@ TestHelper.scope do |this|
     it "should scan scenario direcotry: S2" do
       s2 = Package::ScenarioScanner.new(this::S2).scan
       s2.name.should == "S2"
-      s2.param_set.should.nil
+      s2.textual_param_sets.should.nil
       s2.inputs.size.should == 0
       s2.outputs.size.should == 1
       s2.outputs.should.include "output/o1"
@@ -52,7 +52,7 @@ TestHelper.scope do |this|
     it "should scan scenario direcotry: S3" do
       s3 = Package::ScenarioScanner.new(this::S3).scan
       s3.name.should == "S3"
-      s3.param_set.should == "{PARAM: 1}"
+      s3.textual_param_sets.should == "{PARAM: 1}"
     end
 
     it "should raise exception because of no scenario names" do

data/test/util/data/pnml/Sequence.pnml

@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--PLEASE DO NOT EDIT THIS FILE
-Created with Workflow PetriNet Designer Version 1.0 (woped.org)-->
-<pnml>
-  <net type="http://www.informatik.hu-berlin.de/top/pntd/ptNetb" id="noID">
-    <place id="p3">
-      <name>
-        <text>o1</text>
-        <graphics>
-          <offset x="350" y="110"/>
-        </graphics>
-      </name>
-      <graphics>
-        <position x="350" y="70"/>
-        <dimension x="40" y="40"/>
-      </graphics>
-    </place>
-    <place id="p2">
-      <name>
-        <text>p1</text>
-        <graphics>
-          <offset x="200" y="110"/>
-        </graphics>
-      </name>
-      <graphics>
-        <position x="200" y="70"/>
-        <dimension x="40" y="40"/>
-      </graphics>
-    </place>
-    <place id="p1">
-      <name>
-        <text>i1</text>
-        <graphics>
-          <offset x="50" y="110"/>
-        </graphics>
-      </name>
-      <graphics>
-        <position x="50" y="70"/>
-        <dimension x="40" y="40"/>
-      </graphics>
-    </place>
-    <transition id="t2">
-      <name>
-        <text>B</text>
-        <graphics>
-          <offset x="270" y="110"/>
-        </graphics>
-      </name>
-      <graphics>
-        <position x="275" y="70"/>
-        <dimension x="40" y="40"/>
-      </graphics>
-      <toolspecific tool="WoPeD" version="1.0">
-        <time>0</time>
-        <timeUnit>1</timeUnit>
-        <orientation>1</orientation>
-      </toolspecific>
-    </transition>
-    <transition id="t1">
-      <name>
-        <text>A</text>
-        <graphics>
-          <offset x="120" y="110"/>
-        </graphics>
-      </name>
-      <graphics>
-        <position x="125" y="70"/>
-        <dimension x="40" y="40"/>
-      </graphics>
-      <toolspecific tool="WoPeD" version="1.0">
-        <time>0</time>
-        <timeUnit>1</timeUnit>
-        <orientation>1</orientation>
-      </toolspecific>
-    </transition>
-    <arc id="a1" source="p1" target="t1">
-      <inscription>
-        <text>1</text>
-      </inscription>
-      <graphics/>
-      <toolspecific tool="WoPeD" version="1.0">
-        <probability>1.0</probability>
-        <displayProbabilityOn>false</displayProbabilityOn>
-        <displayProbabilityPosition x="500.0" y="0.0"/>
-      </toolspecific>
-    </arc>
-    <arc id="a2" source="t1" target="p2">
-      <inscription>
-        <text>1</text>
-      </inscription>
-      <graphics/>
-      <toolspecific tool="WoPeD" version="1.0">
-        <probability>1.0</probability>
-        <displayProbabilityOn>false</displayProbabilityOn>
-        <displayProbabilityPosition x="500.0" y="0.0"/>
-      </toolspecific>
-    </arc>
-    <arc id="a3" source="p2" target="t2">
-      <inscription>
-        <text>1</text>
-      </inscription>
-      <graphics/>
-      <toolspecific tool="WoPeD" version="1.0">
-        <probability>1.0</probability>
-        <displayProbabilityOn>false</displayProbabilityOn>
-        <displayProbabilityPosition x="500.0" y="0.0"/>
-      </toolspecific>
-    </arc>
-    <arc id="a4" source="t2" target="p3">
-      <inscription>
-        <text>1</text>
-      </inscription>
-      <graphics/>
-      <toolspecific tool="WoPeD" version="1.0">
-        <probability>1.0</probability>
-        <displayProbabilityOn>false</displayProbabilityOn>
-        <displayProbabilityPosition x="500.0" y="0.0"/>
-      </toolspecific>
-    </arc>
-    <toolspecific tool="WoPeD" version="1.0">
-      <bounds>
-        <position x="2" y="24"/>
-        <dimension x="1168" y="565"/>
-      </bounds>
-      <scale>100</scale>
-      <treeWidthRight>911</treeWidthRight>
-      <overviewPanelVisible>true</overviewPanelVisible>
-      <treeHeightOverview>100</treeHeightOverview>
-      <treePanelVisible>true</treePanelVisible>
-      <verticalLayout>false</verticalLayout>
-      <resources/>
-      <simulations/>
-      <partnerLinks/>
-      <variables/>
-    </toolspecific>
-  </net>
+Created with Workflow PetriNet Designer Version 1.0 (woped.org)-->
+<pnml>
+  <net type="http://www.informatik.hu-berlin.de/top/pntd/ptNetb" id="noID">
+    <place id="p3">
+      <name>
+        <text>>'o1'</text>
+        <graphics>
+          <offset x="350" y="110"/>
+        </graphics>
+      </name>
+      <graphics>
+        <position x="350" y="70"/>
+        <dimension x="40" y="40"/>
+      </graphics>
+    </place>
+    <place id="p2">
+      <name>
+        <text>'p1'</text>
+        <graphics>
+          <offset x="200" y="110"/>
+        </graphics>
+      </name>
+      <graphics>
+        <position x="200" y="70"/>
+        <dimension x="40" y="40"/>
+      </graphics>
+    </place>
+    <place id="p1">
+      <name>
+        <text>'i1'</text>
+        <graphics>
+          <offset x="50" y="110"/>
+        </graphics>
+      </name>
+      <graphics>
+        <position x="50" y="70"/>
+        <dimension x="40" y="40"/>
+      </graphics>
+    </place>
+    <transition id="t2">
+      <name>
+        <text>B</text>
+        <graphics>
+          <offset x="270" y="110"/>
+        </graphics>
+      </name>
+      <graphics>
+        <position x="275" y="70"/>
+        <dimension x="40" y="40"/>
+      </graphics>
+      <toolspecific tool="WoPeD" version="1.0">
+        <time>0</time>
+        <timeUnit>1</timeUnit>
+        <orientation>1</orientation>
+      </toolspecific>
+    </transition>
+    <transition id="t1">
+      <name>
+        <text>A</text>
+        <graphics>
+          <offset x="120" y="110"/>
+        </graphics>
+      </name>
+      <graphics>
+        <position x="125" y="70"/>
+        <dimension x="40" y="40"/>
+      </graphics>
+      <toolspecific tool="WoPeD" version="1.0">
+        <time>0</time>
+        <timeUnit>1</timeUnit>
+        <orientation>1</orientation>
+      </toolspecific>
+    </transition>
+    <arc id="a1" source="p1" target="t1">
+      <inscription>
+        <text>1</text>
+      </inscription>
+      <graphics/>
+      <toolspecific tool="WoPeD" version="1.0">
+        <probability>1.0</probability>
+        <displayProbabilityOn>false</displayProbabilityOn>
+        <displayProbabilityPosition x="500.0" y="0.0"/>
+      </toolspecific>
+    </arc>
+    <arc id="a2" source="t1" target="p2">
+      <inscription>
+        <text>1</text>
+      </inscription>
+      <graphics/>
+      <toolspecific tool="WoPeD" version="1.0">
+        <probability>1.0</probability>
+        <displayProbabilityOn>false</displayProbabilityOn>
+        <displayProbabilityPosition x="500.0" y="0.0"/>
+      </toolspecific>
+    </arc>
+    <arc id="a3" source="p2" target="t2">
+      <inscription>
+        <text>1</text>
+      </inscription>
+      <graphics/>
+      <toolspecific tool="WoPeD" version="1.0">
+        <probability>1.0</probability>
+        <displayProbabilityOn>false</displayProbabilityOn>
+        <displayProbabilityPosition x="500.0" y="0.0"/>
+      </toolspecific>
+    </arc>
+    <arc id="a4" source="t2" target="p3">
+      <inscription>
+        <text>1</text>
+      </inscription>
+      <graphics/>
+      <toolspecific tool="WoPeD" version="1.0">
+        <probability>1.0</probability>
+        <displayProbabilityOn>false</displayProbabilityOn>
+        <displayProbabilityPosition x="500.0" y="0.0"/>
+      </toolspecific>
+    </arc>
+    <toolspecific tool="WoPeD" version="1.0">
+      <bounds>
+        <position x="2" y="22"/>
+        <dimension x="1351" y="472"/>
+      </bounds>
+      <scale>130</scale>
+      <treeWidthRight>1066</treeWidthRight>
+      <overviewPanelVisible>true</overviewPanelVisible>
+      <treeHeightOverview>100</treeHeightOverview>
+      <treePanelVisible>true</treePanelVisible>
+      <verticalLayout>false</verticalLayout>
+      <resources/>
+      <simulations/>
+      <partnerLinks/>
+      <variables/>
+    </toolspecific>
+  </net>
 </pnml>

data/test/util/spec_pnml-compiler.rb

@@ -5,17 +5,28 @@ TestHelper.scope do |this|
 
   describe Pione::Util::PNMLCompiler do
     it "should compile from PNML to PIONE" do
-      pione = Util::PNMLCompiler.new(this::PNML1).compile
+      pione = Util::PNMLCompiler.new(this::PNML1, "Test", "E", "T").compile
+
       env = Lang::Environment.new.setup_new_package("Test")
       TestHelper::Lang.package_context!(env, pione)
-      rule_a = env.rule_get(Lang::RuleExpr.new("A"))
-      cond_a = rule_a.rule_condition_context.eval(env)
-      cond_a.inputs.should == [Lang::DataExprSequence.of("i1")]
-      cond_a.outputs.should == [Lang::DataExprSequence.of("p1")]
-      rule_b = env.rule_get(Lang::RuleExpr.new("B"))
-      cond_b = rule_b.rule_condition_context.eval(env)
-      cond_b.inputs.should == [Lang::DataExprSequence.of("p1")]
-      cond_b.outputs.should == [Lang::DataExprSequence.of("o1")]
+
+      env.rule_get(Lang::RuleExpr.new("Main")).tap do |rule|
+        cond = rule.rule_condition_context.eval(env)
+        cond.inputs.should == [TestHelper::Lang.expr("'i1'")]
+        cond.outputs.should == [TestHelper::Lang.expr("'o1'")]
+      end
+
+      env.rule_get(Lang::RuleExpr.new("A")).tap do |rule|
+        cond = rule.rule_condition_context.eval(env)
+        cond.inputs.should == [TestHelper::Lang.expr("'i1'")]
+        cond.outputs.should == [TestHelper::Lang.expr("'p1'.touch")]
+      end
+
+      env.rule_get(Lang::RuleExpr.new("B")).tap do |rule|
+        cond = rule.rule_condition_context.eval(env)
+        cond.inputs.should == [TestHelper::Lang.expr("'p1'")]
+        cond.outputs.should == [TestHelper::Lang.expr("'o1'.touch")]
+      end
     end
   end
 end