fpm-cookery 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82401ffb722aef0a168578e624216a7ccd85310d
-  data.tar.gz: d223a2d22f15a430e97d2fddaab03c4733a3ba13
+  metadata.gz: a8092cdd01badb7c7c69adc60983e1d8b220f878
+  data.tar.gz: b31722bf137e40a7201b1b8b00aaa6adc89ca165
 SHA512:
-  metadata.gz: 0a1c032e19a090b2856e51f111bfa8e74b376fab56861921d7d3b0970c7ad2584f7b35d7fac71bde72aec2260577d622f679287f23e0afe4acd2893f1d3f2c20
-  data.tar.gz: 9c72fcfaf623cfbd3aecc7d87c5ffb586828a1fbe0a9113bfaa97a6a3f9e06c6799388696fe8ca3550943277bbf66150a967792ea3ae3e246c4396c4fb88cfe3
+  metadata.gz: cf005ab828be976ab4372ea4366155ac3e0c9b21d545d462a7000430ceebd4117c0cff927c7feb17a39873e6057b79d8a5f83e8bb30789f3ff216efc2a2674af
+  data.tar.gz: a3b7a495348df7a575f802f7f4881a4996791a7ae5a4fade00f62111c5da79196fa99c08ee4cfa2a95e339e0caa07511bafcdbad5b074647e6682ee3e335a894

data/.gitignore

@@ -12,3 +12,6 @@ tmp-dest/
 .vagrant
 Vagrantfile
 /vendor
