serverspec_launcher 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d747bafea2a25edb9e1c389f2937012185c11ced3b1cfb88a4ddc02043b399
-  data.tar.gz: 0d5b881ac15c71e0d97a8fdb63d8533d2ca46d24cf859e2f4d06fad5988ab1fb
+  metadata.gz: 5ea13b6e9ca452bd873f940b0d7907d1af810a12bf2e75b1aff3225047120e2d
+  data.tar.gz: 36c35423fb86605144ca0db45f561e13ff9d6a2618a27cd898236ea1b8a48632
 SHA512:
-  metadata.gz: bd246a8001512e21d2bfc65f2266778fbbb0701a7c674de9ab5a991b3a41064a52c6090cd9cc37e10e97f4f19dc9915c4754b910011f5c8e873818739b90626b
-  data.tar.gz: e2cde13693883258a5cd1a71ad625c15d6ab021334c7d6077ee435dfe8e1fc41f19d6c8d67b607fe775a7dcb4e26b1504b253d5db5c805eaae0d1dfdef00afca
+  metadata.gz: 1d2c5785bf2b400912f54e71e34a5a9a3e853f518e4b4eed9e987dd81b5a6c68a65a4af9bec5c382bd1e9f81c4f43d28145ff52aa7850bd65f497d87d08f7781
+  data.tar.gz: 94f1b1023c0c7ae012b5456f269e8f7d2e804d89faa72c8d81bebfe074f9be400d606d2558704c3539b125f9cdf073321433232cd6fb6a8f17dacc2a11e5a183

data/README.md

@@ -238,7 +238,7 @@ options:
   # Stop the test on the first failure (default: true)
   fail_on_err: true
   # Specify output format defaults is docs_screen multiple formatters can be specified
-  formaters:
+  formatters:
     # RSpec Documentation Formatter writing to file reports/<target>.docs
     - docs
     # RSpec Documentation Formatter writing to screen

data/Rakefile

@@ -4,7 +4,11 @@ require 'rspec/core/rake_task'
 require 'conventional_changelog'
 require 'docker-api'
 
-RSpec::Core::RakeTask.new(:spec)
+require 'serverspec_launcher/rake_tasks'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.exclude_pattern = 'spec/integration/**/*_spec.rb'
+end
 
 task default: :spec
 

data/lib/serverspec_launcher/generators/gemspec_generator.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: false
+require 'erb'
+require 'serverspec_launcher/version'
+# Generates the rakefile that will bring in the serverspec tasks
+class GemspecGenerator
+
+  def initialize(root_path = nil)
+    path = root_path ? "#{root_path}/" : ''
+    @template_path = File.expand_path('../../../../templates', __FILE__)
+    @project_name =  Dir.pwd.split('/')[-1]
+    @gemspec_file = "#{path}#{@project_name}.gemspec"
+    @name = '<Your Name>'
+    @email = '<Your email>'
+  end
+
+  def gemspec_template
+    File.read "#{@template_path}/gemspec.rb.erb"
+  end
+
+
+  def generate
+    renderer = ERB.new gemspec_template
+    File.open(@gemspec_file, 'w') { |file| file.write renderer.result(binding) } if Dir['*.gemspec'].empty?
+  end
+end

data/lib/serverspec_launcher/generators/properties_generator.rb

@@ -7,14 +7,20 @@ class PropertiesGenerator
     path = root_path ? "#{root_path}/" : ''
     @template_path = File.expand_path('../../../../templates', __FILE__)
     @properties_file = "#{path}properties.yml"
+    @full_properties_file = "#{path}properties.full.example.yml"
   end
 
   def properties_template
+    File.read "#{@template_path}/properties-light.yaml.erb"
+  end
+
+  def full_properties_template
     File.read "#{@template_path}/properties.yaml.erb"
   end
 
   def generate
     renderer = ERB.new properties_template
     File.open(@properties_file, 'w') { |file| file.write renderer.result } unless File.exists? @properties_file
+    File.open(@full_properties_file, 'w') { |file| file.write renderer.result } unless File.exists? @full_properties_file
   end
 end

data/lib/serverspec_launcher/generators/rakefile_generator.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'erb'
 
 # Generates the rakefile that will bring in the serverspec tasks
