serverspec-runner 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de02cac0480ebd0499fbf20db6a505293761e942
-  data.tar.gz: b8db8e52b61dc74a9c433a923f8ce8b967edb20b
+  metadata.gz: 8bbdaab098b4ab210d5f3990c4a2fa59b34740da
+  data.tar.gz: 6f9b74bd39f704d32ba75a77245df1e0cd65bd8c
 SHA512:
-  metadata.gz: c24c72fba9a8d2b91c7fe00fc30fc573692f84a901c2ec1729b6b13b21ae63148f28537827c94b2b6da8386d4acbee7c77a29ccced23757614316e035c298707
-  data.tar.gz: cd7d1b854da9b2e064784095347590e4bc7f946c64e87a6a8f57d73efd441b473a93304abed0e3bcfdbbee23eeae9189c8a757856ef0b767cf8037eede4fe7a1
+  metadata.gz: 336d14453ead53ea80583ddddb2ff3dfcb2431251c81e2b9bb67bbd5bd464369fee8abb8b28ffffc2fa0a226a0dc18085b1a3bd63abfead11ad9b932557c6b5c
+  data.tar.gz: a44f9de7fb360df996945e68eb20355247610bc72eb7ee438555bd1d8422d78d6e9ea8fa98411eb7b596a0a255be56680f88088a65c3a8bf1a5d9511cd6c5282

data/README.md

@@ -50,7 +50,7 @@ or
 
     $ cd /path/to/your_serverspec_root && serverspec-runner
 
