tdl-client-ruby 0.21.1 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2946fef767b43f89dabb751fe533d47ade5875407725d310505e49bdb02c636
-  data.tar.gz: 62338aa99a4160bf3415883d5b7fcb6bbc9382f8958303cb09fdcafaf309f61e
+  metadata.gz: c010e01bbf54e96598f837d6dbad4d2522e8ece8c359a934e6d248fb73ac40da
+  data.tar.gz: ab556e467482c6a227d55e8425ed338bf2899856b114617f96e9c49cb53eebce
 SHA512:
-  metadata.gz: 3340ba277189e1a9fbed0311fbf17cd2ebbc5d4f700480cb5d6449be9263d456fe1660b78a0392750ca74a3c85de6ded334d79d0660ba936f1642cc6b2fd24d4
-  data.tar.gz: 50328c8ac9c44bbd3f5a6a41527b2924424991f16d980373f8ce3705e515dff90b3fb4d765e058a2e797501f9175c0ca57692e8cd5aed2aaec1f98b285f90fe3
+  metadata.gz: ec89c3029e6d36f119c390a83816762d3276f421622d3386c0358bd427583cd8f71fbc8ed9601133b6e38adf08387e0a903343d72c5d6cc25aaa3d39c8dd0a3c
+  data.tar.gz: bdf125e5e75c8ad5c6dd90fa38e1a42170931f8b72230c22ccda1c56e3d82a9228908781bc3a854edbf6c6ae72e26f9e8b04d234fd2c6ecce7655210581b51b9

data/README.md

@@ -40,6 +40,8 @@ Recommendation is to use the cucumber command instead of rake always outside of
 Stop external dependencies
 ```
 python ./broker/activemq-wrapper.py stop
+python wiremock/wiremock-wrapper.py stop 41375
+python wiremock/wiremock-wrapper.py stop 8222
 ```
 
 

data/lib/tdl/previous_version.rb

@@ -1,4 +1,4 @@
 module TDL
-  PREVIOUS_VERSION = '0.20.4'
+  PREVIOUS_VERSION = '0.21.1'
   # the current MAJOR.MINOR version is dynamically computed from the version of the Spec
 end

data/lib/tdl/runner/challenge_session.rb

@@ -46,55 +46,50 @@ module TDL
         @config.get_use_colours)
       
       begin
-        should_continue = check_status_of_challenge
-        if should_continue
-          user_input = @user_input_callback.call
-          @audit_stream.write_line "Selected action is: #{user_input}"
-          round_description = execute_user_action(user_input)
-          RoundManagement.save_description(@recording_system, round_description, @audit_stream, @config.get_working_directory)
-        end
-      rescue ChallengeServerClient::ClientErrorException => e
-        @audit_stream.write_line e.message
-      rescue ChallengeServerClient::ServerErrorException => e
-        @audit_stream.write_line 'Server experienced an error. Try again in a few minutes.'
-      rescue ChallengeServerClient::OtherCommunicationException => e
-        @audit_stream.write_line 'Client threw an unexpected error. Try again.'
-      end
-    end
-
-    def check_status_of_challenge
-      @audit_stream = @config.get_audit_stream
+        @audit_stream = @config.get_audit_stream
 
-      journey_progress = @challenge_server_client.get_journey_progress
-      @audit_stream.write_line(journey_progress)
+        journey_progress = @challenge_server_client.get_journey_progress
+        @audit_stream.write_line(journey_progress)
 
-      available_actions = @challenge_server_client.get_available_actions
-      @audit_stream.write_line(available_actions)
+        available_actions = @challenge_server_client.get_available_actions
+        @audit_stream.write_line(available_actions)
 
-      not(available_actions.include?('No actions available.'))
-    end
+        no_actions_available = available_actions.include?('No actions available.')
+        if no_actions_available
+          @recording_system.tell_to_stop
+          return
+        end
 
