fpm-cookery 0.19.0 → 0.20.0

data/spec/package_maintainer_spec.rb

@@ -10,23 +10,6 @@ describe 'Maintainer' do
 
   let(:maintainer) { klass.new(recipe, config) }
 
-  def with_shellout_stub(opts = {}, &spec)
-    callable = lambda do |key|
-      return if opts[:nil]
-
-      case key
-      when 'user.name'
-        'John Doe'
-      when 'user.email'
-        'john@example.com'
-      else
-        raise "Invalid key: #{key}"
-      end
-    end
-
-    FPM::Cookery::Shellout.stub(:git_config_get, callable, &spec)
-  end
-
   def with_env_stub(env)
     old_env = ENV.to_hash
     env.each do |key, value|
@@ -37,54 +20,51 @@ describe 'Maintainer' do
     ENV.replace(old_env)
   end
 
+  before do
+    allow(FPM::Cookery::Shellout).to receive(:git_config_get).with('user.name').and_return('John Doe')
+    allow(FPM::Cookery::Shellout).to receive(:git_config_get).with('user.email').and_return('john@example.com')
+  end
+
   describe '#to_s' do
     context 'with maintainer set in recipe' do
       it 'returns the recipe maintainer' do
-        with_shellout_stub do
-          recipe.maintainer = 'Foo <bar@example.com>'
-
-          maintainer.to_s.must_equal 'Foo <bar@example.com>'
-        end
+        recipe.maintainer = 'Foo <bar@example.com>'
+        expect(maintainer.to_s).to eq('Foo <bar@example.com>')
       end
     end
 
     context 'with maintainer set in config' do
       it 'returns the config maintainer' do
-        with_shellout_stub do
-          config[:maintainer] = 'Foo <bar@example.com>'
+        config[:maintainer] = 'Foo <bar@example.com>'
 
-          maintainer.to_s.must_equal 'Foo <bar@example.com>'
-        end
+        expect(maintainer.to_s).to eq('Foo <bar@example.com>')
       end
     end
 
     context 'with maintainer in config and recipe' do
       it 'returns the config maintainer' do
-        with_shellout_stub do
-          recipe.maintainer = 'Foo <bar@example.com>'
-          config[:maintainer] = 'Jane Doe <jane@example.com>'
+        recipe.maintainer = 'Foo <bar@example.com>'
+        config[:maintainer] = 'Jane Doe <jane@example.com>'
 
-          maintainer.to_s.must_equal 'Jane Doe <jane@example.com>'
-        end
+        expect(maintainer.to_s).to eq('Jane Doe <jane@example.com>')
       end
     end
 
     context 'without any maintainer set' do
       it 'returns the maintainer from git' do
-        with_shellout_stub do
-          maintainer.to_s.must_equal 'John Doe <john@example.com>'
-        end
+        expect(maintainer.to_s).to eq('John Doe <john@example.com>')
       end
     end
 
     context 'without valid git data' do
+      before do
+        allow(FPM::Cookery::Shellout).to receive(:git_config_get).and_return(nil)
+        allow(Socket).to receive(:gethostname).and_return('hostname')
+      end
+
       it 'returns a default maintainer' do
-        Socket.stub(:gethostname, lambda { 'hostname' }) do
-          with_shellout_stub(:nil => true) do
-            with_env_stub('USER' => 'john') do
-              maintainer.to_s.must_equal '<john@hostname>'
-            end
-          end
+        with_env_stub('USER' => 'john') do
+          expect(maintainer.to_s).to eq('<john@hostname>')
         end
       end
     end
@@ -92,11 +72,9 @@ describe 'Maintainer' do
 
   describe '#to_str' do
     it 'converts the maintainer object to a string' do
-      with_shellout_stub do
-        recipe.maintainer = 'Foo <bar@example.com>'
+      recipe.maintainer = 'Foo <bar@example.com>'
 
-        maintainer.to_str.must_equal 'Foo <bar@example.com>'
-      end
+      expect(maintainer.to_str).to eq('Foo <bar@example.com>')
     end
   end
 end

data/spec/package_spec.rb

@@ -55,107 +55,111 @@ describe 'Package' do
 
   describe 'fpm package object initialization' do
     it 'sets name' do
-      package.fpm.name.must_equal 'foo'
+      expect(package.fpm.name).to eq('foo')
     end
 
     it 'sets url' do
-      package.fpm.url.must_equal 'http://example.com'
+      expect(package.fpm.url).to eq('http://example.com')
     end
 
     it 'sets category' do
-      package.fpm.category.must_equal 'langs'
+      expect(package.fpm.category).to eq('langs')
     end
 
     context 'without section set' do
       it 'sets category to "optional"' do
         recipe.instance_variable_set(:@section, nil)
 
-        package.fpm.category.must_equal 'optional'
+        expect(package.fpm.category).to eq('optional')
       end
     end
 
     it 'sets the description' do
-      package.fpm.description.must_equal 'a test package'
+      expect(package.fpm.description).to eq('a test package')
     end
 
     it 'sets the architecture' do
-      package.fpm.architecture.must_equal 'all'
+      expect(package.fpm.architecture).to eq('all')
     end
 
     it 'sets the dependencies' do
-      package.fpm.dependencies.must_equal ['ab', 'c']
+      expect(package.fpm.dependencies).to eq(['ab', 'c'])
     end
 
     it 'sets the conflicts' do
-      package.fpm.conflicts.must_equal ['xz', 'y']
+      expect(package.fpm.conflicts).to eq(['xz', 'y'])
     end
 
     it 'sets the provides' do
-      package.fpm.provides.must_equal ['foo-package']
+      expect(package.fpm.provides).to eq(['foo-package'])
     end
 
     it 'sets the replaces' do
-      package.fpm.replaces.must_equal ['foo-old']
+      expect(package.fpm.replaces).to eq(['foo-old'])
     end
 
     it 'sets the config_files' do
-      package.fpm.config_files.must_equal ['/etc/foo.conf']
+      expect(package.fpm.config_files).to eq(['/etc/foo.conf'])
     end
 
     it 'sets the directories' do
-      package.fpm.directories.must_equal ['/var/lib/foo', '/var/cache/foo']
+      expect(package.fpm.directories).to eq(['/var/lib/foo', '/var/cache/foo'])
     end
 
     describe 'attributes' do
       let(:attributes) { package.fpm.attributes }
 
       it 'sets deb_compression' do
-        attributes[:deb_compression].must_equal 'gz'
+        expect(attributes[:deb_compression]).to eq('gz')
       end
 
       it 'sets deb_user' do
-        attributes[:deb_user].must_equal 'root'
+        expect(attributes[:deb_user]).to eq('root')
       end
 
       it 'sets deb_group' do
-        attributes[:deb_group].must_equal 'root'
+        expect(attributes[:deb_group]).to eq('root')
       end
 
       it 'sets rpm_compression' do
-        attributes[:rpm_compression].must_equal 'gzip'
+        expect(attributes[:rpm_compression]).to eq('gzip')
       end
 
       it 'sets rpm_digest' do
-        attributes[:rpm_digest].must_equal 'md5'
+        expect(attributes[:rpm_digest]).to eq('md5')
       end
 
       it 'sets rpm_user' do
-        attributes[:rpm_user].must_equal 'root'
+        expect(attributes[:rpm_user]).to eq('root')
       end
 
       it 'sets rpm_group' do
-        attributes[:rpm_group].must_equal 'root'
+        expect(attributes[:rpm_group]).to eq('root')
       end
 
       it 'sets rpm_defattrfile' do
-        attributes[:rpm_defattrfile].must_equal '-'
+        expect(attributes[:rpm_defattrfile]).to eq('-')
       end
 
       it 'sets rpm_defattrdir' do
-        attributes[:rpm_defattrdir].must_equal '-'
+        expect(attributes[:rpm_defattrdir]).to eq('-')
       end
 
       it 'sets excludes' do
-        attributes[:excludes].must_equal []
+        expect(attributes[:excludes]).to eq([])
+      end
+
+      it 'sets rpm_auto_add_directories?' do
+        expect(attributes[:rpm_auto_add_directories?]).to eq(true)
       end
     end
 
     it 'calls the package_setup method' do
-      package.test_package_setup_run.must_equal true
+      expect(package.test_package_setup_run).to eq(true)
     end
 
     it 'calls the package_input method' do
-      package.test_package_input_run.must_equal true
+      expect(package.test_package_input_run).to eq(true)
     end
 
     context 'without package_input method defined' do
@@ -167,7 +171,9 @@ describe 'Package' do
       end
 
       it 'raises a MethodNotImplemented error' do
-        proc { package_bare }.must_raise FPM::Cookery::Error::MethodNotImplemented
+        expect {
+          package_bare
+        }.to raise_error(FPM::Cookery::Error::MethodNotImplemented)
       end
     end
 
@@ -180,7 +186,9 @@ describe 'Package' do
       end
 
       it 'raises a MethodNotImplemented error' do