+
+# vim backups
+*~

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v0.32.0
+* Add `sourcedir` accessor that holds the path to the extracted source. (#132)
+* Add support for DirRecipe and Directory Handler. (cas-ei / #147)
+* Extend virtualenv support. (MrPrimate / #146)
+* Don't dereference symlinks in 'install'. (phyber / #143)
+* Add support for OracleLinux. (#148)
+* Initialize submodules after sha/tag/branch has been set. (#144)
+* Fix configure arguments for list of strings.
+
+
 # v0.31.0 (2015-11-07)
 * Add support for .tar archives. (devkid / #132)
 * Add support for virtualenv recipes. (skoenig/zalando / #137)

data/fpm-cookery.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "fpm", "~> 1.1"
   s.add_runtime_dependency "facter"
   s.add_runtime_dependency "puppet", "~> 3.4"
-  s.add_runtime_dependency "addressable"
+  s.add_runtime_dependency "addressable", "~> 2.3.8"
   s.add_runtime_dependency "systemu"
 end

data/lib/fpm/cookery/facts.rb

@@ -25,9 +25,10 @@ module FPM
 
       def self.target
         @target ||= case platform
-                    when :centos, :redhat, :fedora, :amazon, :scientific then :rpm
-                    when :debian, :ubuntu                                then :deb
-                    when :darwin                                         then :osxpkg
+                    when :centos, :redhat, :fedora, :amazon,
+                         :scientific, :oraclelinux           then :rpm
+                    when :debian, :ubuntu                    then :deb
+                    when :darwin                             then :osxpkg
                     end
       end
 

data/lib/fpm/cookery/package/virtualenv.rb

@@ -12,8 +12,11 @@ module FPM
         def package_setup
           fpm.version = recipe.version
           fpm.attributes[:virtualenv_pypi] = recipe.virtualenv_pypi unless recipe.virtualenv_pypi.nil?
+          fpm.attributes[:virtualenv_pypi_extra_index_urls] = recipe.virtualenv_pypi_extra_index_urls unless recipe.virtualenv_pypi_extra_index_urls.nil?
           fpm.attributes[:virtualenv_install_location] = recipe.virtualenv_install_location unless recipe.virtualenv_install_location.nil?
           fpm.attributes[:virtualenv_fix_name?] = false
+          fpm.attributes[:virtualenv_package_name_prefix] = recipe.virtualenv_package_name_prefix unless recipe.virtualenv_package_name_prefix.nil?
+          fpm.attributes[:virtualenv_other_files_dir] = recipe.virtualenv_other_files_dir unless recipe.virtualenv_other_files_dir.nil?
         end
 
         def package_input

data/lib/fpm/cookery/packager.rb

@@ -131,7 +131,9 @@ module FPM
               extracted_source = recipe.extracted_source
             end
 
-            recipe.run_lifecycle_hook(:after_source_extraction, recipe.builddir(extracted_source))
+            # Make the path to the extracted source available in the recipe.
+            recipe.sourcedir = recipe.builddir(extracted_source)
+            recipe.run_lifecycle_hook(:after_source_extraction, recipe.sourcedir)
 
             Log.info "Using source directory: #{extracted_source}"
 

data/lib/fpm/cookery/path.rb

@@ -66,7 +66,10 @@ module FPM
 
         # We used to use :preserve => true here, but that broke package
         # building when the file tree contains broken symlinks.
-        FileUtils.cp_r src, dst
+        # :dereference_root => false, results in symlinks being copied instead
+        # of dereferencing them first. Copying a symlink that points to a
+        # non-existent file is not an error.
+        FileUtils.cp_r src, dst, :dereference_root => false
 
         # if File.symlink? src
         #   # we use the BSD mv command because FileUtils copies the target and

data/lib/fpm/cookery/recipe.rb

@@ -14,6 +14,7 @@ require 'fpm/cookery/package/npm'
 require 'fpm/cookery/package/pear'
 require 'fpm/cookery/package/python'
 require 'fpm/cookery/package/virtualenv'
+require 'fpm/cookery/log'
 
 module FPM
   module Cookery
@@ -184,7 +185,11 @@ module FPM
         self.class.extracted_source
       end
 
-      attr_reader :source_handler
+      def sourcedir=(sourcedir)
+        @sourcedir = sourcedir
+      end
+
+      attr_reader :source_handler, :sourcedir
 
       extend Forwardable
       def_delegator :@source_handler, :local_path
@@ -223,10 +228,36 @@ module FPM
     end
 
     class VirtualenvRecipe < BaseRecipe
-      attr_rw :virtualenv_pypi, :virtualenv_install_location, :virtualenv_fix_name
+      attr_rw :virtualenv_pypi, :virtualenv_install_location, :virtualenv_fix_name,
+              :virtualenv_pypi_extra_index_urls, :virtualenv_package_name_prefix,
+              :virtualenv_other_files_dir
       def input(config)
         FPM::Cookery::Package::Virtualenv.new(self, config)
       end
     end
+
+    # Helps packaging a directory of content
+    class DirRecipe < Recipe
+
+      def input(config)
+        FPM::Cookery::Package::Dir.new(self, config)
+      end
+
+      # Dir Recipes by default build action.
+      def build
+      end
+
+      # Default action for a dir recipe install is to copy items selected
+      def install
+        FileUtils.cp_r File.join(builddir, '.'), destdir
+        # Remove build cookies
+        %w(build extract).each do |cookie|
+          Dir.glob("#{destdir}/.#{cookie}-cookie-*").each do |f|
+            Log.info "Deleting FPM Cookie #{f}"
+            File.delete(f)
+          end
+        end
+      end
+    end
   end
 end

data/lib/fpm/cookery/source_handler.rb

@@ -5,6 +5,7 @@ require 'fpm/cookery/source_handler/git'
 require 'fpm/cookery/source_handler/hg'
 require 'fpm/cookery/source_handler/local_path'
 require 'fpm/cookery/source_handler/noop'
+require 'fpm/cookery/source_handler/directory'
 require 'fpm/cookery/log'
 
 module FPM

data/lib/fpm/cookery/source_handler/directory.rb

@@ -0,0 +1,33 @@
+require 'fpm/cookery/source_handler/template'
+require 'fpm/cookery/log'
+require 'fileutils'
+
+module FPM
+  module Cookery
+    class SourceHandler
+      class Directory < FPM::Cookery::SourceHandler::Template
+        CHECKSUM = false
+        NAME = :directory
+
+        def fetch(config = {})
+            path = source.path
+            cached_file = File.join(@cachedir, path)
+            if File.exist? cached_file
+              Log.info "Using cached file #{cached_file}"
+            else
+              # Exclude source directory
+              path = File.join(path,'.')
+              Log.info "Copying #{path} to cache"
+              FileUtils.cp_r(path, cachedir)
+            end
+          cachedir
+        end
+
+        def extract(config = {})
+          FileUtils.cp_r(File.join(cachedir,'.'), builddir)
+          builddir
+        end
+      end
+    end
+  end
+end

data/lib/fpm/cookery/source_handler/git.rb

@@ -24,9 +24,6 @@ module FPM
             Dir.chdir(cachedir) do
               git('clone', url, local_path)
             end
-            Dir.chdir(local_path) do
-              git('submodule', 'update', '--init') if options[:submodule]
-            end
           end
 
           local_path
@@ -50,6 +47,9 @@ module FPM
               extracted_source << '-HEAD'
             end
 
+            # Initialize submodules after sha/tag/branch has been set.
+            # See: https://github.com/bernd/fpm-cookery/issues/144
+            git('submodule', 'update', '--init') if options[:submodule]
 
             case options.fetch(:extract, :default).to_s.to_sym
             when :clone

data/lib/fpm/cookery/utils.rb

@@ -37,6 +37,7 @@ module FPM
             end
           }
         end
+        args
       end
 
       def configure(*args)

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.31.0'
+    VERSION = '0.32.0'
   end
 end

data/spec/recipe_spec.rb

@@ -280,6 +280,17 @@ describe "Recipe" do
     end
   end
 
+  describe ".sourcedir" do
+    it "is not set by default" do
+      expect(recipe.sourcedir).to be_nil
+    end
+
+    it "can be set" do
+      recipe.sourcedir = '/tmp/foo/bar'
+      expect(recipe.sourcedir).to eq('/tmp/foo/bar')
+    end
+  end
+
   describe "#local_path" do
     it "returns the path to the local source file" do
       klass.class_eval do

data/spec/utils_spec.rb

@@ -8,6 +8,18 @@ describe FPM::Cookery::Utils do
     def run_configure_no_arg
       configure
     end
+
+    def run_configure
+      configure '--prefix=/usr', '--test=yo'
+    end
+
+    def run_configure_hash
+      configure :hello_world => true, :prefix => '/usr', 'a-dash' => 1
+    end
+
+    def run_configure_mix
+      configure '--first=okay', '--second=okay', :hello_world => true, :prefix => '/usr', 'a-dash' => 1
+    end
   end
 
   let(:test) { TestUtils.new }
@@ -18,6 +30,27 @@ describe FPM::Cookery::Utils do
   end
 
   describe '#configure' do
+    context 'with a list of string arguments' do
+      it 'calls ./configure with the correct arguments' do
+        expect(test).to receive(:system).with('./configure', '--prefix=/usr', '--test=yo')
+        test.run_configure
+      end
+    end
+
+    context 'with hash arguments' do
+      it 'calls ./configure with the correct arguments' do
+        expect(test).to receive(:system).with('./configure', '--hello-world', '--prefix=/usr', '--a-dash=1')
+        test.run_configure_hash
+      end
+    end
+
+    context 'with string and hash arguments' do
+      it 'calls ./configure with the correct arguments' do
+        expect(test).to receive(:system).with('./configure', '--first=okay', '--second=okay', '--hello-world', '--prefix=/usr', '--a-dash=1')
+        test.run_configure_mix
+      end
+    end
+
     context 'without any arguments' do
       it 'calls ./configure without any arguments' do
         expect(test).to receive(:system).with('./configure')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -84,16 +84,16 @@ dependencies:
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ files:
 - lib/fpm/cookery/source.rb
 - lib/fpm/cookery/source_handler.rb
 - lib/fpm/cookery/source_handler/curl.rb
+- lib/fpm/cookery/source_handler/directory.rb
 - lib/fpm/cookery/source_handler/git.rb
 - lib/fpm/cookery/source_handler/hg.rb
 - lib/fpm/cookery/source_handler/local_path.rb
@@ -244,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tool for building software packages with fpm.