-You can also specify [ssh_options.yml](http://net-ssh.github.io/ssh/v2/api/classes/Net/SSH/Config.html)(Net::SSH options) file by "-o" option for default ssh options.
+You can also specify [ssh_options.yml](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html)(Net::SSH options) file by "-o" option for default ssh options.
 
     $ serverspec-runner -s /path/to/your_scenario.yml -o /path/to/your_ssh_options.yml
 

data/Rakefile

@@ -39,6 +39,8 @@ namespace :spec do
 
     FileUtils.mkdir_p(path)
     FileUtils.cp("#{File.dirname(__FILE__)}/scenario.yml", ENV['specroot'])
+    FileUtils.cp("#{File.dirname(__FILE__)}/ssh_options_default.yml", ENV['specroot'])
+    FileUtils.cp("#{File.dirname(__FILE__)}/.rspec", ENV['specroot'])
     FileUtils.cp_r("#{File.dirname(__FILE__)}/spec/.", path)
 
     puts("Please edit \"#{ENV['specroot']}/scenario.yml\" and change directory to \"#{ENV['specroot']}\" and exec \"serverspec-runner\" command !!")
@@ -70,8 +72,6 @@ namespace :spec do
         platform[host_alias.to_sym][:ssh_opts].each { |k, v| ssh_options[k.to_sym] = v } if platform[host_alias.to_sym].include?(:ssh_opts)
 
         tasks << "#{path}::#{host_alias}"
-        platform[host_alias.to_sym] = ServerspecRunner::Detection.platform(ssh_host, ssh_options, platform[host_alias.to_sym])
-        return ''
       end
     end
 

data/lib/serverspec-runner/version.rb

@@ -1,3 +1,3 @@
 module ServerspecRunner
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/serverspec-runner.rb

@@ -1,2 +1 @@
 require 'serverspec-runner/version'
-require 'serverspec-runner/detection'

data/serverspec-runner.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   
   spec.add_runtime_dependency     "serverspec"
   spec.add_runtime_dependency     "net-ssh"
-  spec.add_runtime_dependency     "net-ssh-shell"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-core"
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/spec_helper.rb

@@ -5,8 +5,6 @@ require 'yaml'
 require 'csv'
 require 'serverspec-runner/util/hash'
 
-set :backend, :exec
-
 ssh_opts_default = YAML.load_file(ENV['ssh_options'])
 csv_path = ENV['result_csv']
 explains = []
@@ -43,7 +41,11 @@ RSpec.configure do |c|
     ssh_opts ||= ssh_opts_default
     property[:ssh_opts].each { |k, v| ssh_opts[k.to_sym] = v } if property[:ssh_opts]
     user    = options[:user] || ssh_opts[:user] || Etc.getlogin
-    c.ssh   = Net::SSH.start(c.host, user, options.merge(ssh_opts))
+    options.merge!(ssh_opts)
+    set :ssh_options, options
+    set :backend, :ssh
+  else
+    set :backend, :exec
   end
 
   c.before(:suite) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-ssh-shell
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -110,8 +96,6 @@ files:
 - Rakefile
 - bin/serverspec-runner
 - lib/serverspec-runner.rb
-- lib/serverspec-runner/detection.rb
-- lib/serverspec-runner/util.rb
 - lib/serverspec-runner/util/hash.rb
 - lib/serverspec-runner/version.rb
 - scenario.yml

data/lib/serverspec-runner/detection.rb

@@ -1,45 +0,0 @@
-require 'socket'
-require 'serverspec-runner/util'
-
-module ServerspecRunner
-  module Detection
-
-    def self.platform(host, ssh_options={}, properties)
-
-      detected = {}
-
-      sudo = properties[:nosudo] ? '' : 'sudo'
-      properties[:sudo_prefix] = sudo + ' ' 
-
-      commands = {
-        :detect_platform_redhat             =>  'cat /etc/redhat-release 2> /dev/null',
-        :detect_platform_debian             =>  'cat /etc/debian_version 2> /dev/null',
-        :detect_hostname                    =>  'hostname 2> /dev/null',
-        :detect_hostname_short              =>  'hostname -s 2> /dev/null',
-      }
-
-      executed = ServerspecRunner::Util.alternative_exec!(host, commands, ssh_options)
-
-      # platform
-      if executed[:detect_platform_redhat][:exit_succeeded]
-        detected[:platform_name] = 'centos'
-
-        if executed[:detect_platform_redhat][:stdout] =~ /^(CentOS release )(\d+).(\d+).*$/
-          detected[:platform_detail_name] = "centos#{$2}"
-        end
-      elsif executed[:detect_platform_debian][:exit_succeeded]
-        detected[:platform_name] = 'debian'
-
-        if executed[:detect_platform_debian][:stdout] =~ /^(\d+).(\d+).(\d*)$/
-          detected[:platform_detail_name] = "debian#{$1}"
-        end
-      end
-
-      # hostname
-      detected[:hostname] = executed[:detect_hostname][:stdout]
-      detected[:hostname_short] = executed[:detect_hostname_short][:stdout]
-
-      detected.merge(properties)
-    end
-  end
-end

data/lib/serverspec-runner/util.rb

@@ -1,48 +0,0 @@
-require 'net/ssh'
-require 'net/ssh/shell'
-
-module ServerspecRunner
-  module Util
-
-    def self.alternative_exec!(host, commands={}, options={})
-
-      result = {}
-
-      if host == 'localhost' || host == '127.0.0.1' || host == nil
-        commands.each do |key,cmd|
-          result[key] = { :stdout => `#{cmd}`.strip, :exit_status => $?, :exit_succeeded => ($? == 0) }
-        end
-
-        return result
-      end
-
-      options = Net::SSH::Config.for(host).merge(options)
-      user    = options[:user] || Etc.getlogin
-
-      puts "connecting #{host}..."
-
-      Net::SSH.start(host, user, options) do |ssh|
-
-        ssh.shell do |sh|
-          commands.each do |key,cmd|
-
-            stdout = ''
-            stderr = ''
-            exit_status = nil
-            exit_succeeded = nil
-
-            pr = sh.execute! cmd do |shell_process|
-              shell_process.on_output do |pr, data|
-                stdout = data
-              end
-            end
-            result[key] = { :stdout => stdout.strip, :exit_status => pr.exit_status, :exit_succeeded => (pr.exit_status == 0) }
-          end
-          sh.execute! "exit"
-        end
-      end
-
-      result
-    end
-  end
-end