sfp 0.1.1 → 0.1.3

data/test/{service-classes.sfp → service-schemas.sfp}

@@ -1,6 +1,6 @@
-include "cloud-classes.sfp"
+include "cloud-schemas.sfp"
 
-class Service {
+schema Service {
 	installed is false
 	running is false
 	on_machine isref Machine
@@ -46,7 +46,7 @@ class Service {
 	}
 }
 
-class LoadBalancer extends Service {
+schema LoadBalancer extends Service {
 	webs isset WebService
 
 	procedure start {
@@ -63,7 +63,7 @@ class LoadBalancer extends Service {
 	}
 }
 
-class WebService extends Service {
+schema WebService extends Service {
 	depend_on isref AppService
 
 	procedure redirect ( app isref AppService ) {
@@ -99,7 +99,7 @@ class WebService extends Service {
 	}
 }
 
-class AppService extends Service {
+schema AppService extends Service {
 	depend_on isref DatabaseService
 
 	procedure redirect ( db isref DatabaseService ) {
@@ -135,7 +135,7 @@ class AppService extends Service {
 	}
 }
 
-class DatabaseService extends Service {
+schema DatabaseService extends Service {
 	procedure stop {
 		conditions {
 			this.installed is true

data/test/test-module1.sfp

@@ -0,0 +1,20 @@
+schema S {
+	foo is true
+	procedure change {
+		conditions {
+		}
+		effects {
+			this.foo is false
+		}
+	}
+}
+
+initial state {
+	a isa S
+	b isa S
+}
+
+goal constraint {
+	a.foo is false
+	b.foo is false
+}

data/test/test1.sfp

@@ -1,12 +1,6 @@
-class S {
-	foo is true
-	procedure change {
-		conditions { }
-		effects {
-			this.foo is false
-		}
-	}
-}
+#!/usr/bin/env sfp
+
+include "test1.inc"
 
 initial state {
 	a isa S

data/test/test2.sfp

@@ -1,17 +1,20 @@
-include "test2.inc"
+schema S {
+	foo is true
+	procedure change {
+		conditions {
+		}
+		effects {
+			this.foo is false
+		}
+	}
+}
 
-// generate all possible states with constraint solver
 initial state {
-	s1 isa Service
-	s2 isa Service
-	s3 isa Service
+	a isa S
+	b isa S
 }
+
 goal constraint {
-	s1.running
-	s2.running
-	s3.running
-}
-global constraint {
-	if s1.running then s2.running
-	if s2.running then s3.running
+	a.foo is false
+	b.foo is false
 }

data/test/test3.sfp

@@ -0,0 +1,17 @@
+include "test3.inc"
+
+// generate all possible states with constraint solver
+initial state {
+	s1 isa Service
+	s2 isa Service
+	s3 isa Service
+}
+goal constraint {
+	s1.running
+	s2.running
+	s3.running
+}
+global constraint {
+	if s1.running then s2.running
+	if s2.running then s3.running
+}

data/test/{types.sfp → test4.inc}

@@ -1,4 +1,4 @@
-class Service {
+schema Service {
 	running is false
 	procedure start {
 		conditions {
@@ -17,7 +17,7 @@ class Service {
 		}
 	}
 }
-class Client {
+schema Client {
 	refer isref Service
 	procedure redirect(s isref Service) {
 		conditions { }

data/test/{task.sfp → test4.sfp}

@@ -1,4 +1,4 @@
-include "types.sfp"
+include "test4.inc"
 
 initial state {
 	a isa Service {

metadata

@@ -1,58 +1,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sfp
-version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - Herry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-06 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &8708440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 7
+        - 5
         version: 1.7.5
   type: :runtime
-  prerelease: false
-  version_requirements: *8708440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: antlr3
-  requirement: &8707420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 8
+        - 12
         version: 1.8.12
   type: :runtime
-  prerelease: false
-  version_requirements: *8707420
-description: A Ruby gem that provides a Ruby API to SFP language parser and SFP planner.
-  It also provides a planner sript to solve a planning problem written in SFP language.
+  version_requirements: *id002
+description: A Ruby gem that provides a Ruby API to SFP language parser and SFP planner. It also provides a planner sript to solve a planning problem written in SFP language.
 email: herry13@gmail.com
-executables:
+executables: 
 - sfp
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - LICENSE
 - README.md
 - bin/sfp
-- bin/solver/linux/downward
-- bin/solver/linux/preprocess
+- bin/solver/linux-arm/downward
+- bin/solver/linux-arm/preprocess
+- bin/solver/linux-x86/downward
+- bin/solver/linux-x86/preprocess
 - bin/solver/macos/downward
 - bin/solver/macos/preprocess
 - lib/sfp.rb
 - lib/sfp/SfpLangLexer.rb
 - lib/sfp/SfpLangParser.rb
 - lib/sfp/Sfplib.rb
+- lib/sfp/executor.rb
 - lib/sfp/parser.rb
 - lib/sfp/planner.rb
 - lib/sfp/sas.rb
@@ -62,60 +78,72 @@ files:
 - sfp.gemspec
 - src/SfpLang.g
 - src/build.sh
-- test/cloud-classes.sfp
-- test/cloud1.sfp
-- test/cloud2.sfp
-- test/cloud3.sfp
+- test/cloud-schemas.sfp
+- test/future/test1.sfp
+- test/nd-cloud1.sfp
+- test/nd-cloud2.sfp
+- test/nd-cloud3.sfp
+- test/nd-service1.sfp
+- test/nd-service2.sfp
+- test/run.sh
 - test/s.sfp
-- test/service-classes.sfp
-- test/service1.sfp
-- test/service3.sfp
-- test/task.sfp
-- test/test.inc
-- test/test.sfp
+- test/service-schemas.sfp
+- test/test-module1-scripts.tgz
+- test/test-module1.sfp
+- test/test1.inc
 - test/test1.sfp
-- test/test2.inc
 - test/test2.sfp
-- test/types.sfp
-- test/v1.1.sfp
+- test/test3.inc
+- test/test3.sfp
+- test/test4.inc
+- test/test4.sfp
+has_rdoc: true
 homepage: https://github.com/herry13/sfp-ruby
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.11
+
+rubyforge_project: sfp
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: SFP Parser and Planner
-test_files:
-- test/cloud-classes.sfp
-- test/cloud1.sfp
-- test/cloud2.sfp
-- test/cloud3.sfp
+test_files: 
+- test/cloud-schemas.sfp
+- test/future/test1.sfp
+- test/nd-cloud1.sfp
+- test/nd-cloud2.sfp
+- test/nd-cloud3.sfp
+- test/nd-service1.sfp
+- test/nd-service2.sfp
+- test/run.sh
 - test/s.sfp
-- test/service-classes.sfp
-- test/service1.sfp
-- test/service3.sfp
-- test/task.sfp
-- test/test.inc
-- test/test.sfp
+- test/service-schemas.sfp
+- test/test-module1-scripts.tgz
+- test/test-module1.sfp
+- test/test1.inc
 - test/test1.sfp
-- test/test2.inc
 - test/test2.sfp
-- test/types.sfp
-- test/v1.1.sfp
+- test/test3.inc
+- test/test3.sfp
+- test/test4.inc
+- test/test4.sfp

data/test/test.sfp

@@ -1,13 +0,0 @@
-#!/usr/bin/env sfp
-
-include "test.inc"
-
-initial state {
-	a isa S
-	b isa S
-}
-
-goal constraint {
-	a.foo is false
-	b.foo is false
-}