test-kitchen 1.6.0 → 1.7.0

data/Rakefile

@@ -1,76 +1,61 @@
-# -*- encoding: utf-8 -*-
-
-require "bundler/gem_tasks"
-
-require "rake/testtask"
-Rake::TestTask.new(:unit) do |t|
-  t.libs.push "lib"
-  t.test_files = FileList["spec/**/*_spec.rb"]
-  t.verbose = true
-end
-
-require "cucumber"
-require "cucumber/rake/task"
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = ["features", "-x", "--format progress", "--no-color"]
-end
-
-desc "Run all test suites"
-task :test => [:unit, :features]
-
-desc "Display LOC stats"
-task :stats do
-  puts "\n## Production Code Stats"
-  sh "countloc -r lib/kitchen lib/kitchen.rb"
-  puts "\n## Test Code Stats"
-  sh "countloc -r spec features"
-end
-
-require "finstyle"
-require "rubocop/rake_task"
-RuboCop::RakeTask.new(:style) do |task|
-  task.options += ["--display-cop-names", "--no-color"]
-end
-
-if RUBY_ENGINE != "jruby"
-  require "cane/rake_task"
-  desc "Run cane to check quality metrics"
-  Cane::RakeTask.new do |cane|
-    cane.canefile = "./.cane"
-  end
-
-  desc "Run all quality tasks"
-  task :quality => [:cane, :style, :stats]
-else
-  desc "Run all quality tasks"
-  task :quality => [:style, :stats]
-end
-
-require "yard"
-YARD::Rake::YardocTask.new
-
-task :default => [:test, :quality]
-
-task :deploy_over_dk do
-  if RUBY_PLATFORM =~ /mswin|mingw|windows/
-    dk_path = File.join(ENV["SYSTEMDRIVE"], "opscode", "chefdk")
-  else
-    dk_path = "/opt/chefdk"
-  end
-
-  dk_app_path = File.join(dk_path, %w[embedded apps test-kitchen])
-  FileUtils.copy_entry(File.dirname(__FILE__), dk_app_path)
-  git_dir = File.join(dk_app_path, ".git")
-  FileUtils.rm_rf(git_dir) if Dir.exist?(git_dir)
-end
-
-task :dk_install => [:deploy_over_dk, :install]
-
-require "github_changelog_generator/task"
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.future_release = Kitchen::VERSION
-  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
-  config.bug_labels = "bug,Bug,Improvement".split(",")
-  config.exclude_labels = %w[Duplicate Question Discussion]
-end
+# -*- encoding: utf-8 -*-
+
+require "bundler/gem_tasks"
+
+require "rake/testtask"
+Rake::TestTask.new(:unit) do |t|
+  t.libs.push "lib"
+  t.test_files = FileList["spec/**/*_spec.rb"]
+  t.verbose = true
+end
+
+require "cucumber"
+require "cucumber/rake/task"
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = ["features", "-x", "--format progress", "--no-color"]
+end
+
+desc "Run all test suites"
+task :test => [:unit, :features]
+
+desc "Display LOC stats"
+task :stats do
+  puts "\n## Production Code Stats"
+  sh "countloc -r lib/kitchen lib/kitchen.rb"
+  puts "\n## Test Code Stats"
+  sh "countloc -r spec features"
+end
+
+require "finstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options += ["--display-cop-names", "--no-color"]
+end
+
+if RUBY_ENGINE != "jruby"
+  require "cane/rake_task"
+  desc "Run cane to check quality metrics"
+  Cane::RakeTask.new do |cane|
+    cane.canefile = "./.cane"
+  end
+
+  desc "Run all quality tasks"
+  task :quality => [:cane, :style, :stats]
+else
+  desc "Run all quality tasks"
+  task :quality => [:style, :stats]
+end
+
+require "yard"
+YARD::Rake::YardocTask.new
+
+task :default => [:test, :quality]
+
+require "github_changelog_generator/task"
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.future_release = Kitchen::VERSION
+  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature,Improvement".split(",")
+  config.bug_labels = "bug,Bug".split(",")
+  config.exclude_labels = %w[Duplicate Question Discussion No_Changelog]
+end

data/appveyor.yml