@@ -16,8 +16,12 @@ class RakefileGenerator
   def generate
     if File.exist? @rakefile
       str = File.read(@rakefile)
-      str.sub!(/((require .*\n)+)/, "\\1require 'serverspec_launcher/rake_tasks'\n")
-      File.open(@rakefile, 'w') { |file| file.write str }
+      new_str = if str.include? "require 'serverspec_launcher/rake_tasks'"
+                  str
+                else
+                  str.sub(/((require .*\n)+)/, "\\1require 'serverspec_launcher/rake_tasks'\n")
+                end
+      File.open(@rakefile, 'w') { |file| file.write new_str }
     else
       renderer = ERB.new rakefile_template
       File.open(@rakefile, 'w') { |file| file.write renderer.result }

data/lib/serverspec_launcher/generators/role_spec_generator.rb

@@ -4,9 +4,9 @@ require 'erb'
 # Generates the propetires.yml to be used in tests
 class RoleSpecGenerator
   def initialize(root_path = nil)
-    path = root_path ? "#{root_path}/" : ''
+    @path = root_path ? "#{root_path}/" : ''
     @template_path = File.expand_path('../../../../templates', __FILE__)
-    @spec_file = "#{path}spec/role_spec.rb"
+    @spec_file = "#{@path}spec/role_spec.rb"
   end
 
   def template
@@ -15,6 +15,7 @@ class RoleSpecGenerator
 
   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/generators/spec_helper_generator.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'erb'
 
 # Generate the spec_helpr.rb file
@@ -20,8 +20,12 @@ class SpecHelperGenerator
   def generate
     if File.exist?(@spec_helper)
       str = File.read(@spec_helper)
-      str.sub!(/((require .*\n)+)/, "\\1require 'serverspec_launcher/spec_helper'\n")
-      File.open(@spec_helper, 'w') { |file| file.write str }
+      new_str = if str.include? "require 'serverspec_launcher/spec_helper'"
+                  str
+                else
+                  str.sub(/((require .*\n)+)/, "\\1require 'serverspec_launcher/spec_helper'\n")
+                end
+      File.open(@spec_helper, 'w') { |file| file.write new_str }
     else
       create_spec_dir
       renderer = ERB.new rakefile_template

data/lib/serverspec_launcher/helpers/properties_loader.rb

@@ -0,0 +1,30 @@
+
+require 'serverspec_launcher/helpers/symbolize_helper'
+require 'yaml'
+class PropertiesLoader
+  using SymbolizeHelper
+  def initialize(properties = nil)
+    load properties
+  end
+
+  def load(properties)
+    @raw_properties =  if properties.is_a? Hash
+      properties.deep_symbolize_keys
+    elsif properties.is_a? String
+      YAML.safe_load expand_env_vars(properties), symbolize_names: true
+    else
+      str = File.read('properties.yml')
+      YAML.safe_load expand_env_vars(str), symbolize_names: true
+    end
+  end
+
+  def expand_env_vars(text)
+    text.gsub /\${([^}]+)}/ do
+      ENV[$1]
+    end
+  end
+
+  def properties
+    @properties ||= @raw_properties
+  end
+end

data/lib/serverspec_launcher/rake_tasks.rb

@@ -10,6 +10,7 @@ require 'etc'
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'serverspec_launcher/helpers/example_helper'
 require 'serverspec_launcher/helpers/symbolize_helper'
+require 'serverspec_launcher/helpers/properties_loader'
 
 # loads up the rake tasks
 class ServerspecLauncherRakeTasks
@@ -18,7 +19,7 @@ class ServerspecLauncherRakeTasks
   using SymbolizeHelper
 
   def initialize(properties = nil)
-    @properties = properties ? properties.deep_symbolize_keys : YAML.load_file('properties.yml').deep_symbolize_keys
+    @properties = properties
     options = @properties[:options] || {}
     @fail_on_err = options[:fail_on_err]
     @formatters = options[:formatters] || ['tick']
@@ -30,6 +31,7 @@ class ServerspecLauncherRakeTasks
 
     namespace :serverspec do
       targets = @properties[:targets] || {}
