serverspec-runner 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf822c5821bc96001f1be8e68b325950f87e438
-  data.tar.gz: 34c45441230429ed4735405ff7badc369b92be6c
+  metadata.gz: de02cac0480ebd0499fbf20db6a505293761e942
+  data.tar.gz: b8db8e52b61dc74a9c433a923f8ce8b967edb20b
 SHA512:
-  metadata.gz: 7ad19aaab1b06c714abea5d86f36731de126d382cb937c2e7953760123c1f7e48b9d5d561f550b62e36631af4b3051ce26f5aaa7d8e46ca3e4a552dcd827fa5a
-  data.tar.gz: 4f53637233248264a55db855c87bdb90f34f58ad61fd22e02b308882b7aeeab6633290a5d8b51d6c654f258830c194f24f09f45c73a85a2deffa9f3ed5d2ecfd
+  metadata.gz: c24c72fba9a8d2b91c7fe00fc30fc573692f84a901c2ec1729b6b13b21ae63148f28537827c94b2b6da8386d4acbee7c77a29ccced23757614316e035c298707
+  data.tar.gz: cd7d1b854da9b2e064784095347590e4bc7f946c64e87a6a8f57d73efd441b473a93304abed0e3bcfdbbee23eeae9189c8a757856ef0b767cf8037eede4fe7a1

data/README.md

@@ -19,13 +19,13 @@ initialize spec direcotries and create skeleton-specfiles.
 
 Edit your [spec-files](http://serverspec.org/resource_types.html).
 
-    $ vim  /path/to/your_serverspec_root/test_name/test_detail_name/your_serverspec_test.rb
+    $ vim  /path/to/your_serverspec_root/test_name/test_sub_name/your_serverspec_test.rb
 
 Edit your infrastructure or middleware tests scenario to "scenario.yml".
 
 ```
-test_name:             # test directory name(required)
-  test_detail_name:    # test detail directory name(not required)
+test_name:             # test directory name
+  test_sub_name:       # test sub directory name(not required)
     - servername       # ssh-accessible ip address or fqdn. or alias
     - :
   - :
@@ -33,7 +33,11 @@ test_name:             # test directory name(required)
 ---
 servername:            # alias name(not required)
   host: 192.168.0.11   # ssh-accessible ip address or fqdn(required if alias exist)
-  any_attribute: "aaa" # host attributes. left example available to get "property[:servername][:any_attribute]"
+  ssh_opts:            # ssh options(not required)
+    port: 22           # ssh port option(not required)
+    user: "anyone"     # ssh user option(not required)
+      :                # any other Net::SSH Options(not required)
+  any_attribute: "aaa" # host attributes. left example available to get "property[:servername][:any_attribute]" from code(not required)
   :
 :
 ```
@@ -42,7 +46,11 @@ do tests.
 
     $ serverspec-runner -r /path/to/your_serverspec_root -s /path/to/your_scenario.yml
 
-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.
+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.
 
     $ serverspec-runner -s /path/to/your_scenario.yml -o /path/to/your_ssh_options.yml
 

data/Rakefile

@@ -1,4 +1,3 @@
-require "bundler/gem_tasks"
 require 'rake'
 require 'rspec/core/rake_task'
 require 'yaml'

data/lib/serverspec-runner/version.rb

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

data/serverspec-runner.gemspec

@@ -21,7 +21,7 @@ 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_runtime_dependency     "rake"
-  spec.add_runtime_dependency     "rspec-core", "~> 2.99"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec-core"
   spec.add_development_dependency "bundler", "~> 1.3"
 end

data/spec/example/default.rb

@@ -4,7 +4,7 @@ describe "example" do
 
   describe "hostname実行" do
     describe command("hostname") do
-      it { return_exit_status 0 }
+      it { eq 0 }
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'yaml'
 require 'csv'
 require 'serverspec-runner/util/hash'
 
-include Serverspec::Helper::DetectOS
+set :backend, :exec
 
 ssh_opts_default = YAML.load_file(ENV['ssh_options'])
 csv_path = ENV['result_csv']
@@ -37,19 +37,13 @@ RSpec.configure do |c|
 
   set_property (YAML.load_file(ENV['platforms_tmp']))[ENV['TARGET_HOST'].to_sym]
 
-  if ENV['TARGET_SSH_HOST'] =~ /localhost|127\.0\.0\.1/
-    include Serverspec::Helper::Exec
-    c.os = backend(Serverspec::Commands::Base).check_os
-  else
-    include SpecInfra::Helper::Ssh
-
+  if ENV['TARGET_SSH_HOST'] !~ /localhost|127\.0\.0\.1/
     c.host = ENV['TARGET_SSH_HOST']
     options = Net::SSH::Config.for(c.host, files=["~/.ssh/config"])
     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))
-    c.os    = backend.check_os
   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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec
@@ -59,7 +59,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -70,16 +70,16 @@ dependencies:
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement