datadog-sdk-testing 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5e778a7c72e505f4b955419d51b86b1e46b331
-  data.tar.gz: 472674321283a3a475b7a79cd2780feb4ba3a970
+  metadata.gz: d246a78322ac6b3a9f1f826e4aac6ccb88bdb3b2
+  data.tar.gz: cb0d8786701dceec9b2a84c4ee0d459fe472936b
 SHA512:
-  metadata.gz: 7bd029a224dbd0d79c438d0bdd94bf389394149a460b8e25a028ac5d1ade601125099d4cb0c2f42adfcd4669f448eaa4637ff965076e749416b8f3b7b99d2225
-  data.tar.gz: 239610171877a7fc21786ff4546f46c405cf5f35d953b8a1770feb250c04e8b3519d7dd67263f6c884ff907ae8a63ff5e12e0701d8c31722fad96bbd6421da4a
+  metadata.gz: 67060013935baf4f2a263e6a07a82cb7d7c6c306bbd240569321182d0a07c5a132a7eac99c614ce06503fd9db264ecfaf309030d08bb68f9912a606d8756d11c
+  data.tar.gz: c219200d56d414d0534f08c40055200adb0af8b30f6ee477031c578ad3f48e1aa788b192e6ea860517f582781e1d8e25ba51964a63eea0e0c98e6bbcb86d43a5

data/lib/tasks/ci/common.rb

@@ -74,6 +74,52 @@ 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
+  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')
+    end
+  end
+  sh "git add #{ENV['SDK_HOME']}/#{integration}/"
+
+  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 line
+    end
+  end
+  File.delete("#{ENV['SDK_HOME']}/circle.yml")
+  File.rename(new_file, "#{ENV['SDK_HOME']}/circle.yml")
+
+  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
+    end
+  end
+  File.delete("#{ENV['SDK_HOME']}/.travis.yml")
+  File.rename(new_file, "#{ENV['SDK_HOME']}/.travis.yml")
+end
+
 # helper class to wait for TCP/HTTP services to boot
 class Wait
   DEFAULT_TIMEOUT = 10
@@ -150,6 +196,8 @@ namespace :ci do
       section('INSTALL')
       use_venv = in_venv
       pip_command = use_venv ? 'venv/bin/pip' : 'pip'
+      sdk_dir = ENV['SDK_HOME'] || Dir.pwd
+
       sh %(#{'python -m ' if Gem.win_platform?}#{pip_command} install --upgrade pip setuptools)
       install_requirements('requirements.txt',
                            "--cache-dir #{ENV['PIP_CACHE']}",
@@ -160,6 +208,17 @@ namespace :ci do
       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
+
+      reqs.each do |req|
+        install_requirements(req,
+                             "--cache-dir #{ENV['PIP_CACHE']}",
+                             "#{ENV['VOLATILE_DIR']}/ci.log", use_venv)
+      end
+
       t.reenable
     end
 

data/lib/tasks/ci/default.rb

@@ -19,23 +19,11 @@ namespace :ci do
       end
     end
 
-    task install: ['ci:common:install'] do
-      sdk_dir = ENV['SDK_HOME'] || Dir.pwd
-      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
-
-      use_venv = in_venv
-      reqs.each do |req|
-        install_requirements(req,
-                             "--cache-dir #{ENV['PIP_CACHE']}",
-                             "#{ENV['VOLATILE_DIR']}/ci.log", use_venv)
-      end
-    end
+    task install: ['ci:common:install']
 
     task before_script: ['ci:common:before_script']
 
-    task lint: ['rubocop'] do
+    task lint: ['ci:common:install', 'rubocop'] do
       check_env
       sh %(flake8 #{ENV['SDK_HOME']})
       sh %(find #{ENV['SDK_HOME']} -name '*.py' -not\

data/lib/tasks/sdk.rake

@@ -55,7 +55,7 @@ desc 'Setup git hooks'
 task 'setup_hooks' do
   check_env
   gem_home = Bundler.rubygems.find_name('datadog-sdk-testing').first.full_gem_path
-  sh "ln -sf #{gem_home}/lib/tasks/ci/hooks/pre-commit.py #{ENV['SDK_HOME']}}/.git/hooks/pre-commit"
+  sh "ln -sf #{gem_home}/lib/tasks/ci/hooks/pre-commit.py #{ENV['SDK_HOME']}/.git/hooks/pre-commit"
 end
 
 desc 'Pull latest agent code'
@@ -91,44 +91,7 @@ namespace :generate do
   desc 'Setup a development environment for the SDK'
   task :skeleton, :option do |_, args|
     check_env
-    puts "generating skeleton files for #{args[:option]}"
-    gem_home = Bundler.rubygems.find_name('datadog-sdk-testing').first.full_gem_path
-    capitalized = args[:option].capitalize
-    sh "mkdir -p #{ENV['SDK_HOME']}/#{args[:option]}/ci"
-    sh "cp #{gem_home}/lib/config/ci/skeleton.rake #{ENV['SDK_HOME']}/#{args[:option]}/ci/#{args[:option]}.rake"
-    sh "cp #{gem_home}/lib/config/manifest.json #{ENV['SDK_HOME']}/#{args[:option]}/manifest.json"
-    sh "cp #{gem_home}/lib/config/check.py #{ENV['SDK_HOME']}/#{args[:option]}/check.py"
-    sh "cp #{gem_home}/lib/config/test_skeleton.py #{ENV['SDK_HOME']}/#{args[:option]}/test_#{args[:option]}.py"
-    sh "cp #{gem_home}/lib/config/metadata.csv #{ENV['SDK_HOME']}/#{args[:option]}/metadata.csv"
-    sh "cp #{gem_home}/lib/config/requirements.txt #{ENV['SDK_HOME']}/#{args[:option]}/requirements.txt"
-    sh "cp #{gem_home}/lib/config/README.md #{ENV['SDK_HOME']}/#{args[:option]}/README.md"
-    Dir.glob("#{ENV['SDK_HOME']}/#{args[:option]}/**/*") do |f|
-      if File.file?(f)
-        sed(f, 'skeleton', "#{args[:option]}", 'g')
-        sed(f, 'Skeleton', "#{capitalized}", 'g')
-      end
-    end
-    sh "git add #{ENV['SDK_HOME']}/#{args[:option]}/"
-
-    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[#{args[:option]}]" 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")
-
-    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[#{args[:option]}]" if line =~ /bundle\ exec\ rake\ requirements/
-        fo.puts line
-      end
-    end
-    File.delete("#{ENV['SDK_HOME']}/.travis.yml")
-    File.rename(new_file, "#{ENV['SDK_HOME']}/.travis.yml")
+    create_skeleton(args[:option])
   end
 end
 

metadata

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