vanagon 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '07341460977d9693423374862c7a7793998b4008'
-  data.tar.gz: 2a4a0e66a4fb11bdaa96d1d7fb3aa36d7908c541
+  metadata.gz: 05ba6ccedb21955cc83f9a9b4c879952f97ae2c7
+  data.tar.gz: c6220fff6a4a1c7ba457447686610988cc778e77
 SHA512:
-  metadata.gz: f83beaff1911b965ff21bbaf64ab2087ae9cef078c77b6b5cf3050bde80d59843dbfacb0aef31feb6788241e450e255a06c0728708d3db2152d280bcfd360592
-  data.tar.gz: 370382929914b3cdb7dd16d350c66777e5ea0ccf228507c5c5e0e2961f23a18f11f4dd6649f6118f590ec4e14d3c91f9cb9d4dda61784785bb6a3f18d39211d9
+  metadata.gz: 73104a5003d115067156eba3a0dbebd8b089917392773a7b4e3f3bafc3904fc9befff092c80d509d04a9f1e9ac81911afc1369bea440330b015a2f6828feac00
+  data.tar.gz: d1c60858b7d44b348fd13bdbbd4454b7c4b6c3e5549384d6011d285f7f0ee099a36135bddc03938d1eded39b271091750b83280ddb4bf4937c4f15d41faeef44

data/bin/build

@@ -2,7 +2,7 @@
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
 optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [<target>] [options]",
-                                 [:workdir, :configdir, :engine, :preserve, :verbose, :skipcheck, :only_build, :"remote-workdir"])
+                                 %i(workdir configdir engine preserve verbose skipcheck only_build remote-workdir))
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/bin/build_host_info

@@ -3,7 +3,7 @@ require 'json'
 
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
-optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", [:workdir, :configdir, :engine])
+optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", %i(workdir configdir engine))
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/bin/devkit

@@ -2,7 +2,7 @@
 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]",
-                                 [:workdir, :configdir, :target, :engine])
+                                 %i(workdir configdir target engine))
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/bin/inspect

@@ -6,7 +6,7 @@ require 'vanagon/extensions/hashable'
 
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
-optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", [:workdir, :configdir, :engine])
+optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", %i(workdir configdir engine))
 options = optparse.parse! ARGV
 
 project = ARGV[0]

data/bin/render

@@ -3,7 +3,7 @@ load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb
 
 optparse = Vanagon::OptParse.new(
   "#{File.basename(__FILE__)} <project-name> <platform-name> [options]",
-  [:workdir, :configdir, :engine]
+  %i(workdir configdir engine)
 )
 options = optparse.parse! ARGV
 

data/lib/vanagon/component.rb

@@ -204,7 +204,7 @@ class Vanagon
         extract_with << source.extract(platform.tar) if source.respond_to? :extract
 
         @cleanup_source = source.cleanup if source.respond_to?(:cleanup)
-        @dirname = source.dirname
+        @dirname ||= source.dirname
 
         # Git based sources probably won't set the version, so we load it if it hasn't been already set
         if source.respond_to?(:version)

data/lib/vanagon/component/dsl.rb

@@ -315,6 +315,29 @@ class Vanagon
         end
       end
 
+      # Set a source dir
+      #
+      # The build dir will be created when the source archive is unpacked. This
+      # should be used when the unpacked directory name does not match the
+      # source archive name.
+      #
+      # @example
+      #   pkg.url "http://the-internet.com/a-silly-name-that-unpacks-into-not-this.tar.gz"
+      #   pkg.dirname "really-cool-directory"
+      #   pkg.configure { ["cmake .."] }
+      #   pkg.build { ["make -j 3"] }
+      #   pkg.install { ["make install"] }
+      #
+      # @param path [String] The build directory to use for building the project
+      def dirname(path)
+        if Pathname.new(path).relative?
+          @component.dirname = path
+        else
+          raise Vanagon::Error, "dirname should be a relative path, but '#{path}' looks to be absolute."
+        end
+      end
+
+
       # This will add a source to the project and put it in the workdir alongside the other sources
       #
       # @param uri [String] uri of the source

data/lib/vanagon/component/source/http.rb

@@ -115,7 +115,6 @@ class Vanagon
           end
 
           target_file
-
         rescue Errno::ETIMEDOUT, Timeout::Error, Errno::EINVAL,
           Errno::EACCES, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse,
           Net::HTTPHeaderSyntaxError, Net::ProtocolError => e

data/lib/vanagon/utilities.rb

@@ -78,7 +78,6 @@ class Vanagon
       response = http.request(request)
 
       JSON.parse(response.body)
-
     rescue Errno::ETIMEDOUT, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
       EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
       Net::ProtocolError => e

data/spec/lib/vanagon/component/source/git_spec.rb

@@ -1,32 +1,45 @@
 require 'vanagon/component/source/git'
 
 describe "Vanagon::Component::Source::Git" do
-  let(:klass) { Vanagon::Component::Source::Git }
-  let(:url) { 'git://github.com/puppetlabs/facter' }
-  let(:ref_tag) { 'refs/tags/2.2.0' }
-  let(:bad_sha) { 'FEEDBEEF' }
-  let(:workdir) { ENV["TMPDIR"] || '/tmp' }
+  # before(:all) blocks are run once before all of the examples in a group
+  before :all do
+    @klass = Vanagon::Component::Source::Git
+    # This repo will not be cloned over the network
+    @url = 'git://github.com/puppetlabs/facter.git'
+    # This path will not be created on disk
+    @local_url = "file://#{Dir.tmpdir}/puppet-agent"
+    @ref_tag = 'refs/tags/2.2.0'
+    @workdir = nil
+  end
 
-  after(:each) { %x(rm -rf #{workdir}/facter) }
+  # before(:each) blocks are run before each example
+  before :each do
+    allow(Git)
+      .to receive(:ls_remote)
+            .and_return(true)
+  end
 
   describe "#initialize" do
     it "raises error on initialization with an invalid repo" do
-      # this test has a spelling error for the git repo
-      # * this is on purpose *
-      expect { klass.new("#{url}l.git", ref: ref_tag, workdir: workdir) }
-        .to raise_error Vanagon::InvalidRepo
+      # Ensure initializing a repo fails without calling over the network
+      allow(Git)
+        .to receive(:ls_remote)
+              .and_return(false)
+
+      expect { @klass.new(@url, ref: @ref_tag, workdir: @workdir) }
+        .to raise_error(Vanagon::InvalidRepo)
     end
   end
 
   describe "#dirname" do
     it "returns the name of the repo" do
-      git_source = klass.new(url, ref: ref_tag, workdir: workdir)
+      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: @workdir)
       expect(git_source.dirname)
-        .to eq('facter')
+        .to eq('puppet-agent')
     end
 
     it "returns the name of the repo and strips .git" do
-      git_source = klass.new("#{url}.git", ref: ref_tag, workdir: workdir)
+      git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir)
       expect(git_source.dirname)
         .to eq('facter')
     end
@@ -34,16 +47,9 @@ describe "Vanagon::Component::Source::Git" do
 
   describe "#ref" do
     it "returns a default value of HEAD when no explicit Git reference is provided" do
-      git_source = klass.new(url, workdir: workdir)
+      git_source = @klass.new(@url, workdir: @workdir)
       expect(git_source.ref)
         .to eq('HEAD')
     end
   end
-
-  describe "#fetch" do
-    it "raises an error on checkout failure with a bad SHA" do
-      expect { klass.new("#{url}", ref: bad_sha, workdir: workdir).fetch }
-        .to raise_error Vanagon::CheckoutFailed
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -237,42 +237,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 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/local_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/makefile_spec.rb