tla-sbuilder 0.1.0 → 0.2.1

data/mustache/invariant_activate.mustache

@@ -0,0 +1,16 @@
+{{!
+
+   invariant_activate.mustache
+
+}}
+
+
+(******************************************************************
+ Activate Type invariants: {{META.desc}}
+ - modelData {{META.modelData}}
+ - template  {{META.template}}
+ ******************************************************************)
+
+{{#invariants}}
+INVARIANT {{name}}
+{{/invariants}}

data/mustache/setup/assumptions_activate.mustache

@@ -0,0 +1,16 @@
+{{!
+
+   assumptions_activate.mustache
+
+}}
+
+
+(******************************************************************
+ Activate Assumptions: {{META.desc}}
+ - modelData {{META.modelData}}
+ - template  {{META.template}}
+ ******************************************************************)
+
+{{#assumptions}}
+ASSUME {{name}}
+{{/assumptions}}

data/mustache/{domains_run.mustache → setup/domains_run.mustache}

@@ -3,7 +3,7 @@
    run_domains.mustache - define domain values
 
    - iterate #domain_values
-   - include Nil to valid domain value
+   - include Nil to valid domain value if property 'nil-value' defined
 
 }}
 
@@ -15,7 +15,7 @@ Assign values to skeleton domains: {{META.desc}}
 
 (* Domains for {{META.setup}} start *)
 {{#domains}}
-Run_{{>name_domain.mustache}}    == { {{#domain_values}}"{{>name_domain_value.mustache}}"{{_comma}} {{/domain_values}} } \cup {Nil} \*
+Run_{{>name_domain.mustache}}    == { {{#domain_values}}"{{>name_domain_value.mustache}}"{{_comma}} {{/domain_values}} } {{#nil_value}} \cup {Nil} {{/nil_value}} \*
 {{/domains}}
 (* Domains for {{META.setup}} end *)
 

data/mustache/setup/operator_run.mustache

@@ -5,3 +5,5 @@ RunProcessRunning( stepdefs ) ==  (CHOOSE s \in Head( stepdefs ): TRUE ).process
 RunProcessEnabled( stepdefs, s ) == Len( stepdefs ) # 0 /\ s =  RunProcessRunning( stepdefs )
 RunProcessesToRun( stepdefs ) == Tail( stepdefs )
 RunProcessParameter( stepdefs ) == Head( stepdefs )
+
+RunInTransaction == tx_running                   \* state variable tx_running records transaction state

data/mustache/setup/steps_run_bind_set.mustache

@@ -29,7 +29,7 @@
     
 }}{{^bindSets}}{{!
 
-     Nil if 'bindSet' not defined.
+     {Nil} if 'bindSet' not defined.
 
 
 }}Nil{{/bindSets}}{{!

data/mustache/setup/steps_run_parameterBind.mustache

@@ -33,7 +33,7 @@
 }}{{^domain_value}}{{^domain_element}}{{^columns.length}}{{^rows.length}}{{parameter_name}}|->Nil{{_comma}}{{/rows.length}}{{/columns.length}}{{/domain_element}}{{/domain_value}}{{!
 
   
- Record
+   Case 4: Record
 
   :parameter:
     columns: (*HERE*  NOTICE NO domain_element )
@@ -45,15 +45,17 @@
         rows: false
         columns: false
         _comma: ","
+	_index: 0
       - :parameter_name: tag
         :domain_element: pet_tag_1
         rows: false
         columns: false
         _comma: ''
+	_index: 1
       _comma: ''
 
 
-}}{{#columns.length}} _key |-> {[ key |-> "{{parameter_name}}", rec |-> [ {{/columns.length}}{{!
+}}{{#columns.length}} _key{{_index}} |-> {[ key |-> "{{parameter_name}}", rec |-> [ {{/columns.length}}{{!
 
    Here recurse columns
 

data/mustache/tla/macro_run.mustache

@@ -18,6 +18,9 @@
       (* Reset infrastructure service responses on process entry *)
       responses := InfrastructureServiceInit;
 
+      (* Flag Transaction started *)
+      tx_running := TRUE;
+
       (* time advances by one tick for each process step *)
       tick();
       \* debug( s );
@@ -33,7 +36,12 @@
     *)
     
     macro process_done( s ) {
+    
         steps := ProcessesToRun( steps ); \* Tail( steps );
+	
+	(* Flag Transaction started *)
+        tx_running := FALSE;
+	
     }
 
     

data/mustache/tla/operator_run.mustache

@@ -6,3 +6,4 @@ ProcessParameter( stepdefs )  == {}     \* Head( stepdefs )
 ProcessesToRun( stepdefs )    == {}     \* Tail( stepdefs )
 
 TickNext( t )   == t + 1                \* advance time (when process start)
+InTransaction   == FALSE                \* TRUE when application service running, FALSE when not

data/mustache/tla/plc_define_run.mustache

@@ -30,12 +30,10 @@
        Recurse one level down  in 'inputParam' using keys 'bindDefs._key.key'.
        Recursion is done only if 'bindDefs' defines field '_key'.
 
-       Should be implemented using recursion, but at the time of writing this comment could not make it work.
-
      *)
      RECURSIVE ProcessParameterEnables( _, _ )
-     ProcessParameterEnables( inputParam, bindDefs ) == ( \A key \in  { k \in DOMAIN bindDefs : k # "_key" /\ k # "_rows" }:  bindDefs[key] = inputParam[key]  )
-                   /\ ( \A reckey \in { k \in DOMAIN bindDefs : k = "_key"  }: \A r \in bindDefs[reckey] : ProcessParameterEnables( inputParam[r.key], r.rec ) )
+     ProcessParameterEnables( inputParam, bindDefs ) == ( \A key \in  { k \in DOMAIN bindDefs : Len(k)<4 \/ (SubSeq(k,1,4) # "_key" /\ k # "_rows" )}:  bindDefs[key] = inputParam[key]  )
+                   /\ ( \A reckey \in { k \in DOMAIN bindDefs : Len(k)>3 /\SubSeq(k,1,4)  = "_key"  }: \A r \in bindDefs[reckey] : ProcessParameterEnables( inputParam[r.key], r.rec ) )
                    /\ ( \A reckey \in { k \in DOMAIN bindDefs : k = "_rows" }: \A r \in bindDefs[reckey] : 
                       Cardinality( r.set ) = Cardinality( inputParam[r.key] ) /\  \A bDef \in r.set: \E ip \in inputParam[r.key]: ProcessParameterEnables( ip, bDef ) 
 	           )

data/mustache/tla/plc_run_state.mustache

@@ -9,4 +9,4 @@ variables
        step              = Nil;   \* processes currently enabled
        step_parameter    = {};    \* paramter binding for currently enabled processes
        now               = 0;     \* current time
-          
+       tx_running        = FALSE; \* TRUE when process is running   

data/src-extend/extend/extend_invariant_cfg.mustache

@@ -4,4 +4,4 @@
  - template  {{META.template}}
 *)
 
-{{>correctness.cfg}}
+{{! >correctness.cfg}}

data/src/pet/assumption_domains.tla

@@ -13,4 +13,4 @@ Assume_Domains ==
 	     /\ Assume_Owner_Domains
 
 
-ASSUME Assume_Domains
+\* ASSUME Assume_Domains

data/src/pet/correctness.cfg

@@ -1,3 +1,5 @@
+(* 
+
 INVARIANT ValidatePets
 INVARIANT UniquePet
 INVARIANT UniqueTag
@@ -7,3 +9,5 @@ INVARIANT CoherentOwnerAddress
 \* Type invariants
 INVARIANT Pets_TypeInvariant
 INVARIANT Tags_TypeInvariant
+
+*)

data/tla-sbuilder.gemspec

@@ -29,13 +29,15 @@ EOF
   s.executables     = [ "sbuilder.rb" ]
   s.license         = 'MIT'
 
+  s.homepage              = "https://github.com/jarjuk/tla-sbuilder"
+  
   s.required_ruby_version = '~> 2'
 
   s.add_runtime_dependency 'mustache', '~>1.0', ">=1.0.2"
   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'
+  s.add_runtime_dependency 'tla-parser-s', ">=0.1.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.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - jarjuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -94,16 +94,16 @@ dependencies:
   name: tla-parser-s
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 description: |2+
 
     A tool to generate runnable specification models in TLA+ language
@@ -134,6 +134,7 @@ files:
 - lib/sbuilder/domain_value.rb
 - lib/sbuilder/exception.rb
 - lib/sbuilder/extension_loader.rb
+- lib/sbuilder/facade/api_loader.rb
 - lib/sbuilder/factory.rb
 - lib/sbuilder/model.rb
 - lib/sbuilder/mustache/template.rb
@@ -143,7 +144,6 @@ files:
 - lib/sbuilder/param_set_db.rb
 - lib/sbuilder/param_set_def.rb
 - lib/sbuilder/param_set_if.rb
-- lib/sbuilder/param_set_loader.rb
 - lib/sbuilder/param_set_loader_swagger.rb
 - lib/sbuilder/param_set_step.rb
 - lib/sbuilder/param_sets.rb
@@ -157,6 +157,9 @@ files:
 - lib/sbuilder/resolver_rule.rb
 - lib/sbuilder/resolver_rule_match.rb
 - lib/sbuilder/resolver_rule_ref.rb
+- lib/sbuilder/spec/README
+- lib/sbuilder/spec/api_loader_facade.rb
+- lib/utils/cache_lines.rb
 - lib/utils/hash_inject.rb
 - lib/utils/logger.rb
 - lib/utils/netio.rb
@@ -174,7 +177,6 @@ files:
 - mustache/definition_types.mustache
 - mustache/domains.mustache
 - mustache/domains_assign.mustache
-- mustache/domains_run.mustache
 - mustache/extend/extend_assumptions.mustache
 - mustache/extend/extend_const.mustache
 - mustache/extend/extend_implementation.mustache
@@ -188,6 +190,7 @@ files:
 - mustache/interface_processes.mustache
 - mustache/interface_stubs_dummy.mustache
 - mustache/interface_types.mustache
+- mustache/invariant_activate.mustache
 - mustache/markdown-header.mustache
 - mustache/markdown-toc.mustache
 - mustache/name_definition_type.mustache
@@ -208,6 +211,8 @@ files:
 - mustache/possibility/possibility_definition.mustache
 - mustache/possibility/possibility_directive.mustache
 - mustache/possibility/possility_setup.mustache
+- mustache/setup/assumptions_activate.mustache
+- mustache/setup/domains_run.mustache
 - mustache/setup/module_footer.mustache
 - mustache/setup/module_header.mustache
 - mustache/setup/operator_run.mustache
@@ -250,7 +255,6 @@ files:
 - src-extend/extend/extend_state.mustache
 - src-extend/extend_app/assumption
 - src-extend/extend_app/correctness
-- src-extend/extend_app/correctness.cfg
 - src-extend/extend_app/infrastructure
 - src-extend/extend_app/interface
 - src-extend/extend_app/operator
@@ -325,7 +329,7 @@ files:
 - src/pet/transaction_enter_tag.tla
 - src/pet/transaction_error.tla
 - tla-sbuilder.gemspec
-homepage: 
+homepage: https://github.com/jarjuk/tla-sbuilder
 licenses:
 - MIT
 metadata: {}

data/lib/sbuilder/param_set_loader.rb

@@ -1,77 +0,0 @@
-
-module Sbuilder
-
-  class ParamSetLoader
-
-    attr_reader :factory                      # to create stuff
-    attr_accessor :controller                 # get sets when load starts
-
-    # ------------------------------------------------------------------
-    # mixer
-    PROGNAME = "ParamSetLoader"               # progname for logger
-    include Sbuilder::Utils::MyLogger         # mix logger
-
-
-    # ------------------------------------------------------------------
-    # constructore
-    
-    def initialize( factory, options = {} )
-      @logger = getLogger( PROGNAME, options )
-      @logger.info( "#{__method__} initialized" )
-      @factory = factory
-    end
-
-    # @param loaderDef [Hash] adding configuration for loader (override)
-    def configure( loaderDef )
-      doConfigure( loaderDef )
-    end
-    
-    def doConfigure( loaderDef )
-      msg = "Sub class should implement doConfigure -method"
-      @logger.error( "#{__method__} #{msg}" )        
-      raise NoMethodError.new( msg  )
-    end
-    
-    # ------------------------------------------------------------------
-    # load paramset from 'fileUri' 
-    def load( controller, fileUri, cacheFile=nil )
-      # controller which control loading
-      @controller = controller
-      
-      begin
-        loaded = doLoad( fileUri, cacheFile )
-      rescue Exception => e
-        msg = "Exception '#{e}' when loading fileUri '#{fileUri}'"
-        @logger.error( "#{__method__} #{msg}" )
-        puts msg
-        raise e
-      end
-
-      # # iterate && report to controller
-      # loaded.each do |paramSet|
-      #   controller.interfaceEncountered( paramSet )
-      # end
-    end
-
-    def createParamSet( type )
-      factory.createParamSet( type )
-    end
-
-    def createParameter( type )
-      factory.createParameter( type )
-    end
-    
-
-    # ------------------------------------------------------------------
-    # sub-class should implement the doload method
-    def doLoad( fileUri, cacheFile=nil )
-      msg = "Sub class should implement doLoad -method"
-      @logger.error( "#{__method__} #{msg}" )        
-      raise NoMethodError.new( msg  )
-    end
-    
-
-  end # class ParamSetLoader
-
-
-end # module

data/src-extend/extend_app/correctness.cfg

@@ -1,9 +0,0 @@
-{{!
-
-   Activate correcness predicates
-
-   For example:
-
-   INVARIANT PetStore_ValidatePets
-
-}}