datadog-sdk-testing 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8abfa3c4a71a45a7f7be6ef19b3ac17de10812ad
-  data.tar.gz: 952c49ece71ff1f1fa96cdaa652c3f52fbc8c393
+  metadata.gz: 35884f0cdb990ba4887fc07a279d45228ae91bd9
+  data.tar.gz: 52e671f3f5d435cea6f3ac22b1107457812c178c
 SHA512:
-  metadata.gz: 46c82f0a53287b96e638eb1d57ff914c8e28c0a5a40cbdf0a2f01f773130dfc54bd142e73f0f6ffdab134cd874ab413d6d919c8e5cd659024bb2c655045b711f
-  data.tar.gz: ca21e14b396d519e58d771ebc6ebc82ab1fb5f11b28d0332a408f4976c0d99b0867810893b9df034115b34b63e33d5265d58cc6304c0e4ab366d6bb5dc97f3ad
+  metadata.gz: 7c64ed55f6ae4d3f4cf891784e72f49e5bc6df161569ba37a387fbcfc24edbcb2984697e851a0ee72024155e0695b4125234b3dc732a3bdf884f6f90401d2c96
+  data.tar.gz: a81b3a9b9f631c81201d0bc382363ca36cd92bbd38d700eff38224a7fc253e54f48f56b817d26f0b67259695d350d950524428ad1965e12dd69a02bd8809e29f

data/lib/config/check.py

@@ -1,3 +1,7 @@
+# (C) Datadog, Inc. 2010-2016
+# All rights reserved
+# Licensed under Simplified BSD License (see LICENSE)
+
 # stdlib
 
 # 3rd party

data/lib/config/ci/skeleton.rake

@@ -1,7 +1,7 @@
 require 'ci/common'
 
 def skeleton_version
-  ENV['FLAVOR_VERSION'] || '2.4.12'
+  ENV['FLAVOR_VERSION'] || 'latest'
 end
 
 def skeleton_rootdir
@@ -18,13 +18,13 @@ namespace :ci do
                            "--cache-dir #{ENV['PIP_CACHE']}",
                            "#{ENV['VOLATILE_DIR']}/ci.log", use_venv)
       # sample docker usage
-      # sh %(docker create -p XXX:YYY --name skeleton source/skeleton)
+      # sh %(docker create -p XXX:YYY --name skeleton source/skeleton:skeleton_version)
       # sh %(docker start skeleton)
     end
 
     task before_script: ['ci:common:before_script']
 
-    task script: ['ci:common:script'] do |_, attr|
+    task script: ['ci:common:script'] do
       this_provides = [
         'skeleton'
       ]

data/lib/config/test_skeleton.py

@@ -1,3 +1,7 @@
+# (C) Datadog, Inc. 2010-2016
+# All rights reserved
+# Licensed under Simplified BSD License (see LICENSE)
+
 # stdlib
 from nose.plugins.attrib import attr
 

data/lib/tasks/ci/common.rb

@@ -7,7 +7,6 @@ require 'timeout'
 # Colors don't work on Appveyor
 String.disable_colorization = true if Gem.win_platform?
 
-
 def check_env
   abort 'SDK_HOME env variable must be defined in your Rakefile to used this gem.' unless ENV['SDK_HOME']
 end
@@ -36,17 +35,21 @@ def in_venv
   ENV['RUN_VENV'] && ENV['RUN_VENV'] == 'true' ? true : false
 end
 
