omnibus 1.3.0 → 2.0.0.rc1

data/spec/software_spec.rb

@@ -6,79 +6,100 @@ require 'spec_helper'
 describe Omnibus::Software do
 
   let(:project) do
-    p = double(Omnibus::Project)
-    p.stub(:install_path).and_return("monkeys")
-    p
+    double(Omnibus::Project, install_path: 'monkeys', overrides: {})
   end
 
-  let(:software_name) { "erchef" }
-  let(:software_file){ software_path(software_name) }
-  let(:version_from_file){ "4b19a96d57bff9bbf4764d7323b92a0944009b9e" }
-  let(:software){ Omnibus::Software.load(software_file, project) }
+  let(:software_name) { 'erchef' }
+  let(:software_file) { software_path(software_name) }
 
-  before :each do
-    # We don't want to mess with any of this stuff for these
-    # tests... we're just looking at version info right now
-    Omnibus::Software.any_instance.stub(:render_tasks)
+  let(:software) do
+    Omnibus::Software.load(software_file, project)
   end
 
-  subject { software }
-
-  describe "#whitelist_file" do
+  before do
+    allow_any_instance_of(Omnibus::Software).to receive(:render_tasks)
+  end
 
-    it "appends to the whitelist_files array" do
-      software.whitelist_files.size.should equal 0
+  describe '#whitelist_file' do
+    it 'appends to the whitelist_files array' do
+      expect(software.whitelist_files.size).to eq(0)
       software.whitelist_file(/foo\/bar/)
-      software.whitelist_files.size.should equal 1
+      expect(software.whitelist_files.size).to eq(1)
     end
 
-    it "converts Strings to Regexp instances" do
-      software.whitelist_file "foo/bar"
-      software.whitelist_files.size.should equal 1
-      software.whitelist_files.first.should be_kind_of(Regexp)
+    it 'converts Strings to Regexp instances' do
+      software.whitelist_file 'foo/bar'
+      expect(software.whitelist_files.size).to eq(1)
+      expect(software.whitelist_files.first).to be_kind_of(Regexp)
     end
   end
 
-  context "testing version overrides" do
+  context 'testing repo-level version overrides' do
+    let(:software_name) { 'zlib' }
+    let(:default_version) { '1.2.6' }
+    let(:expected_version) { '1.2.6' }
+    let(:expected_override_version) { nil }
+    let(:expected_md5) { '618e944d7c7cd6521551e30b32322f4a' }
+    let(:expected_url) { 'http://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz' }
+
+    shared_examples_for 'a software definition' do
+      it 'should have the same name' do
+        expect(software.name).to eq(software_name)
+      end
 
-    context "without overrides" do
-      its(:name){should eq(software_name)}
-      its(:version){should eq(version_from_file)}
-      its(:given_version){should eq(software.version)}
-      its(:override_version){should be_nil}
-    end
+      it 'should have the same version' do
+        expect(software.version).to eq(expected_version)
+      end
 
-    context "with overrides" do
-      let(:override_software_version){"6.6.6"}
-      let(:overrides) do
-        {override_software_name => override_software_version}
+      it 'should have the right default_version' do
+        expect(software.default_version).to eq(default_version)
       end
-      let(:software){Omnibus::Software.load(software_file, project, overrides)}
 
-      context "but not for this software" do
-        let(:override_software_name){"chaos_monkey"}
+      it 'should have nil for an override_version' do
+        expect(software.override_version).to eq(expected_override_version)
+      end
 
-        it "really should not have any overrides for this software" do
-          overrides.should_not have_key(software_name)
-        end
+      it 'should have the md5 of the default version' do
+        expect(software.source[:md5]).to eq(expected_md5)
+      end
 
-        its(:version){should eq(version_from_file)}
-        its(:given_version){should eq(software.version)}
-        its(:override_version){should be_nil}
+      it 'should have the url of the default version' do
+        expect(software.source[:url]).to eq(expected_url)
       end
+    end
 
-      context "for this software" do
-        let(:override_software_name){software_name}
+    context 'without overrides' do
+      it_behaves_like 'a software definition'
+    end
+
+    context 'with overrides for different software' do
+      let(:overrides) { { 'chaos_monkey' => '1.2.8' } }
+      let(:software) { Omnibus::Software.load(software_file, project, overrides) }
+
+      it_behaves_like 'a software definition'
+    end
 
-        it "really should have an override for this software" do
-          overrides.should have_key(software_name)
-        end
+    context 'with overrides for this software' do
+      let(:expected_version) { '1.2.8' }
+      let(:expected_override_version) { '1.2.8' }
+      let(:overrides) { { software_name => expected_override_version } }
+      let(:software) { Omnibus::Software.load(software_file, project, overrides) }
+      let(:expected_md5) { '44d667c142d7cda120332623eab69f40' }
+      let(:expected_url) { 'http://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz' }
 
-        its(:version){should eq(override_software_version)}
-        its(:override_version){should eq(software.version)}
-        its(:version){should_not eq(software.given_version)}
-        its(:given_version){should eq(version_from_file)}
+      it_behaves_like 'a software definition'
+    end
+
+    context 'with an overide in the project' do
+      let(:project) do
+        double(Omnibus::Project, install_path: 'monkeys', overrides: { zlib: { version: '1.2.8' } })
       end
+      let(:expected_version) { '1.2.8' }
+      let(:expected_override_version) { '1.2.8' }
+      let(:expected_md5) { '44d667c142d7cda120332623eab69f40' }
+      let(:expected_url) { 'http://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz' }
+
+      it_behaves_like 'a software definition'
     end
 
   end

