opskeleton 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b48a3126100217a68d9b58345c07aa2f87806d8b
-  data.tar.gz: 540ab69aef10b3365533329e5ac9d3f5f9602bba
+  metadata.gz: 11f82b361bb97d7f9abff3dee8e09ac3530b0da3
+  data.tar.gz: 6331db06e138b00e8bbdf5a2a821e98f78ce89ae
 SHA512:
-  metadata.gz: b7b47b9669f4b7fda4b950e10f9cf38ee04270c786221326887556fe3c4427b1a1c64302b0080db180ce6e956030f0d9b0334b95dfdda0e122140768cf772202
-  data.tar.gz: fb25cdc7cf1d94f12e163ef2d6e4cfd0bee0295600cbcb2546208f9c68b1b4e685f364fa2de7cd3ae103a3fecdc795a52e5128d56f89184e890b47a802027107
+  metadata.gz: 7b8ff87846c90ff1f2e94fc573635054f44cfa71210008c32a63f8af476d99ed3997f47bf2392409e043076ac28f99a29211494d470711158c6406599fbbc501
+  data.tar.gz: d22049c78fbf07a26c0287f88426ffca48a3a620f003f8fbce96c0b0214062ff4b835a951fbf4c28801369de1e2a5fb602f46d0674cacbf06b23ed3bc6331a6c

data/lib/opskeleton/deploy_s3.rb

@@ -1,8 +1,5 @@
 
-require 'configuration'
-conf = "#{ENV['HOME']}/.configuration.rb"
-raise "#{conf} not found, please create a conf file with a s3 section" unless File.exists?(conf)
-require conf
+
 
 module  Opsk
   class DeployS3 < Thor::Group
@@ -17,6 +14,12 @@ module  Opsk
 	check_root
     end
 
+    def load_conf
+	require 'configuration'
+	conf = "#{ENV['HOME']}/.configuration.rb"
+	raise "#{conf} not found, please create a conf file with a s3 section" unless File.exists?(conf)
+	require conf   	
+    end
 
     def upload
 	require 'aws-sdk'

data/lib/opskeleton/deploy_scp.rb

@@ -1,8 +1,5 @@
 
-require 'configuration'
-conf = "#{ENV['HOME']}/.configuration.rb"
-raise "#{conf} not found, please create a conf file with a scp section" unless File.exists?(conf)
-require conf
+
 
 module  Opsk
   class DeployScp < Thor::Group
@@ -16,6 +13,12 @@ module  Opsk
 	check_root
     end
 
+    def load_conf
+	require 'configuration'
+	conf = "#{ENV['HOME']}/.configuration.rb"
+	raise "#{conf} not found, please create a conf file with a scp section" unless File.exists?(conf)
+	require conf   	
+    end
 
     def upload
 	require 'net/scp'
@@ -25,10 +28,10 @@ module  Opsk
 	if(File.exists?(tar))
 	  begin
 	    conf = Configuration.for('scp').send(dest.to_sym)
-          port = conf.port || '22'
+	    port = conf.port || '22'
 	    Net::SSH.start(conf.host, conf.user, :port => port) do |session|
-            session.scp.upload!(tar, conf.dest)
-          end
+		session.scp.upload!(tar, conf.dest)
+	    end
 	    say("deployed #{base} to #{conf.user}@#{conf.host}:#{conf.dest}")
 	  rescue Exception => e
 	    say("failed to deploy due to #{e}")

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.8.9'
+  VERSION = '0.8.10'
 end

data/templates/parent/spec/spec_helper.erb

@@ -2,8 +2,8 @@ require 'serverspec'
 require 'pathname'
 require 'net/ssh'
 
-include SpecInfra::Helper::Ssh
-include SpecInfra::Helper::DetectOS
+
+set :backend, :ssh
 
 def run(cmd)
   unless(system(cmd, out: $stdout, err: :out))
@@ -45,7 +45,7 @@ RSpec.configure do |c|
           if match = /HostName (.*)/.match(line)
             sshhost = match[1]
           elsif  match = /User (.*)/.match(line)
-            sshuser = match[1]
+            options[:user] = match[1]
           elsif match = /IdentityFile (.*)/.match(line)
             options[:keys] =  [match[1].gsub(/"/,'')]
           elsif match = /Port (.*)/.match(line)
@@ -55,9 +55,10 @@ RSpec.configure do |c|
       end
     else
       sshhost = 'localhost' 
-      sshuser = 'vagrant' 
+	options[:user] = 'vagrant'
     end
-    c.ssh = Net::SSH.start(sshhost, sshuser, options)
+    set :host, sshhost
+    set :ssh_options,options
   end
 
   c.after :suite do

data/templates/puppet/Gemfile.erb

@@ -1,12 +1,12 @@
 source "https://rubygems.org"
 
 # base
-gem 'puppet'
+gem 'puppet','= 3.7.5'
 
 group :testing do 
   gem 'rspec-puppet'
   gem 'puppetlabs_spec_helper', '>= 0.1.0'
-  gem 'serverspec', '~> 1.14.0'
+  gem 'serverspec'
 end
 
 group :build do 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor