vanagon 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb77baf3c8dca42c4cec74d3a31c74af63ee37df
-  data.tar.gz: 32949fe6e83be1972bc91057b5a522b116de0bc2
+  metadata.gz: 931b3b9e351487626cfc70250f5515612364a25d
+  data.tar.gz: 41efa48f0508c3c030650b13991b7049153f1e56
 SHA512:
-  metadata.gz: e2a8b0411fc595f95b40c8f63229f73ed4324f9712c9c04dab01340a95fa27246e305cc0d44b7a7c7b7b2a5725ac6991971607d31eb7313a4953baf60fe7bb98
-  data.tar.gz: 5b6ee385067ff48a3befb3f2d5abc796a3b7589ef389534c2ab3d2a0840a85982f1eca22a3365c2a4f875a1619cc722fc1f7655118c273e47793d63f596d9c28
+  metadata.gz: 3b15f73c6cee6de81dd0b4e0b53d7d72bd1dc02dd4d9eb1e11f5b114dba410828089552fb68db206907514d853d0c5a88d8f43718d3c2ccd7f16e5dabaa9bee2
+  data.tar.gz: 2bb2d911f8046369d1807937e017a56aaff4c0f8ee82ae6a13cfda544765a487158be6e4d9e1be2dad9b4ac762fb7d42f988c575ad01c90f58d9d796f6f5e3f0

data/lib/vanagon/component/dsl.rb

@@ -214,7 +214,7 @@ class Vanagon
         end
 
         # Register the service for use in packaging
-        @component.service = OpenStruct.new(:name => service_name, :service_file => target_service_file)
+        @component.service = OpenStruct.new(:name => service_name, :service_file => target_service_file, :type => service_type)
       end
 
       # Copies a file from source to target during the install phase of the component

data/lib/vanagon/component/source.rb

@@ -1,5 +1,6 @@
 require 'vanagon/component/source/http'
 require 'vanagon/component/source/git'
+require 'vanagon/component/source/localsource'
 
 class Vanagon
   class Component
@@ -64,7 +65,7 @@ class Vanagon
                         when /^http/
                           Vanagon::Component::Source::Http.new(self.rewrite(url, 'http'), options[:sum], workdir)
                         when /^file/
-                          Vanagon::Component::Source::Http.new(self.rewrite(url, 'file'), options[:sum], workdir)
+                          Vanagon::Component::Source::LocalSource.new(self.rewrite(url, 'file'), workdir)
                         when /^git/
                           Vanagon::Component::Source::Git.new(self.rewrite(url, 'git'), options[:ref], workdir)
                         else

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

@@ -52,7 +52,6 @@ class Vanagon
           uri = URI.parse(@url)
           target_file = File.basename(uri.path)
           puts "Downloading file '#{target_file}' from url '#{@url}'"
-
           case uri.scheme
           when 'http', 'https'
             Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
@@ -69,17 +68,6 @@ class Vanagon
                 end
               end
             end
-          when 'file'
-            uri = @url.match(/^file:\/\/(.*)$/)
-            if uri
-              source_file = uri[1]
-              target_file = File.basename(source_file)
-              FileUtils.cp(source_file, File.join(@workdir, target_file))
-            else
-              raise Vanagon::Error, "Unable to parse '#{@url}' for local file path."
-            end
-          else
-            fail "Unable to download files using the uri scheme '#{uri.scheme}'. Maybe you have a typo or need to teach me a new trick?"
           end
 
           target_file

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

