opskeleton 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8b5625f8be2bf3a45e1dd3554aabce54c64ac05
-  data.tar.gz: b3676744041d0337f721ce3d9f07a92d537f145c
+  metadata.gz: 1a5ac47a5adfbfcb23b17b3cd11a8f7898f4b6fc
+  data.tar.gz: c3a72f36fb8f572007d2f540199e23015707809d
 SHA512:
-  metadata.gz: 19c555108388d8d5e94aaa91422ac36706c1f3280f7bd4540020f29049a4241756821f8196ed6aacc9695fecea3bb7774cd9b7fdbb6bb0d8a7d57f972cee67a7
-  data.tar.gz: 7031895bb8a7dfb6da1b97f7342b516654a4b2a8d98645929353d5b06dd52ab4794b37a60000b3c7763e7eb07adcde2016ba5af28f1600b9bcd5e8b465cd9c0c
+  metadata.gz: 6129a1aca0ab8a40787f4e6d5fafceda42f60fc7d4b4f686dc6a66463f64d3bca860dae93d2a471a119cb7e7aa6d5f4b0033d5bd3ebf0b77a1bc294850f40b20
+  data.tar.gz: a95d1e9651fe865593b3048c2d7c229ee2d7e7e06f0de3b7dc81440e614e753ee3e7c4f7c59a7b5cb2ff7e04f4770b5d57491d30cd630ccdb6ac7e91a84a3f2a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.7.0)
+    opskeleton (0.7.1)
       bintray_deploy
       thor
 

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/templates/parent/spec/spec_helper.rb

@@ -5,29 +5,44 @@ require 'net/ssh'
 include SpecInfra::Helper::Ssh
 include SpecInfra::Helper::DetectOS
 
+def run(cmd)
+  unless(system(cmd, out: $stdout, err: :out))
+    puts 'Failed to setup vagrant machine'
+    System.exit 1
+  end
+end
+
 RSpec.configure do |c|
-  c.before :all do
+  c.before :suite do
     c.host  = ENV['TARGET_HOST']
     c.ssh.close if c.ssh
     options = Net::SSH::Config.for(c.host)
-    user    = 'vagrant'
-    vagrant_up = `vagrant up #{c.host}`
-    config = `vagrant ssh-config #{c.host}`
-    sshhost =  sshuser = ''
-    if config != ''
-      config.each_line do |line|
-        if match = /HostName (.*)/.match(line)
-          sshhost = match[1]
-        elsif  match = /User (.*)/.match(line)
-          sshuser = match[1]
-        elsif match = /IdentityFile (.*)/.match(line)
-          options[:keys] =  [match[1].gsub(/"/,'')]
-        elsif match = /Port (.*)/.match(line)
-          options[:port] = match[1]
+    if(!ENV['LOCAL'])
+	run("vagrant up #{c.host}")
+      config = `vagrant ssh-config #{c.host}`
+      sshhost =  sshuser = ''
+      if config != ''
+        config.each_line do |line|
+          if match = /HostName (.*)/.match(line)
+            sshhost = match[1]
+          elsif  match = /User (.*)/.match(line)
+            sshuser = match[1]
+          elsif match = /IdentityFile (.*)/.match(line)
+            options[:keys] =  [match[1].gsub(/"/,'')]
+          elsif match = /Port (.*)/.match(line)
+            options[:port] = match[1]
+          end
         end
       end
+    else
+      sshhost = 'localhost' 
+      sshuser = 'vagrant' 
     end
-    
     c.ssh = Net::SSH.start(sshhost, sshuser, options)
   end
+
+  c.after :suite do
+    c.host  = ENV['TARGET_HOST']
+    run("vagrant destroy #{c.host} -f")
+  end
 end

data/templates/puppet/opsk.yaml

@@ -6,6 +6,7 @@
     - modules
     - manifests
     - hieradata
+    - hiera.yaml
     - static-modules
     - Gemfile
     - Gemfile.lock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor