fpm-cookery 0.19.0 → 0.20.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzkyZWRmNjI3Yjc0ZGUxMmEyMTBiMjZhOTE4Mzg4ZWMxOWYzODI5Zg==
-  data.tar.gz: !binary |-
-    OGM1ZGNlOTc1YTcxYTdmMDBlOWM2ZWRiNzBiNGIwMjcyMjZlNmU5ZA==
+SHA1:
+  metadata.gz: eb9277f23528fc7aeb48ba0a8a10d9861c70917b
+  data.tar.gz: e1379467c6ffe436d779e6d32ed472352aa31e43
 SHA512:
-  metadata.gz: !binary |-
-    ZmY4NjMwNjc5NGI0MzFiYmU0MWU0NzA1ZjE2Nzk4Y2Q5MDA4YTRkZDFmMDhk
-    MzQxYzc0NmY2YjRkMTIxZWEwZDliZTU3OGE3ZjQ0MjVhNjg3OGU5MDQzMWJh
-    NzQ4ZDhmOGY2MGNiNTU5ODhiOWExZTFlODZkYTZlYmI5ODZjN2E=
-  data.tar.gz: !binary |-
-    MGQwMWJhMjYyZWQwODExMzM3MmU1NDc5YWQ4OThlNDkwNjY1MWRjNTkzZjI4
-    ODMwNzM0NzcyZDc2YjQ1OTBhMWQ3ZjNjNmVhNjk5ODBjZTQ0ZjczNTIwZmQw
-    MjI3MDVlMzRkNTg0Y2JlYmE4ZWM5YWZkMTEwMzkyMGUzNTVmZTA=
+  metadata.gz: c703e14db35cff6e1a95778a7d7e0abc0519ff1f1ede27c11daf6d27bd8128cb18e1a36960187c3bcee0c4450af41939817706fbfc0d0fbad9bb839a7aa4d810
+  data.tar.gz: 1a833e697752e67acb1b0eda8a44ec825cc1d8e084ebd72ea72462e0b5ef3890a554f4d2397371cc61a4faabf170e96e4992326165c7115d8ec29b1ea3b6eb27

data/.gitignore

@@ -8,6 +8,7 @@ tmp-build/
 tmp-dest/
 .buildpath
 .project
+.rspec
 .vagrant
 Vagrantfile
 /vendor

data/.travis.yml

