omnibus 5.4.0 → 5.5.0

data/spec/unit/library_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe Library do
@@ -19,49 +19,49 @@ module Omnibus
 
     let(:project) do
       Project.new.evaluate do
-        name          'chef-dk'
-        maintainer    'Chef Software, Inc'
-        homepage      'http://getchef.com'
-        build_version '1.0.0'
+        name          "chef-dk"
+        maintainer    "Chef Software, Inc"
+        homepage      "http://getchef.com"
+        build_version "1.0.0"
 
-        install_dir '/opt/chefdk'
+        install_dir "/opt/chefdk"
 
-        dependency 'preparation'
-        dependency 'erchef'
-        dependency 'postgresql'
-        dependency 'ruby'
-        dependency 'chef'
-        dependency 'chefdk'
+        dependency "preparation"
+        dependency "erchef"
+        dependency "postgresql"
+        dependency "ruby"
+        dependency "chef"
+        dependency "chefdk"
       end
     end
 
     let(:library) { Library.new(project) }
 
-    let(:bundler)     { generate_software('bundler', '1.5.4') }
-    let(:curl)        { generate_software('curl', '1.5.4', %w(openssl zlib)) }
-    let(:chef)        { generate_software('chef', '1.0.0', %w(bundler ohai ruby)) }
-    let(:erchef)      { generate_software('erchef', '4b19a96d57bff9bbf4764d7323b92a0944009b9e', %w(curl erlang rsync)) }
-    let(:erlang)      { generate_software('erlang', 'R15B03-1', %w(openssl zlib)) }
-    let(:libgcc)      { generate_software('libgcc', '0.0.0') }
-    let(:ncurses)     { generate_software('ncurses', '5.9', %w(libgcc)) }
-    let(:ohai)        { generate_software('ohai', 'master', %w(ruby rubygems yajl)) }
-    let(:openssl)     { generate_software('openssl', '1.0.1g', %w(zlib)) }
-    let(:postgresql)  { generate_software('postgresql', '9.2.8', %w(zlib openssl)) }
-    let(:preparation) { generate_software('preparation', '1.0.0') }
-    let(:rsync)       { generate_software('rsync', '3.0.9') }
-    let(:ruby)        { generate_software('ruby', '1.9.3-p481', %w(zlib ncurses)) }
-    let(:rubygems)    { generate_software('rubygems', '1.8.24', %w(ruby)) }
-    let(:skitch)      { generate_software('skitch', '4.4.1', %w(postgresql)) }
-    let(:yajl)        { generate_software('yajl', '1.1.0', %w(rubygems)) }
-    let(:zlib)        { generate_software('zlib', '1.2.6', %w(libgcc)) }
+    let(:bundler)     { generate_software("bundler", "1.5.4") }
+    let(:curl)        { generate_software("curl", "1.5.4", %w{openssl zlib}) }
+    let(:chef)        { generate_software("chef", "1.0.0", %w{bundler ohai ruby}) }
+    let(:erchef)      { generate_software("erchef", "4b19a96d57bff9bbf4764d7323b92a0944009b9e", %w{curl erlang rsync}) }
+    let(:erlang)      { generate_software("erlang", "R15B03-1", %w{openssl zlib}) }
+    let(:libgcc)      { generate_software("libgcc", "0.0.0") }
+    let(:ncurses)     { generate_software("ncurses", "5.9", %w{libgcc}) }
+    let(:ohai)        { generate_software("ohai", "master", %w{ruby rubygems yajl}) }
+    let(:openssl)     { generate_software("openssl", "1.0.1g", %w{zlib}) }
+    let(:postgresql)  { generate_software("postgresql", "9.2.8", %w{zlib openssl}) }
+    let(:preparation) { generate_software("preparation", "1.0.0") }
+    let(:rsync)       { generate_software("rsync", "3.0.9") }
+    let(:ruby)        { generate_software("ruby", "1.9.3-p481", %w{zlib ncurses}) }
+    let(:rubygems)    { generate_software("rubygems", "1.8.24", %w{ruby}) }
+    let(:skitch)      { generate_software("skitch", "4.4.1", %w{postgresql}) }
+    let(:yajl)        { generate_software("yajl", "1.1.0", %w{rubygems}) }
+    let(:zlib)        { generate_software("zlib", "1.2.6", %w{libgcc}) }
 
     describe '#component_added' do
-      it 'adds the software to the component list' do
+      it "adds the software to the component list" do
         library.component_added(erchef)
         expect(library.components).to eql([erchef])
       end
 
-      it 'does not add a component more than once' do
+      it "does not add a component more than once" do
         library.component_added(erchef)
         library.component_added(erchef)
         expect(library.components).to eql([erchef])
@@ -81,7 +81,7 @@ module Omnibus
         library
       end
 
-      it 'returns an array of software descriptions, with all top level deps first' do
+      it "returns an array of software descriptions, with all top level deps first" do
         expect(library.build_order).to eq([
           preparation,
           erlang,
@@ -93,8 +93,8 @@ module Omnibus
         ])
       end
 
-      context 'with a complex dep tree' do
-        let(:chefdk) { generate_software('chefdk', '1.0.0.alpha', %w(bundler ruby)) }
+      context "with a complex dep tree" do
+        let(:chefdk) { generate_software("chefdk", "1.0.0.alpha", %w{bundler ruby}) }
 
         let(:library) do
           # This is the LOAD ORDER
@@ -112,7 +112,7 @@ module Omnibus
           library
         end
 
