vanagon 0.4.1 → 0.5.0

data/spec/lib/vanagon/component_spec.rb

@@ -19,4 +19,21 @@ describe "Vanagon::Component" do
       expect(comp.get_environment).to eq(':')
     end
   end
+
+  describe "#get_build_dir" do
+    subject(:comp) do
+      Vanagon::Component.new('build-dir-test', {}, {}).tap do |comp|
+        comp.dirname = "build-dir-test"
+      end
+    end
+
+    it "uses the dirname when no build_dir was set" do
+      expect(comp.get_build_dir).to eq "build-dir-test"
+    end
+
+    it "joins the dirname and the build dir when a build_dir was set" do
+      comp.build_dir = "cmake-build"
+      expect(comp.get_build_dir).to eq File.join("build-dir-test", "cmake-build")
+    end
+  end
 end

data/spec/lib/vanagon/engine/hardware_spec.rb

@@ -0,0 +1,48 @@
+require 'vanagon/engine/hardware'
+require 'vanagon/driver'
+require 'vanagon/platform'
+require 'logger'
+
+# Haus, I added this, cause it prevented errors.
+@@logger = Logger.new('/dev/null')
+
+describe 'Vanagon::Engine::Hardware' do
+
+  let (:platform_without_build_hosts) {
+    plat = Vanagon::Platform::DSL.new('aix-7.1-ppc')
+    plat.instance_eval("platform 'aix-7.1-ppc' do |plat|
+                    end")
+    plat._platform
+  }
+
+  let (:platform) {
+    plat = Vanagon::Platform::DSL.new('aix-6.1-ppc')
+    plat.instance_eval("platform 'aix-6.1-ppc' do |plat|
+                      plat.build_host 'abcd'
+                    end")
+    plat._platform
+  }
+
+  describe '#select_target' do
+    it 'raises an error without a target' do
+      base = Vanagon::Engine::Hardware.new(platform_without_build_hosts, nil)
+      expect { base.validate_platform }.to raise_error(Vanagon::Error)
+    end
+
+    it 'returns a target if one is set' do
+      base = Vanagon::Engine::Hardware.new(platform, nil)
+      expect(base).to receive(:node_lock).with(['abcd']).and_return('abcd')
+      expect(base.select_target).to eq('abcd')
+    end
+  end
+
+  describe '#validate_platform' do
+    it 'raises an error if the platform is missing a required attribute' do
+      expect{ Vanagon::Engine::Hardware.new(platform_without_build_hosts, nil).validate_platform }.to raise_error(Vanagon::Error)
+    end
+
+    it 'returns true if the platform has the required attributes' do
+      expect(Vanagon::Engine::Hardware.new(platform, nil).validate_platform).to be(true)
+    end
+  end
+end

data/spec/lib/vanagon/optparse_spec.rb

@@ -0,0 +1,40 @@
+require 'vanagon/optparse'
+
+describe Vanagon::OptParse do
+
+  describe "options that don't take a value" do
+    [:skipcheck, :preserve, :verbose].each do |flag|
+      it "can create an option parser that accepts the #{flag} flag" do
+        subject = described_class.new("test", [flag])
+        expect(subject.parse!(["--#{flag}"])).to eq(flag => true)
+      end
+    end
+
+    describe "short options" do
+      [["p", :preserve], ["v", :verbose]].each do |short, long|
+        it "maps the short option #{short} to #{long}" do
+          subject = described_class.new("test", [long])
+          expect(subject.parse!(["-#{short}"])).to eq(long => true)
+        end
+      end
+    end
+  end
+
+  describe "options that take a value" do
+    [:workdir, :configdir, :target, :engine].each do |option|
+      it "can create an option parser that accepts the #{option} option" do
+        subject = described_class.new("test", [option])
+        expect(subject.parse!(["--#{option}", "hello"])).to eq(option => "hello")
+      end
+    end
+
+    describe "short options" do
+      [["w", :workdir], ["c", :configdir], ["t", :target], ["e", :engine]].each do |short, long|
+        it "maps the short option #{short} to #{long}" do
+          subject = described_class.new("test", [long])
+          expect(subject.parse!(["-#{short}", "hello"])).to eq(long => "hello")
+        end
+      end
+    end
+  end
+end

data/spec/lib/vanagon/utilities/shell_utilities_spec.rb

@@ -0,0 +1,32 @@
+require 'vanagon/utilities/shell_utilities'
+
+describe Vanagon::Utilities::ShellUtilities do
+  describe "#cmdjoin" do
+    it "returns a single value as-is" do
+      expect(described_class.cmdjoin(["make test"], " !! ")).to eq "make test"
+    end
+
+    it "turns an array with a single value into the wrapped value" do
+      expect(described_class.cmdjoin([["make test"]], " !! ")).to eq "make test"
+    end
+
+    it "joins multiple commands with the separator string" do
+      expect(described_class.cmdjoin(["cd build", "cmake ..", "make"], " !! ")).to eq "cd build !! cmake .. !! make"
+    end
+
+    it "joins single strings and arrays of strings" do
+      expect(described_class.cmdjoin([
+        "cd build",
+        ["make", "make test"]
+      ], " !! ")).to eq "cd build !! make !! make test"
+    end
+  end
+
+  it "#andand joins commands with &&" do
+    expect(described_class.andand("foo", ["bar", "baz"])).to eq "foo && bar && baz"
+  end
+
+  it "#andand_multiline joins commands with && and an escaped newline" do
+    expect(described_class.andand_multiline("foo", ["bar", "baz"])).to eq "foo && \\\nbar && \\\nbaz"
+  end
+end

data/templates/Makefile.erb

@@ -55,64 +55,7 @@ cleanup-components: <%= @components.map {|comp| "#{comp.name}-cleanup" }.join("
 	touch <%= @name %>-project
 
 <%- @components.each do |comp| -%>
-<%= comp.name %>: <%= comp.name %>-install
-
-<%- if @cleanup -%>
-<%= comp.name %>-cleanup: <%= comp.name %>-install
-	<%= comp.cleanup_source %>
-	touch <%= comp.name %>-cleanup
-<%- end -%>
-
-<%= comp.name %>-unpack: file-list-before-build
-	<%= comp.extract_with %>
-	touch <%= comp.name %>-unpack
-
-<%= comp.name %>-patch: <%= comp.name %>-unpack
-	<%- unless comp.patches.empty? -%>
-		cd <%= comp.dirname %> && \
-		<%- comp.patches.each do |patch| -%>
-			<%= @platform.patch %> --strip=<%= patch.strip %> --fuzz=<%= patch.fuzz %> --ignore-whitespace < ../patches/<%= File.basename(patch.path) %> && \
-		<%- end -%>
-		:
-	<%- end -%>
-	
-	touch <%= comp.name %>-patch
-
-<%= comp.name %>-configure: <%= comp.name %>-patch <%= list_component_dependencies(comp).join(" ") %>
-	<%- unless comp.configure.empty? -%>
-	cd <%= comp.dirname %> && \
-	<%= comp.get_environment %> && \
-	<%= comp.configure.join(" && \\\n\t") %>
-	<%- end -%>
-	touch <%= comp.name %>-configure
-
-<%= comp.name %>-build: <%= comp.name %>-configure
-	<%- unless comp.build.empty? -%>
-	cd <%= comp.dirname %> && \
-	<%= comp.get_environment %> && \
-	<%= comp.build.join(" && \\\n\t") %>
-	<%- end -%>
-	touch <%= comp.name %>-build
-
-<%= comp.name %>-install: <%= comp.name %>-build
-	<%- unless comp.install.empty? -%>
-	cd <%= comp.dirname %> && \
-	<%= comp.get_environment %> && \
-	<%= comp.install.join(" && \\\n\t") %>
-	<%- end -%>
-	touch <%= comp.name %>-install
-
-<%= comp.name %>-clean:
-	[ -d <%= comp.dirname %> ] && cd <%= comp.dirname %> && \
-	<%= @platform[:make] %> clean
-	<%- ["configure", "build", "install"].each do |type| -%>
-	[ -e <%= comp.name %>-<%= type %> ] && rm <%= comp.name %>-<%= type %>
-	<%- end -%>
-
-<%= comp.name %>-clobber: <%= comp.name %>-clean
-	[ -d <%= comp.dirname %> ] && rm -r <%= comp.dirname %>
-	[ -e <%= comp.name %>-unpack ] && rm <%= comp.name %>-unpack
-
+<%= comp.rules(self, @platform).to_s %>
 <%- end -%>
 
 clean: <%= @components.map {|comp| "#{comp.name}-clean" }.join(" ") %>

data/templates/rpm/project.spec.erb

@@ -90,7 +90,7 @@ install -d %{buildroot}
   cp -Rp <%= file %> %{buildroot}/<%= File.dirname(file) %>
 <%- end -%>
 
-<%- if @platform.is_cisco_wrlinux? || @platform.is_huaweios? -%>
+<%- if @platform.is_cisco_wrlinux? -%>
   # Generate a list of directories and append it to the file list. RPMv4
   # automatically does this implicitly, but RPMv5 is more strict and you
   # need to list the dirs for them to be packaged properly.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: lock_manager
+  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: Vanagon is a tool to build a single package out of a project, which can
   itself contain one or more components.
 email: info@puppetlabs.com
@@ -55,50 +69,59 @@ files:
 - bin/devkit
 - bin/repo
 - bin/ship
+- lib/makefile.rb
 - lib/vanagon.rb
 - lib/vanagon/common.rb
 - lib/vanagon/common/pathname.rb
 - lib/vanagon/common/user.rb
 - lib/vanagon/component.rb
 - lib/vanagon/component/dsl.rb
+- lib/vanagon/component/rules.rb
 - lib/vanagon/component/source.rb
 - lib/vanagon/component/source/git.rb
 - lib/vanagon/component/source/http.rb
 - lib/vanagon/driver.rb
 - lib/vanagon/engine/base.rb
 - lib/vanagon/engine/docker.rb
+- lib/vanagon/engine/hardware.rb
 - lib/vanagon/engine/local.rb
 - lib/vanagon/engine/pooler.rb
 - lib/vanagon/errors.rb
 - lib/vanagon/extensions/string.rb
 - lib/vanagon/optparse.rb
+- lib/vanagon/patch.rb
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
 - lib/vanagon/platform/dsl.rb
 - lib/vanagon/platform/osx.rb
 - lib/vanagon/platform/rpm.rb
 - lib/vanagon/platform/rpm/aix.rb
+- lib/vanagon/platform/rpm/eos.rb
 - lib/vanagon/platform/rpm/sles.rb
 - lib/vanagon/platform/rpm/wrl.rb
 - lib/vanagon/platform/solaris_10.rb
 - lib/vanagon/platform/solaris_11.rb
-- lib/vanagon/platform/swix.rb
 - lib/vanagon/project.rb
 - lib/vanagon/project/dsl.rb
 - lib/vanagon/utilities.rb
+- lib/vanagon/utilities/shell_utilities.rb
 - spec/fixures/component/invalid-test-fixture.json
 - spec/fixures/component/mcollective.service
 - spec/fixures/component/test-fixture.json
+- spec/lib/makefile_spec.rb
 - spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/common/user_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
@@ -107,6 +130,7 @@ files:
 - spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
 - templates/Makefile.erb
 - templates/deb/changelog.erb
@@ -151,21 +175,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
+- spec/lib/makefile_spec.rb
 - spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/common/user_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
@@ -174,5 +202,6 @@ test_files:
 - spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
 has_rdoc: 

data/lib/vanagon/platform/swix.rb

@@ -1,35 +0,0 @@
-class Vanagon
-  class Platform
-    class RPM
-      class Swix < Vanagon::Platform::RPM
-        # The specific bits used to generate an SWIX package for a given project
-        #
-        # @param project [Vanagon::Project] project to build a SWIX package of
-        # @return [Array] list of commands required to build the SWIX package
-        # for the given project from an rpm
-        def generate_package(project)
-          target_dir = project.repo ? output_dir(project.repo) : output_dir
-
-          commands = super(project)
-          pkgname_swix = package_name(project)
-          pkgname_rpm = pkgname_swix.sub(/swix$/, 'rpm')
-          commands += ["echo 'format: 1' > ./output/#{target_dir}/manifest.txt",
-          "echo \"primaryRpm: #{pkgname_rpm}\" >> ./output/#{target_dir}/manifest.txt",
-          "echo #{pkgname_rpm}-sha1: `sha1sum ./output/#{target_dir}/#{pkgname_rpm}`",
-          "cd ./output/#{target_dir}/ && zip #{pkgname_swix} manifest.txt #{pkgname_rpm}",
-          "rm ./output/#{target_dir}/manifest.txt ./output/#{target_dir}/#{pkgname_rpm}"]
-
-          commands
-        end
-
-        # Method to derive the package name for the project
-        #
-        # @param project [Vanagon::Project] project to name
-        # @return [String] name of the SWIX package for this project
-        def package_name(project)
-          "#{project.name}-#{project.version}-#{project.release}.#{os_name}#{os_version}.#{project.noarch ? 'noarch' : @architecture}.swix"
-        end
-      end
-    end
-  end
-end