datadog-sdk-testing 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 013c7b5b9ff3626e2f2924adb8ff35ce45bd5a21
-  data.tar.gz: e53a7fbbc1dcd7a43dc6f34fbbccc4af375df50e
+  metadata.gz: '09da343a453702e3ab460ce06fc7b716d0f81433'
+  data.tar.gz: 930b99070d8b19491d7bad0e3a9e8653e46ced55
 SHA512:
-  metadata.gz: a2d11c175dc4d8943e879056a6d718caa7ae1ff09594da070ea6cd97f7aded0c9439f689bdd8b2c415180d054b3cfea567f7b0687a008d7765e088cc281be280
-  data.tar.gz: f587725bbbf302383fc599875ff844a074cba08ab755a21d72c681bf41c73134624c225e0a3aa2faadaa3491144f13cc18791dca344268c8d0bdfb0b63a0a80d
+  metadata.gz: 3a53a6ee721dc4a9109b15a20fe0d104e7fb0c3e0efb468c77143830d34713df84a88eaf24f08a488ce26a3f2787cf90b57b1fe086f84eae73629ab745574302
+  data.tar.gz: 93ae97e7a0c4d8b06d8e82db42f8df2b2c2b42162d150e836fb54aa203bf6f90f90c3b1515d61b229cda38559ea7e3425f79972442a7ad85ecd5cf7c97506713

data/lib/config/check.py

@@ -14,8 +14,5 @@ EVENT_TYPE = SOURCE_TYPE_NAME = 'skeleton'
 
 class SkeletonCheck(AgentCheck):
 
-    def __init__(self, name, init_config, agentConfig, instances=None):
-        AgentCheck.__init__(self, name, init_config, agentConfig, instances)
-
     def check(self, instance):
         pass

data/lib/config/ci/skeleton.rake

@@ -12,11 +12,8 @@ namespace :ci do
   namespace :skeleton do |flavor|
     task before_install: ['ci:common:before_install']
 
-    task install: ['ci:common:install'] do
-      use_venv = in_venv
-      install_requirements('skeleton/requirements.txt',
-                           "--cache-dir #{ENV['PIP_CACHE']}",
-                           "#{ENV['VOLATILE_DIR']}/ci.log", use_venv)
+    task :install do
+      Rake::Task['ci:common:install'].invoke('skeleton')
       # sample docker usage
       # sh %(docker create -p XXX:YYY --name skeleton source/skeleton:skeleton_version)
       # sh %(docker start skeleton)
@@ -46,7 +43,11 @@ namespace :ci do
         %w(before_install install before_script).each do |u|
           Rake::Task["#{flavor.scope.path}:#{u}"].invoke
         end
-        Rake::Task["#{flavor.scope.path}:script"].invoke
+        if !ENV['SKIP_TEST']
+          Rake::Task["#{flavor.scope.path}:script"].invoke
+        else
+          puts 'Skipping tests'.yellow
+        end
         Rake::Task["#{flavor.scope.path}:before_cache"].invoke
       rescue => e
         exception = e

data/lib/tasks/ci/common.rb

@@ -19,11 +19,7 @@ end
 def sed(source, op, a, b, mods)
   cmd = "#{op}/#{a}"
   cmd = "#{cmd}/#{b}" unless b.nil? || b.empty?
-  if RUBY_PLATFORM.include? 'darwin'
-    sh "sed -i '' \"#{cmd}/#{mods}\" #{source}"
-  else
-    sh "sed -i \"#{cmd}/#{mods}\" #{source}"
-  end
+  sh "sed -i '' \"#{cmd}/#{mods}\" #{source} || sed -i \"#{cmd}/#{mods}\" #{source}"
 end
 
 def sleep_for(secs)
@@ -61,22 +57,11 @@ def in_venv
   ENV['RUN_VENV'] && ENV['RUN_VENV'] == 'true' ? true : false
 end
 
-def install_req(requirement, pip_options = nil, output = nil, use_venv = nil)
+def install_requirements(req_file, pip_options = nil, output = nil, use_venv = nil)
   pip_command = use_venv ? "#{ENV['SDK_HOME']}/venv/bin/pip" : 'pip'
   redirect_output = output ? "2>&1 >> #{output}" : ''
   pip_options = '' if pip_options.nil?