@@ -0,0 +1,119 @@
+require 'vanagon/utilities'
+require 'net/http'
+require 'uri'
+
+class Vanagon
+  class Component
+    class Source
+      class LocalSource
+        include Vanagon::Utilities
+        attr_accessor :url, :file, :extension, :workdir, :cleanup
+
+        # Extensions for files we intend to unpack during the build
+        ARCHIVE_EXTENSIONS = '.tar.gz', '.tgz', '.zip'
+
+        # Constructor for the File source type
+        #
+        # @param url [String] url of the http source to fetch
+        # @param workdir [String] working directory to download into
+        def initialize(url, workdir)
+          @url = url
+          @workdir = workdir
+        end
+
+        # Download the source from the url specified. Sets the full path to the
+        # file as @file and the @extension for the file as a side effect.
+        def fetch
+          @file = download
+          @extension = get_extension
+        end
+
+        # Local files need no checksum so this is a noop
+        def verify
+          # nothing to do here, so just return
+        end
+
+        # Moves file from source to workdir
+        #
+        # @raise [RuntimeError, Vanagon::Error] an exception is raised if the URI scheme cannot be handled
+        def download
+          uri = URI.parse(@url)
+          target_file = File.basename(uri.path)
+          puts "Moving file '#{target_file}' to workdir"
+
+          uri = @url.match(/^file:\/\/(.*)$/)
+          if uri
+            source_file = uri[1]
+            target_file = File.basename(source_file)
+            FileUtils.cp(source_file, File.join(@workdir, target_file))
+          else
+            raise Vanagon::Error, "Unable to parse '#{@url}' for local file path."
+          end
+
+          target_file
+
+        end
+
+        # Gets the command to extract the archive given if needed (uses @extension)
+        #
+        # @param tar [String] the tar command to use
+        # @return [String, nil] command to extract the source
+        # @raise [RuntimeError] an exception is raised if there is no known extraction method for @extension
+        def extract(tar)
+          if ARCHIVE_EXTENSIONS.include?(@extension)
+            case @extension
+            when ".tar.gz", ".tgz"
+              return "gunzip -c '#{@file}' | '#{tar}' xf -"
+            when ".zip"
+              return "unzip '#{@file}' || 7za x -r -tzip -o'#{File.basename(@file, ".zip")}' '#{@file}'"
+            end
+          else
+            # Extension does not appear to be an archive
+            return ':'
+          end
+        end
+
+        # Return the correct incantation to cleanup the source archive and source directory for a given source
+        #
+        # @return [String] command to cleanup the source
+        # @raise [RuntimeError] an exception is raised if there is no known extraction method for @extension
+        def cleanup
+          if ARCHIVE_EXTENSIONS.include?(@extension)
+            return "rm #{@file}; rm -r #{dirname}"
+          else
+            # Because dirname will be ./ here, we don't want to try to nuke it
+            return "rm #{@file}"
+          end
+        end
+
+        # Returns the extension for @file
+        #
+        # @return [String] the extension of @file
+        def get_extension
+          extension_match = @file.match(/.*(#{Regexp.union(ARCHIVE_EXTENSIONS)})/)
+          unless extension_match
+            if @file.split('.').last.include?('.')
+              return '.' +  @file.split('.').last
+            else
+              # This is the case where the file has no extension
+              return @file
+            end
+          end
+          extension_match[1]
+        end
+
+        # The dirname to reference when building from the source
+        #
+        # @return [String] the directory that should be traversed into to build this source
+        # @raise [RuntimeError] if the @extension for the @file isn't currently handled by the method
+        def dirname
+          if ARCHIVE_EXTENSIONS.include?(@extension)
+            return @file.chomp(@extension)
+          else
+            return './'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vanagon/project/dsl.rb

@@ -137,7 +137,8 @@ class Vanagon
       # and reachable from the current commit in that repository.
       #
       def version_from_git
-        @project.version = Vanagon::Utilities.git_version(File.expand_path("..", Vanagon::Driver.configdir)).gsub('-', '.')
+        version = Vanagon::Utilities.git_version(File.expand_path("..", Vanagon::Driver.configdir))
+        @project.version = version.split('-').reject(&:empty?).join('.')
       end
 
       # Sets the vendor for the project. Used in packaging artifacts.

data/resources/solaris/11/p5m.erb

@@ -44,7 +44,7 @@ depend fmri=pkg:/<%= requirement %> type=require
   <transform dir path=<%= strip_and_escape(File.dirname(service.service_file)) -%>$ -> drop>
 <%- end -%>
 <transform dir path=(var|lib)/svc/manifest$ -> drop>
-set name=org.opensolaris.smf.fmri <%= get_services.map {|service| "value=svc:/#{service.name}"}.join(" ") %>
+set name=org.opensolaris.smf.fmri <%= get_services.map {|service| "value=svc:/#{service.type}/#{service.name}"}.join(" ") %>
 <%- end -%>
 
 <%- unless @bill_of_materials -%>
@@ -56,7 +56,7 @@ set name=org.opensolaris.smf.fmri <%= get_services.map {|service| "value=svc:/#{
 # Preserve the old conf file on upgrade, restart services on config file change
 <transform file path=<%= strip_and_escape(config.path) %>$ -> add preserve renamenew>
   <%- get_services.each do |service| -%>
-    <transform file path=<%= strip_and_escape(config.path) %>$ -> add restart_fmri <%= "svc:/#{service.name}:*" %> >
+    <transform file path=<%= strip_and_escape(config.path) %>$ -> add restart_fmri <%= "svc:/#{service.type}/#{service.name}:*" %> >
   <%- end -%>
 <%- end -%>
 

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

@@ -0,0 +1,41 @@
+require 'vanagon/component/source/git'
+
+describe "Vanagon::Component::Source::File" do
+  let (:file_base) { 'file://spec/fixtures/files/fake_file_ext' }
+  let (:tar_filename) { 'file://spec/fixtures/files/fake_dir.tar.gz' }
+  let (:plaintext_filename) { 'file://spec/fixtures/files/fake_file.txt' }
+  let (:workdir) { "/tmp" }
+
+  describe "#fetch" do
+    it "puts the source file in to the workdir" do
+      file = Vanagon::Component::Source::LocalSource.new(plaintext_filename, workdir)
+      file.fetch
+      expect(File).to exist("#{workdir}/fake_file.txt")
+    end
+  end
+
+  describe "#dirname" do
+    it "returns the name of the tarball, minus extension for archives" do
+      file = Vanagon::Component::Source::LocalSource.new(tar_filename, workdir)
+      file.fetch
+      expect(file.dirname).to eq("fake_dir")
+    end
+
+    it "returns the current directory for non-archive files" do
+      file = Vanagon::Component::Source::LocalSource.new(plaintext_filename, workdir)
+      file.fetch
+      expect(file.dirname).to eq("./")
+    end
+  end
+
+  describe "#get_extension" do
+    it "returns the extension for valid extensions" do
+      Vanagon::Component::Source::LocalSource::ARCHIVE_EXTENSIONS.each do |ext|
+        filename = "#{file_base}#{ext}"
+        file = Vanagon::Component::Source::LocalSource.new(filename, workdir)
+        file.fetch
+        expect(file.get_extension).to eq(ext)
+      end
+    end
+  end
+end

data/spec/lib/vanagon/component/source_spec.rb

@@ -43,7 +43,7 @@ describe "Vanagon::Component::Source" do
     end
 
     it "returns an object of the correct type for file:// urls" do
-      expect(Vanagon::Component::Source.source(file_url, {:sum => sum }, workdir).class).to equal(Vanagon::Component::Source::Http)
+      expect(Vanagon::Component::Source.source(file_url, {:sum => sum }, workdir).class).to equal(Vanagon::Component::Source::LocalSource)
     end
 
     it "applies any rewrite rules before defining an http Source" do

data/spec/lib/vanagon/project/dsl_spec.rb

@@ -17,6 +17,14 @@ end" }
       proj.version_from_git
       expect(proj._project.version).to eq('1.2.3.1234')
     end
+    it 'sets the version based on the git describe with multiple dashes' do
+      expect(Vanagon::Driver).to receive(:configdir).and_return(configdir)
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+      expect(Vanagon::Utilities).to receive(:git_version).with(File.expand_path('..', configdir)).and_return('1.2.3---1234')
+      proj.version_from_git
+      expect(proj._project.version).to eq('1.2.3.1234')
+    end
   end
 
   describe '#directory' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,7 @@ files:
 - lib/vanagon/component/source.rb
 - lib/vanagon/component/source/git.rb
 - lib/vanagon/component/source/http.rb
+- lib/vanagon/component/source/localsource.rb
 - lib/vanagon/driver.rb
 - lib/vanagon/engine/base.rb
 - lib/vanagon/engine/docker.rb
@@ -140,6 +141,11 @@ files:
 - spec/fixtures/component/invalid-test-fixture.json
 - spec/fixtures/component/mcollective.service
 - spec/fixtures/component/test-fixture.json
+- spec/fixtures/files/fake_dir.tar.gz
+- spec/fixtures/files/fake_file.txt
+- spec/fixtures/files/fake_file_ext.tar.gz
+- spec/fixtures/files/fake_file_ext.tgz
+- spec/fixtures/files/fake_file_ext.zip
 - spec/fixtures/wix/resources/windows/wix/file-1.wxs
 - spec/fixtures/wix/resources/windows/wix/file-2.wxs
 - spec/fixtures/wix/resources/windows/wix/file-3.wxs.erb
@@ -156,6 +162,7 @@ files:
 - 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/localsource_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
@@ -196,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
@@ -208,6 +215,7 @@ test_files:
 - 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/localsource_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb