tla-sbuilder 0.2.2 → 0.3.4

data/src/pet/interface

@@ -5,8 +5,8 @@
 }}
 
 
-{{>interface_post_pet.tla}}
-{{>interface_get_pet.tla}}
-{{>interface_delete_pet.tla}}
-{{>interface_post_tag.tla}}
-{{>interface_put_tag.tla}}
+{{!interface_post_pet.tla}}
+{{!interface_get_pet.tla}}
+{{!interface_delete_pet.tla}}
+{{!interface_post_tag.tla}}
+{{!interface_put_tag.tla}}

data/src/pet/interface_delete_pet.tla

@@ -1,5 +1,5 @@
 \* this macro expanded in process
-macro delete_pet( input ) {
+macro {{#SPEC_NAME}}service_implementation./pets/{id}(delete){{/SPEC_NAME}}( input ) {
 
       call s_delete_pet( input );
 }

data/src/pet/interface_get_pet.tla

@@ -1,4 +1,4 @@
-macro get_pet( input ) {
+macro {{#SPEC_NAME}}service_implementation./pets/{id}(get){{/SPEC_NAME}}( input ) {
 
       call s_get_pet( input );
 }

data/src/pet/interface_post_pet.tla

@@ -1,5 +1,7 @@
-\* this macro expanded in process
-macro post_pet( input ) {
+(* This macro uses 'specName' -property to create name for the
+interface in specification code domain.  *)
+
+macro {{specName}}( input ) {
 
       call s_post_pet( input );
 }

data/src/pet/interface_post_tag.tla

@@ -1,5 +1,5 @@
 
-macro post_tag( input ) {
+macro {{#SPEC_NAME}}service_implementation./tags(post){{/SPEC_NAME}}( input ) {
 
       call s_post_tag( input );
 }

data/src/pet/interface_put_tag.tla

@@ -1,3 +1,3 @@
-macro put_tag( input ) {
+macro {{#SPEC_NAME}}service_implementation./tags(put){{/SPEC_NAME}}( input ) {
       call s_put_tag( input );
 }

data/tla-sbuilder.gemspec

@@ -33,12 +33,12 @@ EOF
   
   s.required_ruby_version = '~> 2'
 
-  s.add_runtime_dependency 'mustache', '~>1.0', ">=1.0.2"
+  s.add_runtime_dependency 'mustache', '~>1.0', ">=1.0.3"
   s.add_runtime_dependency 'hashie', '~>3.3', ">=3.3.2"
   s.add_runtime_dependency 'thor', '~>0.19', ">=0.19.1"
   s.add_runtime_dependency 'json-schema', '~>2.5', ">=2.5.2"
-  s.add_runtime_dependency 'tla-parser-s', ">=0.1.2"
-
+  s.add_runtime_dependency 'tla-parser-s',  '~>0.2', ">=0.2.2"
+ 
   # # used in pet.sh
   # s.add_runtime_dependency 'bcat'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tla-sbuilder
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.4
 platform: ruby
 authors:
 - jarjuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -19,7 +19,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -94,16 +94,22 @@ dependencies:
   name: tla-parser-s
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.2
 description: |2+
 
     A tool to generate runnable specification models in TLA+ language
@@ -128,22 +134,37 @@ files:
 - lib/sbuilder.rb
 - lib/sbuilder/constants.rb
 - lib/sbuilder/controller.rb
+- lib/sbuilder/controller_utils.rb
 - lib/sbuilder/default-sbuilder.yaml
 - lib/sbuilder/domain.rb
 - lib/sbuilder/domain_cardinality.rb
+- lib/sbuilder/domain_range.rb
+- lib/sbuilder/domain_type.rb
 - lib/sbuilder/domain_value.rb
 - lib/sbuilder/exception.rb
 - lib/sbuilder/extension_loader.rb
-- lib/sbuilder/facade/api_loader.rb
+- lib/sbuilder/extension_loader_deprecated_step_extensions.rb
+- lib/sbuilder/extension_loader_step_generator.rb
+- lib/sbuilder/facade/api_loader_facade.rb
 - lib/sbuilder/facade/api_loader_plugin.rb
+- lib/sbuilder/facade/api_loader_plugin_mixer.rb
+- lib/sbuilder/facade/facade_constants.rb
+- lib/sbuilder/facade/loader_plugin_root.rb
+- lib/sbuilder/facade/param_set_root.rb
+- lib/sbuilder/facade/snippet_loader_facade.rb
+- lib/sbuilder/facade/snippet_loader_plugin.rb
+- lib/sbuilder/facade/snippet_loader_plugin_mixer.rb
 - lib/sbuilder/factory.rb
 - lib/sbuilder/model.rb
 - lib/sbuilder/mustache/template.rb
 - lib/sbuilder/mustache/template_reader.rb
 - lib/sbuilder/mustache/template_reader_context.rb
+- lib/sbuilder/mustache/template_resolve.rb
+- lib/sbuilder/mustache/template_root.rb
 - lib/sbuilder/param_set.rb
 - lib/sbuilder/param_set_db.rb
 - lib/sbuilder/param_set_def.rb
+- lib/sbuilder/param_set_def_func.rb
 - lib/sbuilder/param_set_if.rb
 - lib/sbuilder/param_set_loader_swagger.rb
 - lib/sbuilder/param_set_step.rb
@@ -152,19 +173,30 @@ files:
 - lib/sbuilder/parameter_container.rb
 - lib/sbuilder/parameter_dom.rb
 - lib/sbuilder/parameter_ref.rb
+- lib/sbuilder/parser/parser_facade.rb
 - lib/sbuilder/resolver.rb
 - lib/sbuilder/resolver_loader.rb
 - lib/sbuilder/resolver_loader_yaml.rb
 - lib/sbuilder/resolver_rule.rb
 - lib/sbuilder/resolver_rule_match.rb
 - lib/sbuilder/resolver_rule_ref.rb
+- lib/sbuilder/setup_loader.rb
+- lib/sbuilder/setup_loader_env.rb
+- lib/sbuilder/setup_loader_pref.rb
+- lib/sbuilder/snippet_loader_simple.rb
 - lib/sbuilder/spec/README
+- lib/sbuilder/spec/api_loader.rb
 - lib/sbuilder/spec/api_loader_facade.rb
-- lib/utils/cache_lines.rb
+- lib/sbuilder/spec/loader_plugin.rb
+- lib/sbuilder/spec/snippet_loader.rb
+- lib/sbuilder/symbol_table.rb
+- lib/utils/fileio.rb
 - lib/utils/hash_inject.rb
 - lib/utils/logger.rb
 - lib/utils/netio.rb
+- lib/utils/powerset.rb
 - lib/utils/string_inject.rb
+- lib/utils/validate.rb
 - lib/utils/version.rb
 - mustache/cfg/const_def.mustache
 - mustache/cfg/const_run.mustache
@@ -194,15 +226,7 @@ files:
 - mustache/invariant_activate.mustache
 - mustache/markdown-header.mustache
 - mustache/markdown-toc.mustache
-- mustache/name_definition_type.mustache
-- mustache/name_domain.mustache
-- mustache/name_domain_value.mustache
-- mustache/name_domain_value_prefix.mustache
-- mustache/name_interface_response_type.mustache
-- mustache/name_interface_type.mustache
 - mustache/name_parameter_definition.mustache
-- mustache/name_parameter_type.mustache
-- mustache/name_process.mustache
 - mustache/name_type_invariant.mustache
 - mustache/name_variable.mustache
 - mustache/operator-infrastructure-service.mustache
@@ -212,6 +236,10 @@ files:
 - mustache/possibility/possibility_definition.mustache
 - mustache/possibility/possibility_directive.mustache
 - mustache/possibility/possility_setup.mustache
+- mustache/resources/schedule_operator_new_step.tla
+- mustache/resources/schedule_process_macro.tla
+- mustache/resources/schedule_process_procedure.tla
+- mustache/resources/schedule_throw.tla
 - mustache/setup/assumptions_activate.mustache
 - mustache/setup/domains_run.mustache
 - mustache/setup/module_footer.mustache
@@ -224,9 +252,7 @@ files:
 - mustache/setup/steps_run_parameterBind.mustache
 - mustache/setup/steps_run_parameterExact.mustache
 - mustache/state_type_invariant-infrastructure-service.mustache
-- mustache/state_type_invariant.mustache
 - mustache/state_type_invariant_cfg.mustache
-- mustache/state_variables.mustache
 - mustache/tla/const_def.mustache
 - mustache/tla/const_run.mustache
 - mustache/tla/macro-infrastructure-service.mustache
@@ -250,7 +276,6 @@ files:
 - src-extend/extend/extend_const.mustache
 - src-extend/extend/extend_implementation.mustache
 - src-extend/extend/extend_invariant.mustache
-- src-extend/extend/extend_invariant_cfg.mustache
 - src-extend/extend/extend_macros.mustache
 - src-extend/extend/extend_operations.mustache
 - src-extend/extend/extend_state.mustache

data/mustache/name_definition_type.mustache

@@ -1,5 +0,0 @@
-{{! name of type
-
-    Notice no new-lines!!!
-
-}}t_{{definition_name}}

data/mustache/name_domain.mustache

@@ -1,5 +0,0 @@
-{{! value within domain_values
-
-    Notice no new-lines!!!
-
-}}d_{{domain_name}}

data/mustache/name_domain_value.mustache

@@ -1,5 +0,0 @@
-{{! value within domain_values
-
-    Notice no new-lines!!!
-
-}}{{value}}

data/mustache/name_domain_value_prefix.mustache

@@ -1,5 +0,0 @@
-{{! name of first domain value
-
-    Notice no new-lines!!!
-
-}}{{namespace}}{{type}}

data/mustache/name_interface_response_type.mustache

@@ -1,6 +0,0 @@
-{{! name of interface reponse type
-
-
-    Notice no new-lines!!!
-
-}}t_resp_{{interface_name}}

data/mustache/name_interface_type.mustache

@@ -1,6 +0,0 @@
-{{! name of interface type
-
-
-    Notice no new-lines!!!
-
-}}t_{{interface_name}}

data/mustache/name_parameter_type.mustache

@@ -1,6 +0,0 @@
-{{!
-
-
-   Notice no newlines
-
-}}{{namespace}}{{type}}

data/mustache/name_process.mustache

@@ -1,6 +0,0 @@
-{{! name of process
-
-
-    Notice no new-lines!!!
-
-}}p_{{interface_name}}

data/mustache/state_type_invariant.mustache

@@ -1,17 +0,0 @@
-{{!
-
-   state_type_constraint: type invariant operator for a varibale
-
-}}
-
-
-(******************************************************************
-Type invariants:  {{META.desc}}
- - modelData {{META.modelData}}
- - template  {{META.template}}
-******************************************************************)
-
-{{#variables}}
-{{>name_type_invariant.mustache}} == \A entry \in {{>name_variable.mustache}}: entry \in {{>name_interface_type.mustache}}
-{{/variables}}
-

data/mustache/state_variables.mustache

@@ -1,20 +0,0 @@
-{{!
-
-   state_variables: state variables parser
-
-
-}}
-
-(******************************************************************
-State varibles: {{META.desc}}
- - modelData {{META.modelData}}
- - template  {{META.template}}
-******************************************************************)
-
-
-{{#variables}}
-       {{>name_variable.mustache}} = {};   \* of type {{>name_interface_type.mustache}}
-{{/variables}}
-
-
-

data/src-extend/extend/extend_invariant_cfg.mustache

@@ -1,7 +0,0 @@
-(*
- {{META.desc}}
- - modelData {{META.modelData}}
- - template  {{META.template}}
-*)
-
-{{! >correctness.cfg}}