-  return true if requirement.empty? || requirement.start_with?('#')
-  sh %(#{pip_command} install #{requirement} #{pip_options} #{redirect_output}\
-       || echo 'Unable to install #{requirement}' #{redirect_output})
-end
-
-def install_requirements(req_file, pip_options = nil, output = nil, use_venv = nil)
-  File.exist?(req_file) && File.open(req_file, 'r') do |f|
-    f.each_line do |line|
-      line.strip!
-      install_req(line, pip_options, output, use_venv)
-    end
-  end
+  sh "#{pip_command} install -r #{req_file} #{pip_options} #{redirect_output}"
 end
 
 def test_files(sdk_dir)
@@ -192,8 +177,6 @@ def create_skeleton(integration)
 
   replace_guid(integration.to_s)
 
-  sh "git add #{ENV['SDK_HOME']}/#{integration}/"
-
   add_travis_flavor(integration)
   add_circleci_flavor(integration)
 end
@@ -292,8 +275,8 @@ namespace :ci do
       t.reenable
     end
 
-    task :install do |t|
-      section('INSTALL')
+    task :install, [:flavor] do |t, attr|
+      flavor = attr[:flavor]
       use_venv = in_venv
       pip_command = use_venv ? 'venv/bin/pip' : 'pip'
       sdk_dir = ENV['SDK_HOME'] || Dir.pwd
@@ -302,16 +285,18 @@ namespace :ci do
       install_requirements('requirements.txt',
                            "--cache-dir #{ENV['PIP_CACHE']}",
                            "#{ENV['VOLATILE_DIR']}/ci.log", use_venv)
-      install_requirements('requirements-opt.txt',
-                           "--upgrade --cache-dir #{ENV['PIP_CACHE']}",
-                           "#{ENV['VOLATILE_DIR']}/ci.log", use_venv)
       install_requirements('requirements-test.txt',
                            "--cache-dir #{ENV['PIP_CACHE']}",
                            "#{ENV['VOLATILE_DIR']}/ci.log", use_venv)
 
-      reqs = Dir.glob(File.join(sdk_dir, '**/requirements.txt')).reject do |path|
-        !%r{#{sdk_dir}/embedded/.*$}.match(path).nil? || !%r{#{sdk_dir}\/venv\/.*$}.match(path).nil?
-      end
+      flavor_file = "#{flavor}/requirements.txt"
+      reqs = if flavor && File.exist?(flavor_file)
+               [flavor_file]
+             else
+               Dir.glob(File.join(sdk_dir, '**/requirements.txt')).reject do |path|
+                 !%r{#{sdk_dir}/embedded/.*$}.match(path).nil? || !%r{#{sdk_dir}\/venv\/.*$}.match(path).nil?
+               end
+             end
 
       reqs.each do |req|
         install_requirements(req,

data/lib/tasks/sdk.rake

@@ -1,5 +1,6 @@
 #!/usr/bin/env rake
 # encoding: utf-8
+
 # 3p
 require 'rake/clean'
 require 'rubocop/rake_task'
@@ -35,6 +36,8 @@ task 'setup_env' do
   `echo "#{ENV['SDK_HOME']}/embedded/dd-agent/" > #{ENV['SDK_HOME']}/venv/lib/python2.7/site-packages/datadog-agent.pth`
   gem_home = Bundler.rubygems.find_name('datadog-sdk-testing').first.full_gem_path
   `cp #{gem_home}/lib/config/datadog.conf #{ENV['SDK_HOME']}/embedded/dd-agent/datadog.conf`
+  # This sometimes causes check setup to fail
+  FileUtils.rm Dir.glob('setuptools*.zip')
 end
 
 desc 'Clean development environment for the SDK (remove!)'
@@ -68,7 +71,7 @@ task 'wipe', :option do |_, args|
     sed("#{ENV['SDK_HOME']}/.travis.yml", '', "=#{flavor}\\ ", '', 'd')
     sed("#{ENV['SDK_HOME']}/.travis.yml", '', "=#{flavor}$", '', 'd')
     sed("#{ENV['SDK_HOME']}/circle.yml", '', "\\[#{flavor}\\]", '', 'd')
-    `git rm -r #{flavor}`
+    puts "Please run 'git rm -r #{flavor}' to complete the wipe."
   when 'N'
     puts 'aborting the task...'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog-sdk-testing
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jaime Fullaondo
@@ -9,7 +9,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-02-14 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.38'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.38'
 description: Datadog Integration SDK testing/scaffolding gem
 email: jaime.fullaondo@datadoghq.com
 executables: []
@@ -52,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Datadog Integration SDK testing/scaffolding facilities.