serverspec 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af5097bb467c14c4f8d0f22747b6775ecf5d598a
-  data.tar.gz: fee035ec0e675c79cf74ef7367da9d2e028a7dbb
+  metadata.gz: db9382459ee16f535fa09efbe1227d821f06156a
+  data.tar.gz: 586c2b1e2d923d3279b28e32bb587e2ef43b58a1
 SHA512:
-  metadata.gz: ba213503e568d2c6bcb5a6f814f436508880546bf90bd43c39e5a944b7d6ada8ce9adbb36889e3024f3dafacb43106a382d7d89cb97eba9217b67694578c8295
-  data.tar.gz: c68841e54c3aa39773d997e330e612ddd74b619a9a93328461a362c326b26e1efea60e3f6d2582c52ab84f8a4ad97931941355c412a3a2baa82b5f51403025d4
+  metadata.gz: 8844aeac98285e412ae03cca2bfc86846104e31c72827042676e23ed65c7de47f892f5c019b12d329a5bf48513aac77893fd5df1b638f9ddeb251e533f5f71d5
+  data.tar.gz: 143c9e0d6b86f4796559b916cb54f7a80035764d7f93ab404850e6e5daca7d9020e5f35077304e912c47068bc1ec215928f9bdad394b0fb8bb509f51a519169d

data/bin/serverspec-init

@@ -5,78 +5,3 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 require 'serverspec'
 
 Serverspec::Setup.run
-
-__END__
-require 'serverspec'
-<% if @os_type == 'UN*X' -%>
-require 'pathname'
-<% end -%>
-<% if @backend_type == 'Ssh' -%>
-require 'net/ssh'
-<% end -%>
-<% if @backend_type == 'WinRM' -%>
-require 'winrm'
-<% end -%>
-
-include Serverspec::Helper::<%= @backend_type %>
-<% if @os_type == 'UN*X' -%>
-include Serverspec::Helper::DetectOS
-<% else  -%>
-include Serverspec::Helper::Windows
-<% end -%>
-
-<% if @os_type == 'UN*X' -%>
-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
-  <%- if @backend_type == 'Ssh' -%>
-  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
-    <%- if @vagrant -%>
-      vagrant_up = `vagrant up #{@hostname}`
-      config = `vagrant ssh-config #{@hostname}`
-      if config != ''
-        config.each_line do |line|
-          if match = /HostName (.*)/.match(line)
-            c.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
-    <%- end -%>
-      c.ssh   = Net::SSH.start(c.host, user, options)
-    end
-  end
-  <%- end -%>
-end
-<% end -%>
-<% if @backend_type == 'WinRM'-%>
-RSpec.configure do |c|
-  user = <username>
-  pass = <password>
-  endpoint = "http://<hostname>:5985/wsman"
-
-  c.winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
-  c.winrm.set_timeout 300 # 5 minutes max timeout for any operation
-end
-<% end -%>

data/lib/serverspec/setup.rb

@@ -139,7 +139,7 @@ EOF
 
     def self.safe_create_spec_helper
       requirements = []
-      content = ERB.new(DATA.read, nil, '-').result(binding)
+      content = ERB.new(spec_helper_template, nil, '-').result(binding)
       if File.exists? 'spec/spec_helper.rb'
         old_content = File.read('spec/spec_helper.rb')
         if old_content != content
@@ -210,5 +210,84 @@ EOF
         exit 1
       end
     end
+
+    def self.spec_helper_template
+      template = <<-EOF
+require 'serverspec'
+<% if @os_type == 'UN*X' -%>
+require 'pathname'
+<% end -%>
+<% if @backend_type == 'Ssh' -%>
+require 'net/ssh'
+<% end -%>
+<% if @backend_type == 'WinRM' -%>
+require 'winrm'
+<% end -%>
+
+include Serverspec::Helper::<%= @backend_type %>
+<% if @os_type == 'UN*X' -%>
+include Serverspec::Helper::DetectOS
+<% else  -%>
+include Serverspec::Helper::Windows
+<% end -%>
+
+<% if @os_type == 'UN*X' -%>
+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
+  <%- if @backend_type == 'Ssh' -%>
+  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
+    <%- if @vagrant -%>
+      vagrant_up = `vagrant up #{@hostname}`
+      config = `vagrant ssh-config #{@hostname}`
+      if config != ''
+        config.each_line do |line|
+          if match = /HostName (.*)/.match(line)
+            c.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
+    <%- end -%>
+      c.ssh   = Net::SSH.start(c.host, user, options)
+    end
+  end
+  <%- end -%>
+end
+<% end -%>
+<% if @backend_type == 'WinRM'-%>
+RSpec.configure do |c|
+  user = <username>
+  pass = <password>
+  endpoint = "http://<hostname>:5985/wsman"
+
+  c.winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
+  c.winrm.set_timeout 300 # 5 minutes max timeout for any operation
+end
+<% end -%>
+EOF
+      template
+    end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Gosuke Miyashita