inferno_core 0.4.27 → 0.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2750c56074f5e6579f3fec5688d7c7c8ef909402a309ce6863da431f572600e
-  data.tar.gz: b883711988bca2af75e2da203b0a6c4f34352470e57f99bb83d71927f5c7851c
+  metadata.gz: 71ffd4d8151e890a5a52cd087d5aeb222efcf27902c2ec01f78d898a08de7d9b
+  data.tar.gz: afe5c2b4cf3603e54e4b085dc609f061d6e78bd929e1b4ee915294dcb0f87de6
 SHA512:
-  metadata.gz: 1196b955b46936d636ca1f6a4d781b15928bd2cc5710cadf852b09f8633202070793dfa24a3b531f668994d8ec9d9abd105b49fc5e47f08557c83b24c2d07a4b
-  data.tar.gz: 9b5a566d027f0cd3f446025dc71bcf6844a03f46ff0cbf6d3d25a150ef9ca154fb06e84e841a9786f7a2d2495a7da273150bae329552a7229d9de60c36574f1c
+  metadata.gz: e0caf2d09c500643311b393129a741a9bd8d3ee043d7b6e45c3cad5cd92eb50802642de5c3222bf62188d1ecbe48469c5b54cf2f3005f65548d544b8ac2f6d30
+  data.tar.gz: bb530410e8303d6fc82132c0f8c3da0fc63987ac6ba48b2be1023d8021ed7350a5158d3941e5bc7090136986248bae9134a64fbf8c6432352bb98ae839abff91

data/lib/inferno/apps/cli/main.rb

@@ -3,6 +3,8 @@ require_relative 'migration'
 require_relative 'services'
 require_relative 'suite'
 require_relative 'suites'
+require_relative 'new'
+require_relative '../../version'
 
 module Inferno
   module CLI
@@ -49,6 +51,13 @@ module Inferno
 
       desc 'suite SUBCOMMAND ...ARGS', 'Perform suite-based operations'
       subcommand 'suite', Suite
+
+      register(New, 'new', 'new TEST_KIT_NAME', 'Run `inferno new --help` for full help')
+
+      desc 'version', "Output Inferno core version (#{Inferno::VERSION})"
+      def version
+        puts "Inferno Core v#{Inferno::VERSION}"
+      end
     end
   end
 end

data/lib/inferno/apps/cli/new.rb

@@ -0,0 +1,103 @@
+require 'thor'
+require 'bundler'
+require_relative '../../utils/named_thor_actions'
+require_relative '../../version'
+
+module Inferno
+  module CLI
+    class New < Thor::Group
+      include Thor::Actions
+      include Inferno::Utils::NamedThorActions
+
+      desc <<~HELP
+        Generate a new Inferno test kit for FHIR software testing
+
+        Examples:
+
+          `inferno new test_fhir_app`
+            => generates an Inferno app
+
+          `inferno new test_my_ig -a MyName`
+            => generates Inferno app and specifies MyName as gemspec author
+
+        https://inferno-framework.github.io/index.html
+      HELP
+
+      def self.banner
+        'inferno new TEST_KIT_NAME'
+      end
+
+      def self.source_root
+        File.join(__dir__, 'templates')
+      end
+
+      argument :name,
+               type: :string,
+               required: true,
+               desc: 'name for new Inferno project'
+      class_option :author,
+                   type: :string,
+                   aliases: '-a',
+                   default: [],
+                   repeatable: true,
+                   desc: "Author names for gemspec file; you may use '-a' multiple times"
+      class_option :skip_bundle,
+                   type: :boolean,
+                   aliases: '-b',
+                   default: false,
+                   desc: 'Do not run bundle install'
+
+      add_runtime_options!
+
+      def create_app
+        directory('.', root_name, { mode: :preserve, recursive: true, verbose: !options['quiet'] })
+
+        bundle_install
+        inferno_migrate
+
+        say_unless_quiet "Created #{root_name} Inferno test kit!", :green
+
+        return unless options['pretend']
+
+        say_unless_quiet 'This was a dry run; re-run without `--pretend` to actually create project',
+                         :yellow
+      end
+
+      private
+
+      def ig_path
+        File.join('lib', library_name, 'igs')
+      end
+
+      def authors
+        options['author'].presence || [default_author]
+      end
+
+      def default_author
+        ENV['USER'] || ENV['USERNAME'] || 'PUT_YOUR_NAME_HERE'
+      end
+
+      def bundle_install
+        return if options['skip_bundle']
+
+        inside(root_name) do
+          Bundler.with_unbundled_env do
+            run 'bundle install', verbose: !options['quiet'], capture: options['quiet']
+          end
+        end
+      end
+
+      def inferno_migrate
+        return if options['skip_bundle']
+
+        inside(root_name) do
+          run 'bundle exec inferno migrate', verbose: !options['quiet'], capture: options['quiet']
+        end
+      end
+
+      def say_unless_quiet(*args)
+        say(*args) unless options['quiet']
+      end
+    end
+  end
+end

