oncall 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07378ff6344fb59c22ac6927c7aeac9cfecabf1504e0bfcbb02871668c04c189'
-  data.tar.gz: f2c98df8c24c08648db1dcff593b68c7bbd2517afae9e090a5728cbe5cca1b24
+  metadata.gz: cf6d8c043e6c45dbc145642e1e3c51668e0addb39027b85616a5bfe9fe0754c0
+  data.tar.gz: a0d8057d55beb01d63cb42368927a8b44c6b3145a3dda9fdccf6195fae5d459d
 SHA512:
-  metadata.gz: ee21dc544043fed09ad3a1cb6f2e5f9a223aab9e8cddd685dbe95710cf5d04c06735654af782a9128bcff24c9f59010ef31834f26ae7b90134f1f7de0cb6368f
-  data.tar.gz: e6290f30cbac7835eabae316ff9b82bb5a075d5d6cf7691cfb7be00840e1b89232896538f8d2f99b86482b3dbedcb25252e3c9932f17d5b649353fc19f4e988b
+  metadata.gz: f8b87c28d86ba180d209cc8af17a8c8703fee8100aae086c9c7385f5c525b11c76d9b2d29e853745b130753cc221b3270d39e6bc68c21cccee5d66c21003e182
+  data.tar.gz: b5bd98e87175f7400cefd1abdea81cc8042523b09300f7b5165fe945bc2bc225749c452dcf7a76ce1e9db29e0239f957dc382e9bf724d17d5509f70ebb569c0e

data/lib/oncall/core/config.rb

@@ -3,10 +3,6 @@ module Oncall
     class Config
       DEFAULT_PATTERN = '**{,/*/**}/*_oncall.rb'.freeze
 
-      def initialize
-        @files = []
-      end
-
       def pattern
         DEFAULT_PATTERN
       end

data/lib/oncall/core/reporter.rb

@@ -1,3 +1,5 @@
+require 'colorize'
+
 module Oncall
   module Core
     class Reporter
@@ -25,7 +27,14 @@ module Oncall
       def finish
         puts "\n\n"
         puts @messages
-        puts "\n#{@results[:success]} passed, #{@results[:failure]} failed."
+
+        result = "\n#{@results[:success]} passed, #{@results[:failure]} failed.\n"
+
+        if success?
+          puts result.green
+        else
+          puts result.red
+        end
       end
 
       def success?
@@ -33,7 +42,7 @@ module Oncall
       end
 
       def report_empty_group
-        print 'E'
+        print '*'
         @results[:empty] = @results[:empty] + 1
       end
 

data/lib/oncall/core/wrapper.rb

@@ -1,3 +1,5 @@
+require_relative '../dsl'
+
 module Oncall
   module Core
     class Wrapper
@@ -6,7 +8,7 @@ module Oncall
       end
 
       def run(reporter)
-        Oncall::Core::Group.new.instance_eval File.read(@file)
+        Oncall::DSL::Group.new.instance_eval File.read(@file)
       end
     end
   end

data/lib/oncall/core.rb

@@ -1,12 +1,8 @@
 module Oncall
   module Core
-    require_relative 'core/assertion'
     require_relative 'core/config'
-    require_relative 'core/group'
     require_relative 'core/reporter'
-    require_relative 'core/request'
     require_relative 'core/runner'
-    require_relative 'core/scenario'
     require_relative 'core/world'
     require_relative 'core/wrapper'
 

data/lib/oncall/{core → dsl}/assertion.rb

@@ -1,5 +1,5 @@
 module Oncall
-  module Core
+  module DSL
     class Assertion
       def initialize(response, method, path)
         @reporter = Oncall::Core.reporter

data/lib/oncall/dsl/call.rb

@@ -0,0 +1,30 @@
+module Oncall
+  module DSL
+    class Call
+      def initialize
+        @config = Oncall::Core.config
+        @http = Net::HTTP.new(@config.domain, @config.port)
+        @headers = { 'User-Agent' => "oncall/#{Oncall::VERSION}" }
+      end
+
+      def header(hash)
+        hash.each do |key, value|
+          @headers[key] = value
+        end
+      end
+
+      def get(path, &block)
+        request = Net::HTTP::Get.new(path)
+
+        @headers.each do |key, value|
+          request[key] = value
+        end
+
+        response = @http.request(request)
+
+        assertion = Oncall::DSL::Assertion.new(response, 'GET', path)
+        assertion.instance_exec(&block)
+      end
+    end
+  end
+end

data/lib/oncall/{core → dsl}/group.rb

@@ -1,13 +1,13 @@
 module Oncall
-  module Core
+  module DSL
     class Group
       def initialize
         @reporter = Oncall::Core.reporter
       end
 
-      def describe(&block)
+      def group(&block)
         if block_given?
-          scenario = Oncall::Core::Scenario.new
+          scenario = Oncall::DSL::Call.new
           scenario.instance_exec &block
         else
           @reporter.report_empty_group

data/lib/oncall/dsl.rb

@@ -1,4 +1,7 @@
 module Oncall
   module DSL
+    require_relative 'dsl/assertion'
+    require_relative 'dsl/call'
+    require_relative 'dsl/group'
   end
 end

data/lib/oncall/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Oncall
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oncall
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Koen Woortman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -82,16 +96,15 @@ files:
 - lib/oncall/commands/run_command.rb
 - lib/oncall/commands/shell_command.rb
 - lib/oncall/core.rb
-- lib/oncall/core/assertion.rb
 - lib/oncall/core/config.rb
-- lib/oncall/core/group.rb
 - lib/oncall/core/reporter.rb
-- lib/oncall/core/request.rb
 - lib/oncall/core/runner.rb
-- lib/oncall/core/scenario.rb
 - lib/oncall/core/world.rb
 - lib/oncall/core/wrapper.rb
 - lib/oncall/dsl.rb
+- lib/oncall/dsl/assertion.rb
+- lib/oncall/dsl/call.rb
+- lib/oncall/dsl/group.rb
 - lib/oncall/http.rb
 - lib/oncall/templates/oncall.yml.template
 - lib/oncall/version.rb

data/lib/oncall/core/request.rb

@@ -1,13 +0,0 @@
-module Oncall
-  module Core
-    class Request
-      def initialize(&block)
-        @proc = Proc.new &block
-      end
-
-      def call
-        @proc.call
-      end
-    end
-  end
-end

data/lib/oncall/core/scenario.rb

@@ -1,18 +0,0 @@
-module Oncall
-  module Core
-    class Scenario
-      def initialize
-        @config = Oncall::Core.config
-        @http = Net::HTTP.new(@config.domain, @config.port)
-      end
-
-      def get(path, &block)
-        request = Net::HTTP::Get.new(path)
-        response = @http.request(request)
-
-        assertion = Oncall::Core::Assertion.new(response, 'GET', path)
-        assertion.instance_exec(&block)
-      end
-    end
-  end
-end