opskeleton 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8e6cfdc4545ead41ce026add622d10a3c6b7e6
-  data.tar.gz: 142bf7f79131d930062982a2d317eb7eac8d4f09
+  metadata.gz: 1fc7f3c7be28794db4f4439d770863d598989ba5
+  data.tar.gz: a39ccc598356b656e7429dbcad46f9c11f0fc604
 SHA512:
-  metadata.gz: a691af74c57934132d1339f4de8074326fd242ed7cc7085da211180f738f3ce79b23f54bed9249617ff74e726b994a93512c01f3117e00cdffdfb7e9a3a8c4e5
-  data.tar.gz: 7e484c8928869d46bf0a1c6e062eaf8507d857a95f731a3542f454f593a96b44b52fa757af15bdb1a8eb86fb1c88b71be4fc975288643416ea3166a9c93e5fa3
+  metadata.gz: a036c652786fc5bf457b6fd01e1076ea0d25923d4fe0cf2d3660685349fe3a60e1c55e0da74e4cf396e6fa6689c02ebc97ec592a2d4d26e5bde94f1383cb6793
+  data.tar.gz: f06e8eb48afc25c213fd49ef7f753b569568ce729627e5bb654f909be84af4fc7e56e5872d5695b19af0a4f482c59a114b75fe743ce0b0e0eec8b6976866aba0

data/lib/opskeleton/generate.rb

@@ -74,5 +74,9 @@ module Opsk
 	   end
 	end
     end
+
+    def server_spec
+	directory('templates/parent/spec', "#{path}/spec")
+    end
   end
 end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/templates/Rakefile

@@ -1,4 +1,13 @@
-task :spec do
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end
+
+task :default => :spec
+
+task :modspec do
     FileList["static-modules/**/Rakefile"].each do |project|
         Rake::Task.clear
         load project

data/templates/gemfile

@@ -12,3 +12,4 @@ gem 'puppet-lint'
 gem 'rake'
 gem 'librarian-puppet'
 gem 'opskeleton'
+gem 'serverspec'

data/templates/parent/spec/default/httpd_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe package('httpd') do
+  it { should be_installed }
+end
+
+describe service('httpd') do
+  it { should be_enabled   }
+  it { should be_running   }
+end
+
+describe port(80) do
+  it { should be_listening }
+end
+
+describe file('/etc/httpd/conf/httpd.conf') do
+  it { should be_file }
+  its(:content) { should match /ServerName default/ }
+end

data/templates/parent/spec/spec_helper.rb

@@ -0,0 +1,46 @@
+require 'serverspec'
+require 'pathname'
+require 'net/ssh'
+
+include SpecInfra::Helper::Ssh
+include SpecInfra::Helper::DetectOS
+
+RSpec.configure do |c|
+  if ENV['ASK_SUDO_PASSWORD']
+    require 'highline/import'
+    c.sudo_password = ask("Enter sudo password: ") { |q| q.echo = false }
+  else
+    c.sudo_password = ENV['SUDO_PASSWORD']
+  end
+  c.before :all do
+    block = self.class.metadata[:example_group_block]
+    if RUBY_VERSION.start_with?('1.8')
+      file = block.to_s.match(/.*@(.*):[0-9]+>/)[1]
+    else
+      file = block.source_location.first
+    end
+    host  = File.basename(Pathname.new(file).dirname)
+    if c.host != host
+      c.ssh.close if c.ssh
+      c.host  = host
+      options = Net::SSH::Config.for(c.host)
+      user    = options[:user] || Etc.getlogin
+      vagrant_up = `vagrant up default`
+      config = `vagrant ssh-config default`
+      if config != ''
+        config.each_line do |line|
+          if match = /HostName (.*)/.match(line)
+            host = match[1]
+          elsif  match = /User (.*)/.match(line)
+            user = match[1]
+          elsif match = /IdentityFile (.*)/.match(line)
+            options[:keys] =  [match[1].gsub(/"/,'')]
+          elsif match = /Port (.*)/.match(line)
+            options[:port] = match[1]
+          end
+        end
+      end
+      c.ssh   = Net::SSH.start(host, user, options)
+    end
+  end
+end

data/templates/parent/travis.erb

@@ -4,5 +4,5 @@ rvm:
 script:
   - "librarian-puppet install"
   - "rake lint"
-  - "rake spec"
+  - "rake modspec"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,6 +136,8 @@ files:
 - templates/module/Rakefile.erb
 - templates/module/spec_helper.rb
 - templates/opsk.yml
+- templates/parent/spec/default/httpd_spec.rb
+- templates/parent/spec/spec_helper.rb
 - templates/parent/travis.erb
 - templates/puppet/default.erb
 - templates/puppet/site.erb