base.rb in omnibus-3.2.0.rc.1

- old
+ new

@@ -25,50 +25,10 @@
     extend Forwardable
 
     # The Omnibus::Project instance that we're packaging.
     attr_reader :project
 
-    # !@method name
-    #   @return (see Project#name)
-    def_delegator :@project, :name
-
-    # !@method friendly_name
-    #   @return (see Project#friendly_name)
-    def_delegator :@project, :friendly_name
-
-    # !@method maintainer
-    #   @return (see Project#maintainer)
-    def_delegator :@project, :maintainer
-
-    # !@method version
-    #   @return (see Project#build_version)
-    def_delegator :@project, :build_version, :version
-
-    # !@method iteration
-    #   @return (see Project#iteration)
-    def_delegator :@project, :iteration, :iteration
-
-    # !@method identifier
-    #   @return (see Project#mac_pkg_identifier)
-    def_delegator :@project, :mac_pkg_identifier, :identifier
-
-    # !@method install_path
-    #   @return (see Project#install_path)
-    def_delegator :@project, :install_path, :install_path
-
-    # !@method scripts
-    #   @return (see Project#package_scripts_path)
-    def_delegator :@project, :package_scripts_path, :scripts
-
-    # !@method files_path
-    #   @return (see Project#files_path)
-    def_delegator :@project, :files_path
-
-    # !@method package_dir
-    #   @return (see Project#package_dir)
-    def_delegator :@project, :package_dir
-
     # The commands/steps to setup the file system.
     def self.setup(&block)
       if block_given?
         @setup = block
       else
@@ -108,11 +68,30 @@
     # @param [Project] project
     def initialize(project)
       @project = project
     end
 
+    # Hacky way to get around the fact that older versions of Omnibus used to
+    # delegate magical methods to this DSL.
     #
+    # @deprecated Use +project+ methods instead
+    def method_missing(m, *args, &block)
+      if project.respond_to?(m)
+        log.deprecated("#{log_key}##{m}") { "#{m}. Please use project.#{m} instead." }
+        project.send(m, *args, &block)
+      else
+        super
+      end
+    end
+
+    # @deprecated
+    def version
+      log.deprecated("#{log_key}#version") { 'version. Please use project.build_version instead.' }
+      project.build_version
+    end
+
+    #
     # Generation methods
     # ------------------------------
 
     # Create a directory at the given +path+.
     #
@@ -227,11 +206,11 @@
 
     # The path to the directory where we can throw staged files.
     #
     # @return [String]
     def staging_dir
-      File.expand_path("#{project.package_tmp}/#{underscore_name}")
+      File.expand_path("#{Config.package_tmp}/#{underscore_name}")
     end
 
     # The path to the directory where the packager resources are
     # copied into from source.
     #
@@ -256,10 +235,10 @@
     # @return [String]
     def resources_path
       base_path = if project.resources_path
                     project.resources_path
                   else
-                    files_path
+                    project.files_path
                   end
 
       File.expand_path(File.join(base_path, underscore_name, 'Resources'))
     end
 