pennyworth-tool 0.1.0 → 0.2.0

data/lib/pennyworth/local_command_runner.rb

@@ -39,8 +39,6 @@ module Pennyworth
           "bash", "-c", *args, options
         )
       end
-    rescue Cheetah::ExecutionFailed => e
-      raise ExecutionFailed.new(e)
     end
 
     # Copy a local file to the remote system.

data/lib/pennyworth/matchers.rb

@@ -0,0 +1,148 @@
+# Copyright (c) 2013-2014 SUSE LLC
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 3 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE about this file by physical or electronic mail,
+# you may find current contact information at www.suse.com
+
+RSpec::Matchers.define :fail do
+  match do |result|
+    if @exit_code
+      result.exit_code == @exit_code
+    else
+      result.exit_code != 0
+    end
+  end
+
+  chain :with_exit_code do |exit_code|
+    @exit_code = exit_code
+  end
+
+  failure_message do |result|
+    message = "Expected\n    #{result.cmd}\nto fail"
+    if @exit_code
+      message += " with exit code #{@exit_code} but it exited with #{result.exit_code}"
+    else
+      message += " but it succeeded."
+    end
+
+    message
+  end
+end
+
+RSpec::Matchers.define :have_stderr do |expected|
+  match do |result|
+    if expected.is_a?(Regexp)
+      expected.match(result.stderr)
+    else
+      expected == result.stderr
+    end
+  end
+
+  failure_message do |result|
+    if expected.is_a?(Regexp)
+      message = "Expected stderr to match #{expected.inspect}"
+      message += " (was:\n\n#{(result.stderr)})"
+    else
+      message = "Expected stderr to be '#{expected}'"
+      message += "\n\nDiff of stderr:"
+      differ = RSpec::Support::Differ.new(color: true)
+      message += differ.diff(result.stderr, expected)
+    end
+
+    message
+  end
+end
+
+RSpec::Matchers.define :include_stderr do |expected|
+  match do |result|
+    result.stderr.include? expected
+  end
+
+  failure_message do |result|
+    "Expected stderr '#{result.stdout}' to include '#{expected}'"
+  end
+  failure_message_when_negated do |result|
+    "Expected stderr '#{result.stdout}' to not include '#{expected}'"
+  end
+end
+RSpec::Matchers.define_negated_matcher :not_include_stderr, :include_stderr
+
+RSpec::Matchers.define :have_stdout do |expected|
+  match do |result|
+    if expected.is_a?(Regexp)
+      expected.match(result.stdout)
+    else
+      expected == result.stdout
+    end
+  end
+
+  failure_message do |result|
+    if expected.is_a?(Regexp)
+      message = "Expected stdout to match #{expected.inspect}"
+      message += " (was:\n\n#{(result.stdout)})"
+    else
+      message = "Expected stdout to be '#{expected}'"
+      message += "\n\nDiff of stdout:"
+      differ = RSpec::Support::Differ.new(color: true)
+      message += differ.diff(result.stdout, expected)
+    end
+
+    message
+  end
+end
+
+RSpec::Matchers.define :include_stdout do |expected|
+  match do |result|
+    result.stdout.include? expected
+  end
+
+  failure_message do |result|
+    "Expected stdout '#{result.stdout}' to include '#{expected}'"
+  end
+  failure_message_when_negated do |result|
+    "Expected stdout '#{result.stdout}' to not include '#{expected}'"
+  end
+end
+RSpec::Matchers.define_negated_matcher :not_include_stdout, :include_stdout
+
+RSpec::Matchers.define :succeed do
+  chain :with_stderr do
+    @allow_stderr = true
+  end
+
+  chain :with_or_without_stderr do
+    @ignore_stderr = true
+  end
+
+  match do |result|
+    return false if result.exit_code != 0
+    return false if !@ignore_stderr && !result.stderr.empty? && !@allow_stderr
+    return false if result.stderr.empty? && @allow_stderr
+
+    true
+  end
+
+  failure_message do |result|
+    message = "Expected\n    #{result.cmd}\nto succeed"
+    if result.exit_code != 0
+      message += " but it returned with exit code #{result.exit_code}"
+    elsif !result.stderr.empty? && !@allow_stderr
+      message += " but it had stderr output.\nThe output was:\n#{result.stderr}"
+    elsif result.stderr.empty? && @allow_stderr
+      message += " with stderr output but stderr was empty."
+    end
+
+    message
+  end
+end

