Merge pull request #2499 from juliandunn/trash-shef

Remove all parts of 'shef'

3 files changed, 1 insertions, 55 deletions

diff --git a/bin/shef b/bin/shef
deleted file mode 100755
index 0862198e53..0000000000
--- a/bin/shef
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-#
-# ./chef-shell - Run the Chef REPL (Shell)
-#
-# Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright (c) 2009
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-begin
-  require "rubygems"
-rescue LoadError
-end
-
-require "irb"
-require "irb/completion"
-require 'irb/ext/save-history'
-
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
-
-require "chef/shell"
-
-Chef::Log.warn("DEPRECATED: The 'shef' program is renamed to 'chef-shell'")
-Shell.start
diff --git a/chef.gemspec b/chef.gemspec
index 67cd29a930..2390d88365 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 3.0" }
 
   s.bindir       = "bin"
-  s.executables  = %w( chef-client chef-solo knife chef-shell shef chef-apply )
+  s.executables  = %w( chef-client chef-solo knife chef-shell chef-apply )
 
   s.require_path = 'lib'
   s.files = %w(Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
diff --git a/lib/chef/shef/ext.rb b/lib/chef/shef/ext.rb
deleted file mode 100644
index 8f03de2d04..0000000000
--- a/lib/chef/shef/ext.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#--
-# Author:: Joshua Timberman (<joshua@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/shell/ext'