data/spec/spec_helper.rb

@@ -2,27 +2,34 @@
 require 'rake/dsl_definition'
 
 require 'omnibus'
+require 'fauxhai'
 
 module Omnibus
   module RSpec
-
-    SPEC_DATA = File.expand_path(File.join(File.dirname(__FILE__), "data"))
+    SPEC_DATA = File.expand_path(File.join(File.dirname(__FILE__), 'data'))
 
     def software_path(name)
-      File.join(SPEC_DATA, "software", "#{name}.rb")
+      File.join(SPEC_DATA, 'software', "#{name}.rb")
     end
 
     def overrides_path(name)
-      File.join(SPEC_DATA, "overrides", "#{name}.overrides")
+      File.join(SPEC_DATA, 'overrides', "#{name}.overrides")
+    end
+
+    def project_path(name)
+      File.join(SPEC_DATA, 'projects', "#{name}.rb")
     end
-    
   end
 end
 
 RSpec.configure do |config|
   config.include Omnibus::RSpec
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
-end
 
+  # Force the expect syntax
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 2.0.0.rc1
 platform: ruby
 authors:
-- Opscode
+- Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.12
+        version: '6.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.12
+        version: '6.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,78 +83,83 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uber-s3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Omnibus helps you build self-installing, full-stack software builds.
-email: info@opscode.com
+email: info@getchef.com
 executables:
 - omnibus
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
+- .rubocop.yml
 - .travis.yml
-- .yardopts
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -175,6 +169,11 @@ files:
 - bin/makeself-header.sh
 - bin/makeself.sh
 - bin/omnibus
+- functional/fixtures/mac_pkg/files/mac_pkg/Resources/background.png
+- functional/fixtures/mac_pkg/files/mac_pkg/Resources/license.html
+- functional/fixtures/mac_pkg/files/mac_pkg/Resources/welcome.html
+- functional/fixtures/mac_pkg/package-scripts/functional-test-project/postinstall
+- functional/packagers/mac_pkg_spec.rb
 - lib/omnibus.rb
 - lib/omnibus/artifact.rb
 - lib/omnibus/build_version.rb
@@ -198,6 +197,7 @@ files:
 - lib/omnibus/library.rb
 - lib/omnibus/overrides.rb
 - lib/omnibus/package_release.rb
+- lib/omnibus/packagers/mac_pkg.rb
 - lib/omnibus/project.rb
 - lib/omnibus/reports.rb
 - lib/omnibus/s3_cacher.rb
@@ -222,59 +222,67 @@ files:
 - omnibus.gemspec
 - spec/artifact_spec.rb
 - spec/build_version_spec.rb
+- spec/config_spec.rb
 - spec/data/overrides/bad_line.overrides
 - spec/data/overrides/good.overrides
 - spec/data/overrides/with_dupes.overrides
+- spec/data/projects/chefdk.rb
+- spec/data/projects/sample.rb
 - spec/data/software/erchef.rb
+- spec/data/software/zlib.rb
 - spec/fetchers/git_fetcher_spec.rb
 - spec/fetchers/net_fetcher_spec.rb
+- spec/omnibus_spec.rb
 - spec/overrides_spec.rb
 - spec/package_release_spec.rb
+- spec/packagers/mac_pkg_spec.rb
+- spec/project_spec.rb
 - spec/s3_cacher_spec.rb
-- spec/software_dirs_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/opscode/omnibus-ruby
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -488059737138888426
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Omnibus helps you build self-installing, full-stack software builds.
 test_files:
 - spec/artifact_spec.rb
 - spec/build_version_spec.rb
+- spec/config_spec.rb
 - spec/data/overrides/bad_line.overrides
 - spec/data/overrides/good.overrides
 - spec/data/overrides/with_dupes.overrides
+- spec/data/projects/chefdk.rb
+- spec/data/projects/sample.rb
 - spec/data/software/erchef.rb
+- spec/data/software/zlib.rb
 - spec/fetchers/git_fetcher_spec.rb
 - spec/fetchers/net_fetcher_spec.rb
+- spec/omnibus_spec.rb
 - spec/overrides_spec.rb
 - spec/package_release_spec.rb
+- spec/packagers/mac_pkg_spec.rb
+- spec/project_spec.rb
 - spec/s3_cacher_spec.rb
-- spec/software_dirs_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/.rspec

@@ -1 +0,0 @@
---color --format doc

data/.yardopts

@@ -1,6 +0,0 @@
---markup=markdown
---markup-provider=redcarpet
---readme=README.md
--
-CHANGELOG.md
-LICENSE

data/spec/software_dirs_spec.rb

@@ -1,34 +0,0 @@
-require 'omnibus'
-require 'spec_helper'
-
-describe Omnibus do
-
-  describe '#software_dirs' do
-
-    before :each do
-      # This is probably really silly, but it works
-      Omnibus.class_eval { @software_dirs = nil }
-    end
-
-    context 'omnibus_software_root not nil' do
-      before :each do
-        Omnibus.stub(:omnibus_software_root) { './data' }
-      end
-
-      it 'will include list of software from omnibus-software gem' do
-        Omnibus.software_dirs.length.should eq 2
-      end
-    end
-
-    context 'omnibus_software_root nil' do
-      before :each do
-        Omnibus.stub(:omnibus_software_root) { nil }
-      end
-
-      it 'will not include list of software from omnibus-software gem' do
-        Omnibus.software_dirs.length.should eq 1
-      end
-    end
-  end
-
-end