data/lib/pennyworth/remote_command_runner.rb

@@ -46,6 +46,7 @@ module Pennyworth
 
       Cheetah.run(
         "ssh",
+        "-q",
         "-o",
         "UserKnownHostsFile=/dev/null",
         "-o",
@@ -55,8 +56,6 @@ module Pennyworth
         *args,
         options
       )
-    rescue Cheetah::ExecutionFailed => e
-      raise ExecutionFailed.new(e)
     end
 
     # Copy a local file to the remote system.

data/lib/pennyworth/runner.rb

@@ -21,7 +21,7 @@ module Pennyworth
     attr_reader :command_runner
 
     def cleanup_directory(dir)
-      command_runner.run("test -d #{dir} && rm -r #{dir}")
+      command_runner.run("test -d #{dir} && rm -r #{dir} || true")
     end
   end
 end

data/lib/pennyworth/settings.rb

@@ -26,8 +26,8 @@ module Pennyworth
       @definitions_dir = File.expand_path("~/.pennyworth")
     end
 
-    def kiwi_dir
-      File.join(@definitions_dir, "/kiwi")
+    def boxes_dir
+      File.join(@definitions_dir, "/boxes")
     end
 
     def vagrant_dir

data/lib/pennyworth/spec.rb

@@ -38,6 +38,7 @@ require_relative "remote_command_runner"
 require_relative "settings"
 require_relative "local_runner"
 require_relative "local_command_runner"
+require_relative "matchers"
 
 module Pennyworth
   module SpecHelper

data/lib/pennyworth/version.rb

@@ -16,7 +16,5 @@
 # you may find current contact information at www.suse.com
 
 module Pennyworth
-
-  VERSION = "0.1.0"
-
+  VERSION = "0.2.0"
 end

data/lib/pennyworth/vm.rb

@@ -21,6 +21,10 @@ module Pennyworth
   class VM
     attr_accessor :ip, :runner
 
+    class CommandResult
+      attr_accessor :stdout, :stderr, :exit_code, :cmd, :error
+    end
+
     def initialize(runner)
       @runner = runner
     end
@@ -34,7 +38,28 @@ module Pennyworth
     end
 
     def run_command(*args)
-      command_runner.run(*args)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+
+      opts.merge!(
+        stdout: :capture,
+        stderr: :capture
+      )
+
+      result = CommandResult.new
+      result.cmd = args.join(" ")
+      begin
+        stdout, stderr = command_runner.run(*args, opts)
+        result.exit_code = 0
+        result.stdout = stdout
+        result.stderr = stderr
+      rescue Cheetah::ExecutionFailed => e
+        result.error = e
+        result.exit_code = e.status.exitstatus
+        result.stdout = e.stdout
+        result.stderr = e.stderr
+      end
+
+      result
     end
 
     def inject_file(source, destination, opts = {})

data/spec/build_base_command_spec.rb

@@ -19,7 +19,7 @@ require "spec_helper.rb"
 
 describe Pennyworth::BuildBaseCommand do
 
