serverspec_launcher 0.4.2 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c1afe040d8228a04805687615aa41ff1b14bb30bad7fe0a7542d1d23ef9f1e
-  data.tar.gz: 2ff2e59ee8b060157648635d0c397441f41bc9108b302e0eed83bd7962c5ec24
+  metadata.gz: d6a8011a886a38e0290fcbe0e8abb9de940d1e86a3485fb74c3d2febfca0bde0
+  data.tar.gz: 86f96b435403dfc3e423f043ff7bb5301a08d4d1b92995e21006c13586151632
 SHA512:
-  metadata.gz: 14e5a182ad429e5910315d8220cb2cdf3b277a3dc34afaef953ec833fcbb546c198a93019f3344f65dcd7d73e029963c44ba2478e676831736257fd696bcf21f
-  data.tar.gz: e4c7781fdfbfcb12975449842c8f5233ab89494713ced8d16f707d25e0fe535a8f7577b2b618c0719e55d4e9a131e1cb9d165592b3c5391ec5af93e49526e86b
+  metadata.gz: 74ddda61add4e88370222706ce5d772ee1d035fb8470851d7ea3e85c1959c7bd50a7ec8b2bff77b326fcce4a5409b3df1c71726ffefcc0a3a102416ad831b392
+  data.tar.gz: 1985d69f979d083e99561b11348ad8c504a5cb42ac3264aa9c268b9a0a2180499d45264ec67d36dd1e6a44b9f2b6f79210c75bbe35d103b7bcbec9d22f78c765

data/.gitignore

@@ -8,4 +8,5 @@
 /spec/reports/
 /tmp/
 
-.idea/
+.idea/
+reports/

data/Rakefile

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
+
+
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'conventional_changelog'
 require 'docker-api'
+require_relative 'spec/helpers/container_helper'
 
 require 'serverspec_launcher/rake_tasks'
 
+include ContainerHelper
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.exclude_pattern = 'spec/integration/**/*_spec.rb'
 end
@@ -18,7 +24,19 @@ task :changelog do
 end
 
 
-task :docker do
+task :stop_ssh_container do
+  stop_ssh_container
+end
+
+task :start_ssh_container do
+  ENV['TARGET_HOST'] = '172.18.0.22'
+  start_ssh_container
+end
+
+task :post_task_cleanup do
+  at_exit { stop_ssh_container }
+end
 
 
-end
+Rake::Task['serverspec:inspec-agent-example:all'].enhance ['post_task_cleanup', 'start_ssh_container']
+Rake::Task['serverspec:inspec-password-example:all'].enhance ['post_task_cleanup', 'start_ssh_container']

data/lib/serverspec_launcher.rb

@@ -18,6 +18,12 @@ module ServerspecLauncher
     properties.generate
   end
 
+
+  def self.generate_examplespec
+    properties = ExampleSpecGenerator.new
+    properties.generate
+  end
+
   def self.generate_spec_helper
     properties = SpecHelperGenerator.new
     properties.generate
@@ -69,12 +75,11 @@ module ServerspecLauncher
   def self.init
     generate_properties 
     generate_rolespec 
-    generate_spec_helper 
+    generate_examplespec
+    generate_spec_helper
     generate_rakefile 
     generate_rolespec 
     generate_gemspec create_repo
-
-
   end
 
   def self.process_command(args)

data/lib/serverspec_launcher/generators/example_spec_generator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require 'erb'
+
+# Generates the propetires.yml to be used in tests
+class ExampleSpecGenerator
+  def initialize(root_path = nil)
+    @path = root_path ? "#{root_path}/" : ''
+    @template_path = File.expand_path('../../../../templates', __FILE__)
+    @spec_file = "#{@path}spec/example_spec.rb"
+  end
+
+  def template
+    File.read "#{@template_path}/example_spec.rb.erb"
+  end
+
+  def generate
+    renderer = ERB.new template
+    Dir.mkdir "#{@path}spec" unless Dir.exists? "#{@path}spec"
+    File.open(@spec_file, 'w') { |file| file.write renderer.result } unless File.exists? @spec_file
+  end
+end

data/lib/serverspec_launcher/rake_tasks.rb

@@ -235,6 +235,11 @@ class ServerspecLauncherRakeTasks
       )
       begin
         puts "inspec #{command.join(' ')}"
+        networks = target[:attach_to] || []
+        networks.each do |nw|
+          network = Docker::Network.get(nw)
+          network.connect(container.id)  
+        end
         container.start
         container.wait
       rescue Docker::Error::TimeoutError => ex
@@ -304,6 +309,8 @@ class ServerspecLauncherRakeTasks
       command << keyfile
     end
     command << "--user=#{target_info[:user]}" if target_info[:user]
+    command << "--port=#{target_info[:ssh_port]}" if target_info[:ssh_port]
+    command << "--password=#{target_info[:password]}" if target_info[:password]
     command << "--bastion-host=#{target_info[:bastion_host]}" if target_info[:bastion_host]
     command << "--bastion-port=#{target_info[:bastion_port]}" if target_info[:bastion_port]
     command << "--bastion-user=#{target_info[:bastion_user]}" if target_info[:bastion_user]
@@ -313,7 +320,7 @@ class ServerspecLauncherRakeTasks
 
   def set_inspec_reporters(key, host, options)
     reporters = []
-    report_path = options[:environment] ? "/share/reports/#{options[:environment]}/#{key}" :  "/share/#{report_path}"
+    report_path = options[:environment] ? "/share/reports/#{options[:environment]}/#{key}" :  "/share/reports/#{key}"
     reporters <<  "junit:#{report_path}.xml" if options[:formatters].include?('junit') || options[:formatters].include?('xml')
     reporters <<  "documentation:#{report_path}.docs" if options[:formatters].include?('docs') || options[:formatters].include?('documentation') || options[:formatters].include?('docs_file')
     reporters <<  'documentation' if options[:formatters].include?('docs_screen')