@@ -1,11 +1,11 @@
-script: bundle exec rake test
+script: bundle exec rake spec
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - ruby-head
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.1.0 # Problem with puppet monkey patch... waiting for >3.4.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.20.0 (2014-03-07)
+* Add `--tmp-root` command line option.
+* Add `--pkg-dir` command line option.
+* Add `--cache-dir` command line option.
+* Fix `%files` section in rpms. (unakatsuo / #67)
+
 # v0.19.0 (2014-03-03)
 * Correctly set version, iteration and vendor on the FPM object.
   __WARNING__: This changes the default package names!

data/Rakefile

@@ -1,10 +1,7 @@
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'bundler/gem_tasks'
 
-Rake::TestTask.new do |t|
-  t.pattern = "spec/*_spec.rb"
-  t.libs << 'spec'
-  t.verbose = false
-end
+desc 'Run all specs'
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :default => :spec

data/fpm-cookery.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "minitest", "~> 5.0"
+  s.add_development_dependency "rspec", "~> 2.14"
   s.add_development_dependency "rake"
   s.add_runtime_dependency "fpm", "~> 1.0.0"
   s.add_runtime_dependency "facter"

data/lib/fpm/cookery/book.rb

@@ -13,7 +13,7 @@ module FPM
       # anonymous module to avoid namespace cluttering. (see Kernel.load)
       def load_recipe(filename, &callback)
         Kernel.load(filename, true)
-        callback.call(@recipe.new(filename))
+        callback.call(@recipe)
       end
 
       def add_recipe_class(klass)

data/lib/fpm/cookery/cli.rb

@@ -21,6 +21,12 @@ module FPM
       option ['-V', '--version'], :flag, 'show fpm-cookery and fpm version'
       option '--[no-]deps', :flag, 'enable/disable dependency checking',
         :attribute_name => 'dependency_check'
+      option '--tmp-root', 'DIR', 'directory root for temporary files',
+        :attribute_name => 'tmp_root'
+      option '--pkg-dir', 'DIR', 'directory for built packages',
+        :attribute_name => 'pkg_dir'
+      option '--cache-dir', 'DIR', 'directory for downloaded sources',
+        :attribute_name => 'cache_dir'
 
       class Command < self
         def recipe_file
@@ -62,7 +68,8 @@ module FPM
 
           FPM::Cookery::BaseRecipe.send(:include, FPM::Cookery::BookHook)
 
-          FPM::Cookery::Book.instance.load_recipe(recipe_file) do |recipe|
+          FPM::Cookery::Book.instance.load_recipe(recipe_file) do |recipe_class|
+            recipe = recipe_class.new(recipe_file, config)
             packager = FPM::Cookery::Packager.new(recipe, config.to_hash)
             packager.target = FPM::Cookery::Facts.target.to_s
 

data/lib/fpm/cookery/config.rb

@@ -6,7 +6,8 @@ module FPM
     class Config
       ATTRIBUTES = [
         :color, :debug, :target, :platform, :maintainer, :vendor,
-        :skip_package, :keep_destdir, :dependency_check, :quiet
+        :skip_package, :keep_destdir, :dependency_check, :quiet,
+        :tmp_root, :pkg_dir, :cache_dir
       ].freeze
 
       DEFAULTS = {

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

@@ -33,6 +33,7 @@ module FPM
           @fpm.attributes[:rpm_group] = 'root'
           @fpm.attributes[:rpm_defattrfile] = '-'
           @fpm.attributes[:rpm_defattrdir] = '-'
+          @fpm.attributes[:rpm_auto_add_directories?] = true
 
           # TODO replace remove_excluded_files() in packager with this.
           @fpm.attributes[:excludes] = []

data/lib/fpm/cookery/recipe.rb

@@ -77,24 +77,32 @@ module FPM
         end
       end
 
-      def initialize(filename)
+      def initialize(filename, config)
         @filename = Path.new(filename).expand_path
+        @config = config
+
+        @workdir = @filename.dirname
+        @tmp_root = @config.tmp_root ? Path.new(@config.tmp_root) : @workdir
+        @pkgdir = @config.pkg_dir && Path.new(@config.pkg_dir)
+        @cachedir = @config.cache_dir && Path.new(@config.cache_dir)
 
         # Set some defaults.
         revision || self.class.revision(1)
       end
 
       def workdir=(value)  @workdir  = Path.new(value) end
+      def tmp_root=(value) @tmp_root = Path.new(value) end
       def destdir=(value)  @destdir  = Path.new(value) end
       def builddir=(value) @builddir = Path.new(value) end
       def pkgdir=(value)   @pkgdir   = Path.new(value) end
       def cachedir=(value) @cachedir = Path.new(value) end
 
-      def workdir(path = nil)  (@workdir  ||= filename.dirname)/path       end
-      def destdir(path = nil)  (@destdir  ||= workdir('tmp-dest'))/path    end
-      def builddir(path = nil) (@builddir ||= workdir('tmp-build'))/path   end
-      def pkgdir(path = nil)   (@pkgdir   ||= workdir('pkg'))/path         end
-      def cachedir(path = nil) (@cachedir ||= workdir('cache'))/path       end
+      def workdir(path = nil)  @workdir/path                               end
+      def tmp_root(path = nil) @tmp_root/path                              end
+      def destdir(path = nil)  (@destdir  || tmp_root('tmp-dest'))/path    end
+      def builddir(path = nil) (@builddir || tmp_root('tmp-build'))/path   end
+      def pkgdir(path = nil)   (@pkgdir   || workdir('pkg'))/path         end
+      def cachedir(path = nil) (@cachedir || workdir('cache'))/path       end
 
       # Resolve dependencies from omnibus package.
       def depends_all
@@ -116,8 +124,8 @@ module FPM
         FPM::Cookery::Package::Dir.new(self, config)
       end
 
-      def initialize(filename)
-        super(filename)
+      def initialize(filename, config)
+        super(filename, config)
         @source_handler = SourceHandler.new(Source.new(source, spec), cachedir, builddir)
       end
 

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.19.0'
+    VERSION = '0.20.0'
   end
 end

data/spec/config_spec.rb

@@ -11,24 +11,25 @@ describe 'Config' do
     it 'can be set on init' do
       data[name.to_sym] = '__set__'
 
-      config.__send__(name).must_equal '__set__'
+      expect(config.__send__(name)).to eq('__set__')
     end
 
     it 'can be set' do
       config.__send__("#{name}=", '__SET__')
-      config.__send__(name).must_equal '__SET__'
+
+      expect(config.__send__(name)).to eq('__SET__')
     end
 
     it 'provides a ? method' do
       data[name.to_sym] = false
 
-      config.__send__("#{name}?").must_equal false
+      expect(config.__send__("#{name}?")).to eq(false)
     end
   end
 
   describe '#color' do
     it 'defaults to true' do
-      default_config.color.must_equal true
+      expect(default_config.color).to eq(true)
     end
 
     common_tests(:color)
@@ -36,7 +37,7 @@ describe 'Config' do
 
   describe '#debug' do
     it 'defaults to true' do
-      default_config.debug.must_equal false
+      expect(default_config.debug).to eq(false)
     end
 
     common_tests(:debug)
@@ -44,7 +45,7 @@ describe 'Config' do
 
   describe '#target' do
     it 'defaults to nil' do
-      default_config.target.must_equal nil
+      expect(default_config.target).to eq(nil)
     end
 
     common_tests(:target)
@@ -52,7 +53,7 @@ describe 'Config' do
 
   describe '#platform' do
     it 'defaults to nil' do
-      default_config.platform.must_equal nil
+      expect(default_config.platform).to eq(nil)
     end
 
     common_tests(:platform)
@@ -60,7 +61,7 @@ describe 'Config' do
 
   describe '#maintainer' do
     it 'defaults to nil' do
-      default_config.maintainer.must_equal nil
+      expect(default_config.maintainer).to eq(nil)
     end
 
     common_tests(:maintainer)
@@ -68,7 +69,7 @@ describe 'Config' do
 
   describe '#vendor' do
     it 'defaults to nil' do
-      default_config.vendor.must_equal nil
+      expect(default_config.vendor).to eq(nil)
     end
 
     common_tests(:vendor)
@@ -76,7 +77,7 @@ describe 'Config' do
 
   describe '#quiet' do
     it 'defaults to false' do
-      default_config.quiet.must_equal false
+      expect(default_config.quiet).to eq(false)
     end
 
     common_tests(:quiet)
@@ -84,7 +85,7 @@ describe 'Config' do
 
   describe '#skip_package' do
     it 'defaults to false' do
-      default_config.skip_package.must_equal false
+      expect(default_config.skip_package).to eq(false)
     end
 
     common_tests(:skip_package)
@@ -92,7 +93,7 @@ describe 'Config' do
 
   describe '#keep_destdir' do
     it 'defaults to false' do
-      default_config.keep_destdir.must_equal false
+      expect(default_config.keep_destdir).to eq(false)
     end
 
     common_tests(:keep_destdir)
@@ -100,20 +101,47 @@ describe 'Config' do
 
   describe '#dependency_check' do
     it 'defaults to false' do
-      default_config.dependency_check.must_equal true
+      expect(default_config.dependency_check).to eq(true)
     end
 
     common_tests(:dependency_check)
   end
 
+  describe '#tmp_root' do
+    it 'defaults to nil' do
+      expect(default_config.tmp_root).to be_nil
+    end
+
+    common_tests(:tmp_root)
+  end
+
+  describe '#pkg_dir' do
+    it 'defaults to nil' do
+      expect(default_config.pkg_dir).to be_nil
+    end
+
+    common_tests(:pkg_dir)
+  end
+
+  describe '#cache_dir' do
+    it 'defaults to nil' do
+      expect(default_config.cache_dir).to be_nil
+    end
+
+    common_tests(:cache_dir)
+  end
+
   describe '#to_hash' do
     it 'returns a hash representation of the object' do
-      default_config.to_hash.must_equal({
+      expect(default_config.to_hash).to eq({
         :color => true,
         :debug => false,
         :target => nil,
         :platform => nil,
         :maintainer => nil,
+        :tmp_root => nil,
+        :pkg_dir => nil,
+        :cache_dir => nil,
         :vendor => nil,
         :skip_package => false,
         :keep_destdir => false,
@@ -127,7 +155,7 @@ describe 'Config' do
     it 'raises an error' do
       data[:__foo__] = true
 
-      proc { config }.must_raise FPM::Cookery::Error::InvalidConfigKey
+      expect { config }.to raise_error(FPM::Cookery::Error::InvalidConfigKey)
     end
 
     it 'adds the invalid keys' do
@@ -138,13 +166,13 @@ describe 'Config' do
       begin; config; rescue => e; error = e; end
 
       # Sort array for Ruby 1.8.7 compat.
-      error.invalid_keys.sort.must_equal [:__bar__, :__foo__]
+      expect(error.invalid_keys.sort).to eq([:__bar__, :__foo__])
     end
 
     it 'works with strings' do
       data['maintainer'] = 'John'
 
-      config.maintainer.must_equal 'John'
+      expect(config.maintainer).to eq('John')
     end
   end
 
@@ -159,7 +187,7 @@ describe 'Config' do
     it 'loads first found file' do
       config = FPM::Cookery::Config.load_file(paths)
 
-      config.maintainer.must_equal 'John Doe <john@example.com>'
+      expect(config.maintainer).to eq('John Doe <john@example.com>')
     end
   end
 
@@ -170,8 +198,8 @@ describe 'Config' do
 
       config = FPM::Cookery::Config.from_cli(cli)
 
-      config.debug.must_equal true
-      config.target.must_equal 'rpm'
+      expect(config.debug).to eq(true)
+      expect(config.target).to eq('rpm')
     end
   end
 end

data/spec/facts_spec.rb

@@ -17,7 +17,7 @@ describe "Facts" do
     end
 
     it "is returns the current platform" do
-      FPM::Cookery::Facts.arch.must_equal :x86_64
+      expect(FPM::Cookery::Facts.arch).to eq(:x86_64)
     end
   end
 
@@ -31,12 +31,12 @@ describe "Facts" do
     end
 
     it "is using Facter to autodetect the platform" do
-      FPM::Cookery::Facts.platform.must_equal :centos
+      expect(FPM::Cookery::Facts.platform).to eq(:centos)
     end
 
     it "can be set" do
       FPM::Cookery::Facts.platform = 'CentOS'
-      FPM::Cookery::Facts.platform.must_equal :centos
+      expect(FPM::Cookery::Facts.platform).to eq(:centos)
     end
   end
 
@@ -44,55 +44,55 @@ describe "Facts" do
     describe "with platform CentOS" do
       it "returns rpm" do
         FPM::Cookery::Facts.platform = 'CentOS'
-        FPM::Cookery::Facts.target.must_equal :rpm
+        expect(FPM::Cookery::Facts.target).to eq(:rpm)
       end
     end
 
     describe "with platform RedHat" do
       it "returns rpm" do
         FPM::Cookery::Facts.platform = 'RedHat'
-        FPM::Cookery::Facts.target.must_equal :rpm
+        expect(FPM::Cookery::Facts.target).to eq(:rpm)
       end
     end
 
     describe "with platform Fedora" do
       it "returns rpm" do
         FPM::Cookery::Facts.platform = 'Fedora'
-        FPM::Cookery::Facts.target.must_equal :rpm
+        expect(FPM::Cookery::Facts.target).to eq(:rpm)
       end
     end
 
     describe "with platform Debian" do
       it "returns rpm" do
         FPM::Cookery::Facts.platform = 'Debian'
-        FPM::Cookery::Facts.target.must_equal :deb
+        expect(FPM::Cookery::Facts.target).to eq(:deb)
       end
     end
 
     describe "with platform Ubuntu" do
       it "returns rpm" do
         FPM::Cookery::Facts.platform = 'Ubuntu'
-        FPM::Cookery::Facts.target.must_equal :deb
+        expect(FPM::Cookery::Facts.target).to eq(:deb)
       end
     end
 
     describe "with platform Darwin" do
       it "returns osxpkg" do
         FPM::Cookery::Facts.platform = 'Darwin'
-        FPM::Cookery::Facts.target.must_equal :osxpkg
+        expect(FPM::Cookery::Facts.target).to eq(:osxpkg)
       end
     end
 
     describe "with an unknown platform" do
       it "returns nil" do
         FPM::Cookery::Facts.platform = '___X___'
-        FPM::Cookery::Facts.target.must_equal nil
+        expect(FPM::Cookery::Facts.target).to eq(nil)
       end
     end
 
     it "can be set" do
       FPM::Cookery::Facts.target = 'rpm'
-      FPM::Cookery::Facts.target.must_equal :rpm
+      expect(FPM::Cookery::Facts.target).to eq(:rpm)
     end
   end
 end