kitchen-sharedtests 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f44bf8f720fd635b7b08bc29b52c51846b99eb9
-  data.tar.gz: 6ca5c12d1bf4904b1d3847e87f42524ef66620fa
+  metadata.gz: ca3adbd039dbd146863b3b3d02df13f5cd094b49
+  data.tar.gz: 6bf101c12aba395ab4add8c4f70aeecde33112d0
 SHA512:
-  metadata.gz: 995d6b40c37772341a1d6ca02607c2e2acdf7bc660dc9e04be6a1511ca54539e3ce28eb861309865fe6531289ff619a2738b9a1b6518c0aa703a2eb95005e758
-  data.tar.gz: 5418d1196ab8cf761ec6729d8f93574358be38063150940e55794824222e6dbd75c8dfcbbea8e3a1c8d8e89574b725aa1f325dd4af1e5bd37a5730408d29ec91
+  metadata.gz: ff29bd83099e3f230825c941c24489503a2a8d96b47c8192c7cd08c2f2e4f77e8f72dc47bdb6ea9d1a8a25250d938d3281da13704129b8d4106fd670cd9fd6aa
+  data.tar.gz: 64f981e9113b7b298d76342e767d344bf1e5e7a8fcd232db352e67399a4e995266af23ef682231faa6c1ba0202457fe4a044e5c670d5a16d1321f32d4abf6eb2

data/Changelog.md

