opskeleton 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b4a374826399d13c9fcb8a303f01ebf3cf8c102
-  data.tar.gz: 615a09a04588c88aa91fa8d8fc8c556dd75db332
+  metadata.gz: f0ce97c953f80ab8ee81d8702974054793781cf6
+  data.tar.gz: 7fde5abe563d7a19aa1fe909e43d44d3000b81c7
 SHA512:
-  metadata.gz: 234f43f5a80f63a4bee67ce23c012d6565bca69b82d262236faeb5ad6eb8e33fac894ecb17be3b01822f1db00037d4dcbdc6ae6baa8e8b3d35c9948654ded1b5
-  data.tar.gz: b4217476b3d80871faa553179a88726e1aa5670e4a3e824b69aa8c7421693fa838ee47f9c1f9d54e1590ea241277828d984d2425dce4852154fc948e847184b9
+  metadata.gz: 55f8f738ce76f66d382aecc2ae553070a2305f5d9cd859f5a99ade740ba825431a75a8e8bfe0b53910bd9c2c4a812fe1395d762a357d7012375a305df480c2de
+  data.tar.gz: 04327c6ca106b4c777bfaab9ae84d3b9c8ede2f16689a918e320d923f4d0094314caf882f4ecf69ba9296b7aa25f5195e7dc94391754205e1eb080557d5cd84c

data/Gemfile.lock

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

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/templates/chef/Rakefile

@@ -7,14 +7,28 @@ end
 
 task :default => :spec
 
-task :modspec do
-    FileList["static-modules/**/Rakefile"].each do |project|
-        Rake::Task.clear
-        load project
-        dir = project.pathmap("%d")
-        Dir.chdir(dir) do
-          spec_task = Rake::Task[:spec]
-          spec_task.invoke()
-        end
+desc "Run serverspec to all hosts"
+task :spec => 'serverspec:all'
+
+class ServerspecTask < RSpec::Core::RakeTask
+
+  attr_accessor :target
+
+  def spec_command
+    cmd = super
+    "env TARGET_HOST=#{target} #{cmd}"
+  end
+
+end
+
+namespace :serverspec do
+
+  %w(<%=@name=>).each do |profile|
+    ServerspecTask.new(profile.to_sym) do |t|
+	t.target = profile
+	t.pattern = "spec/#{profile}/*_spec.rb"
     end
+  end
 end
+
+task :default => 'serverspec:minimal'

data/templates/parent/spec/spec_helper.rb

@@ -6,41 +6,28 @@ 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
+    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]
         end
       end
-      c.ssh   = Net::SSH.start(host, user, options)
     end
+    
+    c.ssh = Net::SSH.start(sshhost, sshuser, options)
   end
 end

data/templates/puppet/Rakefile

@@ -22,3 +22,29 @@ end
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.ignore_paths =['modules/**/*', 'vendor/**/*']
 PuppetLint.configuration.send("disable_80chars")
+
+desc "Run serverspec to all hosts"
+task :spec => 'serverspec:all'
+
+class ServerspecTask < RSpec::Core::RakeTask
+
+  attr_accessor :target
+
+  def spec_command
+    cmd = super
+    "env TARGET_HOST=#{target} #{cmd}"
+  end
+
+end
+
+namespace :serverspec do
+
+  %w(<%=@name=>).each do |profile|
+    ServerspecTask.new(profile.to_sym) do |t|
+      t.target = profile
+      t.pattern = "spec/#{profile}/*_spec.rb"
+    end
+  end
+end
+
+task :default => 'serverspec:minimal'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -164,7 +164,7 @@ files:
 - templates/hiera_vagrant.yaml
 - templates/module/Rakefile.erb
 - templates/module/spec_helper.rb
-- templates/parent/spec/default/httpd_spec.rb
+- templates/parent/spec/default/stub_spec.rb
 - templates/parent/spec/spec_helper.rb
 - templates/parent/travis.erb
 - templates/puppet/Rakefile