-def install_requirements(req_file, pip_options = nil, output = nil, use_venv = nil)
+def install_req(requirement, 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?
+  unless requirement.empty? || requirement.start_with?('#')
+    sh %(#{pip_command} install #{requirement} #{pip_options} #{redirect_output}\
+         || echo 'Unable to install #{requirement}' #{redirect_output})
+  end
+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!
-      unless line.empty? || line.start_with?('#')
-        sh %(#{pip_command} install #{line} #{pip_options} #{redirect_output}\
-             || echo 'Unable to install #{line}' #{redirect_output})
-      end
+      install_req(line, pip_options, output, use_venv)
     end
   end
 end
@@ -74,50 +77,90 @@ def integration_tests(root_dir)
   [testable, untested]
 end
 
-def create_skeleton(integration)
-  if File.directory?("#{ENV['SDK_HOME']}/#{integration}")
-    puts "directory already exists for #{integration} - bailing out."
-    return
+def move_file(src, dst)
+  File.delete(dst)
+  File.rename(src, dst)
+end
+
+def check_travis_flavor(flavor, version = nil)
+  version = 'latest' if version.nil?
+  File.foreach("#{ENV['SDK_HOME']}/.travis.yml") do |line|
+    return false if line =~ /- TRAVIS_FLAVOR=#{flavor} FLAVOR_VERSION=#{version}/
   end
+  true
+end
 
-  puts "generating skeleton files for #{integration}"
-  gem_home = Bundler.rubygems.find_name('datadog-sdk-testing').first.full_gem_path
-  capitalized = integration.capitalize
-  sh "mkdir -p #{ENV['SDK_HOME']}/#{integration}/ci"
-  sh "cp #{gem_home}/lib/config/ci/skeleton.rake #{ENV['SDK_HOME']}/#{integration}/ci/#{integration}.rake"
-  sh "cp #{gem_home}/lib/config/manifest.json #{ENV['SDK_HOME']}/#{integration}/manifest.json"
-  sh "cp #{gem_home}/lib/config/check.py #{ENV['SDK_HOME']}/#{integration}/check.py"
-  sh "cp #{gem_home}/lib/config/test_skeleton.py #{ENV['SDK_HOME']}/#{integration}/test_#{integration}.py"
-  sh "cp #{gem_home}/lib/config/metadata.csv #{ENV['SDK_HOME']}/#{integration}/metadata.csv"
-  sh "cp #{gem_home}/lib/config/requirements.txt #{ENV['SDK_HOME']}/#{integration}/requirements.txt"
-  sh "cp #{gem_home}/lib/config/README.md #{ENV['SDK_HOME']}/#{integration}/README.md"
-  Dir.glob("#{ENV['SDK_HOME']}/#{integration}/**/*") do |f|
-    if File.file?(f)
-      sed(f, 'skeleton', "#{integration}", 'g')
-      sed(f, 'Skeleton', "#{capitalized}", 'g')
+def add_travis_flavor(flavor, version = nil)
+  new_file = "#{ENV['SDK_HOME']}/.travis.yml.new"
+  version = 'latest' if version.nil?
+  added = false
+  File.open(new_file, 'w') do |fo|
+    File.foreach("#{ENV['SDK_HOME']}/.travis.yml") do |line|
+      if !added && line =~ /# END OF TRAVIS MATRIX|- TRAVIS_FLAVOR=#{flavor}/
+        fo.puts "    - TRAVIS_FLAVOR=#{flavor} FLAVOR_VERSION=#{version}"
+        added = true
+      end
+      fo.puts line
     end
   end
-  sh "git add #{ENV['SDK_HOME']}/#{integration}/"
+  move_file(new_file, "#{ENV['SDK_HOME']}/.travis.yml")
+end
 
+def add_circleci_flavor(flavor)
   new_file = "#{ENV['SDK_HOME']}/circle.yml.new"
   File.open(new_file, 'w') do |fo|
     File.foreach("#{ENV['SDK_HOME']}/circle.yml") do |line|
-      fo.puts "        - rake ci:run[#{integration}]" if line =~ /bundle\ exec\ rake\ requirements/
+      fo.puts "        - rake ci:run[#{flavor}]" if line =~ /bundle\ exec\ rake\ requirements/
       fo.puts line
     end
   end
-  File.delete("#{ENV['SDK_HOME']}/circle.yml")
-  File.rename(new_file, "#{ENV['SDK_HOME']}/circle.yml")
+  move_file(new_file, "#{ENV['SDK_HOME']}/circle.yml")
+end
 
-  new_file = "#{ENV['SDK_HOME']}/.travis.yml.new"
-  File.open(new_file, 'w') do |fo|
-    File.foreach("#{ENV['SDK_HOME']}/.travis.yml") do |line|
-      fo.puts "  - rake ci:run[#{integration}]" if line =~ /bundle\ exec\ rake\ requirements/
-      fo.puts line
+def copy_skeleton(source, dst, integration)
+  gem_home = Bundler.rubygems.find_name('datadog-sdk-testing').first.full_gem_path
+  sh "cp #{gem_home}/#{source} #{ENV['SDK_HOME']}/#{integration}/#{dst}"
+end
+
+def create_integration_path(integration)
+  sh "mkdir -p #{ENV['SDK_HOME']}/#{integration}/ci"
+end
+
+def rename_skeleton(integration)
+  capitalized = integration.capitalize
+  Dir.glob("#{ENV['SDK_HOME']}/#{integration}/**/*") do |f|
+    if File.file?(f)
+      sed(f, 'skeleton', integration.to_s, 'g')
+      sed(f, 'Skeleton', capitalized.to_s, 'g')
     end
   end
-  File.delete("#{ENV['SDK_HOME']}/.travis.yml")
-  File.rename(new_file, "#{ENV['SDK_HOME']}/.travis.yml")
+end
+
+def generate_skeleton(integration)
+  copy_skeleton('lib/config/ci/skeleton.rake', "ci/#{integration}.rake", integration)
+  copy_skeleton('lib/config/manifest.json', 'manifest,json', integration)
+  copy_skeleton('lib/config/check.py', 'check.py', integration)
+  copy_skeleton('lib/config/test_skeleton.py', "test_#{integration}.py", integration)
+  copy_skeleton('lib/config/metadata.csv', 'metadata.csv', integration)
+  copy_skeleton('lib/config/requirements.txt', 'requirements.txt', integration)
+  copy_skeleton('lib/config/README.md', 'README.md', integration)
+end
+
+def create_skeleton(integration)
+  if File.directory?("#{ENV['SDK_HOME']}/#{integration}")
+    puts "directory already exists for #{integration} - bailing out."
+    return
+  end
+
+  puts "generating skeleton files for #{integration}"
+  create_integration_path(integration.to_s)
+  generate_skeleton(integration.to_s)
+  rename_skeleton(integration.to_s)
+
+  sh "git add #{ENV['SDK_HOME']}/#{integration}/"
+
+  add_travis_flavor(integration)
+  add_circleci_flavor(integration)
 end
 
 # helper class to wait for TCP/HTTP services to boot

data/lib/tasks/sdk.rake

@@ -38,16 +38,15 @@ end
 desc 'Clean development environment for the SDK (remove!)'
 task 'clean_env' do
   check_env
-  input = ''
-  print "Are you sure you want to delete the SDK environment (y/n)? "
+  print 'Are you sure you want to delete the SDK environment (y/n)? '
   input = STDIN.gets.chomp
   case input.upcase
-  when "Y"
+  when 'Y'
     `rm -rf #{ENV['SDK_HOME']}/venv` if File.directory?("#{ENV['SDK_HOME']}/venv")
     `rm -rf #{ENV['SDK_HOME']}/embedded` if File.directory?("#{ENV['SDK_HOME']}/embedded")
-    puts "virtual environment, agent source removed."
-  when "N"
-    puts "aborting the task..."
+    puts 'virtual environment, agent source removed.'
+  when 'N'
+    puts 'aborting the task...'
   end
 end
 
@@ -93,6 +92,21 @@ namespace :generate do
     check_env
     create_skeleton(args[:option])
   end
+
+  desc 'Add a new integration flavor to Travis - option may be option or option,version'
+  task :travis_flavor, [:option] do |_, args|
+    check_env
+
+    integration = args[:option]
+    flavor = 'latest'
+    flavor = args.extras[0] if args.extras.count == 1
+    puts "Adding integration flavor to travis: #{integration}:#{flavor}"
+    if check_travis_flavor(integration, flavor)
+      add_travis_flavor(integration, flavor)
+    else
+      puts "#{integration}:#{flavor} already set in travis... skipping."
+    end
+  end
 end
 
 namespace :ci do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-sdk-testing
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Jaime Fullaondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies: []
 description: Datadog Integration SDK testing/scaffolding gem
 email: jaime.fullaondo@datadoghq.com