omnibus 2.0.2 → 3.0.0

data/spec/unit/packagers/mac_pkg_spec.rb

@@ -0,0 +1,163 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'stringio'
+require 'spec_helper'
+
+describe Omnibus::Packager::MacPkg do
+
+  let(:project_name) { 'myproject' }
+
+  let(:mac_pkg_identifier) { 'com.mycorp.myproject' }
+
+  let(:omnibus_root) { '/omnibus/project/root' }
+
+  let(:scripts_path) { "#{omnibus_root}/scripts" }
+
+  let(:package_dir) { '/home/someuser/omnibus-myproject/pkg' }
+
+  let(:package_tmp) { '/var/cache/omnibus/pkg-tmp' }
+
+  let(:files_path) { "#{omnibus_root}/files" }
+
+  let(:expected_distribution_content) do
+    <<-EOH
+<?xml version="1.0" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+    <title>Myproject</title>
+    <background file="background.png" alignment="bottomleft" mime-type="image/png"/>
+    <welcome file="welcome.html" mime-type="text/html"/>
+    <license file="license.html" mime-type="text/html"/>
+
+    <!-- Generated by productbuild - - synthesize -->
+    <pkg-ref id="com.mycorp.myproject"/>
+    <options customize="never" require-scripts="false"/>
+    <choices-outline>
+        <line choice="default">
+            <line choice="com.mycorp.myproject"/>
+        </line>
+    </choices-outline>
+    <choice id="default"/>
+    <choice id="com.mycorp.myproject" visible="false">
+        <pkg-ref id="com.mycorp.myproject"/>
+    </choice>
+    <pkg-ref id="com.mycorp.myproject" version="23.4.2" onConclusion="none">myproject-core.pkg</pkg-ref>
+</installer-gui-script>
+EOH
+  end
+
+  let(:expected_distribution_path) { '/var/cache/omnibus/pkg-tmp/mac_pkg/Distribution' }
+
+  let(:project) do
+    double Omnibus::Project,
+           name: project_name,
+           build_version: '23.4.2',
+           iteration: 4,
+           maintainer: "Joe's Software",
+           install_path: '/opt/myproject',
+           package_scripts_path: scripts_path,
+           files_path: files_path,
+           package_dir: package_dir,
+           package_tmp: package_tmp,
+           mac_pkg_identifier: mac_pkg_identifier
+  end
+
+  let(:packager) do
+    Omnibus::Packager::MacPkg.new(project)
+  end
+
+  it "uses the project's version" do
+    expect(packager.version).to eq(project.build_version)
+  end
+
+  it "uses the project's name" do
+    expect(packager.name).to eq(project.name)
+  end
+
+  it "uses the project's mac_pkg_identifier" do
+    expect(packager.identifier).to eq(mac_pkg_identifier)
+  end
+
+  it 'names the component package PROJECT_NAME-core.pkg' do
+    expect(packager.component_pkg).to eq('myproject-core.pkg')
+  end
+
+  it 'names the product package PROJECT_NAME.pkg' do
+    expect(packager.package_name).to eq('myproject-23.4.2-4.pkg')
+  end
+
+  it "use's the project's package_scripts_path" do
+    expect(packager.scripts).to eq(project.package_scripts_path)
+  end
+
+  it 'runs pkgbuild' do
+    expect(packager).to receive(:execute).with <<-EOH.gsub(/^ {6}/, '')
+      pkgbuild \\
+        --identifier "com.mycorp.myproject" \\
+        --version "23.4.2" \\
+        --scripts "/omnibus/project/root/scripts" \\
+        --root "/opt/myproject" \\
+        --install-location "/opt/myproject" \\
+        "myproject-core.pkg"
+    EOH
+    packager.build_component_pkg
+  end
+
+  it 'generates a Distribution file describing the product package content' do
+    file = StringIO.new
+    File.stub(:open).with(any_args).and_yield(file)
+
+    expect(file).to receive(:puts).with(expected_distribution_content)
+    packager.generate_distribution
+  end
+
+  describe 'generating the distribution file' do
+    let(:distribution_file) { StringIO.new }
+
+    before do
+      expect(File).to receive(:open)
+        .with(expected_distribution_path, 'w', 0600)
+        .and_yield(distribution_file)
+    end
+
+    it 'writes the distribution file to the staging directory' do
+      packager.generate_distribution
+      expect(distribution_file.string).to eq(expected_distribution_content)
+    end
+  end
+
+  describe 'building the product package' do
+    it 'generates the distribution and runs productbuild' do
+      expect(packager).to receive(:execute).with <<-EOH.gsub(/^ {8}/, '')
+        productbuild \\
+          --distribution "/var/cache/omnibus/pkg-tmp/mac_pkg/Distribution" \\
+          --resources "/omnibus/project/root/files/mac_pkg/Resources" \\
+          "/home/someuser/omnibus-myproject/pkg/myproject-23.4.2-4.pkg"
+      EOH
+      packager.build_product_pkg
+    end
+  end
+
+  context "when the mac_pkg_identifier isn't specified by the project" do
+    let(:mac_pkg_identifier) { nil }
+    let(:project_name) { 'My $Project' }
+
+    it 'uses com.example.PROJECT_NAME as the identifier' do
+      expect(packager.identifier).to eq('test.joessoftware.pkg.myproject')
+    end
+  end
+end

data/spec/{project_spec.rb → unit/project_spec.rb}

@@ -135,18 +135,4 @@ describe Omnibus::Project do
       expect(project.override(:thing)[:version]).to eq('6.6.6')
     end
   end
