change calls that have been deprecated

chef · Feb 26, 2014 · 540f691 · 540f691
1 parent 004c9d0
commit 540f691
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/omnibus/builder.rb b/lib/omnibus/builder.rb
@@ -210,7 +210,7 @@ def log(message)
 
     def build
       log "building #{name}"
-      log "version overridden from #{@software.given_version} to #{@software.override_version}" if @software.overridden?
+      log "version overridden from #{@software.default_version} to #{@software.version}" if @software.overridden?
       time_it("#{name} build") do
         @build_commands.each do |cmd|
           execute(cmd)

diff --git a/lib/omnibus/library.rb b/lib/omnibus/library.rb
@@ -33,9 +33,9 @@ def component_added(component)
 
     def version_map
       @components.inject({}) {|map, component|
-        map[component.name] = if component.given_version
+        map[component.name] = if component.default_version
                                 {:version       => component.version,
-                                 :given_version => component.given_version,
+                                 :default_version => component.default_version,
                                  :overridden    => component.overridden?,
                                  :version_guid  => component.version_guid}
                               else

diff --git a/lib/omnibus/reports.rb b/lib/omnibus/reports.rb
@@ -54,7 +54,7 @@ def pretty_version_map(project)
       # because we want to output a column only if something was
       # overridden, but nothing if no packages were changed
       overridden_versions = non_nil_values(version_map.values.select{|v| v[:overridden]},
-                                           :given_version)
+                                           :default_version)
 
 
       # Determine how wide the printed table columns need to be

diff --git a/spec/software_spec.rb b/spec/software_spec.rb
@@ -52,8 +52,8 @@
         expect(software.version).to eq(expected_version)
       end
 
-      it "should have the right given_version" do
-        expect(software.given_version).to eq(default_version)
+      it "should have the right default_version" do
+        expect(software.default_version).to eq(default_version)
       end
 
       it "should have nil for an override_version" do