pg-verify 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0582b670fd565351fe5f6f01f34e5dd7358f4fd6f2385ced16d7a487c0b65a8d'
-  data.tar.gz: ea5556b7831154f0330e96e145be74fba25a31d5a775dc5e6abc5d32eaba9b03
+  metadata.gz: 9b580ce77eaa5f2da5c136688b09db56a3397d810188fcfe8480a59bca92760a
+  data.tar.gz: 89a4e5af16afc5186326cb12615432cb17d38fb7e986b790b7e061cc53138541
 SHA512:
-  metadata.gz: fb81fb19377bda7a3c109a5dfb7ee4174c5d529a3133223b784ff814bc68636487664ed07ce8cc6f39eed1cdf99ebd3e20ac027ab5a19da9416f32f6977a5105
-  data.tar.gz: 5453f990cda9252b0be7b9e6c0a71ce8f1d8fc77f064ef5f3f6eb29c03dbb1a5a44f370e54b8137398c02c0a3643a9135558ea5c20066684545618ab60f5de94
+  metadata.gz: c3d040e30a27cf278ff987157b97abeb045d0cf12d209eacc7f4577e81ca39ae40bff1bff51ffb9581b030f5b28628ca08e84994b554c5ca8ac01773c1a8e4f5
+  data.tar.gz: 56f901795a267c9fea53f0a203122767cb50003fc18f510df455de9f3df715421a7b788321d3538f19e3e87ac3b5cac4d6d6e8908db16f935bf5481959197e9b

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    pg-verify (0.1.0)
+    pg-verify (0.1.1)
       config (~> 4.2.1)
-      ebnf (~> 2.3.4)
       plantuml_builder (~> 0.3.0)
       rainbow (~> 3.0.0)
       thor (~> 1.2.1)
@@ -50,21 +49,10 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.8, >= 1.8.0)
-    ebnf (2.3.4)
-      htmlentities (~> 4.3)
-      rdf (~> 3.2)
-      scanf (~> 1.0)
-      sxp (~> 1.2)
-      unicode-types (~> 1.8)
-    htmlentities (4.3.4)
-    link_header (0.0.8)
-    matrix (0.4.2)
     plantuml_builder (0.3.0)
       docopt (~> 0.5.0)
     rainbow (3.0.0)
     rake (13.0.6)
-    rdf (3.2.11)
-      link_header (~> 0.0, >= 0.0.8)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -78,12 +66,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    scanf (1.0.0)
-    sxp (1.2.4)
-      matrix (~> 0.4)
-      rdf (~> 3.2)
     thor (1.2.1)
-    unicode-types (1.8.0)
 
 PLATFORMS
   x86_64-darwin-19

data/data/banner.txt

@@ -0,0 +1,5 @@
+   ___  _____  _   __        _ ___    
+  / _ \/ ___/ | | / /__ ____(_) _/_ __
+ / ___/ (_ /  | |/ / -_) __/ / _/ // /
+/_/   \___/   |___/\__/_/ /_/_/ \_, / 
+                version 0.1.0   /___/ 

data/lib/pg-verify/cli/cli.rb

@@ -93,6 +93,18 @@ module PgVerify
 
         class BaseCommand < Thor
 
+            desc "version", "Print version information"
+            def version()
+                banner = File.read(File.join(PgVerify.root, "data", "banner.txt"))
+                banner = banner.gsub("0.1.0", PgVerify::VERSION)
+                colors = [ "red", "orange", "yellow", "orange", "red" ]
+                banner = banner.split("\n").each_with_index.map { |l, i| l.send(:"c_#{colors[i]}") }.join("\n")
+                puts banner
+                puts 
+                puts "You are running #{'pg-verify'.c_string} version #{PgVerify::VERSION.to_s.c_num}"
+                puts "Installation root: #{PgVerify.root.to_s.c_file}"
+            end
+
             desc "test", "Test the model specifications"
             method_option :script, :type => :string
             def test()
@@ -205,6 +217,8 @@ module PgVerify
                 # Copy the actual default config into the project as that
                 # will contain all keys and should be commented
                 FileUtils.cp(File.join(PgVerify.root, "data", "config", "pg-verify.yml"), File.join(target, ".pg-verify.yml"))