-
-  describe '#package_user' do
-    it 'returns root by default' do
-      subject.instance_variable_set(:@package_user, nil)
-      expect(subject.package_user).to eq('root')
-    end
-  end
-
-  describe '#package_group' do
-    it 'returns root by default' do
-      subject.instance_variable_set(:@package_group, nil)
-      expect(subject.package_group).to eq('root')
-    end
-  end
 end

data/spec/{software_spec.rb → unit/software_spec.rb}

@@ -1,4 +1,3 @@
-require 'rake/dsl_definition'
 require 'omnibus/software'
 
 require 'spec_helper'

metadata

@@ -1,174 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: chef-sugar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: ohai
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.12'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: ohai
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.12'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
 - !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: 2.14.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     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: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   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.
@@ -178,11 +171,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE
 - NOTICE
 - README.md
@@ -190,16 +184,14 @@ 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
+- docs/Building on OSX.md
+- docs/omnibus-build-cache.md
 - lib/omnibus.rb
 - lib/omnibus/artifact.rb
+- lib/omnibus/assets/README-logo.png
+- lib/omnibus/assets/logo.psd
 - lib/omnibus/build_version.rb
 - lib/omnibus/builder.rb
-- lib/omnibus/clean_tasks.rb
 - lib/omnibus/cli.rb
 - lib/omnibus/cli/application.rb
 - lib/omnibus/cli/base.rb
@@ -215,14 +207,18 @@ files:
 - lib/omnibus/fetchers/path_fetcher.rb
 - lib/omnibus/fetchers/s3_cache_fetcher.rb
 - lib/omnibus/health_check.rb
+- lib/omnibus/install_path_cache.rb
 - lib/omnibus/library.rb
 - lib/omnibus/overrides.rb
 - lib/omnibus/package_release.rb
+- lib/omnibus/packagers/base.rb
+- lib/omnibus/packagers/mac_dmg.rb
 - lib/omnibus/packagers/mac_pkg.rb
 - lib/omnibus/project.rb
 - lib/omnibus/reports.rb
 - lib/omnibus/s3_cacher.rb
 - lib/omnibus/software.rb
+- lib/omnibus/sugar.rb
 - lib/omnibus/templates/.kitchen.local.yml.erb
 - lib/omnibus/templates/.kitchen.yml.erb
 - lib/omnibus/templates/Berksfile.erb
@@ -230,6 +226,11 @@ files:
 - lib/omnibus/templates/README.md.erb
 - lib/omnibus/templates/Vagrantfile.erb
 - lib/omnibus/templates/gitignore.erb
+- lib/omnibus/templates/mac_dmg/background.png
+- lib/omnibus/templates/mac_dmg/icon.png
+- lib/omnibus/templates/mac_pkg/background.png
+- lib/omnibus/templates/mac_pkg/license.html.erb
+- lib/omnibus/templates/mac_pkg/welcome.html.erb
 - lib/omnibus/templates/omnibus.rb.example.erb
 - lib/omnibus/templates/package_scripts/makeselfinst.erb
 - lib/omnibus/templates/package_scripts/postinst.erb
@@ -243,9 +244,6 @@ files:
 - lib/omnibus/util.rb
 - lib/omnibus/version.rb
 - 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
@@ -253,48 +251,55 @@ files:
 - 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_spec.rb
+- spec/fixtures/sample/files/mac_dmg/Resources/background.png
+- spec/fixtures/sample/files/mac_dmg/Resources/icon.png
+- spec/fixtures/sample/files/mac_pkg/Resources/background.png
+- spec/fixtures/sample/files/mac_pkg/Resources/license.html
+- spec/fixtures/sample/files/mac_pkg/Resources/welcome.html
+- spec/fixtures/sample/package-scripts/sample/postinstall
+- spec/functional/packagers/mac_spec.rb
 - spec/spec_helper.rb
+- spec/sugar_spec.rb
+- spec/unit/artifact_spec.rb
+- spec/unit/build_version_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/fetchers/git_fetcher_spec.rb
+- spec/unit/fetchers/net_fetcher_spec.rb
+- spec/unit/install_path_cache_spec.rb
+- spec/unit/library_spec.rb
+- spec/unit/omnibus_spec.rb
+- spec/unit/overrides_spec.rb
+- spec/unit/package_release_spec.rb
+- spec/unit/packagers/base_spec.rb
+- spec/unit/packagers/mac_pkg_spec.rb
+- spec/unit/project_spec.rb
+- spec/unit/s3_cacher_spec.rb
+- spec/unit/software_spec.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: 4053594469113083441
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 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
@@ -302,14 +307,28 @@ test_files:
 - 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_spec.rb
+- spec/fixtures/sample/files/mac_dmg/Resources/background.png
+- spec/fixtures/sample/files/mac_dmg/Resources/icon.png
+- spec/fixtures/sample/files/mac_pkg/Resources/background.png
+- spec/fixtures/sample/files/mac_pkg/Resources/license.html
+- spec/fixtures/sample/files/mac_pkg/Resources/welcome.html
+- spec/fixtures/sample/package-scripts/sample/postinstall
+- spec/functional/packagers/mac_spec.rb
 - spec/spec_helper.rb
+- spec/sugar_spec.rb
+- spec/unit/artifact_spec.rb
+- spec/unit/build_version_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/fetchers/git_fetcher_spec.rb
+- spec/unit/fetchers/net_fetcher_spec.rb
+- spec/unit/install_path_cache_spec.rb
+- spec/unit/library_spec.rb
+- spec/unit/omnibus_spec.rb
+- spec/unit/overrides_spec.rb
+- spec/unit/package_release_spec.rb
+- spec/unit/packagers/base_spec.rb
+- spec/unit/packagers/mac_pkg_spec.rb
+- spec/unit/project_spec.rb
+- spec/unit/s3_cacher_spec.rb
+- spec/unit/software_spec.rb
 has_rdoc: