diff options
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/resource/scm.rb | 21 | ||||
| -rw-r--r-- | lib/chef/resource/subversion.rb | 17 |
2 files changed, 17 insertions, 21 deletions
diff --git a/lib/chef/resource/scm.rb b/lib/chef/resource/scm.rb index 8bc55a7974..2fef1a1466 100644 --- a/lib/chef/resource/scm.rb +++ b/lib/chef/resource/scm.rb @@ -24,10 +24,6 @@ class Chef default_action :sync allowed_actions :checkout, :export, :sync, :diff, :log - def initialize(name, run_context = nil) - super - end - property :destination, String, name_property: true, identity: true property :repository, String property :revision, String, default: "HEAD" @@ -45,23 +41,6 @@ class Chef property :checkout_branch, String, default: "deploy" property :environment, [Hash, nil], default: nil - def svn_arguments(arg = nil) - @svn_arguments, arg = nil, nil if arg == false - set_or_return( - :svn_arguments, - arg, - :kind_of => String - ) - end - - def svn_info_args(arg = nil) - @svn_info_args, arg = nil, nil if arg == false - set_or_return( - :svn_info_args, - arg, - :kind_of => String) - end - alias :env :environment end end diff --git a/lib/chef/resource/subversion.rb b/lib/chef/resource/subversion.rb index b093ad3097..02b9da0a42 100644 --- a/lib/chef/resource/subversion.rb +++ b/lib/chef/resource/subversion.rb @@ -38,6 +38,23 @@ class Chef "#{self} (#{defined_at}) had an error: #{e.class.name}: #{svn_password ? e.message.gsub(svn_password, "[hidden_password]") : e.message}" end + def svn_arguments(arg = nil) + @svn_arguments, arg = nil, nil if arg == false + set_or_return( + :svn_arguments, + arg, + :kind_of => String + ) + end + + def svn_info_args(arg = nil) + @svn_info_args, arg = nil, nil if arg == false + set_or_return( + :svn_info_args, + arg, + :kind_of => String) + end + property :svn_binary, String end end |