-  let(:tmp_dir) { "/tmp/kiwi-vagrant-build-environment" }
+  let(:tmp_dir) { "/tmp/vagrant-build-environment" }
   let(:expected_content) {
     <<-EOT
 ---
@@ -41,8 +41,8 @@ EOT
   context "with non-existing box state file" do
     before(:each) do
       Pennyworth::Cli.settings = Pennyworth::Settings.new
-      @kiwi_dir = File.join(test_data_dir, "kiwi")
-      @cmd = Pennyworth::BuildBaseCommand.new(@kiwi_dir)
+      @boxes_dir = File.join(test_data_dir, "boxes")
+      @cmd = Pennyworth::BuildBaseCommand.new(@boxes_dir)
     end
 
     it "reads box sources state of one box" do
@@ -59,7 +59,7 @@ EOT
     end
 
     it "writes box state file" do
-      box_state_file = File.join(@kiwi_dir, "box_state.yaml")
+      box_state_file = File.join(@boxes_dir, "box_state.yaml")
 
       box_state = {}
       [ "base_opensuse13.1_kvm", "base_opensuse12.3_kvm" ].each do |box|
@@ -92,26 +92,36 @@ EOT
       # Don't actually build
       allow(@cmd).to receive(:base_image_create)
       allow(@cmd).to receive(:base_image_export)
-      allow(@cmd).to receive(:base_image_cleanup_build)
 
       allow(@cmd).to receive(:log) # Don't print to stdout
 
       @cmd.execute(tmp_dir, "base_opensuse13.1_kvm")
       @cmd.execute(tmp_dir, "base_opensuse12.3_kvm")
 
-      box_state_file = File.join(@kiwi_dir, "box_state.yaml")
+      box_state_file = File.join(@boxes_dir, "box_state.yaml")
 
       expect(File.read(box_state_file)).to eq expected_content
 
       FileUtils.rm(box_state_file) if File.exist?(box_state_file)
     end
+
+    it "triggers kiwi builds" do
+      expect(@cmd).to receive(:build_kiwi)
+      allow(@cmd).to receive(:base_image_cleanup_build)
+      @cmd.execute(tmp_dir, "base_opensuse13.1_kvm")
+    end
+
+    it "triggers veewee builds" do
+      expect(@cmd).to receive(:build_veewee)
+      @cmd.execute(tmp_dir, "veewee_definition")
+    end
   end
 
   context "with existing box state file" do
     before(:each) do
       Pennyworth::Cli.settings = Pennyworth::Settings.new
-      @kiwi_dir = File.join(test_data_dir, "kiwi2")
-      @cmd = Pennyworth::BuildBaseCommand.new(@kiwi_dir)
+      @boxes_dir = File.join(test_data_dir, "boxes2")
+      @cmd = Pennyworth::BuildBaseCommand.new(@boxes_dir)
     end
 
     it "reads box state file" do
@@ -129,8 +139,6 @@ EOT
       allow(@cmd).to receive(:write_box_state_file) # Don't actually write data
 
       expect(@cmd).to receive(:base_image_create)
-      expect(@cmd).to receive(:base_image_export)
-      expect(@cmd).to receive(:base_image_cleanup_build)
       @cmd.execute(tmp_dir, "base_opensuse13.1_kvm")
     end
 

data/spec/import_base_command_spec.rb

@@ -28,13 +28,13 @@ describe Pennyworth::ImportBaseCommand do
     stub_request(:get, /example.com.*import_state.yaml/).
       with(headers: {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
       to_return(status: 200, body: File.read(File.join(test_data_dir,
-        "/kiwi5/import_state.yaml")), headers: {})
+        "/boxes5/import_state.yaml")), headers: {})
   end
 
   context "without box state file" do
     before(:each) do
-      @kiwi_dir = File.join(test_data_dir, "kiwi")
-      @cmd = Pennyworth::ImportBaseCommand.new(@kiwi_dir, "http://example.com/pennyworth/")
+      @boxes_dir = File.join(test_data_dir, "boxes")
+      @cmd = Pennyworth::ImportBaseCommand.new(@boxes_dir, "http://example.com/pennyworth/")
       allow(Pennyworth::Libvirt).to receive(:ensure_libvirt_env_started)
       allow(@cmd).to receive(:log)
       allow(@cmd).to receive(:write_import_state_file) # Don't write state
@@ -43,7 +43,7 @@ describe Pennyworth::ImportBaseCommand do
     it "imports a local box" do
       expect(@cmd).to receive(:base_image_clean).with("base_opensuse12.3_kvm")
       expect_any_instance_of(Pennyworth::Vagrant).to receive(:run).with("box", "add",
-        "base_opensuse12.3_kvm", "#{@kiwi_dir}/base_opensuse12.3_kvm.box",
+        "base_opensuse12.3_kvm", "#{@boxes_dir}/base_opensuse12.3_kvm.box",
         "--force")
 
       @cmd.execute("base_opensuse12.3_kvm", :local => true)