-        proc { package_bare }.must_raise FPM::Cookery::Error::MethodNotImplemented
+        expect {
+          package_bare
+        }.to raise_error(FPM::Cookery::Error::MethodNotImplemented)
       end
     end
   end

data/spec/package_version_spec.rb

@@ -3,7 +3,7 @@ require 'fpm/cookery/package/version'
 require 'ostruct'
 
 describe 'Version' do
-  def target; 'deb'; end
+  let(:target) { 'deb' }
 
   let(:klass) { FPM::Cookery::Package::Version }
 
@@ -15,23 +15,23 @@ describe 'Version' do
   describe '#vendor_delimiter' do
     context 'with target deb' do
       it 'returns "+"' do
-        version.vendor_delimiter.must_equal '+'
+        expect(version.vendor_delimiter).to eq('+')
       end
     end
 
     context 'with target rpm' do
-      def target; 'rpm'; end
+      let(:target) { 'rpm' }
 
       it 'returns "."' do
-        version.vendor_delimiter.must_equal '.'
+        expect(version.vendor_delimiter).to eq('.')
       end
     end
 
     context 'with unknown target' do
-      def target; '_foo_'; end
+      let(:target) { '_foo_' }
 
       it 'returns "-"' do
-        version.vendor_delimiter.must_equal '-'
+        expect(version.vendor_delimiter).to eq('-')
       end
     end
   end
@@ -41,7 +41,7 @@ describe 'Version' do
       it 'returns the config.vendor value' do
         config[:vendor] = 'foo'
 
-        version.vendor.must_equal 'foo'
+        expect(version.vendor).to eq('foo')
       end
     end
 
@@ -49,7 +49,7 @@ describe 'Version' do
       it 'returns the recipe.vendor value' do
         recipe.vendor = 'bar'
 
-        version.vendor.must_equal 'bar'
+        expect(version.vendor).to eq('bar')
       end
     end
 
@@ -58,7 +58,7 @@ describe 'Version' do
         config[:vendor] = 'foo'
         recipe.vendor = 'bar'
 
-        version.vendor.must_equal 'foo'
+        expect(version.vendor).to eq('foo')
       end
     end
   end
@@ -67,7 +67,7 @@ describe 'Version' do
     it 'returns the recipe.revision value' do
       recipe.revision = 24
 
-      version.revision.must_equal 24
+      expect(version.revision).to eq(24)
     end
   end
 
@@ -75,14 +75,14 @@ describe 'Version' do
     it 'returns the version epoch' do
       recipe.version = '4:1.2.3'
 
-      version.epoch.must_equal '4'
+      expect(version.epoch).to eq('4')
     end
 
     context 'without epoch' do
       it 'returns nil' do
         recipe.version = '1.2.3'
 
-        version.epoch.must_equal nil
+        expect(version.epoch).to eq(nil)
       end
     end
   end
@@ -93,18 +93,18 @@ describe 'Version' do
       recipe.vendor = 'testing1'
       recipe.revision = 5
 
-      version.to_s.must_equal '2.1.3-5+testing1'
+      expect(version.to_s).to eq('2.1.3-5+testing1')
     end
 
     context 'with target rpm' do
-      def target; 'rpm'; end
+      let(:target) { 'rpm' }
 
       it 'returns a string representation of the version' do
         recipe.version = '2.1.3'
         recipe.vendor = 'testing1'
         recipe.revision = 5
 
-        version.to_s.must_equal '2.1.3-5.testing1'
+        expect(version.to_s).to eq('2.1.3-5.testing1')
       end
     end
 
@@ -113,31 +113,31 @@ describe 'Version' do
         recipe.version = '2.1.3'
         recipe.revision = 5
 
-        version.to_s.must_equal '2.1.3-5'
+        expect(version.to_s).to eq('2.1.3-5')
       end
 
       context 'with target rpm' do
-        def target; 'rpm'; end
+        let(:target) { 'rpm' }
 
         it 'returns a string representation of the version' do
           recipe.version = '2.1.3'
           recipe.revision = 5
 
-          version.to_s.must_equal '2.1.3-5'
+          expect(version.to_s).to eq('2.1.3-5')
         end
       end
     end
   end
 
   describe '#to_str' do
-      def target; 'rpm'; end
+    let(:target) { 'rpm' }
 
     it 'returns a string representation of the version' do
       recipe.version = '1.3'
       recipe.vendor = 'foo'
       recipe.revision = 1
 