+      desc 'Run all targets and environments'
       task all: targets.keys.map { |key| 'serverspec:' + key.to_s.split('.')[0] }
       targets.keys.each do |key|
         target = targets[key]
@@ -38,6 +40,7 @@ class ServerspecLauncherRakeTasks
 
       environments = @properties[:environments] || {}
       environments.keys.each do |key|
+        desc "Run all tasks in environment #{key}"
         task key.to_sym => "serverspec:#{key}:all"
         namespace key.to_sym do
           environment = environments[key]
@@ -139,7 +142,8 @@ class ServerspecLauncherRakeTasks
   end
 
   def self.load(properties = nil)
-    tasks = ServerspecLauncherRakeTasks.new properties
+    props = PropertiesLoader.new properties
+    tasks = ServerspecLauncherRakeTasks.new props.properties
     tasks.load_tasks
   end
 

data/lib/serverspec_launcher/spec_helper.rb

@@ -13,6 +13,7 @@ require 'bundler'
 require 'specinfra'
 
 require 'serverspec_launcher/helpers/example_helper'
+require 'serverspec_launcher/helpers/properties_loader'
 require 'serverspec_launcher/helpers/symbolize_helper'
 
 # Does all the setup fo r the serverspec tests
@@ -26,16 +27,20 @@ class SpecHelper
     @host = host
     @target = target
     @source = task_source
-    @environment = ENV['TASK_ENV']
+    @environment = environment
     load_properties properties
   end
 
   def load_properties(properties = nil)
-    @properties = properties ? properties.deep_symbolize_keys : YAML.load_file('properties.yml').deep_symbolize_keys
-    if @source == 'environment'
-      @target_properties = @properties[:environments][@environment.to_sym][:targets][@target.to_sym]
+    @properties = if properties
+                    properties.deep_symbolize_keys
+                  else
+                    YAML.load_file('properties.yml').deep_symbolize_keys
+                  end
+    @target_properties = if @source == 'environment'
+     @properties[:environments][@environment.to_sym][:targets][@target.to_sym]
     else
-      @target_properties = @properties[:targets][@target.to_sym]
+      @properties[:targets][@target.to_sym]
     end
     if @source == 'environment'
       vars = @properties[:environments][@environment.to_sym][:variables] ? @properties[:environments][@environment.to_sym][:variables] : {}
@@ -152,8 +157,9 @@ class SpecHelper
     end
   end
 
-  def self.load(host = ENV['TARGET_HOST'], target = ENV['TARGET'], properties = nil, task_source = ENV['TASK_SOURCE'], environment = '')
-    helper = SpecHelper.new host, target, properties, task_source, environment
+  def self.load(host = ENV['TARGET_HOST'], target = ENV['TARGET'], properties = nil, task_source = ENV['TASK_SOURCE'], environment = ENV['TASK_ENV'])
+    props = PropertiesLoader.new properties
+    helper = SpecHelper.new host, target, props.properties, task_source, environment
     props = helper.properties[:shared_example_gems] || []
     helper.load_shared_examples props
     helper.setup_backend

data/lib/serverspec_launcher/version.rb

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

data/lib/serverspec_launcher.rb

@@ -4,6 +4,7 @@ require 'serverspec_launcher/generators/properties_generator'
 require 'serverspec_launcher/generators/rakefile_generator'
 require 'serverspec_launcher/generators/spec_helper_generator'
 require 'serverspec_launcher/generators/role_spec_generator'
+require 'serverspec_launcher/generators/gemspec_generator'
 
 # Main Class
 module ServerspecLauncher
@@ -17,6 +18,38 @@ module ServerspecLauncher
     properties.generate
   end
 
+  def self.generate_spec_helper
+    properties = SpecHelperGenerator.new
+    properties.generate
+  end
+
+  def self.generate_rakefile
+    properties = RakefileGenerator.new
+    properties.generate
+  end
+
+  def self.generate_gemspec
+    gemspec = GemspecGenerator.new
+    gemspec.generate
+  end
+
+
+  def self.which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        return exe if File.executable?(exe) && !File.directory?(exe)
+      }
+    end
+    return nil
+  end
+
+  def self.create_repo
+    if which 'git'
+      system('git init .') unless Dir.exists? '.git'
+    end
+  end
 
   def self.check_args(args)
     if args.length.zero?