@@ -1,34 +1,44 @@
-version: "master-{build}"
-
-os: Windows Server 2012
-platform:
-  - x64
-
-environment:
-  matrix:
-    - ruby_version: "200"
-
-clone_folder: c:\projects\test_kitchen
-clone_depth: 1
-skip_tags: true
-
-branches:
-  only:
-    - master
-
-install:
-  - winrm quickconfig -q
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - echo %PATH%
-  - ruby --version
-  - gem --version
-  - gem install bundler --quiet --no-ri --no-rdoc
-  - bundler --version
-
-build_script:
-  - bundle install || bundle install || bundle install
-
-test_script:
-  - SET SPEC_OPTS=--format progress
-  - bundle exec rake unit
-  - bundle exec rake quality
+version: "master-{build}"
+
+os: Windows Server 2012 R2
+platform:
+  - x64
+
+environment:
+  machine_user: test_user
+  machine_pass: Pass@word1
+  machine_port: 5985
+  KITCHEN_YAML: .kitchen.ci.yml
+  SSL_CERT_FILE: c:\projects\test_kitchen\certs.pem
+
+  matrix:
+    - ruby_version: "21"
+
+clone_folder: c:\projects\test_kitchen
+clone_depth: 1
+skip_tags: true
+
+branches:
+  only:
+    - master
+
+install:
+  - ps: net user /add $env:machine_user $env:machine_pass
+  - ps: net localgroup administrators $env:machine_user /add
+  - ps: $env:PATH="C:\Ruby$env:ruby_version\bin;$env:PATH"
+  - ps: gem install bundler --quiet --no-ri --no-rdoc
+  - ps: Invoke-WebRequest -Uri http://curl.haxx.se/ca/cacert.pem -OutFile c:\projects\test_kitchen\certs.pem
+  - ps: Write-Host $env:path
+  - ruby --version
+  - gem --version
+  - bundler --version
+
+build_script:
+  - bundle install --without guard integration
+
+test_script:
+  - SET SPEC_OPTS=--format progress
+  - bundle exec rake unit
+  - bundle exec rake quality
+  - bundle install --with integration
+  - bundle exec kitchen verify windows

data/features/kitchen_action_commands.feature

