omnibus 5.5.0 → 5.6.0

data/spec/functional/templating_spec.rb

@@ -8,33 +8,33 @@ module Omnibus
   describe Templating do
     subject { RandomClass.new }
 
-    describe '#render_template' do
-      let(:source)      { File.join(tmp_path, "source.erb") }
-      let(:destination) { File.join(tmp_path, "final") }
-      let(:mode)        { 0644 }
-      let(:variables)   { { name: "Name" } }
-      let(:contents) do
-        <<-EOH.gsub(/^ {10}/, "")
+    let(:source)      { File.join(tmp_path, "source.erb") }
+    let(:destination) { File.join(tmp_path, "final") }
+    let(:mode)        { 0644 }
+    let(:variables)   { { name: "Name" } }
+    let(:contents) do
+      <<-EOH.gsub(/^ {10}/, "")
           <%= name %>
 
           <% if false -%>
             This is magic!
           <% end -%>
         EOH
-      end
+    end
 
-      let(:options) do
-        {
-          destination: destination,
-          variables:   variables,
-          mode:        mode,
-        }
-      end
+    let(:options) do
+      {
+        destination: destination,
+        variables:   variables,
+        mode:        mode,
+      }
+    end
 
-      before do
-        File.open(source, "w") { |f| f.write(contents) }
-      end
+    before do
+      File.open(source, "w") { |f| f.write(contents) }
+    end
 
+    describe "#render_template" do
       context "when no destination is given" do
         let(:destination) { nil }
 
@@ -59,24 +59,25 @@ module Omnibus
           expect(destination).to be_an_executable
         end
       end
+    end
 
+    describe "#render_template_content" do
       context "when an undefined variable is used" do
         let(:contents) { "<%= not_a_real_variable %>" }
 
         it "raise an exception" do
           expect do
-            subject.render_template(source, options)
+            subject.render_template_content(source, variables)
           end.to raise_error(NameError)
         end
       end
 
       context "when no variables are present" do
-        let(:content)   { "static content" }
+        let(:contents) { "static content" }
         let(:variables) { {} }
 
         it "renders the template" do
-          subject.render_template(source, options)
-          expect(destination).to be_a_file
+          expect(subject.render_template_content(source, variables)).to eq("static content")
         end
       end
     end

data/spec/support/git_helpers.rb

@@ -21,30 +21,36 @@ module Omnibus
           git %{remote add origin "#{options[:remote]}"} if options[:remote]
           git %{push origin master}
 
-          options[:annotated_tags].each do |tag|
-            File.open("tag", "w") { |f| f.write(tag) }
-            git %{add tag}
-            git %{commit -am "Create tag #{tag}"}
-            git %{tag "#{tag}" -m "#{tag}"}
-            git %{push origin "#{tag}"} if options[:remote]
-          end if options[:annotated_tags]
-
-          options[:tags].each do |tag|
-            File.open("tag", "w") { |f| f.write(tag) }
-            git %{add tag}
-            git %{commit -am "Create tag #{tag}"}
-            git %{tag "#{tag}"}
-            git %{push origin "#{tag}"} if options[:remote]
-          end if options[:tags]
-
-          options[:branches].each do |branch|
-            git %{checkout -b #{branch} master}
-            File.open("branch", "w") { |f| f.write(branch) }
-            git %{add branch}
-            git %{commit -am "Create branch #{branch}"}
-            git %{push origin "#{branch}"} if options[:remote]
-            git %{checkout master}
-          end if options[:branches]
+          if options[:annotated_tags]
+            options[:annotated_tags].each do |tag|
+              File.open("tag", "w") { |f| f.write(tag) }
+              git %{add tag}
+              git %{commit -am "Create tag #{tag}"}
+              git %{tag "#{tag}" -m "#{tag}"}
+              git %{push origin "#{tag}"} if options[:remote]
+            end
+          end
+
+          if options[:tags]
+            options[:tags].each do |tag|
+              File.open("tag", "w") { |f| f.write(tag) }
+              git %{add tag}
+              git %{commit -am "Create tag #{tag}"}
+              git %{tag "#{tag}"}
+              git %{push origin "#{tag}"} if options[:remote]
+            end
+          end
+
+          if options[:branches]
+            options[:branches].each do |branch|
+              git %{checkout -b #{branch} master}
+              File.open("branch", "w") { |f| f.write(branch) }
+              git %{add branch}
+              git %{commit -am "Create branch #{branch}"}
+              git %{push origin "#{branch}"} if options[:remote]
+              git %{checkout master}
+            end
+          end
         end
         path
       end

data/spec/unit/build_version_spec.rb

@@ -185,7 +185,7 @@ module Omnibus
       end
     end
 
-    describe '#initialize `path` parameter' do
+    describe "#initialize `path` parameter" do
       let(:path) { "/some/fake/path" }
       subject(:build_version) { BuildVersion.new(path) }
 

data/spec/unit/builder_spec.rb

@@ -28,121 +28,133 @@ module Omnibus
       end
     end
 
-    describe '#command' do
+    describe "#command" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:command)
       end
     end
 
-    describe '#workers' do
+    describe "#workers" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:workers)
       end
     end
 
-    describe '#ruby' do
+    describe "#ruby" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:ruby)
       end
     end
 
-    describe '#gem' do
+    describe "#gem" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:gem)
       end
     end
 
-    describe '#bundle' do
+    describe "#bundle" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:bundle)
       end
     end
 
-    describe '#appbundle' do
+    describe "#appbundle" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:appbundle)
       end
     end
 
-    describe '#block' do
+    describe "#block" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:block)
       end
     end
 
-    describe '#erb' do
+    describe "#erb" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:erb)
       end
     end
 
-    describe '#mkdir' do
+    describe "#mkdir" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:mkdir)
       end
     end
 
-    describe '#touch' do
+    describe "#touch" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:touch)
       end
     end
 
-    describe '#delete' do
+    describe "#delete" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:delete)
       end
     end
 
-    describe '#copy' do
+    describe "#strip" do
+      it "is a DSL method" do
+        expect(subject).to have_exposed_method(:strip)
+      end
+    end
+
+    describe "#copy" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:copy)
       end
     end
 
-    describe '#move' do
+    describe "#move" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:move)
       end
     end
 
-    describe '#link' do
+    describe "#link" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:link)
       end
     end
 
-    describe '#sync' do
+    describe "#sync" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:sync)
       end
     end
 
-    describe '#update_config_guess' do
+    describe "#update_config_guess" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:update_config_guess)
       end
     end
 
-    describe '#windows_safe_path' do
+    describe "#windows_safe_path" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:windows_safe_path)
       end
     end
 
-    describe '#project_dir' do
+    describe "#project_dir" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:project_dir)
       end
     end
 
-    describe '#install_dir' do
+    describe "#install_dir" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:install_dir)
       end
     end
 
-    describe '#make' do
+    describe "#overrides" do
+      it "is a DSL method" do
+        expect(subject).to have_exposed_method(:overrides)
+      end
+    end
+
+    describe "#make" do
       before do
         allow(subject).to receive(:command)
       end
@@ -205,7 +217,7 @@ module Omnibus
       end
     end
 
-    describe '#configure' do
+    describe "#configure" do
       before do
         allow(subject).to receive(:command)
       end
@@ -287,7 +299,7 @@ module Omnibus
       end
     end
 
-    describe '#patch' do
+    describe "#patch" do
       before do
         allow(subject).to receive(:find_file)
           .with("config/patches", "good_patch")
@@ -331,11 +343,11 @@ module Omnibus
 
     describe "#shasum" do
       let(:build_step) do
-        Proc.new {
+        Proc.new do
           block do
             command("true")
           end
-        }
+        end
       end
 
       let(:tmp_dir) { Dir.mktmpdir }

data/spec/unit/changelogprinter_spec.rb

@@ -14,30 +14,32 @@ module Omnibus
         })
       end
 
-      let(:changelog) { double(ChangeLog,
+      let(:changelog) do
+        double(ChangeLog,
                                changelog_entries: %w{entry1 entry2},
-                               authors: %w{alice bob}) }
-      let(:git_changelog) { double(ChangeLog,
+                               authors: %w{alice bob}) end
+      let(:git_changelog) do
+        double(ChangeLog,
                                    changelog_entries:
-                                   %w{sub-entry1 sub-entry2}) }
+                                   %w{sub-entry1 sub-entry2}) end
       let(:now) { double(Time) }
       let(:emptydiff) { EmptyManifestDiff.new }
-      let(:old_manifest) {
+      let(:old_manifest) do
         m = Manifest.new()
         m.add("updated-comp", manifest_entry_for("updated-comp", "v9", "v9"))
         m.add("updated-comp-2", manifest_entry_for("updated-comp-2", "someref0", "someref0", :git))
         m.add("removed-comp", manifest_entry_for("removed-comp", "v9", "v9"))
         m.add("removed-comp-2", manifest_entry_for("removed-comp-2", "v10", "v10"))
         m
-      }
-      let(:new_manifest) {
+      end
+      let(:new_manifest) do
         m = Manifest.new()
         m.add("updated-comp", manifest_entry_for("updated-comp", "v10", "v10"))
         m.add("updated-comp-2", manifest_entry_for("updated-comp-2", "someotherref", "someotherref", :git))
         m.add("added-comp", manifest_entry_for("added-comp", "v100", "v100"))
         m.add("added-comp-2", manifest_entry_for("added-comp-2", "v101", "v101"))
         m
-      }
+      end
       let(:diff) { ManifestDiff.new(old_manifest, new_manifest) }
 
       it "starts with a changelog version header including the time" do

data/spec/unit/cleanroom_spec.rb

@@ -17,11 +17,11 @@ module Omnibus
 
     let(:instance) { klass.new }
 
-    describe '#evaluate' do
+    describe "#evaluate" do
       it "exposes public methods" do
-        expect {
+        expect do
           instance.evaluate("exposed_method")
-        }.to_not raise_error
+        end.to_not raise_error
       end
 
       it "calls exposed methods on the instance" do
@@ -30,13 +30,13 @@ module Omnibus
       end
 
       it "does not expose unexposed methods" do
-        expect {
+        expect do
           instance.evaluate("unexposed_method")
-        }.to raise_error(NameError)
+        end.to raise_error(NameError)
       end
     end
 
-    describe '#evaluate_file' do
+    describe "#evaluate_file" do
       let(:contents) do
         <<-EOH.gsub(/^ {10}/, "")
           exposed_method

data/spec/unit/compressors/dmg_spec.rb

@@ -5,6 +5,7 @@ module Omnibus
     let(:project) do
       Project.new.tap do |project|
         project.name("project")
+        project.friendly_name("Project One")
         project.homepage("https://example.com")
         project.install_dir("/opt/project")
         project.build_version("1.2.3")
@@ -33,7 +34,7 @@ module Omnibus
       allow(subject).to receive(:shellout!)
     end
 
-    describe '#window_bounds' do
+    describe "#window_bounds" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:window_bounds)
       end
@@ -43,7 +44,7 @@ module Omnibus
       end
     end
 
-    describe '#pkg_position' do
+    describe "#pkg_position" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:pkg_position)
       end
@@ -53,19 +54,19 @@ module Omnibus
       end
     end
 
-    describe '#id' do
+    describe "#id" do
       it "is :dmg" do
         expect(subject.id).to eq(:dmg)
       end
     end
 
-    describe '#resources_dir' do
+    describe "#resources_dir" do
       it "is nested inside the staging_dir" do
         expect(subject.resources_dir).to eq("#{staging_dir}/Resources")
       end
     end
 
-    describe '#clean_disks' do
+    describe "#clean_disks" do
       it "logs a message" do
         allow(subject).to receive(:shellout!)
           .and_return(double(Mixlib::ShellOut, stdout: ""))
@@ -75,7 +76,7 @@ module Omnibus
       end
     end
 
-    describe '#create_writable_dmg' do
+    describe "#create_writable_dmg" do
       it "logs a message" do
         output = capture_logging { subject.create_writable_dmg }
         expect(output).to include("Creating writable dmg")
@@ -86,7 +87,7 @@ module Omnibus
           .with <<-EOH.gsub(/^ {12}/, "")
             hdiutil create \\
               -srcfolder "#{staging_dir}/Resources" \\
-              -volname "Project" \\
+              -volname "Project One" \\
               -fs HFS+ \\
               -fsargs "-c c=64,a=16,e=16" \\
               -format UDRW \\
@@ -98,7 +99,7 @@ module Omnibus
       end
     end
 
-    describe '#attach_dmg' do
+    describe "#attach_dmg" do
       before do
         allow(subject).to receive(:shellout!)
           .and_return(shellout)
@@ -129,7 +130,7 @@ module Omnibus
       end
     end
 