+                prelude_pg_file = File.join(PgVerify.root, "integration_tests", "ruby_dsl", "016_pressure_tank.rb")
+                FileUtils.cp(prelude_pg_file, File.join(target, Settings.ruby_dsl.default_script_name))
 
                 # Initialize git project
                 Dir.chdir(target) { 

data/lib/pg-verify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgVerify
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/pg-verify.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
 
   # Gem dependencies
   spec.add_dependency "thor", "~> 1.2.1"
-  spec.add_dependency "ebnf", "~> 2.3.4"
   spec.add_dependency "rainbow", "~> 3.0.0"
   spec.add_dependency "config", "~> 4.2.1"
   spec.add_dependency "plantuml_builder", "~> 0.3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg-verify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Arian Weber
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: ebnf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -97,13 +83,12 @@ files:
 - bin/pg-verify.rb
 - bin/setup
 - calc.ebnf
+- data/banner.txt
 - data/config/pg-verify.yml
 - data/nusmv.sample.smv
 - data/project-template/.gitignore.resource
-- data/project-template/.pg-verify.yml
 - data/project-template/README.md
 - data/project-template/addon/.keep
-- data/project-template/program-graph.rb.resource
 - devpg
 - doc/examples/railroad_crossing.rb
 - doc/examples/train-tree.rb

data/data/project-template/program-graph.rb.resource

@@ -1,103 +0,0 @@
-####################################################################
-# Model definition
-####################################################################
-
-model :FeelThePain do
-
-    # Define a graph called 'Hand'.
-    graph :Hand do
-        # The hand can be touching the fence or be somewhere else
-        # It starts in 'somewhere' as that state is listed first
-        states :somewhere, :at_fence
-
-        # Transition non-deterministically between those states
-        transition :somewhere => :somewhere
-        transition :somewhere => :at_fence
-        transition :at_fence => :somewhere
-        transition :at_fence => :at_fence
-    end
-
-    # Define another graph called 'PowerSwitch', which also
-    # transitions non-deterministically.
-    graph :PowerSwitch do
-        states :off, :on
-        transition :off => :off
-        transition :off => :on
-        transition :on  => :off
-        transition :on  => :on
-    end
-
-    graph :Fence do
-        # The fence has no states we are interested in
-        states :exists
-
-        # The fence has a voltage which can go up to 15
-        var :voltage => (0..12), init: 0
-
-        # The voltage increases when the power switch is on
-        transition :exists => :exists do
-            guard "PowerSwitch == on"
-            action "voltage := voltage + 1"
-        end
-        # ..and instantly stops when the switch is off
-        transition :exists => :exists do
-            guard "PowerSwitch == off"
-            action "voltage := 0"
-        end
-
-    end
-
-    graph :Pain do
-        # We can either be in pain or not
-        states :No, :Yes
-        # Using regular variables with string interpolation
-        pain_threshold = 7
-        transition :No => :Yes do
-            # action "voltage := 2"
-            guard "Hand == at_fence && voltage >= #{pain_threshold}"
-        end
-        transition :Yes => :No do
-            guard "Hand == somewhere || voltage < #{pain_threshold}"
-        end
-    end
-
-    ####################################################################
-    # Validity tests
-    ####################################################################
-
-    # Specification of validity characteristics regarding the hand.
-    # The 'specify' block serves as a namespace/container for the contained specifications
-    specify "The Hand" do
-        # Define some simple specs using a description text and an LTL expression
-        it "isn't always touching the fence"  => :"F Hand == somewhere"
-        it "isn't always away form the fence" => :"F Hand == at_fence"
-    end
-
-    # Specification of validity characteristics regarding the pain
-    specify "The pain" do
-        # Use a regular LTL Formula as the expression
-        it "is felt at some point" => :"F Pain == Yes"
-        # Use a more declarative syntax. This becomes useful for complex expressions
-        # as LTL patterns can be used very easily
-        it "is always felt at some point" => ltl.globally.exists(:"Pain == Yes")
-
-        # Pattern: 'Universality', range: 'after q'
-        it "is felt after the switch is activated" => ltl.after(:"PowerSwitch == on").exists(:"Pain == Yes")
-        # Pattern: 'Absence', range: 'before q'
-        it "is never felt before the switch is activated" => ltl.before(:"PowerSwitch == on").never(:"Pain == Yes")
-        # Pattern: 'Reaction', range: 'global'
-        it "always reacts to the switch being activated"  => ltl.globally.reacts(:"PowerSwitch == on", :"Pain == Yes")
-
-        # Define an assumption. That assumption must be true for all contained specs
-        assuming "the switch is never activated" => :"G PowerSwitch == off" do
-            it "is never felt " => :"G Pain == No"
-        end
-
-        # Assumptions can be nested and used with the declarative syntax.
-        assuming "the switch is activated" => ltl.globally.exists(:"PowerSwitch == No") do
-            assuming "the hand never touches the fence" => :"G Hand != at_fence" do
-                it "is never felt " => :"G Pain == No"
-            end
-        end
-    end
-end