vanagon 0.13.1 → 0.14.1

data/spec/lib/vanagon/component_spec.rb

@@ -65,6 +65,10 @@ describe "Vanagon::Component" do
         .and_return(OpenStruct.new(verify: true))
     end
 
+    it "will not consider a non-rewritten URI as a mirror" do
+      expect(subject.mirrors).to eq Set.new []
+    end
+
     it "attempts to retrieve from a mirror before a canonical URI" do
       allow(subject)
         .to receive(:fetch_url)

data/spec/lib/vanagon/optparse_spec.rb

@@ -3,28 +3,52 @@ require 'vanagon/optparse'
 describe Vanagon::OptParse do
 
   describe "options that don't take a value" do
-    [:skipcheck, :preserve, :verbose].each do |flag|
+    [:skipcheck, :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)
+        expect(subject.parse!(["--#{flag}"])).to have_key(flag)
       end
     end
 
     describe "short options" do
-      [["p", :preserve], ["v", :verbose]].each do |short, long|
+      [["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)
+          expect(subject.parse!(["-#{short}"])).to include(long => true)
         end
       end
     end
   end
 
+  describe "options that only allow limited values" do
+    [[:preserve, ["always", "never", "on-failure"]]].each do |option, values|
+      values.each do |value|
+        it "can create a parser that accepts \"--#{option} #{value}\"" do
+          subject = described_class.new("test", [option, value])
+          expect(subject.parse!(["--#{option}", value])).to eq(option => value.to_sym)
+        end
+      end
+    end
+    [[:preserve, ["bad-argument"]]].each do |option, values|
+      values.each do |value|
+        it "rejects the bad argument \"--#{option} #{value}\"" do
+          subject = described_class.new("test", [option, value])
+          expect{subject.parse!(["--#{option}", value])}.to raise_error(OptionParser::InvalidArgument)
+        end
+      end
+    end
+    it "preserve defaults to :on-failure" do
+      subject = described_class.new("test")
+      expect(subject.parse!([])).to include(:preserve => :'on-failure')
+    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")
+        expect(subject.parse!(["--#{option}", "hello"])).to include(option => "hello")
       end
     end
 
@@ -32,7 +56,7 @@ describe Vanagon::OptParse 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")
+          expect(subject.parse!(["-#{short}", "hello"])).to include(long => "hello")
         end
       end
     end

data/spec/lib/vanagon/platform/windows_spec.rb

@@ -38,6 +38,7 @@ describe "Vanagon::Platform::Windows" do
       let (:project_block) {
         <<-HERE.undent
           project 'test-fixture' do |proj|
+            proj.version '0.0.0'
             proj.setting(:company_name, "Test Name")
             proj.setting(:company_id, "TestID")
             proj.setting(:product_id, "TestProduct")
@@ -65,6 +66,33 @@ describe "Vanagon::Platform::Windows" do
           expect(cur_plat._platform.wix_product_version("1.0.g0")).to eq("1.0.0")
         end
       end
+
+      describe '#package_type' do
+        it "skips package generation for 'archive' package types" do
+          cur_plat.instance_eval(plat[:block])
+          cur_plat.package_type 'archive'
+          proj = Vanagon::Project::DSL.new('test-fixture', cur_plat._platform, [])
+          proj.instance_eval(project_block)
+          expect(cur_plat._platform.generate_package(proj._project)).to eq([])
+        end
+
+        it "generates a package_name for 'archive' package types" do
+          cur_plat.instance_eval(plat[:block])
+          cur_plat.package_type 'archive'
+          proj = Vanagon::Project::DSL.new('test-fixture', cur_plat._platform, [])
+          proj.instance_eval(project_block)
+          expect(cur_plat._platform.package_name(proj._project)).to eq('test-fixture-0.0.0-archive')
+        end
+
+        it "skips packaging artifact generation for 'archive' package types" do
+          cur_plat.instance_eval(plat[:block])
+          cur_plat.package_type 'archive'
+          proj = Vanagon::Project::DSL.new('test-fixture', cur_plat._platform, [])
+          proj.instance_eval(project_block)
+          expect(cur_plat._platform.generate_packaging_artifacts('',proj._project.name,'',proj._project)).to eq(nil)
+        end
+      end
+
       describe '#generate_msi_packaging_artifacts' do
         before(:each) do
           # Create Workdir and temp root directory

data/spec/lib/vanagon/project_spec.rb

@@ -11,6 +11,48 @@ describe 'Vanagon::Project' do
     end"
   }
 
+  let(:upstream_project_block) {
+    "project 'upstream-test' do |proj|
+    proj.setting(:test, 'upstream-test')
+    end"
+  }
+
+  let(:inheriting_project_block) {
+    "project 'inheritance-test' do |proj|
+    proj.inherit_settings 'upstream-test', 'git://some.url', 'master'
+    end"
+  }
+
+  let(:inheriting_project_block_with_settings) {
+    "project 'inheritance-test' do |proj|
+    proj.setting(:merged, 'yup')
+    proj.inherit_settings 'upstream-test', 'git://some.url', 'master'
+    end"
+  }
+
+  let(:preset_inheriting_project_block) {
+    "project 'inheritance-test' do |proj|
+    proj.setting(:test, 'inheritance-test')
+    proj.inherit_settings 'upstream-test', 'git://some.url', 'master'
+    end"
+  }
+
+  let(:postset_inheriting_project_block) {
+    "project 'inheritance-test' do |proj|
+    proj.inherit_settings 'upstream-test', 'git://some.url', 'master'
+    proj.setting(:test, 'inheritance-test')
+    end"
+  }
+
+  let (:dummy_platform_sysv) {
+    plat = Vanagon::Platform::DSL.new('debian-6-i386')
+    plat.instance_eval("platform 'debian-6-i386' do |plat|
+                       plat.servicetype 'sysv'
+                       plat.servicedir '/etc/init.d'
+                       plat.defaultdir '/etc/default'
+                    end")
+    plat._platform
+  }
 
   describe '#get_root_directories' do
 
@@ -44,6 +86,46 @@ describe 'Vanagon::Project' do
     end
   end
 
+  describe "#load_upstream_settings" do
+    before(:each) do
+      # stub out all of the git methods so we don't actually clone
+      allow(Vanagon::Component::Source::Git).to receive(:valid_remote?).with(URI.parse('git://some.url')).and_return(true)
+      git_source = Vanagon::Component::Source::Git.new('git://some.url', workdir: Dir.getwd)
+      allow(Vanagon::Component::Source::Git).to receive(:new).and_return(git_source)
+      expect(git_source).to receive(:fetch).and_return(true)
+
+      # stubs for the upstream project
+      upstream_proj = Vanagon::Project::DSL.new('upstream-test', {}, [])
+      upstream_proj.instance_eval(upstream_project_block)
+      expect(Vanagon::Project).to receive(:load_project).and_return(upstream_proj._project)
+    end
+
+    it 'loads upstream settings' do
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', {}, [])
+      inheriting_proj.instance_eval(inheriting_project_block)
+      expect(inheriting_proj._project.settings[:test]).to eq('upstream-test')
+    end
+
+    it 'overrides duplicate settings from before the load' do
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', {}, [])
+      inheriting_proj.instance_eval(preset_inheriting_project_block)
+      expect(inheriting_proj._project.settings[:test]).to eq('upstream-test')
+    end
+
+    it 'lets you override settings after the load' do
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', {}, [])
+      inheriting_proj.instance_eval(postset_inheriting_project_block)
+      expect(inheriting_proj._project.settings[:test]).to eq('inheritance-test')
+    end
+
+    it 'merges settings' do
+      inheriting_proj = Vanagon::Project::DSL.new('inheritance-test', {}, [])
+      inheriting_proj.instance_eval(inheriting_project_block_with_settings)
+      expect(inheriting_proj._project.settings[:test]).to eq('upstream-test')
+      expect(inheriting_proj._project.settings[:merged]).to eq('yup')
+    end
+  end
+
   describe "#filter_component" do
 
     # All of the following tests should be run with one project level
@@ -116,6 +198,55 @@ describe 'Vanagon::Project' do
     end
   end
 
+  describe '#get_preinstall_actions' do
+    it "Collects the preinstall actions for the specified package state" do
+      proj = Vanagon::Project.new('action-test', {})
+      proj.get_preinstall_actions('upgrade')
+      proj.get_preinstall_actions('install')
+      expect(proj.get_preinstall_actions('install')).to be_instance_of(String)
+    end
+  end
+
+  describe '#get_trigger_scripts' do
+    it "Collects the install triggers for the project for the specified packing state" do
+      proj = Vanagon::Project.new('action-test', {})
+      expect(proj.get_trigger_scripts('install')).to eq({})
+      expect(proj.get_trigger_scripts('upgrade')).to be_instance_of(Hash)
+    end
+    it 'fails with empty install trigger action' do
+      proj = Vanagon::Project.new('action-test', {})
+      expect { proj.get_trigger_scripts([]) }.to raise_error(Vanagon::Error)
+    end
+    it 'fails with incorrect install trigger action' do
+      proj = Vanagon::Project.new('action-test', {})
+      expect { proj.get_trigger_scripts('foo') }.to raise_error(Vanagon::Error)
+    end
+  end
+
+  describe '#get_interest_triggers' do
+    it "Collects the interest triggers for the project for the specified packaging state" do
+      proj = Vanagon::Project.new('action-test', {})
+      expect(proj.get_interest_triggers('install')).to eq([])
+      expect(proj.get_interest_triggers('upgrade')).to be_instance_of(Array)
+    end
+    it 'fails with empty interest trigger action' do
+      proj = Vanagon::Project.new('action-test', {})
+      expect { proj.get_interest_triggers([]) }.to raise_error(Vanagon::Error)
+    end
+    it 'fails with incorrect interest trigger action' do
+      proj = Vanagon::Project.new('action-test', {})
+      expect { proj.get_interest_triggers('foo') }.to raise_error(Vanagon::Error)
+    end
+  end
+
+  describe '#get_activate_triggers' do
+    it "Collects the activate triggers for the project for the specified packaging state" do
+      proj = Vanagon::Project.new('action-test', {})
+      expect(proj.get_activate_triggers()).to be_instance_of(Array)
+      expect(proj.get_activate_triggers()).to be_instance_of(Array)
+    end
+  end
+
   describe '#generate_dependencies_info' do
     before(:each) do
       @proj = Vanagon::Project.new('test-project', {})
@@ -165,5 +296,53 @@ describe 'Vanagon::Project' do
         'build_time' => '2017-07-10T13:34:25-07:00',
       })
     end
+
+    it 'should call pretty-print when we want pretty json' do
+      comp1 = Vanagon::Component.new('test-component1', {}, {})
+      comp1.version = '1.0.0'
+      @proj.components << comp1
+      @proj.version = '123abcde'
+
+      expect(JSON).to receive(:pretty_generate)
+      @proj.build_manifest_json(true)
+    end
+  end
+
+  describe '#generate_package' do
+    it "builds packages by default" do
+      platform = Vanagon::Platform::DSL.new('el-7-x86_64')
+      platform.instance_eval("platform 'el-7-x86_6' do |plat| end")
+      proj = Vanagon::Project::DSL.new('test-fixture', platform._platform, [])
+      expect(platform._platform).to receive(:generate_package) { ["# making a package"] }
+      expect(proj._project.generate_package).to eq(["# making a package"])
+    end
+
+    it "builds packages and archives if configured for both" do
+      platform = Vanagon::Platform::DSL.new('el-7-x86_64')
+      platform.instance_eval("platform 'el-7-x86_6' do |plat| end")
+      proj = Vanagon::Project::DSL.new('test-fixture', platform._platform, [])
+      proj.generate_archives(true)
+      expect(platform._platform).to receive(:generate_package) { ["# making a package"] }
+      expect(platform._platform).to receive(:generate_compiled_archive) { ["# making an archive"] }
+      expect(proj._project.generate_package).to eq(["# making a package", "# making an archive"])
+    end
+
+    it "can build only archives" do
+      platform = Vanagon::Platform::DSL.new('el-7-x86_64')
+      platform.instance_eval("platform 'el-7-x86_6' do |plat| end")
+      proj = Vanagon::Project::DSL.new('test-fixture', platform._platform, [])
+      proj.generate_archives(true)
+      proj.generate_packages(false)
+      expect(platform._platform).to receive(:generate_compiled_archive) { ["# making an archive"] }
+      expect(proj._project.generate_package).to eq(["# making an archive"])
+    end
+
+    it "builds nothing if that's what you really want" do
+      platform = Vanagon::Platform::DSL.new('el-7-x86_64')
+      platform.instance_eval("platform 'el-7-x86_6' do |plat| end")
+      proj = Vanagon::Project::DSL.new('test-fixture', platform._platform, [])
+      proj.generate_packages(false)
+      expect(proj._project.generate_package).to eq([])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -61,7 +61,6 @@ executables:
 - ship
 - render
 - repo
-- devkit
 - build_host_info
 extensions: []
 extra_rdoc_files: []
@@ -70,7 +69,6 @@ files:
 - README.md
 - bin/build
 - bin/build_host_info
-- bin/devkit
 - bin/inspect
 - bin/render
 - bin/repo
@@ -133,6 +131,7 @@ files:
 - resources/deb/preinst.erb
 - resources/deb/prerm.erb
 - resources/deb/rules.erb
+- resources/deb/triggers.erb
 - resources/osx/postinstall.erb
 - resources/osx/preinstall.erb
 - resources/osx/project-installer.xml.erb

data/bin/devkit

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
-
-optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [<component-name>...] [options]",
-                                 %i[workdir configdir target engine])
-options = optparse.parse! ARGV
-
-project = ARGV[0]
-platform = ARGV[1]
-components = ARGV.drop(2)
-
-if project.nil? or platform.nil?
-  warn "project and platform are both required arguments."
-  $stderr.puts optparse
-  exit 1
-end
-
-artifact = Vanagon::Driver.new(platform, project, options.merge({ :components => components }))
-
-artifact.preserve = true
-
-artifact.prepare(options[:workdir])