-    describe '#set_volume_icon' do
+    describe "#set_volume_icon" do
       it "logs a message" do
         output = capture_logging { subject.set_volume_icon }
         expect(output).to include("Setting volume icon")
@@ -155,17 +156,17 @@ module Omnibus
             iconutil -c icns tmp.iconset
 
             # Copy it over
-            cp tmp.icns "/Volumes/Project/.VolumeIcon.icns"
+            cp tmp.icns "/Volumes/Project One/.VolumeIcon.icns"
 
             # Source the icon
-            SetFile -a C "/Volumes/Project"
+            SetFile -a C "/Volumes/Project One"
           EOH
 
         subject.set_volume_icon
       end
     end
 
-    describe '#prettify_dmg' do
+    describe "#prettify_dmg" do
       it "logs a message" do
         output = capture_logging { subject.prettify_dmg }
         expect(output).to include("Making the dmg all pretty and stuff")
@@ -180,23 +181,9 @@ module Omnibus
         subject.prettify_dmg
         contents = File.read("#{staging_dir}/create_dmg.osascript")
 
-        expect(contents).to include('tell application "Finder"')
-        expect(contents).to include('  tell disk "Project"')
-        expect(contents).to include("    open")
-        expect(contents).to include("    set current view of container window to icon view")
-        expect(contents).to include("    set toolbar visible of container window to false")
-        expect(contents).to include("    set statusbar visible of container window to false")
-        expect(contents).to include("    set the bounds of container window to {100, 100, 750, 600}")
-        expect(contents).to include("    set theViewOptions to the icon view options of container window")
-        expect(contents).to include("    set arrangement of theViewOptions to not arranged")
-        expect(contents).to include("    set icon size of theViewOptions to 72")
-        expect(contents).to include('    set background picture of theViewOptions to file ".support:background.png"')
-        expect(contents).to include("    delay 5")
-        expect(contents).to include('    set position of item "project-1.2.3-2.pkg" of container window to {535, 50}')
-        expect(contents).to include("    update without registering applications")
-        expect(contents).to include("    delay 5")
-        expect(contents).to include("  end tell")
-        expect(contents).to include("end tell")
+        expect(contents).to include('set found_disk to do shell script "ls /Volumes/ | grep \'Project One*\'"')
+        expect(contents).to include("	set the bounds of Finder window 1 to {100, 100, 750, 600}")
+        expect(contents).to include('  	set position of item "project-1.2.3-2.pkg" of container window to {535, 50}')
       end
 
       it "runs the apple script" do
@@ -209,7 +196,7 @@ module Omnibus
       end
     end
 
-    describe '#compress_dmg' do
+    describe "#compress_dmg" do
       it "logs a message" do
         output = capture_logging { subject.compress_dmg }
         expect(output).to include("Compressing dmg")
@@ -221,7 +208,7 @@ module Omnibus
 
         expect(subject).to receive(:shellout!)
           .with <<-EOH.gsub(/^ {12}/, "")
-            chmod -Rf go-w /Volumes/Project
+            chmod -Rf go-w "/Volumes/Project One"
             sync
             hdiutil detach "#{device}"
             hdiutil convert \\
@@ -237,7 +224,7 @@ module Omnibus
       end
     end
 
-    describe '#set_dmg_icon' do
+    describe "#set_dmg_icon" do
       it "logs a message" do
         output = capture_logging { subject.set_dmg_icon }
         expect(output).to include("Setting dmg icon")
@@ -265,7 +252,7 @@ module Omnibus
       end
     end
 
-    describe '#package_name' do
+    describe "#package_name" do
       it 'reflects the packager\'s unmodified package_name' do
         expect(subject.package_name).to eq("project-1.2.3-2.dmg")
       end
@@ -279,7 +266,7 @@ module Omnibus
       end
     end
 
-    describe '#writable_dmg' do
+    describe "#writable_dmg" do
       it "is in the staging_dir" do
         expect(subject.writable_dmg).to include(staging_dir)
       end
@@ -289,10 +276,9 @@ module Omnibus
       end
     end
 
-    describe '#volume_name' do
+    describe "#volume_name" do
       it "is the project friendly_name" do
-        project.friendly_name("Friendly Bacon Bits")
-        expect(subject.volume_name).to eq("Friendly Bacon Bits")
+        expect(subject.volume_name).to eq("Project One")
       end
     end
   end