@@ -24,13 +57,28 @@ module ServerspecLauncher
       exit 1
     end
   end
+  
+  def self.init
+    generate_properties 
+    generate_rolespec 
+    generate_spec_helper 
+    generate_rakefile 
+    generate_rolespec 
+    generate_gemspec 
+    create_repo 
+  end
 
   def self.process_command(args)
     check_args args
     command = args.shift
     parameters = args
 
-    generate_properties if command == 'init'
-    generate_rolespec if command == 'init'
+    case command
+    when 'init'
+      init
+    when 'version'
+      puts "Serverspec Launcher version #{ServerspecLauncher::VERSION}"
+    end
+
   end
 end

data/properties.yml

@@ -0,0 +1,31 @@
+---
+options:
+  fail_on_err: true
+  formatters:
+    - tick
+  color: false
+
+targets:
+  targ:
+    backend: ssh
+    hosts:
+      - testenv01
+      - testenv02
+    spec_type: integration/example
+
+
+environments:
+    env:
+      targets:
+        env_target:
+          backend: ssh
+          hosts:
+            - testenv01
+            - testenv02
+          spec_type: integration/example
+
+        env_target2:
+          backend: ssh
+          hosts: testenv01
+          spec_type: integration/example
+

data/templates/Rakefile.erb

@@ -1,4 +1,4 @@
 require 'bundler/gem_tasks'
 require 'rake'
 require 'rspec/core/rake_task'
-require 'serverspec_launcher/rake_tasks'
+require 'serverspec_launcher/rake_tasks'

data/templates/gemspec.rb.erb

@@ -0,0 +1,29 @@
+# coding: utf-8
+# frozen_string_literal: true
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+
+Gem::Specification.new do |spec|
+  spec.name          = '<%= @project_name %>'
+  spec.version       = '0.1.0'
+  spec.authors       = [<%= @name %>]
+  spec.email         = [<%= @email %>>]
+
+  spec.summary       = "TODO: "
+  spec.description   = "TODO: "
+  spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.license       = 'MIT'
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'serverspec_launcher', '~> <%= ServerspecLauncher::VERSION %>'
+end

data/templates/properties-light.yaml.erb

@@ -0,0 +1,12 @@
+---
+options:
+  fail_on_err: true
+  formatters:
+    - tick
+  color: false
+
+targets:
+  example:
+    backend: exec
+    spec_type: pi
+  

data/templates/properties.yaml.erb

@@ -3,7 +3,7 @@ options:
   # Stop the test on the first failure (default: true)
   fail_on_err: true
   # Specify output format defaults is docs_screen multiple formatters can be specified
-  formaters:
+  formatters:
     # RSpec Documentation Formatter writing to file reports/<target>.docs
     - docs
     # RSpec Documentation Formatter writing to screen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec_launcher
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Wardrobe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,17 +214,22 @@ files:
 - exe/serverspec_launcher
 - lib/launcher_json_formatter.rb
 - lib/serverspec_launcher.rb
+- lib/serverspec_launcher/generators/gemspec_generator.rb
 - lib/serverspec_launcher/generators/properties_generator.rb
 - lib/serverspec_launcher/generators/rakefile_generator.rb
 - lib/serverspec_launcher/generators/role_spec_generator.rb
 - lib/serverspec_launcher/generators/spec_helper_generator.rb
 - lib/serverspec_launcher/helpers/example_helper.rb
+- lib/serverspec_launcher/helpers/properties_loader.rb
 - lib/serverspec_launcher/helpers/symbolize_helper.rb
 - lib/serverspec_launcher/rake_tasks.rb
 - lib/serverspec_launcher/spec_helper.rb
 - lib/serverspec_launcher/version.rb
+- properties.yml
 - serverspec_launcher.gemspec
 - templates/Rakefile.erb
+- templates/gemspec.rb.erb
+- templates/properties-light.yaml.erb
 - templates/properties.yaml.erb
 - templates/role_spec.rb.erb
 - templates/spec_helper.rb.erb