diff options
| -rwxr-xr-x | bin/chef-apply | 2 | ||||
| -rw-r--r-- | lib/chef/application/apply.rb | 12 | ||||
| -rw-r--r-- | spec/unit/application/apply.rb | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/bin/chef-apply b/bin/chef-apply index df960bc455..ed7f3173a5 100755 --- a/bin/chef-apply +++ b/bin/chef-apply @@ -22,4 +22,4 @@ require 'rubygems' $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) require 'chef/application/apply' -Chef::Application::Recipe.new.run +Chef::Application::Apply.new.run diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb index 4e750b0e15..cf34f51c19 100644 --- a/lib/chef/application/apply.rb +++ b/lib/chef/application/apply.rb @@ -27,7 +27,7 @@ require 'tempfile' require 'chef/providers' require 'chef/resources' -class Chef::Application::Recipe < Chef::Application +class Chef::Application::Apply < Chef::Application banner "Usage: chef-recipe [RECIPE_FILE] [-e RECIPE_TEXT] [-s]" @@ -43,7 +43,7 @@ class Chef::Application::Recipe < Chef::Application :long => "--stdin", :description => "Execute resources read from STDIN", :boolean => true - + option :log_level, :short => "-l LEVEL", :long => "--log_level LEVEL", @@ -59,7 +59,7 @@ class Chef::Application::Recipe < Chef::Application :show_options => true, :exit => 0 - + option :version, :short => "-v", :long => "--version", @@ -116,7 +116,7 @@ class Chef::Application::Recipe < Chef::Application @recipe_fh.rewind @recipe_filename = @recipe_fh.path end - + def run_chef_recipe if config[:execute] @recipe_text = config[:execute] @@ -148,7 +148,7 @@ class Chef::Application::Recipe < Chef::Application rescue Exception => e Chef::Application.debug_stacktrace(e) Chef::Application.fatal!("#{e.class}: #{e.message}", 1) - end + end end # Get this party started @@ -156,5 +156,5 @@ class Chef::Application::Recipe < Chef::Application reconfigure run_application end - + end diff --git a/spec/unit/application/apply.rb b/spec/unit/application/apply.rb index 18149c65f1..7038801a60 100644 --- a/spec/unit/application/apply.rb +++ b/spec/unit/application/apply.rb @@ -17,7 +17,7 @@ require 'spec_helper' -describe Chef::Application::Recipe do +describe Chef::Application::Apply do before do @original_config = Chef::Config.configuration |