kitchen-linode 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b429d8c0d943634ab216a027c4bc62162566f3a5
-  data.tar.gz: c82211b3cb544569746a8f2d9a337ad385c316a2
+  metadata.gz: 3f6494b7dad0c2e9f070ec64f5edbf64574202c3
+  data.tar.gz: dd9a1a89580527e094224cf2ac1a5f852a8a953a
 SHA512:
-  metadata.gz: 0666415dff8f9a349760291379e98ee71fbd8ebd622d964c63a0e98fc85041a633c685398eaa0e717c077d66b8cc2ec5ad3577daab6ec5c3c539d152edaea23d
-  data.tar.gz: 393231cd75860bbea2e844bae894b082bd60125cfb704d5e2e5443d6db435a8243bbe732ae4e43ea3ad8cc61d2dc813e76a6ce1350c56d87c12e81c6673c1a96
+  metadata.gz: 764ec4ead550fe4e8009a501345f7ebc783996e235762634e981901fcde441a10d257be9c1a3301a89221abf675950b6036e554b10aee0aeba1f91a6eccb913a
+  data.tar.gz: 51d899dedcf85e91286f03d28505963ea207045a618f7ecd9d15fea965f929746b56ce8f524e47bae3cc25879093c32c7abc4ce1288911c830145dc6ef7fd927

data/README.md

@@ -43,6 +43,7 @@ LINODE_API_KEY      Linode API Key environment variable, default: nil
 :ssh_timeout        ssh timeout, default: 600 (seconds)
 :sudo               use sudo, default: True
 :port               ssh port, default: 22
+:server_name        set the hostname and linode name
 ```
 
 ## <a name="usage"></a> Usage

data/lib/kitchen/driver/linode.rb

@@ -226,9 +226,18 @@ module Kitchen
           config[:server_name] = "kitchen-#{config[:server_name]}-#{instance.name}-#{Time.now.to_i.to_s}"
         else
           config[:vm_hostname] = "#{instance.name}"
-          config[:server_name] = "kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}-#{Time.now.to_i.to_s}"
+          if ENV["JOB_NAME"]
+            # use jenkins job name variable. "kitchen_root" turns into "workspace" which is uninformative.
+            jobname = ENV["JOB_NAME"].tr(" ", "_")
+          elsif ENV["TRAVIS_REPO_SLUG"]
+            jobname = ENV["TRAVIS_REPO_SLUG"].tr("/", "_")
+          else
+            jobname = File.basename(config[:kitchen_root])
+          end
+          config[:server_name] = "kitchen-#{jobname}-#{instance.name}-#{Time.now.to_i.to_s}"
         end
         
+        # cut to fit Linode 32 character maximum
         if config[:server_name].is_a?(String) && config[:server_name].size >= 32
           config[:server_name] = "#{config[:server_name][0..29]}#{rand(10..99)}"
         end

data/lib/kitchen/driver/linode_version.rb

@@ -20,6 +20,6 @@ module Kitchen
 
   module Driver
     # Version string for Linode Kitchen driver
-    LINODE_VERSION = "0.12.0"
+    LINODE_VERSION = "0.13.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-linode
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Brett Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver to use Linodes as your development environment