-      version.to_str.must_equal '1.3-1.foo'
+      expect(version.to_str).to eq('1.3-1.foo')
     end
   end
 end

data/spec/path_helper_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 require 'fpm/cookery/path_helper'
 
 describe "PathHelper" do
-  class PathTest
-    include FPM::Cookery::PathHelper
+  let(:helper) do
+    Class.new {
+      include FPM::Cookery::PathHelper
 
-    def destdir; FPM::Cookery::Path.new('/tmp/dest') end
+      def destdir; FPM::Cookery::Path.new('/tmp/dest') end
+    }.new
   end
 
-  let(:helper) { PathTest.new }
-
   describe "path helper methods" do
     [ ['prefix', '/usr'],
       ['root_prefix', '/'],
@@ -42,19 +42,19 @@ describe "PathHelper" do
 
         context "without an argument" do
           it "returns #{path}" do
-            helper.send(name).to_s.must_equal path
+            expect(helper.send(name).to_s).to eq(path)
           end
         end
 
         context "with an argument" do
           it "adds the argument to the path" do
-            helper.send(name, 'foo/bar').to_s.must_equal c("#{path}/foo/bar")
+            expect(helper.send(name, 'foo/bar').to_s).to eq(c("#{path}/foo/bar"))
           end
         end
 
         context "with a nil argument" do
           it "does not add anything to the path" do
-            helper.send(name, nil).to_s.must_equal path
+            expect(helper.send(name, nil).to_s).to eq(path)
           end
         end
 
@@ -62,7 +62,7 @@ describe "PathHelper" do
           before { helper.installing = true}
 
           it "adds the destdir as prefix" do
-            helper.send(name, 'blah').to_s.must_equal c("#{helper.destdir}#{path}/blah")
+            expect(helper.send(name, 'blah').to_s).to eq(c("#{helper.destdir}#{path}/blah"))
           end
         end
 
@@ -70,7 +70,7 @@ describe "PathHelper" do
           before { helper.omnibus_installing = true }
 
           it "does not add anything to the path" do
-            helper.send(name, 'blah').to_s.must_equal c("#{path}/blah")
+            expect(helper.send(name, 'blah').to_s).to eq(c("#{path}/blah"))
           end
         end
 
@@ -78,7 +78,7 @@ describe "PathHelper" do
           before { helper.omnibus_installing = true ; helper.installing = true }
 
           it "does not add anything to the path" do
-            helper.send(name, 'blah').to_s.must_equal c("#{path}/blah")
+            expect(helper.send(name, 'blah').to_s).to eq(c("#{path}/blah"))
           end
         end
       end
@@ -90,7 +90,7 @@ describe "PathHelper" do
       before { helper.installing = true}
 
       it "returns true" do
-        helper.installing?.must_equal true
+        expect(helper.installing?).to eq(true)
       end
     end
 
@@ -98,7 +98,7 @@ describe "PathHelper" do
       before { helper.installing = false }
 
       it "returns true" do
-        helper.installing?.must_equal false
+        expect(helper.installing?).to eq(false)
       end
     end
   end
@@ -108,7 +108,7 @@ describe "PathHelper" do
       before { helper.omnibus_installing = true }
 
       it "returns true" do
-        helper.omnibus_installing?.must_equal true
+        expect(helper.omnibus_installing?).to eq(true)
       end
     end
 
@@ -116,7 +116,7 @@ describe "PathHelper" do
       before { helper.omnibus_installing = false }
 
       it "returns false" do
-        helper.omnibus_installing?.must_equal false
+        expect(helper.omnibus_installing?).to eq(false)
       end
     end
   end
@@ -127,13 +127,13 @@ describe "PathHelper" do
 
       specify "prefix returns /" do
         helper.with_trueprefix do
-          helper.prefix.to_s.must_equal '/usr'
+          expect(helper.prefix.to_s).to eq('/usr')
         end
       end
 
       it "will restore the previous installing value" do
         helper.with_trueprefix {}
-        helper.installing.must_equal true
+        expect(helper.installing).to eq(true)
       end
     end
 
@@ -142,13 +142,13 @@ describe "PathHelper" do
 
       specify "prefix returns /" do
         helper.with_trueprefix do
-          helper.prefix.to_s.must_equal '/usr'
+          expect(helper.prefix.to_s).to eq('/usr')
         end
       end
 
       it "will restore the previous installing value" do
         helper.with_trueprefix {}
-        helper.installing.must_equal false
+        expect(helper.installing).to eq(false)
       end
     end
   end