@@ -1,164 +1,164 @@
-Feature: Running instance actions
-  In order to trigger discrete instance lifecyle actions
-  As an operator
-  I want to run a action commands
-
-  Background:
-    Given a file named ".kitchen.yml" with:
-    """
-    ---
-    driver:
-      name: dummy
-
-    provisioner:
-      name: dummy
-
-    verifier:
-      name: dummy
-
-    platforms:
-      - name: cool
-      - name: beans
-
-    suites:
-      - name: client
-      - name: server
-    """
-
-  @spawn
-  Scenario: Creating a single instance
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
-    When I run `kitchen create client-beans`
-    Then the output should contain "Finished creating <client-beans>"
-    And the exit status should be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
-
-  @spawn
-  Scenario: Creating a single instance that fails
-    Given a file named ".kitchen.local.yml" with:
-    """
-    ---
-    driver:
-      fail_create: true
-    """
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
-    When I run `kitchen create client-beans`
-    Then the output should contain "Create failed on instance <client-beans>"
-    And the exit status should not be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
-
-  @spawn
-  Scenario: Converging a single instance
-    When I successfully run `kitchen create client-beans`
-    And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
-    When I run `kitchen converge client-beans`
-    Then the output should contain "Finished converging <client-beans>"
-    And the exit status should be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
-
-  @spawn
-  Scenario: Converging a single instance that fails
-    Given a file named ".kitchen.local.yml" with:
-    """
-    ---
-    provisioner:
-      fail: true
-    """
-    When I successfully run `kitchen create client-beans`
-    And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
-    When I run `kitchen converge client-beans`
-    Then the output should contain "Converge failed on instance <client-beans>"
-    And the exit status should not be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
-
-  @spawn
-  Scenario: Setting up a single instance
-    When I successfully run `kitchen converge client-beans`
-    And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
-    When I run `kitchen setup client-beans`
-    Then the output should contain "Finished setting up <client-beans>"
-    And the exit status should be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
-
-  @spawn
-  Scenario: Setting up a single instance that fails
-    Given a file named ".kitchen.local.yml" with:
-    """
-    ---
-    verifier:
-      fail: true
-    """
-    When I successfully run `kitchen converge client-beans`
-    And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
-    When I run `kitchen verify client-beans`
-    Then the output should contain "Verify failed on instance <client-beans>"
-    And the exit status should not be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
-
-  @spawn
-  Scenario: Verifying a single instance
-    When I successfully run `kitchen setup client-beans`
-    And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
-    When I run `kitchen verify client-beans`
-    Then the output should contain "Finished verifying <client-beans>"
-    And the exit status should be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Verified\Z/
-
-  @spawn
-  Scenario: Verifying a single instance that fails
-    Given a file named ".kitchen.local.yml" with:
-    """
-    ---
-    verifier:
-      fail: true
-    """
-    When I successfully run `kitchen setup client-beans`
-    And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
-    When I run `kitchen verify client-beans`
-    Then the output should contain "Verify failed on instance <client-beans>"
-    And the exit status should not be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
-
-  @spawn
-  Scenario: Destroying a single instance
-    When I successfully run `kitchen create client-beans`
-    And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
-    When I run `kitchen destroy client-beans`
-    Then the output should contain "Finished destroying <client-beans>"
-    And the exit status should be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
-
-  @spawn
-  Scenario: Destroying a single instance that fails
-    Given a file named ".kitchen.local.yml" with:
-    """
-    ---
-    driver:
-      fail_destroy: true
-    """
-    When I successfully run `kitchen create client-beans`
-    And I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
-    When I run `kitchen destroy client-beans`
-    Then the output should contain "Destroy failed on instance <client-beans>"
-    And the exit status should not be 0
-    When I successfully run `kitchen list client-beans`
-    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+Feature: Running instance actions
+  In order to trigger discrete instance lifecyle actions
+  As an operator
+  I want to run a action commands
+
+  Background:
+    Given a file named ".kitchen.yml" with:
+    """
+    ---
+    driver:
+      name: dummy
+
+    provisioner:
+      name: dummy
+
+    verifier:
+      name: dummy
+
+    platforms:
+      - name: cool
+      - name: beans
+
+    suites:
+      - name: client
+      - name: server
+    """
+
+  @spawn
+  Scenario: Creating a single instance
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
+    When I run `kitchen create client-beans`
+    Then the output should contain "Finished creating <client-beans>"
+    And the exit status should be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+
+  @spawn
+  Scenario: Creating a single instance that fails
+    Given a file named ".kitchen.local.yml" with:
+    """
+    ---
+    driver:
+      fail_create: true
+    """
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
+    When I run `kitchen create client-beans`
+    Then the output should contain "Create failed on instance <client-beans>"
+    And the exit status should not be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
+
+  @spawn
+  Scenario: Converging a single instance
+    When I successfully run `kitchen create client-beans`
+    And I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    When I run `kitchen converge client-beans`
+    Then the output should contain "Finished converging <client-beans>"
+    And the exit status should be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
+
+  @spawn
+  Scenario: Converging a single instance that fails
+    Given a file named ".kitchen.local.yml" with:
+    """
+    ---
+    provisioner:
+      fail: true
+    """
+    When I successfully run `kitchen create client-beans`
+    And I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    When I run `kitchen converge client-beans`
+    Then the output should contain "Converge failed on instance <client-beans>"
+    And the exit status should not be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+
+  @spawn
+  Scenario: Setting up a single instance
+    When I successfully run `kitchen converge client-beans`
+    And I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
+    When I run `kitchen setup client-beans`
+    Then the output should contain "Finished setting up <client-beans>"
+    And the exit status should be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+
+  @spawn
+  Scenario: Setting up a single instance that fails
+    Given a file named ".kitchen.local.yml" with:
+    """
+    ---
+    verifier:
+      fail: true
+    """
+    When I successfully run `kitchen converge client-beans`
+    And I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Converged\Z/
+    When I run `kitchen verify client-beans`
+    Then the output should contain "Verify failed on instance <client-beans>"
+    And the exit status should not be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+
+  @spawn
+  Scenario: Verifying a single instance
+    When I successfully run `kitchen setup client-beans`
+    And I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+    When I run `kitchen verify client-beans`
+    Then the output should contain "Finished verifying <client-beans>"
+    And the exit status should be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Verified\Z/
+
+  @spawn
+  Scenario: Verifying a single instance that fails
+    Given a file named ".kitchen.local.yml" with:
+    """
+    ---
+    verifier:
+      fail: true
+    """
+    When I successfully run `kitchen setup client-beans`
+    And I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+    When I run `kitchen verify client-beans`
+    Then the output should contain "Verify failed on instance <client-beans>"
+    And the exit status should not be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Set Up\Z/
+
+  @spawn
+  Scenario: Destroying a single instance
+    When I successfully run `kitchen create client-beans`
+    And I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    When I run `kitchen destroy client-beans`
+    Then the output should contain "Finished destroying <client-beans>"
+    And the exit status should be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+\<Not Created\>\Z/
+
+  @spawn
+  Scenario: Destroying a single instance that fails
+    Given a file named ".kitchen.local.yml" with:
+    """
+    ---
+    driver:
+      fail_destroy: true
+    """
+    When I successfully run `kitchen create client-beans`
+    And I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Created\Z/
+    When I run `kitchen destroy client-beans`
+    Then the output should contain "Destroy failed on instance <client-beans>"
+    And the exit status should not be 0
+    When I successfully run `kitchen list client-beans`
+    Then the stdout should match /^client-beans\s+.+\s+Created\Z/