data/lib/serverspec_launcher/spec_helper.rb

@@ -74,6 +74,8 @@ class SpecHelper
 
     sudo_checks
 
+
+
     ssh_user = @target_properties[:user] || Etc.getlogin
 
     options = if @backend == 'vagrant'
@@ -81,13 +83,17 @@ class SpecHelper
               else
                 Net::SSH::Config.for(@host)
               end
-
+    password_checks(options)
     options[:user] ||= ssh_user
     options[:keys] = [@target_properties[:identity_file]] if @target_properties[:identity_file]
+    options[:port] = @target_properties[:ssh_port] if @target_properties[:ssh_port]
+    host_key_checking(options)
+
 
     set :host, options[:host_name] || @host
     set :ssh_options, options
 
+
     # Disable sudo
     # set :disable_sudo, true
 
@@ -114,6 +120,19 @@ class SpecHelper
     end
   end
 
+  def password_checks(options)
+    if ENV['ASK_LOGIN_PASSWORD']
+      begin
+        require 'highline/import'
+      rescue LoadError
+        raise 'highline is not available. Try installing it.'
+      end
+      options[:password] = ask('Enter login password: ') { |q| q.echo = false }
+    else
+      options[:password] =  ENV['LOGIN_PASSWORD']
+    end
+  end
+
   def vagrant_backend
     @host = @target_properties[:vagrant_host] || 'default'
     vagrant_dir = @target_properties[:vagrant_dir]
@@ -165,6 +184,12 @@ class SpecHelper
     helper.setup_backend
     helper
   end
+
+  private
+
+  def host_key_checking(options)
+    options[:verify_host_key] = @target_properties[:verify_host_key].to_sym if @target_properties[:verify_host_key]
+  end
 end
 
 SpecHelper.load unless $dont_load_spec_helper

data/lib/serverspec_launcher/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ServerspecLauncher
-  VERSION = '0.4.2'
+  VERSION = '0.4.5'
 end

data/properties.yml

@@ -3,15 +3,51 @@ options:
   fail_on_err: true
   formatters:
     - tick
-  color: false
+  color: true
 
 targets:
-  targ:
+  exec-example:
+    backend: exec
+    spec_type: integration/example
+
+  docker-example:
+    backend: docker
+    docker_image: alpine:latest
+    spec_type: integration/docker
+
+  ssh-example:
     backend: ssh
     hosts:
-      - testenv01
-      - testenv02
-    spec_type: integration/example
+      - 172.18.0.22
+      - 172.18.0.23
+    user: root
+    spec_type: integration/ssh
+    identity_file: spec/resources/ssh.rsa
+    verify_host_key: never
+
+  inspec-agent-example:
+    backend: inspec
+    control: spec/integration/inspec_spec.rb
+    ssh_port: 22
+    user: root
+    hosts:
+      - 172.18.0.22
+    auth_method: agent
+    attach_to:
+      - test_network
+
+  inspec-password-example:
+    backend: inspec
+    control: spec/integration/inspec_spec.rb
+    user: root
+    password: root
+    hosts:
+      - 172.18.0.22
+    auth_method: password
+    attach_to:
+      - test_network
+    formatters:
+      - json
 
 
 environments:

data/serverspec_launcher.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rspec-tick-formatter', '0.1.3'
   spec.add_runtime_dependency 'rspec_html_reporter', '~> 1.0.0'
   spec.add_runtime_dependency 'docker-api'
+  spec.add_runtime_dependency 'docker-swarm-sdk'
 end

data/templates/example_spec.rb.erb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+context ENV['TARGET_HOST'] do
+  describe package('httpd'), :if => os[:family] == 'redhat' do
+    it { should be_installed }
+  end
+
+  describe package('apache2'), :if => os[:family] == 'ubuntu' do
+    it { should be_installed }
+  end
+
+  describe service('httpd'), :if => os[:family] == 'redhat' do
+    it { should be_enabled }
+    it { should be_running }
+  end
+
+  describe service('apache2'), :if => os[:family] == 'ubuntu' do
+    it { should be_enabled }
+    it { should be_running }
+  end
+
+  describe service('org.apache.httpd'), :if => os[:family] == 'darwin' do
+    it { should be_enabled }
+    it { should be_running }
+  end
+
+  describe port(80) do
+    it { should be_listening }
+  end
+end

data/templates/properties-light.yaml.erb

@@ -8,5 +8,5 @@ options:
 targets:
   example:
     backend: exec
-    spec_type: pi
+    spec_type: example
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec_launcher
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.5
 platform: ruby
 authors:
 - Andrew Wardrobe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-swarm-sdk
+  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'
 description: A utility to manage serverspec scripts
 email:
 - andrew.g.wardrobe@googlemail.com
@@ -214,6 +228,7 @@ files:
 - exe/serverspec_launcher
 - lib/launcher_json_formatter.rb
 - lib/serverspec_launcher.rb
+- lib/serverspec_launcher/generators/example_spec_generator.rb
 - lib/serverspec_launcher/generators/gemspec_generator.rb
 - lib/serverspec_launcher/generators/properties_generator.rb
 - lib/serverspec_launcher/generators/rakefile_generator.rb
@@ -228,6 +243,7 @@ files:
 - properties.yml
 - serverspec_launcher.gemspec
 - templates/Rakefile.erb
+- templates/example_spec.rb.erb
 - templates/gemspec.rb.erb
 - templates/properties-light.yaml.erb
 - templates/properties.yaml.erb