oncall 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf6d8c043e6c45dbc145642e1e3c51668e0addb39027b85616a5bfe9fe0754c0
-  data.tar.gz: a0d8057d55beb01d63cb42368927a8b44c6b3145a3dda9fdccf6195fae5d459d
+  metadata.gz: 97c624adba4e2e68cd74e7f5211d9118b61e5d790d634486699f68555d5b6665
+  data.tar.gz: b024f0d793c08c9effd162a07aff1da4ee073489d0ae184e0389f08ebcde6515
 SHA512:
-  metadata.gz: f8b87c28d86ba180d209cc8af17a8c8703fee8100aae086c9c7385f5c525b11c76d9b2d29e853745b130753cc221b3270d39e6bc68c21cccee5d66c21003e182
-  data.tar.gz: b5bd98e87175f7400cefd1abdea81cc8042523b09300f7b5165fe945bc2bc225749c452dcf7a76ce1e9db29e0239f957dc382e9bf724d17d5509f70ebb569c0e
+  metadata.gz: 52eb1ea9450b1769ec6a2e2aeca4f44fb2b797fa73c31b36d52e2009d6a9937e8475ce466727d46540cf357562559891c5b121aef4747d842f7ba93a090976b2
+  data.tar.gz: 132efe00a5dc72ac7fc43ceabf92258de9abd3eb0a3918e6185f860a6eace498239e92efcb14d3b44880a8e5282a2d15d5f3c052986e1ba8fd21d8f4b831649a

data/lib/oncall/cli.rb

@@ -12,11 +12,11 @@ module Oncall
     def self.run
       case ARGV[0].to_s.downcase
       when 'init'
-        Oncall::Commands::InitCommand.invoke(ARGV.shift)
+        Oncall::Commands::InitCommand.invoke(ARGV)
       when 'run'
-        Oncall::Commands::RunCommand.invoke(ARGV.shift)
+        Oncall::Commands::RunCommand.invoke(ARGV)
       when 'shell'
-        Oncall::Commands::ShellCommand.invoke(ARGV.shift)
+        Oncall::Commands::ShellCommand.invoke(ARGV)
       else
         Oncall::Commands::BaseCommand.invoke(ARGV)
       end

data/lib/oncall/core/config.rb

@@ -3,6 +3,19 @@ module Oncall
     class Config
       DEFAULT_PATTERN = '**{,/*/**}/*_oncall.rb'.freeze
 
+      def initialize
+        @config = []
+        @env = 'develop'
+      end
+
+      def set_config(config)
+        @config = config
+      end
+
+      def set_env(env)
+        @env = env
+      end
+
       def pattern
         DEFAULT_PATTERN
       end
@@ -12,11 +25,11 @@ module Oncall
       end
 
       def domain
-        'localhost'
+        @config[@env]['domain'] || 'localhost'
       end
 
       def port
-        4567
+        @config[@env]['port'] || 4567
       end
 
       def test_files

data/lib/oncall/core/runner.rb

@@ -13,16 +13,27 @@ module Oncall
       end
 
       def self.run(args, err=$stderr, out=$stdout)
-        # TODO: init options class
-        new.run(err, out)
+        new.run(args, err, out)
       end
 
-      def run(err, out)
-        setup(err, out)
+      def run(args, err, out)
+        setup(args, err, out)
         run_tests(@world.suite)
       end
 
-      def setup(err, out)
+      def setup(args, err, out)
+        begin
+          config = YAML.load_file('oncall.yml')
+        rescue StandardError
+          puts 'Cannot load oncall.yml'
+          exit 1
+        end
+
+        env = args[1] || config['default']
+
+        @config.set_config(config)
+        @config.set_env(env)
+
         files = @config.test_files
         @world.register_suite(files)
       end

data/lib/oncall/core.rb

@@ -9,7 +9,7 @@ module Oncall
     STATUS_EMPTY = :empty
 
     class << self
-      attr_writer :config, :world
+      attr_writer :config, :world, :reporter
     end
 
     def self.config

data/lib/oncall/dsl/call.rb

@@ -1,3 +1,5 @@
+require_relative '../http'
+
 module Oncall
   module DSL
     class Call
@@ -5,6 +7,7 @@ module Oncall
         @config = Oncall::Core.config
         @http = Net::HTTP.new(@config.domain, @config.port)
         @headers = { 'User-Agent' => "oncall/#{Oncall::VERSION}" }
+        @params = {}
       end
 
       def header(hash)
@@ -13,8 +16,15 @@ module Oncall
         end
       end
 
+      def param(hash)
+        hash.each do |key, value|
+          @params[key] = value
+        end
+      end
+
       def get(path, &block)
-        request = Net::HTTP::Get.new(path)
+        uri = Oncall::HTTP.uri(path, @params)
+        request = Net::HTTP::Get.new(uri)
 
         @headers.each do |key, value|
           request[key] = value

data/lib/oncall/dsl/group.rb

@@ -5,7 +5,7 @@ module Oncall
         @reporter = Oncall::Core.reporter
       end
 
-      def group(&block)
+      def group(name=nil, &block)
         if block_given?
           scenario = Oncall::DSL::Call.new
           scenario.instance_exec &block

data/lib/oncall/http.rb

@@ -1,4 +1,20 @@
 module Oncall
   module HTTP
+    def self.uri(path, params)
+      parts = path.split('/')
+
+      if parts.empty?
+        return '/'
+      end
+
+      parts.each_with_index do |part, index|
+        if part.start_with?(':')
+          part[0] = ''
+          parts[index] = params[part.to_sym]
+        end
+      end
+
+      parts.join('/')
+    end
   end
 end

data/lib/oncall/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oncall
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Koen Woortman