@@ -0,0 +1,11 @@
+
+## 0.2.0
+
+- create the test folder if it is missing and clone into a folder named integration [view commit](http://github.com///commit/39308349c6c5d68e0cf07815f5c6ddcf1c86f6f4)
+- prefix commands with sharedtests so that it is clear we are using a different path here [view commit](http://github.com///commit/6f18a5a901b99351eb378c7be3d22ddf57265b3e)
+- shared repo is for integration tests only [view commit](http://github.com///commit/1fb1441ccffe98ab2194fa4a50f362d79f8f0556)
+- update the read me to be more useful and explain things [view commit](http://github.com///commit/d03ae01f4be83469831b441ef53bd2f5958a894e)
+
+## 0.1.0
+
+- bump minor as we have a breaking change [view commit](http://github.com///commit/1719bf4e86b16516eacf15b5bc24e3059812251e)

data/README.md

@@ -8,7 +8,7 @@ This gem allows you to use an external git repo for your tests. This comes in ha
 
 Add this line to your application's Gemfile:
 
-    gem 'kitchen-shared-tests'
+    gem 'kitchen-sharedtests'
 
 And then execute:
 
@@ -16,7 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install kitchen-shared-tests
+    $ gem install kitchen-sharedtests
 
 ## Usage
 
@@ -40,6 +40,43 @@ provisioner:
   test_repo_uri: "https://github.com/ehaselwanter/tests-kitchen-example.git"
 ```
 
+Then you can either overwrite your local integration folder or run from a new integration test folder.
+
+```
+thor kitchen:fetch-remote-tests
+
+± kitchen diagnose |grep test_base_path
+        test_base_path: /....../puppet-kitchen-example/test/integration
+        test_base_path: /....../puppet-kitchen-example/test/integration
+        test_base_path: /....../puppet-kitchen-example/test/integration
+```
+
+will clone the in the `provisioner.test_repo_uri` to `test/integration`
+
+```
+thor kitchen:all-sharedtests 
+```
+
+and the other `kitchen:*-sharedtests*` tasks will create a folder `./shared_test_repo` and point `test_base_path` to this folder
+
+```
+± thor kitchen:diagnose-sharedtests-default-ubuntu-1204|grep test_base_path
+    !ruby/sym test_base_path: /....../puppet-kitchen-example/shared_test_repo
+    !ruby/sym test_base_path: /....../puppet-kitchen-example/shared_test_repo
+    !ruby/sym test_base_path: /....../puppet-kitchen-example/shared_test_repo
+```    
+
+```
+± thor -T
+kitchen
+-------
+thor kitchen:all-sharedtests                           # Run all test instances
+thor kitchen:diagnose-sharedtests-default-ubuntu-1204  # Diagnose default-ubuntu-1204 test instance
+thor kitchen:fetch-remote-tests                        # Fetch remote tests from provider.test_repo_uri
+thor kitchen:run-sharedtests-default-ubuntu-1204       # Run run-sharedtests-default-ubuntu-1204 test instance
+thor kitchen:verify-sharedtests-default-ubuntu-1204    # Run default-ubuntu-1204 to verify instance
+```
+
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/kitchen-shared-tests/fork )

data/lib/kitchen/sharedtests/version.rb

@@ -1,6 +1,6 @@
 
 module Kitchen
   module Sharedtests
-	VERSION = "0.1.0"
+	VERSION = "0.2.0"
   end
 end

data/lib/kitchen/sharedtests_thor_tasks.rb

@@ -46,37 +46,41 @@ module Kitchen
 
     def define
       config.instances.each do |instance|
-        self.class.desc instance.name, "Run #{instance.name} test instance"
-        self.class.send(:define_method, instance.name.gsub(/-/, '_')) do
+        command = "run-sharedtests-#{instance.name}"
+        self.class.desc command, "Run #{command} test instance"
+        self.class.send(:define_method, command.gsub(/-/, '_')) do
           create_or_update_test_repo(instance.provisioner[:test_repo_uri], Kitchen::Sharedtests::TEST_REPO_NAME, config.kitchen_root)
           instance.test(:always)
         end
       end
 
       config.instances.each do |instance|
-        command = "verify-#{instance.name}"
-        self.class.desc command, "Run #{command} to verify instance"
+        command = "verify-sharedtests-#{instance.name}"
+        self.class.desc command, "Run #{instance.name} to verify instance"
         self.class.send(:define_method, command.gsub(/-/, '_')) do
           create_or_update_test_repo(instance.provisioner[:test_repo_uri], Kitchen::Sharedtests::TEST_REPO_NAME, config.kitchen_root)
           instance.verify
         end
       end
 
-      self.class.desc "all", "Run all test instances"
-      self.class.send(:define_method, :all) do
+      self.class.desc "all-sharedtests", "Run all test instances"
+      self.class.send(:define_method, :all_sharedtests) do
         config.instances.each { |i| invoke i.name.gsub(/-/, '_') }
       end
 
       config.instances.each do |instance|
-        self.class.desc "diagnose-#{instance.name}", "Diagnose #{instance.name} test instance"
-        self.class.send(:define_method, "diagnose_#{instance.name.gsub(/-/, '_')}") do
-          puts instance.diagnose
+        command = "diagnose-sharedtests-#{instance.name}"
+        self.class.desc command, "Diagnose #{instance.name} test instance"
+        self.class.send(:define_method, command.gsub(/-/, '_')) do
+          puts instance.diagnose.to_yaml
         end
       end
 
       self.class.desc "fetch-remote-tests", "Fetch remote tests from provider.test_repo_uri"
       self.class.send(:define_method, "fetch_remote_tests") do
-        create_or_update_test_repo(config.instances.first.provisioner[:test_repo_uri], "test", config.kitchen_root)
+        test_root = File.join(config.kitchen_root,'test')
+        Dir.mkdir(test_root) unless File.directory?(test_root)
+        create_or_update_test_repo(config.instances.first.provisioner[:test_repo_uri], "integration", test_root)
       end
     end
 

data/lib/kitchen_sharedtests.rb

@@ -4,6 +4,7 @@ module Kitchen
   module Sharedtests
     TEST_REPO_NAME = "shared_test_repo"
     TEST_REPO_BASE_PATH = File.join(Dir.pwd, TEST_REPO_NAME)
-    TEST_BASE_PATH = File.join(TEST_REPO_BASE_PATH, "/integration")
+    # this is the path to the directory containing the integration test suites
+    TEST_BASE_PATH = TEST_REPO_BASE_PATH
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-sharedtests
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Edmund Haselwanter
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md