@@ -66,14 +66,14 @@ describe Pennyworth::ImportBaseCommand do
       end
 
       it "fetches the box state file from an url with a trailing slash" do
-        cmd = Pennyworth::ImportBaseCommand.new(@kiwi_dir, "http://example.com/pennyworth/")
+        cmd = Pennyworth::ImportBaseCommand.new(@boxes_dir, "http://example.com/pennyworth/")
         cmd.read_remote_box_state_file()
 
         assert_requested(@box_state_get)
       end
 
       it "fetches the box state file from an url without a trailing slash" do
-        cmd = Pennyworth::ImportBaseCommand.new(@kiwi_dir, "http://example.com/pennyworth")
+        cmd = Pennyworth::ImportBaseCommand.new(@boxes_dir, "http://example.com/pennyworth")
         cmd.read_remote_box_state_file()
 
         assert_requested(@box_state_get)
@@ -83,12 +83,12 @@ describe Pennyworth::ImportBaseCommand do
 
   context "with box state file" do
     before(:each) do
-      @kiwi_dir = File.join(test_data_dir, "kiwi2")
-      @cmd = Pennyworth::ImportBaseCommand.new(@kiwi_dir)
+      @boxes_dir = File.join(test_data_dir, "boxes2")
+      @cmd = Pennyworth::ImportBaseCommand.new(@boxes_dir)
       allow(Pennyworth::Libvirt).to receive(:ensure_libvirt_env_started)
       allow(@cmd).to receive(:log)
       allow(@cmd).to receive(:fetch_remote_box_state_file).and_return(
-        File.read(File.join(@kiwi_dir, "box_state.yaml")))
+        File.read(File.join(@boxes_dir, "box_state.yaml")))
     end
 
     it "writes import state file" do
@@ -96,7 +96,7 @@ describe Pennyworth::ImportBaseCommand do
       allow(@cmd).to receive(:vagrant)
       allow_any_instance_of(Pennyworth::Vagrant).to receive(:run)
 
-      import_state_file = File.join(@kiwi_dir, "import_state.yaml")
+      import_state_file = File.join(@boxes_dir, "import_state.yaml")
 
       FileUtils.rm(import_state_file) if File.exist?(import_state_file)
 
@@ -126,13 +126,13 @@ base_opensuse12.3_kvm: e4e743b5340686d8488dbce54b5644d8
 
   context "with box and import state files" do
     before(:each) do
-      @kiwi_dir = File.join(test_data_dir, "kiwi3")
-      @cmd = Pennyworth::ImportBaseCommand.new(@kiwi_dir, "http://example.com/pennyworth/")
+      @boxes_dir = File.join(test_data_dir, "boxes3")
+      @cmd = Pennyworth::ImportBaseCommand.new(@boxes_dir, "http://example.com/pennyworth/")
       allow(Pennyworth::Libvirt).to receive(:ensure_libvirt_env_started)
       allow(@cmd).to receive(:log)
       allow(@cmd).to receive(:write_import_state_file) # Don't write state
       allow(@cmd).to receive(:fetch_remote_box_state_file).and_return(
-        File.read(File.join(@kiwi_dir, "box_state.yaml")))
+        File.read(File.join(@boxes_dir, "box_state.yaml")))
     end
 
     it "imports changed local box" do
@@ -166,8 +166,8 @@ base_opensuse12.3_kvm: e4e743b5340686d8488dbce54b5644d8
 
   context "without box state, but with import state files" do
     before(:each) do
-      @kiwi_dir = File.join(test_data_dir, "kiwi4")
-      @cmd = Pennyworth::ImportBaseCommand.new(@kiwi_dir)
+      @boxes_dir = File.join(test_data_dir, "boxes4")
+      @cmd = Pennyworth::ImportBaseCommand.new(@boxes_dir)
       allow(Pennyworth::Libvirt).to receive(:ensure_libvirt_env_started)
       allow(@cmd).to receive(:log)
     end