-    def execute_user_action(user_input)
-      if user_input == 'deploy'
+        user_input = @user_input_callback.call
+        @audit_stream.write_line "Selected action is: #{user_input}"
+        if user_input == 'deploy'
           @runner.run
           last_fetched_round = RoundManagement.get_last_fetched_round(@config.get_working_directory)
           @recording_system.notify_event(last_fetched_round, RecordingEvent::ROUND_SOLUTION_DEPLOY)
-      end
+        end
 
-      execute_action user_input
-    end
+        action_feedback = @challenge_server_client.send_action user_input
+        if action_feedback.include?('Round time for')
+          last_fetched_round = RoundManagement.get_last_fetched_round(@config.get_working_directory)
+          @recording_system.notify_event(last_fetched_round, RecordingEvent::ROUND_COMPLETED)
+        end
+        if action_feedback.include?('All challenges have been completed')
+          @recording_system.tell_to_stop
+        end
 
-    def execute_action(user_input)
-      action_feedback = @challenge_server_client.send_action user_input
-      if action_feedback.include?('Round time for')
-        last_fetched_round = RoundManagement.get_last_fetched_round(@config.get_working_directory)
-        @recording_system.notify_event(last_fetched_round, RecordingEvent::ROUND_COMPLETED)
+        @audit_stream.write_line action_feedback
+        round_description = @challenge_server_client.get_round_description
+        RoundManagement.save_description(@recording_system, round_description, @audit_stream, @config.get_working_directory)
+      rescue ChallengeServerClient::ClientErrorException => e
+        @audit_stream.write_line e.message
+      rescue ChallengeServerClient::ServerErrorException => e
+        @audit_stream.write_line 'Server experienced an error. Try again in a few minutes.'
+      rescue ChallengeServerClient::OtherCommunicationException => e
+        @audit_stream.write_line 'Client threw an unexpected error. Try again.'
       end
-
-      @audit_stream.write_line action_feedback
-      @challenge_server_client.get_round_description
     end
 
+
   end
     
 end

data/lib/tdl/runner/recording_system.rb

@@ -42,25 +42,36 @@ class RecordingSystem
     end
 
     def notify_event(round_id, event_name)
-        if not @recording_required
-          return
-        end
+      puts "Notify round #{round_id}, event #{event_name}"
+      _send_post("/notify", "#{round_id}/#{event_name}")
+    end
 
-        begin
-          response = Unirest.post "#{RECORDING_SYSTEM_ENDPOINT}/notify",
-                                  parameters:"#{round_id}/#{event_name}"
+    def tell_to_stop
+      puts "Stopping recording system"
+      _send_post("/stop", "")
+    end
 
-          unless response.code == 200
-            puts "Recording system returned code: #{response.code}"
-            return
-          end
+    def _send_post(endpoint, body)
+      unless @recording_required
+        return
+      end
 
-          unless response.body.start_with?('ACK')
-            puts "Recording system returned body: #{response.body}"
-          end
-        rescue StandardError => e
-          puts "Could not reach recording system: #{e.message}"
+      begin
+        response = Unirest.post "#{RECORDING_SYSTEM_ENDPOINT}#{endpoint}",
+                                parameters: body
+
+        unless response.code == 200
+          puts "Recording system returned code: #{response.code}"
+          return
         end
+
+        unless response.body.start_with?('ACK')
+          puts "Recording system returned body: #{response.body}"
+        end
+      rescue StandardError => e
+        puts "Could not reach recording system: #{e.message}"
+      end
     end
 
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdl-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.22.1
 platform: ruby
 authors:
 - Julian Ghionoiu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stomp
@@ -243,7 +243,7 @@ homepage: https://github.com/julianghionoiu/tdl-client-ruby
 licenses:
 - GPL-3.0
 metadata:
-  previous_version: 0.20.4
+  previous_version: 0.21.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A client to connect to the central kata server.