botspec 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd692787dd9635586ffac7978dc137c978c24e5
-  data.tar.gz: 455617f8f2ea6e0d373f76d6c2ddb3ef2a0d7eb1
+  metadata.gz: 52a9fe509aded882158e7a905abd7a4bae5b7323
+  data.tar.gz: 7a002b2de6b4f8e4a80650f9f04865c94a559c60
 SHA512:
-  metadata.gz: e7ba529d6d880b39bf624b5050f9dfed01f0dd0774fe8f19b508586a055c84071099a09acbb133883e909e3faf137e1dab1dee1ea195f89a5859299419a7a2d5
-  data.tar.gz: c9d667e8dc7dea179eb82c41242fe8fbd57d19dbd53d1a698f52cc4f73d5f1e27fcb559195c45fd85c1823b19ddadc04487493218797547f7085c76615dc0551
+  metadata.gz: 8fee6513811028d9c1d60724b35fd2e81ee23b7705f66871a1aa7e071c6296590ba561e13c1c4bc8882e2b1b3533e296a57b0051223438f8a07be62852938219
+  data.tar.gz: 62311a3913997f1dbaf0fcaaa7e0f4f260f508f9b648541c851685e9a837c4c15d52ab60f59acbf2a124343a471760f6bd5ab9da33909f79b80dad4b36c21e2d

data/.circleci/config.yml

@@ -0,0 +1,73 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/ruby:2.4.1-node-browsers
+        environment:
+          BUNDLER_VERSION: 2.0.2
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+            rake spec
+
+  publish:
+    docker:
+      # specify the version you desire here
+      - image: circleci/ruby:2.4.1-node-browsers
+
+    working_directory: ~/repo
+
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "4c:60:84:77:2a:a6:e5:1a:4c:7f:c3:fc:dd:4c:78:c4"
+      - checkout
+
+      - run:
+          name: Gem Release
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+            git config user.email "elliottmurray@gmail.com"
+            git config user.name "Circleci"
+            git config --global push.default simple
+            git push --set-upstream origin $CIRCLE_BRANCH
+            .circleci/setup-rubygems.sh
+
+            script/patch.sh
+
+      - run:
+          name: Docker Release
+          command: curl --data build=true -X POST https://cloud.docker.com/api/build/v1/source/06910a8b-39e1-4929-b55c-4111c3216452/trigger/24b37a19-bd4c-461d-ba80-3d9f1b0704bd/call/
+
+workflows:
+  version: 2
+  build_and_publish:
+    jobs:
+      - build
+      - publish:
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - master
+                - publish_gem
+

data/.circleci/setup-rubygems.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mkdir /home/circleci/.gem
+echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > /home/circleci/.gem/credentials
+chmod 0600 /home/circleci/.gem/credentials

data/.gitignore

@@ -36,3 +36,5 @@ tmp/
 # ignore lock file
 Gemfile.lock
 
+vendor/
+

data/botspec.gemspec

@@ -42,8 +42,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thor', "~> 0.20.0"
   gem.add_runtime_dependency 'hashie', "~> 3.6.0"
 
-  gem.add_development_dependency "bundler", ">= 1.16"
-
   gem.add_development_dependency "guard-rspec", "~> 4.7"
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "byebug"

data/lib/botspec/version.rb

@@ -1,3 +1,3 @@
 module Botspec
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

data/lib/chatbot_helpers.rb

@@ -0,0 +1,43 @@
+
+require 'botspec/lex/lex_service.rb'
+
+
+module ChatbotHelpers
+  
+  @client = nil
+  @logger = nil
+  @response = nil
+
+  def chatbot_client
+    @client ||= BotSpec::AWS::LexService.new({botname: 'WebUiOrderFlowers'}) 
+  end
+
+  def the_logger
+    @logger = @logger ||= Logger.new(STDOUT)
+    @logger.level = Logger::INFO
+    @logger
+  end
+  
+  def user(utterance)
+    the_logger.info "User says: " + utterance.inspect
+    @response = chatbot_client.post_message(utterance, 'user_id')
+  end
+  
+  def chatbot(expected_response)
+    the_logger.info "Expected response: " + expected_response.inspect
+    the_logger.info "Actual response:   " + @response.message.inspect
+    expect(@response.message).to match(expected_response)
+  end
+
+  def intent_fired(intent_details)
+    expected_intent = intent_details.first
+    the_logger.info "\n\n got this intent.data: " + @response.data.inspect
+
+    expected_intent.keys.each do |key|
+      expect(@response.data[key]).to eq(expected_intent[key])
+    end
+
+  end
+  
+end
+

data/lib/load_dialogs.rb

@@ -12,7 +12,6 @@ class LoadDialogs
     @@botname = botname
 
     dialog_paths = Dir.glob(dialogs_path).select{ |e| File.file? e }
-    #dialog_paths = Dir["#{dialogs_path}*\[yaml|yml\]"]
     dialog_yamls = dialog_paths.collect{ |dialog_file| Hashie.symbolize_keys YAML.load_file(dialog_file).merge!(file: dialog_file) }
 
     dialog_yamls.collect{ |dialog_content|
@@ -30,7 +29,8 @@ class LoadDialogs
 end
 
 class Dialog
-  attr_reader :describe, :name, :interactions, :file
+  attr_reader :describe, :name, :interactions
+  attr_accessor :file
 
   def initialize args
     args.each do |k,v|
@@ -38,15 +38,10 @@ class Dialog
     end
   end
 
-  def file(file)
-    @file = file
-  end
-
   def interactions
     @interactions
   end
 
-
   def lex_chat
     @lex_chat ||= BotSpec::AWS::LexService.new({botname: LoadDialogs.botname})
   end

data/lib/rspec/botspec_runner.rb

@@ -23,7 +23,6 @@ module BotSpec
 
       def run(args, out, err)
 
-
         setup(err, out)
 
         botname = args[:botname]

data/script/release.sh

@@ -7,11 +7,11 @@ bundle exec bump ${MODE} --no-commit
 
 #bundle exec appraisal update
 bundle exec rake generate_changelog
-git add lib/botspec/version.rb CHANGELOG.md 
-git commit -m "chore(release): version $(ruby -r ./lib/botspec/version.rb -e "puts Botspec::VERSION")" && git push
+git add lib/botspec/version.rb CHANGELOG.md
+git commit -m "chore(release) [ci skip]: version $(ruby -r ./lib/botspec/version.rb -e "puts Botspec::VERSION")" && git push
 bundle exec rake release
 
 # Dockerhub release
-docker build -t botspec .
-docker tag botspec elliottmurray/botspec
-docker push elliottmurray/botspec
+#docker build -t botspec .
+#docker tag botspec elliottmurray/botspec
+#docker push elliottmurray/botspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botspec
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Elliott Murray
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +171,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".circleci/setup-rubygems.sh"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -204,6 +192,7 @@ files:
 - lib/botspec/lex/lex_service.rb
 - lib/botspec/tasks/verification_task.rb
 - lib/botspec/version.rb
+- lib/chatbot_helpers.rb
 - lib/cli.thor
 - lib/load_dialogs.rb
 - lib/rspec/botspec_runner.rb
@@ -231,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Acceptance tests for bots