data/lib/inferno/apps/web/controllers/test_runs/destroy.rb

@@ -21,7 +21,7 @@ module Inferno
 
             if test_run_is_waiting
               waiting_result = results_repo.find_waiting_result(test_run_id: test_run.id)
-              results_repo.cancel_waiting_result(waiting_result.id, 'Test cancelled by user')
+              results_repo.update_result(waiting_result.id, 'cancel', 'Test cancelled by user')
               Jobs.perform(Jobs::ResumeTestRun, test_run.id)
             end
 

data/lib/inferno/dsl/fhir_resource_validation.rb

@@ -45,7 +45,7 @@ module Inferno
         # @param validator_url [String]
         def url(validator_url = nil)
           @url = validator_url if validator_url
-
+          @url ||= default_validator_url
           @url
         end
 

data/lib/inferno/dsl/fhir_validation.rb

@@ -60,7 +60,7 @@ module Inferno
         # @param validator_url [String]
         def url(validator_url = nil)
           @url = validator_url if validator_url
-
+          @url ||= default_validator_url
           @url
         end
 

data/lib/inferno/dsl/resume_test_route.rb

@@ -28,6 +28,11 @@ module Inferno
         self.class.singleton_class.instance_variable_get(:@tags)
       end
 
+      # @private
+      def result
+        self.class.singleton_class.instance_variable_get(:@result)
+      end
+
       # @private
       def find_test_run(test_run_identifier)
         test_runs_repo.find_latest_waiting_by_identifier(test_run_identifier)
@@ -40,7 +45,7 @@ module Inferno
 
       # @private
       def update_result(waiting_result)
-        results_repo.pass_waiting_result(waiting_result.id)
+        results_repo.update_result(waiting_result.id, result)
       end
 
       # @private

data/lib/inferno/dsl/runnable.rb

@@ -342,16 +342,19 @@ module Inferno
       #   Router](https://github.com/hanami/router/tree/f41001d4c3ee9e2d2c7bb142f74b43f8e1d3a265#a-beautiful-dsl)
       #   can be used here.
       # @param tags [Array<String>] a list of tags to assign to the request
+      # @param result [String] the result for the waiting test. Must be one of:
+      #   'pass', 'fail', 'skip', 'omit', 'cancel'
       # @yield This method takes a block which must return the identifier
       #   defined when a test was set to wait for the test run that hit this
       #   route. The block has access to the `request` method which returns a
       #   {Inferno::Entities::Request} object with the information for the
       #   incoming request.
       # @return [void]
-      def resume_test_route(method, path, tags: [], &block)
+      def resume_test_route(method, path, tags: [], result: 'pass', &block)
         route_class = Class.new(ResumeTestRoute) do |klass|
           klass.singleton_class.instance_variable_set(:@test_run_identifier_block, block)
           klass.singleton_class.instance_variable_set(:@tags, tags)
+          klass.singleton_class.instance_variable_set(:@result, result)
         end
 
         route(method, path, route_class)