-        it 'returns an array of software descriptions, with all top level deps first, assuming they are not themselves transitive deps' do
+        it "returns an array of software descriptions, with all top level deps first, assuming they are not themselves transitive deps" do
           expect(library.build_order).to eql(
             [
               preparation, # first

data/spec/unit/manifest_diff_spec.rb

@@ -1,17 +1,16 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe ManifestDiff do
     def manifest_entry_for(name, dv, lv)
-      Omnibus::ManifestEntry.new(name, {:described_version => dv,
-                                   :locked_version => lv,
-                                   :locked_source => {
-                                     :git => "git://#{name}@example.com"},
-                                   :source_type => :git
+      Omnibus::ManifestEntry.new(name, { :described_version => dv,
+                                         :locked_version => lv,
+                                         :locked_source => {
+                                     :git => "git://#{name}@example.com" },
+                                         :source_type => :git,
                                  })
     end
 
-
     let(:manifest_one) do
       m = Omnibus::Manifest.new()
       m.add("foo", manifest_entry_for("foo", "1.2.4", "deadbeef"))
@@ -28,7 +27,7 @@ module Omnibus
       m
     end
 
-    subject { described_class.new(manifest_one, manifest_two)}
+    subject { described_class.new(manifest_one, manifest_two) }
 
     describe "#updated" do
       it "returns items that existed in the first manifest but have been changed" do
@@ -36,7 +35,7 @@ module Omnibus
                                          :old_version => "deadbeef",
                                          :new_version => "deadbea0",
                                          :source_type => :git,
-                                         :source => {:git => "git://foo@example.com"}
+                                         :source => { :git => "git://foo@example.com" },
                                        }])
       end
 
@@ -45,7 +44,7 @@ module Omnibus
           expect(subject.removed).to eq([{ :name => "bar",
                                            :old_version => "deadbeef",
                                            :source_type => :git,
-                                           :source => {:git => "git://bar@example.com"}
+                                           :source => { :git => "git://bar@example.com" },
                                          }])
         end
       end
@@ -55,7 +54,7 @@ module Omnibus
           expect(subject.added).to eq([{ :name => "quux",
                                          :new_version => "deadbeef",
                                          :source_type => :git,
-                                         :source => {:git => "git://quux@example.com"}
+                                         :source => { :git => "git://quux@example.com" },
                                        }])
         end
       end

data/spec/unit/manifest_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'omnibus/manifest'
-require 'omnibus/manifest_entry'
+require "spec_helper"
+require "omnibus/manifest"
+require "omnibus/manifest_entry"
 
 module Omnibus
   describe Manifest do
@@ -9,11 +9,11 @@ module Omnibus
     describe "#add" do
       it "stores manifest entries" do
         me = ManifestEntry.new("womabt", {})
-        expect {subject.add("wombat", me)}.to_not raise_error
+        expect { subject.add("wombat", me) }.to_not raise_error
       end
 
       it "raises an error if it isn't given a ManifestEntry" do
-        expect {subject.add("foobar", {})}.to raise_error Manifest::NotAManifestEntry
+        expect { subject.add("foobar", {}) }.to raise_error Manifest::NotAManifestEntry
       end
     end
 
@@ -25,7 +25,7 @@ module Omnibus
       end
 
       it "raises an error if no such manifest entry exists" do
-        expect {subject.entry_for("non-existant-entry")}.to raise_error Manifest::MissingManifestEntry
+        expect { subject.entry_for("non-existant-entry") }.to raise_error Manifest::MissingManifestEntry
       end
     end
 
@@ -35,7 +35,7 @@ module Omnibus
         second = ManifestEntry.new("wombat", {})
         subject.add("foobar", first)
         subject.add("wombat", second)
-        expect{ |b| subject.each &b }.to yield_successive_args(first, second)
+        expect { |b| subject.each(&b) }.to yield_successive_args(first, second)
       end
     end
 
@@ -90,17 +90,17 @@ module Omnibus
               locked_version: "new.newer",
               source_type: "url",
               described_version: "new.newer",
-            }
-          }
+            },
+          },
         }
       }
 
       it "has a build_version" do
-        expect(Manifest.from_hash(manifest).build_version).to eq('12.4.0+20150629082811')
+        expect(Manifest.from_hash(manifest).build_version).to eq("12.4.0+20150629082811")
       end
 
       it "has a build_git_revision" do
-        expect(Manifest.from_hash(manifest).build_git_revision).to eq('2e763ac957b308ba95cef256c2491a5a55a163cc')
+        expect(Manifest.from_hash(manifest).build_git_revision).to eq("2e763ac957b308ba95cef256c2491a5a55a163cc")
       end
 
       it "returns a manifest from a hash" do
@@ -108,7 +108,7 @@ module Omnibus
       end
 
       it "normalizes the source to use symbols" do
-        expect(Manifest.from_hash(manifest).entry_for(:zlib).locked_source).to eq({url: "an_url"})
+        expect(Manifest.from_hash(manifest).entry_for(:zlib).locked_source).to eq({ url: "an_url" })
       end
 
       context "v2 manifest" do
@@ -120,19 +120,19 @@ module Omnibus
             software: {
               zlib: {
                 locked_source: {
-                  url: "an_url"
+                  url: "an_url",
                 },
                 locked_version: "new.newer",
                 source_type: "url",
                 described_version: "new.newer",
                 license: "Zlib",
-              }
-            }
+              },
+            },
           }
         }
 
         it "has a license" do
-          expect(Manifest.from_hash(manifest).license).to eq('Unspecified')
+          expect(Manifest.from_hash(manifest).license).to eq("Unspecified")
         end
       end
 
@@ -144,7 +144,7 @@ module Omnibus
         }
 
         it "raises an error if it doesn't recognize the manifest version" do
-          expect{Manifest.from_hash(manifest)}.to raise_error Manifest::InvalidManifestFormat
+          expect { Manifest.from_hash(manifest) }.to raise_error Manifest::InvalidManifestFormat
         end
       end
     end